From b7cc8b196565cf86344c54ac9032b458e1d2312b Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 13 Mar 2026 17:11:21 +0800
Subject: [PATCH] =?UTF-8?q?2026-03-13=20=E6=8A=A5=E4=BB=B7=E7=9A=84?=
 =?UTF-8?q?=E5=B7=A5=E8=89=BA=E9=A1=B5=E7=AD=BE=EF=BC=8C=E6=9C=BA=E5=99=A8?=
 =?UTF-8?q?=E6=88=90=E6=9C=AC=E5=92=8C=E4=BA=BA=E5=B7=A5=E6=88=90=E6=9C=AC?=
 =?UTF-8?q?=E4=B9=9F=E6=8B=86=E5=BC=80=EF=BC=8C=E5=88=86=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E5=92=8C=E8=B0=83=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/primary/quoteDetailRouting.vue     | 91 +++++++++++++++++--
 1 file changed, 82 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/quote/detail/primary/quoteDetailRouting.vue b/src/views/modules/quote/detail/primary/quoteDetailRouting.vue
index 7b3a512..476ee52 100644
--- a/src/views/modules/quote/detail/primary/quoteDetailRouting.vue
+++ b/src/views/modules/quote/detail/primary/quoteDetailRouting.vue
@@ -419,39 +419,112 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5011,
-          serialNumber: '5011Table5TotalMachCost',
+          serialNumber: '5011Table5TotalMachSetupCost',
           tableId: "5011Table5",
           tableName: "报价工艺信息",
-          columnProp: 'totalMachCost',
+          columnProp: 'totalMachSetupCost',
           headerAlign: "center",
           align: "right",
-          columnLabel: '机器成本',
+          columnLabel: '机器成本-调机',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 140,
+          columnWidth: 120,
         },
         {
           userId: this.$store.state.user.name,
           functionId: 5011,
-          serialNumber: '5011Table5TotalLaborCost',
+          serialNumber: '5011Table5TotalMachRunCost',
           tableId: "5011Table5",
           tableName: "报价工艺信息",
-          columnProp: 'totalLaborCost',
+          columnProp: 'totalMachRunCost',
           headerAlign: "center",
           align: "right",
-          columnLabel: '人工成本',
+          columnLabel: '机器成本-生产',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 140,
-        },{
+          columnWidth: 120,
+        },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 5011,
+        //   serialNumber: '5011Table5TotalMachCost',
+        //   tableId: "5011Table5",
+        //   tableName: "报价工艺信息",
+        //   columnProp: 'totalMachCost',
+        //   headerAlign: "center",
+        //   align: "right",
+        //   columnLabel: '机器成本',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        //   columnWidth: 140,
+        // },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5011,
+          serialNumber: '5011Table5TotalLaborSetupCost',
+          tableId: "5011Table5",
+          tableName: "报价工艺信息",
+          columnProp: 'totalLaborSetupCost',
+          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: '5011Table5TotalLaborRunCost',
+          tableId: "5011Table5",
+          tableName: "报价工艺信息",
+          columnProp: 'totalLaborRunCost',
+          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: '5011Table5TotalLaborCost',
+        //   tableId: "5011Table5",
+        //   tableName: "报价工艺信息",
+        //   columnProp: 'totalLaborCost',
+        //   headerAlign: "center",
+        //   align: "right",
+        //   columnLabel: '人工成本',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        //   columnWidth: 140,
+        // },
+        {
           userId: this.$store.state.user.name,
           functionId: 5011,
           serialNumber: '5011Table5TotalCost',