From a808bb53dac0e63686520409a218fb0deff95ade Mon Sep 17 00:00:00 2001
From: zelian_wu <zelian.wu@xujiesoft.com>
Date: Tue, 30 Apr 2024 17:30:29 +0800
Subject: [PATCH] 2024-04-30

---
 src/views/modules/proofing/requestForProofing.vue         | 8 ++++----
 .../modules/quotation/sellForQuotation/quoteDetail.vue    | 2 +-
 src/views/modules/test/requestForTest.vue                 | 4 ++--
 src/views/modules/test/testSoBom/testTable.vue            | 4 +++-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue
index 48343a7..1aaa2b0 100644
--- a/src/views/modules/proofing/requestForProofing.vue
+++ b/src/views/modules/proofing/requestForProofing.vue
@@ -481,7 +481,7 @@
     </el-dialog>
 
     <!-- 页签 -->
-    <el-tabs v-model="activeTable" style="margin-top: 0px; width: 100%; min-height: 500px;" type="border-card" @tab-click="tabClick" class="customer-tab">
+    <el-tabs v-model="activeTable" style="margin-top: 0px; width: 100%; min-height: 300px;" type="border-card" @tab-click="tabClick" class="customer-tab">
       <!-- 打样详细信息页签 -->
       <el-tab-pane label="打样详细信息" name="proofing_detail_information" v-if="false">
         <el-form :inline="true" label-position="top" :model="proofingDetailData" style="margin-left: 10px;margin-top: 10px;">
@@ -1088,7 +1088,7 @@
         exportFooter: [],
         resultList: [],
         // ======== 行高 ========
-        height: 200,
+        height: 300,
         secondHeight: 200,
         // ======== 分页 ========
         pageIndex: 1,
@@ -2058,7 +2058,7 @@
     },
     mounted () {
       this.$nextTick(() => {
-        this.height = window.innerHeight / 2 - 240;
+        this.height = window.innerHeight / 2 - 80;
         /*第二个表格高度的动态调整*/
         this.secondHeight = window.innerHeight / 2  - 206;
       })
@@ -3303,7 +3303,7 @@
 <style scoped lang="scss">
 /deep/ .customer-tab .el-tabs__content {
   padding: 0px !important;
-  height: 459px;
+  height: 300px;
 }
 .right /deep/ .el-input__inner{
   text-align: right;
diff --git a/src/views/modules/quotation/sellForQuotation/quoteDetail.vue b/src/views/modules/quotation/sellForQuotation/quoteDetail.vue
index 09e9de9..49dae3d 100644
--- a/src/views/modules/quotation/sellForQuotation/quoteDetail.vue
+++ b/src/views/modules/quotation/sellForQuotation/quoteDetail.vue
@@ -1134,7 +1134,7 @@ export default {
       <el-tab-pane name="tool" label="工具">
         <tool-quotation ref="tool" :total-cost.sync="ToolCost"  v-if="quotationDetailFlag" :height="fullscreen?660:420" :detail="quotationDetail"></tool-quotation>
       </el-tab-pane>
-      <el-tab-pane name="property" label="成品属性">
+      <el-tab-pane name="property" label="其他成本">
         <property-templates ref="property" :pack-cost.sync="packInfoCost" :shipping-cost.sync="shippingInfoCost"  v-if="quotationDetailFlag" :height="fullscreen?660:420" :detail="quotationDetail" ></property-templates>
       </el-tab-pane>
       <el-tab-pane name="cost" label="成本&价格">
diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue
index efe954e..de4bb79 100644
--- a/src/views/modules/test/requestForTest.vue
+++ b/src/views/modules/test/requestForTest.vue
@@ -274,13 +274,13 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="CQC">
-              <span slot="label"><a herf="#" @click="getBaseList(2043)">CQC</a></span>
+              <span slot="label"><a herf="#" @click="getBaseList(2007)">CQC</a></span>
               <el-input v-model="modalData.artworkName"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="FAI">
-              <span slot="label"><a herf="#" @click="getBaseList(2044)">FAI</a></span>
+              <span slot="label"><a herf="#" @click="getBaseList(2008)">FAI</a></span>
               <el-input v-model="modalData.plannerName"></el-input>
             </el-form-item>
           </el-col>
diff --git a/src/views/modules/test/testSoBom/testTable.vue b/src/views/modules/test/testSoBom/testTable.vue
index 7e17c93..e3452bf 100644
--- a/src/views/modules/test/testSoBom/testTable.vue
+++ b/src/views/modules/test/testSoBom/testTable.vue
@@ -87,6 +87,7 @@ export default {
         remark:undefined,
         unitCost:0,
         totalCost:0,
+        status:"N",
       },
       selectionTestSoBomList:[],
       testSoBomColumnList:[{
@@ -398,6 +399,7 @@ export default {
       this.testSoBom.partDesc = row.partDesc;
       this.testSoBom.umId = row.umId;
       this.testSoBom.unitCost = row.standardCost;
+      this.testSoBom.status = row.status;
       this.partDialogFlag = false;
     },
     testSoBomClickRow(row,column){
@@ -689,7 +691,7 @@ export default {
           </el-col>
           <el-col :span="8">
             <el-form-item label="单价" prop="unitCost">
-              <el-input-number @input="computeTotalCost" style="width: 100%;margin-top: -5px;" :min="0" v-model="testSoBom.unitCost" :controls="false"></el-input-number>
+              <el-input-number @input="computeTotalCost" :disabled="testSoBom.status === 'N'" style="width: 100%;margin-top: -5px;" :min="0" v-model="testSoBom.unitCost" :controls="false"></el-input-number>
             </el-form-item>
           </el-col>
 <!--          <el-col :span="8">-->