From b027c231fa31c4bf8d46e2abacd12373491a909f Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Tue, 8 Oct 2024 14:45:58 +0800
Subject: [PATCH] 2024-10-08

---
 src/views/modules/quotation/requestForQuote.vue    |  2 +-
 src/views/modules/quotation/sellForQuotation.vue   |  5 ++---
 .../sellForQuotation/quotationDetail/costPrice.vue | 14 +++++++++-----
 src/views/modules/quotation/toBeQuoted.vue         |  2 +-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue
index 33f85cc..4d9c2e7 100644
--- a/src/views/modules/quotation/requestForQuote.vue
+++ b/src/views/modules/quotation/requestForQuote.vue
@@ -163,7 +163,7 @@
     <selectDiv ref="selectDiv"></selectDiv>
 
     <!-- 分页插件 -->
-    <el-pagination style="margin-top: 0px"
+    <el-pagination style="margin-top: 0"
                    @size-change="sizeChangeHandle"
                    @current-change="currentChangeHandle"
                    :current-page="pageIndex"
diff --git a/src/views/modules/quotation/sellForQuotation.vue b/src/views/modules/quotation/sellForQuotation.vue
index 4ff95ad..e194f36 100644
--- a/src/views/modules/quotation/sellForQuotation.vue
+++ b/src/views/modules/quotation/sellForQuotation.vue
@@ -280,11 +280,10 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="采购专员" prop="trackerName">
-              <!--            <el-form-item prop="tracker" label="采购专员">-->
-              <span slot="label" v-if="insertData.internalInquiryNo ==='' && !detailDialogVisible" @click="getBaseList(2000)">
+              <span slot="label" v-if="!detailDialogVisible" @click="getBaseList(2000)">
                 <a>采购专员</a>
               </span>
-              <el-input v-model="insertData.trackerName" :disabled="insertData.internalInquiryNo !=='' || detailDialogVisible" @clear="clearTracker"  readonly clearable/>
+              <el-input v-model="insertData.trackerName" :disabled="detailDialogVisible" @clear="clearTracker"  readonly clearable/>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/modules/quotation/sellForQuotation/quotationDetail/costPrice.vue b/src/views/modules/quotation/sellForQuotation/quotationDetail/costPrice.vue
index e229604..711fd72 100644
--- a/src/views/modules/quotation/sellForQuotation/quotationDetail/costPrice.vue
+++ b/src/views/modules/quotation/sellForQuotation/quotationDetail/costPrice.vue
@@ -219,7 +219,7 @@ export default {
     <!--系统自动计算结果-->
     <el-form :model="copyDetail" ref="costForm" :rules="rules" label-position="top" label-width="120px">
       <fieldset
-        style="height:80px;margin-top: 2px;border-color: rgb(255,255,255);">
+        style="height:80px;margin-top: 2px;">
         <legend>系统自动计算结果(料工费/工具)</legend>
         <el-row :gutter="20">
           <el-col :span="4">
@@ -255,7 +255,7 @@ export default {
         </el-row>
       </fieldset>
       <fieldset
-        style="height:80px;margin-top: 5px;border-color: rgb(255,255,255);">
+        style="height:80px;margin-top: 5px;">
         <legend>调整后成本(料工费/工具)</legend>
         <el-row :gutter="20">
           <el-col :span="4">
@@ -291,7 +291,7 @@ export default {
         </el-row>
       </fieldset>
       <fieldset
-        style="height:80px;margin-top: 5px;border-color: rgb(255,255,255)">
+        style="height:80px;margin-top: 5px;">
         <legend>其他成本</legend>
         <el-row :gutter="20">
           <el-col :span="4">
@@ -326,7 +326,7 @@ export default {
           </el-col>
         </el-row>
       </fieldset>
-      <fieldset style="height:80px;margin-top: 5px;border-color: rgb(255,255,255);">
+      <fieldset style="height:80px;margin-top: 5px;">
         <legend>利润</legend>
           <el-row :gutter="20">
             <el-col :span="4">
@@ -343,7 +343,7 @@ export default {
             </el-col>
           </el-row>
       </fieldset>
-      <fieldset style="height:80px;margin-top: 5px;border-color: rgb(255,255,255);">
+      <fieldset style="height:80px;margin-top: 5px;">
         <legend>最终价格</legend>
           <el-row :gutter="20">
             <el-col :span="4">
@@ -387,4 +387,8 @@ export default {
   text-align: right;
   padding-right: 5px !important;
 }
+
+form fieldset{
+  border: 1px solid #000;
+}
 </style>
diff --git a/src/views/modules/quotation/toBeQuoted.vue b/src/views/modules/quotation/toBeQuoted.vue
index 505da8a..6e93a0d 100644
--- a/src/views/modules/quotation/toBeQuoted.vue
+++ b/src/views/modules/quotation/toBeQuoted.vue
@@ -72,7 +72,7 @@
 <!--        </el-select>-->
 <!--      </el-form-item>-->
       <el-form-item :label="'状态'">
-        <el-select v-model="searchData.quotationResultStatus" style="width: 120px">
+        <el-select v-model="searchData.quotationStatus" style="width: 120px">
           <el-option label="全部" value=""></el-option>
           <el-option label="草稿" value="草稿"></el-option>
           <el-option label="下达" value="下达"></el-option>