From ca7d28ad2a49a648a8aa5d54db463ea20c4b2e81 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Wed, 27 Nov 2024 13:02:10 +0800
Subject: [PATCH 1/2] 20241127

---
 .../modules/quote/detail/primary/quoteDetailCost.vue      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/quote/detail/primary/quoteDetailCost.vue b/src/views/modules/quote/detail/primary/quoteDetailCost.vue
index 763feb0..95c9c65 100644
--- a/src/views/modules/quote/detail/primary/quoteDetailCost.vue
+++ b/src/views/modules/quote/detail/primary/quoteDetailCost.vue
@@ -587,13 +587,13 @@ export default {
           <el-col :span="4">
             <el-form-item label="标准币种成本1:" prop="currencyTotalCost1" :show-message="false">
               <el-input-number style="width: 100%;" :controls="false"
-                               v-model="quoteDetail.currencyTotalCost1" :step="0" :min="0" :precision="6" disabled/>
+                               v-model="quoteDetail.currencyTotalCost1" :step="0" :min="0" :precision="6"/>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="标准币种成本2:" prop="currencyTotalCost2" :show-message="false">
               <el-input-number style="width: 100%;" :controls="false"
-                               v-model="quoteDetail.currencyTotalCost2" :step="0" :min="0" :precision="6" disabled/>
+                               v-model="quoteDetail.currencyTotalCost2" :step="0" :min="0" :precision="6"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -636,13 +636,13 @@ export default {
           <el-col :span="4">
             <el-form-item label="报价币种成本1:" prop="quoteCurrencyTotalCost1" :show-message="false">
               <el-input-number style="width: 100%;" :controls="false"
-                               v-model="quoteDetail.quoteCurrencyTotalCost1" :step="0" :min="0" :precision="6" disabled/>
+                               v-model="quoteDetail.quoteCurrencyTotalCost1" :step="0" :min="0" :precision="6"/>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="报价币种成本2:" prop="quoteCurrencyTotalCost2" :show-message="false">
               <el-input-number style="width: 100%;" :controls="false"
-                               v-model="quoteDetail.quoteCurrencyTotalCost2" :step="0" :min="0" :precision="6" disabled/>
+                               v-model="quoteDetail.quoteCurrencyTotalCost2" :step="0" :min="0" :precision="6"/>
             </el-form-item>
           </el-col>
         </el-row>

From 85b35b0d9e431c6a2ae3dabf83d6f7418046d8f6 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Thu, 28 Nov 2024 17:59:22 +0800
Subject: [PATCH 2/2] 20241128

---
 .../modules/quote/detail/quoteDetail.vue      | 519 +-----------------
 1 file changed, 12 insertions(+), 507 deletions(-)

diff --git a/src/views/modules/quote/detail/quoteDetail.vue b/src/views/modules/quote/detail/quoteDetail.vue
index 49c4bdd..b57a87c 100644
--- a/src/views/modules/quote/detail/quoteDetail.vue
+++ b/src/views/modules/quote/detail/quoteDetail.vue
@@ -108,7 +108,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 200
+          columnWidth: 120
         },
         {
           userId: this.$store.state.user.name,
@@ -126,7 +126,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 200
+          columnWidth: 240
         },
         {
           userId: this.$store.state.user.name,
@@ -146,131 +146,6 @@ export default {
           fixed: '',
           columnWidth: 100
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5011,
-          serialNumber: '5011Table2PartCost',
-          tableId: '5011Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'partCost',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '计算后材料标准成本',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5011,
-          serialNumber: '5011Table2BomUnYield',
-          tableId: '5011Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'bomUnYield',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '计算后材料报价成本',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5011,
-          serialNumber: '5011Table2MachineCost',
-          tableId: '5011Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'machineCost',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '计算后机器成本',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },{
-          userId: this.$store.state.user.name,
-          functionId: 5011,
-          serialNumber: '5011Table2LabourCost',
-          tableId: '5011Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'labourCost',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '计算后人工成本',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5011,
-          serialNumber: '5011Table2FabricateCost',
-          tableId: '5011Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'fabricateCost',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '计算后制造费用',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5011,
-          serialNumber: '5011Table2tToolCost',
-          tableId: '5011Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'toolCost',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '计算后工具成本',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5011,
-          serialNumber: '5011Table2AdjustPartCost',
-          tableId: '5011Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'adjustPartCost',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '调整后材料标准成本',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },
         {
           userId: this.$store.state.user.name,
           functionId: 5011,
@@ -280,7 +155,7 @@ export default {
           columnProp: 'adjustBomUnYield',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '调整后材料报价成本',
+          columnLabel: '报价成本',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -289,24 +164,6 @@ export default {
           fixed: '',
           columnWidth: 130
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5011,
-          serialNumber: '5011Table2AdjustMachineCost',
-          tableId: '5011Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'adjustMachineCost',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '调整后机器成本',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },
         {
           userId: this.$store.state.user.name,
           functionId: 5011,
@@ -316,7 +173,7 @@ export default {
           columnProp: 'adjustLabourCost',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '调整后人工成本',
+          columnLabel: 'DL',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -334,24 +191,7 @@ export default {
           columnProp: 'adjustFabricateCost',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '调整后制造费用',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },{
-          userId: this.$store.state.user.name,
-          functionId: 5011,
-          serialNumber: '5011Table2AdjustToolCost',
-          tableId: '5011Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'adjustToolCost',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '调整后工具成本',
+          columnLabel: 'VOH',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -363,30 +203,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5011,
-          serialNumber: '5011Table2OtherCost',
-          tableId: '5011Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'otherCost',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '其他成本',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },{
-          userId: this.$store.state.user.name,
-          functionId: 5011,
-          serialNumber: '5011Table2ManageCost',
+          serialNumber: '5011Table2AdjustMachineCost',
           tableId: '5011Table2',
           tableName: '报价详情信息表',
-          columnProp: 'manageCost',
+          columnProp: 'adjustMachineCost',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '管理成本',
+          columnLabel: 'FOH',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -394,7 +217,8 @@ export default {
           status: true,
           fixed: '',
           columnWidth: 120
-        },{
+        }
+        ,{
           userId: this.$store.state.user.name,
           functionId: 5011,
           serialNumber: '5011Table2TotalCost',
@@ -403,315 +227,14 @@ export default {
           columnProp: 'totalCost',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '总成本',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },{
-          userId: this.$store.state.user.name,
-          functionId: 5011,
-          serialNumber: '5011Table2ProfitRate',
-          tableId: '5011Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'profitRate',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '利润率%',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },{
-          userId: this.$store.state.user.name,
-          functionId: 5011,
-          serialNumber: '5011Table2ProfitAmount',
-          tableId: '5011Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'profitAmount',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '利润额',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },{
-          userId: this.$store.state.user.name,
-          functionId: 5011,
-          serialNumber: '5011Table2UnitPrice',
-          tableId: '5011Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'unitPrice',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '未税单价',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },{
-          userId: this.$store.state.user.name,
-          functionId: 5011,
-          serialNumber: '5011Table2TotalPrice',
-          tableId: '5011Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'totalPrice',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '未税总价',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5011,
-          serialNumber: '5011Table2TaxRate',
-          tableId: '5011Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'taxRate',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '税率%',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },{
-          userId: this.$store.state.user.name,
-          functionId: 5011,
-          serialNumber: '5011Table2TaxUnitPrice',
-          tableId: '5011Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'taxUnitPrice',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '含税单价',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5011,
-          serialNumber: '5011Table2TaxTotalPrice',
-          tableId: '5011Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'taxTotalPrice',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '含税总价',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5011,
-          serialNumber: '5011Table2ProcessTime',
-          tableId: '5011Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'processTime',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '处理时间',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5011,
-          serialNumber: '5011Table2Yield',
-          tableId: '5011Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'yield',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: 'Yield',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5011,
-          serialNumber: '5011Table2BomYield',
-          tableId: '5011Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'bomYield',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: 'BOM Yield',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5011,
-          serialNumber: '5011Table2ParentAttritionRate',
-          tableId: '5011Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'parentAttritionRate',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '母件损耗率',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5011,
-          serialNumber: '5011Table2ChildAttritionRate',
-          tableId: '5011Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'childAttritionRate',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '子件损耗率',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5011,
-          serialNumber: '5011Table2Status',
-          tableId: '5011Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'status',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '状态',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5011,
-          serialNumber: '5011Table2CreateBy',
-          tableId: '5011Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'createBy',
-          headerAlign: 'center',
-          align: 'left',
-          columnLabel: '创建人',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5011,
-          serialNumber: '5011Table2CreateDate',
-          tableId: '5011Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'createDate',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '创建日期',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 130
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5011,
-          serialNumber: '5011Table2UpdateBy',
-          tableId: '5011Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'updateBy',
-          headerAlign: 'center',
-          align: 'left',
-          columnLabel: '更新人',
+          columnLabel: 'Total Cost(RMB.KCT)',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5011,
-          serialNumber: '5011Table2UpdateDate',
-          tableId: '5011Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'updateDate',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '更新日期',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 130
+          columnWidth: 140
         },
         {
           userId: this.$store.state.user.name,
@@ -731,24 +254,6 @@ export default {
           fixed: '',
           columnWidth: 120
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5011,
-          serialNumber: '5011Table2InternalInquiryNo',
-          tableId: '5011Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'internalInquiryNo',
-          headerAlign: 'center',
-          align: 'left',
-          columnLabel: '询价单号',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },
       ],
       partVisible:false,
       activeName:'bom',