20240927

src/views/modules/quote/detail/primary/quoteDetailRouting.vue

@@ -161,16 +161,17 @@ export default {
           status: true,
           fixed: '',
           columnWidth: 200,
-        },{
+        },
+        {
           userId: this.$store.state.user.name,
           functionId: 5011,
-          serialNumber: '5011Table5WorkCenterCost',
+          serialNumber: '5011Table5MachSetupTime',
           tableId: "5011Table5",
           tableName: "报价工艺信息",
-          columnProp: 'workCenterCost',
+          columnProp: 'machSetupTime',
           headerAlign: "center",
-          align: "left",
-          columnLabel: '加工中心成本',
+          align: "right",
+          columnLabel: '机器调机时间',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -178,16 +179,17 @@ export default {
           status: true,
           fixed: '',
           columnWidth: 100,
-        },{
+        },
+        {
           userId: this.$store.state.user.name,
           functionId: 5011,
-          serialNumber: '5011Table5EfficiencyFactor',
+          serialNumber: '5011Table5SetupCrewSize',
           tableId: "5011Table5",
           tableName: "报价工艺信息",
-          columnProp: 'efficiencyFactor',
+          columnProp: 'setupCrewSize',
           headerAlign: "center",
           align: "right",
-          columnLabel: '效率%',
+          columnLabel: '调机过程人数',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -195,33 +197,35 @@ export default {
           status: true,
           fixed: '',
           columnWidth: 100,
-        },{
+        },
+        {
           userId: this.$store.state.user.name,
           functionId: 5011,
-          serialNumber: '5011Table5MachRunFactor',
+          serialNumber: '5011Table5SetupLaborClassNo',
           tableId: "5011Table5",
           tableName: "报价工艺信息",
-          columnProp: 'machRunFactor',
+          columnProp: 'setupLaborClassNo',
           headerAlign: "center",
-          align: "right",
-          columnLabel: '机器单位产出',
+          align: "left",
+          columnLabel: '调机时人员等级',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 100,
-        },{
+          columnWidth: 140,
+        },
+        {
           userId: this.$store.state.user.name,
           functionId: 5011,
-          serialNumber: '5011Table5MachSetupTime',
+          serialNumber: '5011Table5MachCycleTime',
           tableId: "5011Table5",
           tableName: "报价工艺信息",
-          columnProp: 'machSetupTime',
+          columnProp: 'machCycleTime',
           headerAlign: "center",
           align: "right",
-          columnLabel: '调机时间',
+          columnLabel: '机器处理时间',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -233,30 +237,31 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5011,
-          serialNumber: '5011Table5LaborRunFactor',
+          serialNumber: '5011Table5MachRunFactor',
           tableId: "5011Table5",
           tableName: "报价工艺信息",
-          columnProp: 'laborRunFactor',
+          columnProp: 'machRunFactor',
           headerAlign: "center",
           align: "right",
-          columnLabel: '人工单位产出',
+          columnLabel: '机器单位产出',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120,
-        },{
+          columnWidth: 100,
+        },
+        {
           userId: this.$store.state.user.name,
           functionId: 5011,
-          serialNumber: '5011Table5LaborSetupTime',
+          serialNumber: '5011Table5CrewSize',
           tableId: "5011Table5",
           tableName: "报价工艺信息",
-          columnProp: 'laborSetupTime',
+          columnProp: 'crewSize',
           headerAlign: "center",
           align: "right",
-          columnLabel: '人工调机时间',
+          columnLabel: '生产过程人数',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -268,13 +273,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5011,
-          serialNumber: '5011Table5RunTimeDesc',
+          serialNumber: '5011Table5LaborClassNo',
           tableId: "5011Table5",
           tableName: "报价工艺信息",
-          columnProp: 'runTimeDesc',
+          columnProp: 'laborClassNo',
           headerAlign: "center",
-          align: "center",
-          columnLabel: '产出单位',
+          align: "left",
+          columnLabel: '人员等级',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -286,13 +291,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5011,
-          serialNumber: '5011Table5MachCycleTime',
+          serialNumber: '5011Table5LaborSetupTime',
           tableId: "5011Table5",
           tableName: "报价工艺信息",
-          columnProp: 'machCycleTime',
+          columnProp: 'laborSetupTime',
           headerAlign: "center",
           align: "right",
-          columnLabel: '机器处理时间',
+          columnLabel: '人工调机时间',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -322,13 +327,31 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5011,
-          serialNumber: '5011Table5ResourceNum',
+          serialNumber: '5011Table5LaborRunFactor',
           tableId: "5011Table5",
           tableName: "报价工艺信息",
-          columnProp: 'resourceNum',
+          columnProp: 'laborRunFactor',
           headerAlign: "center",
           align: "right",
-          columnLabel: '机台数量',
+          columnLabel: '人工单位产出',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5011,
+          serialNumber: '5011Table5RunTimeDesc',
+          tableId: "5011Table5",
+          tableName: "报价工艺信息",
+          columnProp: 'runTimeDesc',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '产出单位',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -340,13 +363,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5011,
-          serialNumber: '5011Table5CrewSize',
+          serialNumber: '5011Table5EfficiencyFactor',
           tableId: "5011Table5",
           tableName: "报价工艺信息",
-          columnProp: 'crewSize',
+          columnProp: 'efficiencyFactor',
           headerAlign: "center",
           align: "right",
-          columnLabel: '生产过程人数',
+          columnLabel: '效率%',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -354,16 +377,17 @@ export default {
           status: true,
           fixed: '',
           columnWidth: 100,
-        },{
+        },
+        {
           userId: this.$store.state.user.name,
           functionId: 5011,
-          serialNumber: '5011Table5SetupCrewSize',
+          serialNumber: '5011Table5ResourceNum',
           tableId: "5011Table5",
           tableName: "报价工艺信息",
-          columnProp: 'setupCrewSize',
+          columnProp: 'resourceNum',
           headerAlign: "center",
           align: "right",
-          columnLabel: '调机过程人数',
+          columnLabel: '机台数量',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -371,50 +395,53 @@ export default {
           status: true,
           fixed: '',
           columnWidth: 100,
-        },{
+        },
+        {
           userId: this.$store.state.user.name,
           functionId: 5011,
-          serialNumber: '5011Table5LaborClassNo',
+          serialNumber: '5011Table5LaborClassCost',
           tableId: "5011Table5",
           tableName: "报价工艺信息",
-          columnProp: 'laborClassNo',
+          columnProp: 'laborClassCost',
           headerAlign: "center",
           align: "left",
-          columnLabel: '人员等级',
+          columnLabel: '单位人工成本-生产',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 100,
-        },{
+          columnWidth: 120,
+        },
+        {
           userId: this.$store.state.user.name,
           functionId: 5011,
-          serialNumber: '5011Table5SetupLaborClassNo',
+          serialNumber: '5011Table5SetupLaborClassCost',
           tableId: "5011Table5",
           tableName: "报价工艺信息",
-          columnProp: 'setupLaborClassNo',
+          columnProp: 'setupLaborClassCost',
           headerAlign: "center",
           align: "left",
-          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: '5011Table5LaborClassCost',
+          serialNumber: '5011Table5WorkCenterCost',
           tableId: "5011Table5",
           tableName: "报价工艺信息",
-          columnProp: 'laborClassCost',
+          columnProp: 'workCenterCost',
           headerAlign: "center",
           align: "left",
-          columnLabel: '人员等级成本',
+          columnLabel: '单位机器成本',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -422,16 +449,17 @@ export default {
           status: true,
           fixed: '',
           columnWidth: 120,
-        },{
+        },
+        {
           userId: this.$store.state.user.name,
           functionId: 5011,
-          serialNumber: '5011Table5SetupLaborClassCost',
+          serialNumber: '5011Table5ManuCost',
           tableId: "5011Table5",
           tableName: "报价工艺信息",
-          columnProp: 'setupLaborClassCost',
+          columnProp: 'manuCost',
           headerAlign: "center",
           align: "left",
-          columnLabel: '调机人员等级成本',
+          columnLabel: '单位制造费用成本',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -439,7 +467,8 @@ export default {
           status: true,
           fixed: '',
           columnWidth: 120,
-        },{
+        },
+        {
           userId: this.$store.state.user.name,
           functionId: 5011,
           serialNumber: '5011Table5TotalMachCost',
@@ -448,7 +477,7 @@ export default {
           columnProp: 'totalMachCost',
           headerAlign: "center",
           align: "right",
-          columnLabel: '单位机器成本',
+          columnLabel: '机器成本',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -465,7 +494,7 @@ export default {
           columnProp: 'totalManCost',
           headerAlign: "center",
           align: "right",
-          columnLabel: '单位制造成本',
+          columnLabel: '制造成本',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -482,7 +511,7 @@ export default {
           columnProp: 'totalLaborCost',
           headerAlign: "center",
           align: "right",
-          columnLabel: '单位人工成本',
+          columnLabel: '人工成本',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -499,7 +528,7 @@ export default {
           columnProp: 'totalCost',
           headerAlign: "center",
           align: "right",
-          columnLabel: '单位报价成本',
+          columnLabel: '成本小计',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -637,6 +666,7 @@ export default {
       })
     },
     versionRowClick(row){
+      this.routing.routingType = row.routingType;
       this.routing.routingRevision = row.routingRevision;
     },
     alternativeRowStyle({row}){