From 7d35407ee1dd27ad20b3f842fb84bd71c01fca12 Mon Sep 17 00:00:00 2001
From: zelian_wu <zelian.wu@xujiesoft.com>
Date: Mon, 18 Mar 2024 09:35:53 +0800
Subject: [PATCH] 2024-03-18

---
 .../modules/quotation/sellForQuotation.vue    | 25 ++++-
 .../sellForQuotation/quoteDetail.vue          | 92 +++++++++----------
 2 files changed, 66 insertions(+), 51 deletions(-)

diff --git a/src/views/modules/quotation/sellForQuotation.vue b/src/views/modules/quotation/sellForQuotation.vue
index f43845a..f1f974c 100644
--- a/src/views/modules/quotation/sellForQuotation.vue
+++ b/src/views/modules/quotation/sellForQuotation.vue
@@ -146,7 +146,7 @@
           <el-col :span="8">
             <el-form-item prop="customerNo" label="客户编码">
               <span slot="label" style="" v-if="insertData.internalInquiryBatchNo ===''" @click="getBaseList(102,1)"><a herf="#">客户编码</a></span>
-              <el-input v-model="insertData.customerNo" :disabled="insertData.internalInquiryBatchNo !==''" placeholder="请输入内容" clearable @clear="clearCustomer"/>
+              <el-input v-model="insertData.customerNo" :disabled="insertData.internalInquiryBatchNo !==''" placeholder="请输入内容" clearable @change="clearCustomer"/>
             </el-form-item>
           </el-col>
           <el-col :span="12" :offset="2">
@@ -909,6 +909,10 @@ export default {
     getBaseData (val) {
       if (this.tagNo === 102) {
         if(this.tagNo1 === 1) {
+          if (this.insertData.customerNo !== val.Customer_no){
+            this.insertData.projectId = '';
+            this.insertData.projectName = '';
+          }
           this.insertData.customerNo = val.Customer_no
           this.insertData.customerName = val.Customer_desc
         }
@@ -1039,14 +1043,29 @@ export default {
       }
     },
     clearCustomer(){
-      this.insertData.customerNo = '';
-      this.insertData.customerName = '';
       this.insertData.projectId = '';
       this.insertData.projectName = '';
     }
   },
   computed:{
 
+  },
+  watch:{
+    "insertData.customerNo":{
+      handler(){
+        if (!this.insertData.customerNo || this.insertData.customerNo.length === 0){
+          this.insertData.customerName = '';
+          this.insertData.projectId = '';
+        }
+      }
+    },
+    "insertData.projectId":{
+      handler(){
+        if (!this.insertData.projectId || this.insertData.projectId.length === 0){
+          this.insertData.projectName = '';
+        }
+      }
+    },
   },
   mounted () {
     this.$nextTick(() => {
diff --git a/src/views/modules/quotation/sellForQuotation/quoteDetail.vue b/src/views/modules/quotation/sellForQuotation/quoteDetail.vue
index 3b624c2..f6590ab 100644
--- a/src/views/modules/quotation/sellForQuotation/quoteDetail.vue
+++ b/src/views/modules/quotation/sellForQuotation/quoteDetail.vue
@@ -515,65 +515,61 @@ export default {
       header-align="center"
       label="序号"
       width="55"
-      align="right"
+      align="center"
       type="index">
     </el-table-column>
     <el-table-column show-overflow-tooltip
                      label="产品编码" prop="productNo"
-                     width="140" align="center">
+                     width="200" align="center">
     </el-table-column>
     <el-table-column show-overflow-tooltip
                      header-align="center"
                      label="产品名称" prop="productDesc"
-                     width="120" align="left">
+                     width="200" align="left">
     </el-table-column>
     <el-table-column show-overflow-tooltip header-align="center"
                      label="报价数量" prop="quotationDetailQuantity"
                      width="80" align="right">
     </el-table-column>
-    <el-table-column label="计算后成本" align="center">
-      <el-table-column show-overflow-tooltip
-                       label="材料成本" prop="computePartCost"
-                       width="120" align="right" header-align="center">
-      </el-table-column>
-      <el-table-column show-overflow-tooltip
-                       label="机器成本" prop="computeMachineCost"
-                       width="120" align="right" header-align="center">
-      </el-table-column>
-      <el-table-column show-overflow-tooltip
-                       label="人工成本" prop="computeLabourCost"
-                       width="120" align="right" header-align="center">
-      </el-table-column>
-      <el-table-column show-overflow-tooltip
-                       label="制造费用" prop="computeFabricateCost"
-                       width="120" align="right" header-align="center">
-      </el-table-column>
-      <el-table-column show-overflow-tooltip
-                       label="工具成本" prop="computeToolCost"
-                       width="120" align="right" header-align="center">
-      </el-table-column>
+    <el-table-column show-overflow-tooltip
+                     label="计算后材料成本" prop="computePartCost"
+                     width="120" align="right" header-align="center">
     </el-table-column>
-    <el-table-column label="调整后成本" align="center">
-      <el-table-column show-overflow-tooltip
-                       label="材料成本" prop="adjustPartCost"
-                       width="120" align="right" header-align="center">
-      </el-table-column>
-      <el-table-column show-overflow-tooltip
-                       label="机器成本" prop="adjustMachineCost"
-                       width="120" align="right" header-align="center">
-      </el-table-column>
-      <el-table-column show-overflow-tooltip
-                       label="人工成本" prop="adjustLabourCost"
-                       width="120" align="right" header-align="center">
-      </el-table-column>
-      <el-table-column show-overflow-tooltip
-                       label="制造费用" prop="adjustFabricateCost"
-                       width="120" align="right" header-align="center">
-      </el-table-column>
-      <el-table-column show-overflow-tooltip
-                       label="工具成本" prop="adjustToolCost"
-                       width="120" align="right" header-align="center">
-      </el-table-column>
+    <el-table-column show-overflow-tooltip
+                     label="计算后机器成本" prop="computeMachineCost"
+                     width="120" align="right" header-align="center">
+    </el-table-column>
+    <el-table-column show-overflow-tooltip
+                     label="计算后人工成本" prop="computeLabourCost"
+                     width="120" align="right" header-align="center">
+    </el-table-column>
+    <el-table-column show-overflow-tooltip
+                     label="计算后制造费用" prop="computeFabricateCost"
+                     width="120" align="right" header-align="center">
+    </el-table-column>
+    <el-table-column show-overflow-tooltip
+                     label="计算后工具成本" prop="computeToolCost"
+                     width="120" align="right" header-align="center">
+    </el-table-column>
+    <el-table-column show-overflow-tooltip
+                     label="调整后材料成本" prop="adjustPartCost"
+                     width="120" align="right" header-align="center">
+    </el-table-column>
+    <el-table-column show-overflow-tooltip
+                     label="调整后机器成本" prop="adjustMachineCost"
+                     width="120" align="right" header-align="center">
+    </el-table-column>
+    <el-table-column show-overflow-tooltip
+                     label="调整后人工成本" prop="adjustLabourCost"
+                     width="120" align="right" header-align="center">
+    </el-table-column>
+    <el-table-column show-overflow-tooltip
+                     label="调整后制造费用" prop="adjustFabricateCost"
+                     width="120" align="right" header-align="center">
+    </el-table-column>
+    <el-table-column show-overflow-tooltip
+                     label="调整后工具成本" prop="adjustToolCost"
+                     width="120" align="right" header-align="center">
     </el-table-column>
     <el-table-column show-overflow-tooltip
                      label="其他成本" prop="detailOtherCost"
@@ -705,15 +701,15 @@ export default {
     <el-form :rules="quotationDetailRules" style="margin-top: 5px" ref="quotationDetailForm"
              :model="quotationDetail" label-width="80px" :inline="true" label-position="top">
       <el-form-item label="产品编码" prop="productNo">
-        <el-input clearable disabled style="width: 160px" v-model="quotationDetail.productNo"/>
+        <el-input clearable disabled style="width: 200px" v-model="quotationDetail.productNo"/>
       </el-form-item>
       <el-form-item label="产品名称" prop="productDesc">
-        <el-input clearable disabled style="width: 200px" v-model="quotationDetail.productDesc"/>
+        <el-input clearable disabled style="width: 240px" v-model="quotationDetail.productDesc"/>
       </el-form-item>
       <el-form-item label="报价数量" prop="quotationDetailQuantity">
         <el-input-number disabled style="width: 100%;margin-top: -5px;" :min="1" v-model="quotationDetail.quotationDetailQuantity" :controls="false"></el-input-number>
       </el-form-item>
-      <el-form-item label="备注" style="display: block;min-height: 90px;width: 60%">
+      <el-form-item label="备注" style="display: block;min-height: 90px;width: 63%">
         <el-input type="textarea" resize="none" disabled v-model="quotationDetail.remark" :autosize="{minRows: 3, maxRows: 3}"
                   style="min-height: 80px" />
       </el-form-item>