From 52cf4b7df72c7ca3c7407e28b9ccb28a14ef4879 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 26 Sep 2024 17:41:29 +0800
Subject: [PATCH] =?UTF-8?q?2024-09-26=20RFQ=20=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/part/routingManagement.vue | 136 +++++++++----------
 1 file changed, 68 insertions(+), 68 deletions(-)

diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue
index a41b032..d774a24 100644
--- a/src/views/modules/part/routingManagement.vue
+++ b/src/views/modules/part/routingManagement.vue
@@ -1253,24 +1253,6 @@ export default {
           fixed: '',
           columnWidth: 100
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 601003,
-          serialNumber: '104003Table2EfficiencyFactor',
-          tableId: '104003Table2',
-          tableName: 'Routing工序表',
-          columnProp: 'efficiencyFactor',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '效率%',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 80
-        },
         {
           userId: this.$store.state.user.name,
           functionId: 601003,
@@ -1292,13 +1274,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 601003,
-          serialNumber: '104003Table2SetupLaborClassDesc',
+          serialNumber: '104003Table2MachSetupTime',
           tableId: '104003Table2',
           tableName: 'Routing工序表',
-          columnProp: 'setupLaborClassDesc',
+          columnProp: 'machSetupTime',
           headerAlign: 'center',
-          align: 'center',
-          columnLabel: '调机时人员等级',
+          align: 'right',
+          columnLabel: '机器调机时间',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1328,13 +1310,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 601003,
-          serialNumber: '104003Table2MachSetupTime',
+          serialNumber: '104003Table2SetupLaborClassDesc',
           tableId: '104003Table2',
           tableName: 'Routing工序表',
-          columnProp: 'machSetupTime',
+          columnProp: 'setupLaborClassDesc',
           headerAlign: 'center',
-          align: 'right',
-          columnLabel: '机器调机时间',
+          align: 'center',
+          columnLabel: '调机时人员等级',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1382,13 +1364,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 601003,
-          serialNumber: '104003Table2LaborClassNo',
+          serialNumber: '104003Table2CrewSize',
           tableId: '104003Table2',
           tableName: 'Routing工序表',
-          columnProp: 'laborClassDesc',
+          columnProp: 'crewSize',
           headerAlign: 'center',
-          align: 'center',
-          columnLabel: '人员等级',
+          align: 'right',
+          columnLabel: '生产过程人数',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1400,13 +1382,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 601003,
-          serialNumber: '104003Table2CrewSize',
+          serialNumber: '104003Table2LaborClassNo',
           tableId: '104003Table2',
           tableName: 'Routing工序表',
-          columnProp: 'crewSize',
+          columnProp: 'laborClassDesc',
           headerAlign: 'center',
-          align: 'right',
-          columnLabel: '生产过程人数',
+          align: 'center',
+          columnLabel: '人员等级',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1469,6 +1451,24 @@ export default {
           fixed: '',
           columnWidth: 100
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 601003,
+          serialNumber: '104003Table2EfficiencyFactor',
+          tableId: '104003Table2',
+          tableName: 'Routing工序表',
+          columnProp: 'efficiencyFactor',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '效率%',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 601003,
@@ -1679,27 +1679,16 @@ export default {
           columnWidth: 120
         },
         {
-          columnProp: 'workCenterNo',
+          columnProp: 'setupCrewSize',
           headerAlign: "center",
-          align: "center",
-          columnLabel: '加工中心编码',
+          align: "right",
+          columnLabel: '调机过程中人数',
           columnHidden: false,
           columnImage: false,
           status: true,
           fixed: '',
           columnWidth: 100
         },
-        {
-          columnProp: 'workCenterDesc',
-          headerAlign: "center",
-          align: "left",
-          columnLabel: '加工中心描述',
-          columnHidden: false,
-          columnImage: false,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },
         {
           columnProp: 'setupLaborClassNo',
           headerAlign: "center",
@@ -1723,10 +1712,10 @@ export default {
           columnWidth: 120
         },
         {
-          columnProp: 'setupCrewSize',
-          headerAlign: "center",
-          align: "right",
-          columnLabel: '调机过程中人数',
+          columnProp: 'machCycleTime',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '机器处理时间',
           columnHidden: false,
           columnImage: false,
           status: true,
@@ -1734,10 +1723,10 @@ export default {
           columnWidth: 100
         },
         {
-          columnProp: 'machCycleTime',
+          columnProp: 'machRunFactor',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '机器处理时间',
+          columnLabel: '机器单位产出',
           columnHidden: false,
           columnImage: false,
           status: true,
@@ -1745,10 +1734,10 @@ export default {
           columnWidth: 100
         },
         {
-          columnProp: 'machRunFactor',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '机器单位产出',
+          columnProp: 'crewSize',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '生产过程中人数',
           columnHidden: false,
           columnImage: false,
           status: true,
@@ -1778,10 +1767,10 @@ export default {
           columnWidth: 120
         },
         {
-          columnProp: 'crewSize',
-          headerAlign: "center",
-          align: "right",
-          columnLabel: '生产过程中人数',
+          columnProp: 'laborCycleTime',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '人工处理时间',
           columnHidden: false,
           columnImage: false,
           status: true,
@@ -1789,10 +1778,10 @@ export default {
           columnWidth: 100
         },
         {
-          columnProp: 'laborCycleTime',
+          columnProp: 'laborRunFactor',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '人工处理时间',
+          columnLabel: '人工单位产出',
           columnHidden: false,
           columnImage: false,
           status: true,
@@ -1800,16 +1789,27 @@ export default {
           columnWidth: 100
         },
         {
-          columnProp: 'laborRunFactor',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '人工单位产出',
+          columnProp: 'workCenterNo',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '加工中心编码',
           columnHidden: false,
           columnImage: false,
           status: true,
           fixed: '',
           columnWidth: 100
         },
+        {
+          columnProp: 'workCenterDesc',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '加工中心描述',
+          columnHidden: false,
+          columnImage: false,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
         {
           columnProp: 'conditionDesc',
           headerAlign: 'center',