From e83ec3ac6a30b7cc134aba30299c8b133070b741 Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Fri, 27 Sep 2024 16:20:57 +0800
Subject: [PATCH] =?UTF-8?q?2024.9.27=20=E8=AF=A2=E4=BB=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20-=20=E8=AF=A2=E4=BB=B7=E7=94=B3=E8=AF=B7=EF=BC=88?=
 =?UTF-8?q?=E6=96=B0=EF=BC=89=20=E7=AC=AC=E4=B8=80=E7=89=88=20=E8=AF=A2?=
 =?UTF-8?q?=E4=BB=B7=E7=AE=A1=E7=90=86=20-=20=E8=AF=A2=E4=BB=B7=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=20=E7=AC=AC=E4=B8=80=E7=89=88=20=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86=20-=20=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E7=BB=84=20=E6=A0=87=E5=87=86=E5=B7=A5=E5=BA=8F=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20-=20=E6=A0=87=E5=87=86=E5=B7=A5=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

待报价、报价

部分功能修正
---
 .../modules/inquiry/inquiryApplication.vue    |  10 +-
 src/views/modules/inquiry/inquiryDetail.vue   |   8 +-
 .../part/partProductGroupInformation.vue      | 292 +++++++++---------
 .../modules/part/standardRoutingOperation.vue | 102 +++---
 4 files changed, 206 insertions(+), 206 deletions(-)

diff --git a/src/views/modules/inquiry/inquiryApplication.vue b/src/views/modules/inquiry/inquiryApplication.vue
index 1556f9f..9cc9484 100644
--- a/src/views/modules/inquiry/inquiryApplication.vue
+++ b/src/views/modules/inquiry/inquiryApplication.vue
@@ -47,7 +47,7 @@
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
       <el-form-item :label="'优先等级'">
         <dict-data-select v-model="searchData.priorityLevel" clearable style="width: 120px" :use-default-value="false"
-                          dict-type="priority_Level"/>
+                          dict-type="inquiry_info_priority_level"/>
       </el-form-item>
       <el-form-item :label="'状态'">
         <el-select v-model="searchData.status" style="width: 120px">
@@ -144,9 +144,9 @@
           </div>
           <div v-else-if="item.columnProp === 'priorityLevel'">
             <span v-if="!item.columnHidden">
-              <span v-if="scope.row.priorityLevel === 'A'">重要客户</span>
-              <span v-if="scope.row.priorityLevel === ' B'">潜力客户</span>
-              <span v-if="scope.row.priorityLevel === ' C'">一般客户</span>
+              <span v-if="scope.row.priorityLevel === 'A'">普通</span>
+              <span v-if="scope.row.priorityLevel === ' B'">重要</span>
+              <span v-if="scope.row.priorityLevel === ' C'">紧急</span>
             </span>
             <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
                                                style="width: 100px; height: 80px"/></span>
@@ -221,7 +221,7 @@
         </el-form-item>
         <el-form-item label="优先等级" >
           <dict-data-select v-if="modalFlag"
-                            v-model="modalData.priorityLevel" dict-type="priority_Level"
+                            v-model="modalData.priorityLevel" dict-type="inquiry_info_priority_level"
                             style="width: 110px;">
           </dict-data-select>
         </el-form-item>
diff --git a/src/views/modules/inquiry/inquiryDetail.vue b/src/views/modules/inquiry/inquiryDetail.vue
index 8179cbe..bcffaf4 100644
--- a/src/views/modules/inquiry/inquiryDetail.vue
+++ b/src/views/modules/inquiry/inquiryDetail.vue
@@ -149,9 +149,9 @@
           </div>
           <div v-else-if="item.columnProp === 'priorityLevel'">
             <span v-if="!item.columnHidden">
-              <span v-if="scope.row.priorityLevel === ' A'">重要客户</span>
-              <span v-if="scope.row.priorityLevel === ' B'">潜力客户</span>
-              <span v-if="scope.row.priorityLevel === ' C'">一般客户</span>
+              <span v-if="scope.row.priorityLevel === 'A'">普通</span>
+              <span v-if="scope.row.priorityLevel === ' B'">重要</span>
+              <span v-if="scope.row.priorityLevel === ' C'">紧急</span>
             </span>
             <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
                                                style="width: 100px; height: 80px"/></span>
@@ -314,7 +314,7 @@ export default {
       return this.inquiryPartCurrentRow.status === 'C' ? '草稿' : (this.inquiryPartCurrentRow.status === 'B' ? '已下达' : '已报价')
     },
     priorityLevelDisplay() {
-      return this.inquiryPartCurrentRow.priorityLevel === 'A' ? '重要客户' : (this.inquiryPartCurrentRow.priorityLevel === 'B' ? '潜力客户' : '一般客户')
+      return this.inquiryPartCurrentRow.priorityLevel === 'A' ? '普通' : (this.inquiryPartCurrentRow.priorityLevel === ' B' ? '重要' : '紧急')
     }
   },
   data() {
diff --git a/src/views/modules/part/partProductGroupInformation.vue b/src/views/modules/part/partProductGroupInformation.vue
index d7f37c4..ca78668 100644
--- a/src/views/modules/part/partProductGroupInformation.vue
+++ b/src/views/modules/part/partProductGroupInformation.vue
@@ -795,10 +795,10 @@ export default {
           serialNumber: '601006Table2WorkCenterNo',
           tableId: '601006Table2',
           tableName: '标准工序表',
-          columnProp: 'crewSize',
+          columnProp: 'setupCrewSize',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '生产过程人数',
+          columnLabel: '调机过程人数',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -809,69 +809,72 @@ export default {
           isVisible: true // 控制显示的属性
         },
         {
+          userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2WorkCenterNo',
-          tableId: '601006Table2',
-          tableName: '标准工序表',
-          columnProp: 'setupCrewSize',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '调机过程人数',
+          serialNumber: '601006Table2SetupLaborClassDesc',
+          tableId: "601006Table2",
+          tableName: "标准工序表",
+          columnProp: 'setupLaborClassNo',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '调机时人员等级编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 100,
+          columnWidth: 118,
           isVisible: true // 控制显示的属性
         },
         {
+          userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2WorkCenterNo',
-          tableId: '601006Table2',
-          tableName: '标准工序表',
-          columnProp: 'workCenterNo',
-          headerAlign: 'center',
-          align: 'left',
-          columnLabel: '加工中心编码',
+          serialNumber: '601006Table2SetupLaborClassDesc',
+          tableId: "601006Table2",
+          tableName: "标准工序表",
+          columnProp: 'setupLaborClassDesc',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '调机时人员等级描述',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 100,
+          columnWidth: 118,
           isVisible: true // 控制显示的属性
         },
         {
+          userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2WorkCenterDesc',
-          tableId: '601006Table2',
-          tableName: '标准工序表',
-          columnProp: 'workCenterDesc',
-          headerAlign: 'center',
-          align: 'left',
-          columnLabel: '加工中心名称',
+          serialNumber: '601006Table2MachCycleTime',
+          tableId: "601006Table2",
+          tableName: "标准工序表",
+          columnProp: 'machCycleTime',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '机器处理时间',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 170,
-          isVisible: true // 控制显示的属性
+          columnWidth: 100,
+          isVisible: false // 控制显示的属性
         },
         {
           userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2LaborClassDesc',
+          serialNumber: '601006Table2MachRunFactor',
           tableId: "601006Table2",
           tableName: "标准工序表",
-          columnProp: 'laborClassNo',
+          columnProp: 'machRunFactor',
           headerAlign: "center",
-          align: "left",
-          columnLabel: '人员等级编码',
+          align: "right",
+          columnLabel: '机器单位产出',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -879,18 +882,17 @@ export default {
           status: true,
           fixed: '',
           columnWidth: 100,
-          isVisible: true // 控制显示的属性
+          isVisible: false // 控制显示的属性
         },
         {
-          userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2LaborClassDesc',
-          tableId: "601006Table2",
-          tableName: "标准工序表",
-          columnProp: 'laborClassDesc',
-          headerAlign: "center",
-          align: "left",
-          columnLabel: '人员等级描述',
+          serialNumber: '601006Table2WorkCenterNo',
+          tableId: '601006Table2',
+          tableName: '标准工序表',
+          columnProp: 'crewSize',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '生产过程人数',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -903,51 +905,51 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2SetupLaborClassDesc',
+          serialNumber: '601006Table2LaborClassDesc',
           tableId: "601006Table2",
           tableName: "标准工序表",
-          columnProp: 'setupLaborClassNo',
+          columnProp: 'laborClassNo',
           headerAlign: "center",
           align: "left",
-          columnLabel: '调机过程中人员等级编码',
+          columnLabel: '人员等级编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 118,
+          columnWidth: 100,
           isVisible: true // 控制显示的属性
         },
         {
           userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2SetupLaborClassDesc',
+          serialNumber: '601006Table2LaborClassDesc',
           tableId: "601006Table2",
           tableName: "标准工序表",
-          columnProp: 'setupLaborClassDesc',
+          columnProp: 'laborClassDesc',
           headerAlign: "center",
           align: "left",
-          columnLabel: '调机过程中人员等级描述',
+          columnLabel: '人员等级描述',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 118,
+          columnWidth: 100,
           isVisible: true // 控制显示的属性
         },
         {
           userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2MachCycleTime',
+          serialNumber: '601006Table2LaborCycleTime',
           tableId: "601006Table2",
           tableName: "标准工序表",
-          columnProp: 'machCycleTime',
+          columnProp: 'laborCycleTime',
           headerAlign: "center",
           align: "right",
-          columnLabel: '机器处理时间',
+          columnLabel: '人工处理时间',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -960,13 +962,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2MachRunFactor',
+          serialNumber: '601006Table2LaborRunFactor',
           tableId: "601006Table2",
           tableName: "标准工序表",
-          columnProp: 'machRunFactor',
+          columnProp: 'laborRunFactor',
           headerAlign: "center",
           align: "right",
-          columnLabel: '机器单位产出',
+          columnLabel: '人工单位产出',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -977,15 +979,14 @@ export default {
           isVisible: false // 控制显示的属性
         },
         {
-          userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2LaborCycleTime',
-          tableId: "601006Table2",
-          tableName: "标准工序表",
-          columnProp: 'laborCycleTime',
-          headerAlign: "center",
-          align: "right",
-          columnLabel: '人工处理时间',
+          serialNumber: '601006Table2WorkCenterNo',
+          tableId: '601006Table2',
+          tableName: '标准工序表',
+          columnProp: 'workCenterNo',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '加工中心编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -993,26 +994,25 @@ export default {
           status: true,
           fixed: '',
           columnWidth: 100,
-          isVisible: false // 控制显示的属性
+          isVisible: true // 控制显示的属性
         },
         {
-          userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2LaborRunFactor',
-          tableId: "601006Table2",
-          tableName: "标准工序表",
-          columnProp: 'laborRunFactor',
-          headerAlign: "center",
-          align: "right",
-          columnLabel: '人工单位产出',
+          serialNumber: '601006Table2WorkCenterDesc',
+          tableId: '601006Table2',
+          tableName: '标准工序表',
+          columnProp: 'workCenterDesc',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '加工中心名称',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 100,
-          isVisible: false // 控制显示的属性
+          columnWidth: 170,
+          isVisible: true // 控制显示的属性
         },
       ],
       stdProcessColumnList1: [
@@ -1059,10 +1059,10 @@ export default {
           serialNumber: '601006Table2WorkCenterNo',
           tableId: '601006Table2',
           tableName: '标准工序表',
-          columnProp: 'crewSize',
+          columnProp: 'setupCrewSize',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '生产过程人数',
+          columnLabel: '调机过程人数',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1073,69 +1073,72 @@ export default {
           isVisible: true // 控制显示的属性
         },
         {
+          userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2WorkCenterNo',
-          tableId: '601006Table2',
-          tableName: '标准工序表',
-          columnProp: 'setupCrewSize',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '调机过程人数',
+          serialNumber: '601006Table2SetupLaborClassDesc',
+          tableId: "601006Table2",
+          tableName: "标准工序表",
+          columnProp: 'setupLaborClassNo',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '调机时人员等级编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 100,
+          columnWidth: 118,
           isVisible: true // 控制显示的属性
         },
         {
+          userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2WorkCenterNo',
-          tableId: '601006Table2',
-          tableName: '标准工序表',
-          columnProp: 'workCenterNo',
-          headerAlign: 'center',
-          align: 'left',
-          columnLabel: '加工中心编码',
+          serialNumber: '601006Table2SetupLaborClassDesc',
+          tableId: "601006Table2",
+          tableName: "标准工序表",
+          columnProp: 'setupLaborClassDesc',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '调机时人员等级描述',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 100,
+          columnWidth: 118,
           isVisible: true // 控制显示的属性
         },
         {
+          userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2WorkCenterDesc',
-          tableId: '601006Table2',
-          tableName: '标准工序表',
-          columnProp: 'workCenterDesc',
-          headerAlign: 'center',
-          align: 'left',
-          columnLabel: '加工中心名称',
+          serialNumber: '601006Table2MachCycleTime',
+          tableId: "601006Table2",
+          tableName: "标准工序表",
+          columnProp: 'machCycleTime',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '机器处理时间',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 170,
-          isVisible: true // 控制显示的属性
+          columnWidth: 100,
+          isVisible: false // 控制显示的属性
         },
         {
           userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2LaborClassDesc',
+          serialNumber: '601006Table2MachRunFactor',
           tableId: "601006Table2",
           tableName: "标准工序表",
-          columnProp: 'laborClassNo',
+          columnProp: 'machRunFactor',
           headerAlign: "center",
-          align: "left",
-          columnLabel: '人员等级编码',
+          align: "right",
+          columnLabel: '机器单位产出',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1143,18 +1146,17 @@ export default {
           status: true,
           fixed: '',
           columnWidth: 100,
-          isVisible: true // 控制显示的属性
+          isVisible: false // 控制显示的属性
         },
         {
-          userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2LaborClassDesc',
-          tableId: "601006Table2",
-          tableName: "标准工序表",
-          columnProp: 'laborClassDesc',
-          headerAlign: "center",
-          align: "left",
-          columnLabel: '人员等级描述',
+          serialNumber: '601006Table2WorkCenterNo',
+          tableId: '601006Table2',
+          tableName: '标准工序表',
+          columnProp: 'crewSize',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '生产过程人数',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1167,51 +1169,51 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2SetupLaborClassDesc',
+          serialNumber: '601006Table2LaborClassDesc',
           tableId: "601006Table2",
           tableName: "标准工序表",
-          columnProp: 'setupLaborClassNo',
+          columnProp: 'laborClassNo',
           headerAlign: "center",
           align: "left",
-          columnLabel: '调机过程中人员等级编码',
+          columnLabel: '人员等级编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 118,
+          columnWidth: 100,
           isVisible: true // 控制显示的属性
         },
         {
           userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2SetupLaborClassDesc',
+          serialNumber: '601006Table2LaborClassDesc',
           tableId: "601006Table2",
           tableName: "标准工序表",
-          columnProp: 'setupLaborClassDesc',
+          columnProp: 'laborClassDesc',
           headerAlign: "center",
           align: "left",
-          columnLabel: '调机过程中人员等级描述',
+          columnLabel: '人员等级描述',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 118,
+          columnWidth: 100,
           isVisible: true // 控制显示的属性
         },
         {
           userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2MachCycleTime',
+          serialNumber: '601006Table2LaborCycleTime',
           tableId: "601006Table2",
           tableName: "标准工序表",
-          columnProp: 'machCycleTime',
+          columnProp: 'laborCycleTime',
           headerAlign: "center",
           align: "right",
-          columnLabel: '机器处理时间',
+          columnLabel: '人工处理时间',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1224,13 +1226,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2MachRunFactor',
+          serialNumber: '601006Table2LaborRunFactor',
           tableId: "601006Table2",
           tableName: "标准工序表",
-          columnProp: 'machRunFactor',
+          columnProp: 'laborRunFactor',
           headerAlign: "center",
           align: "right",
-          columnLabel: '机器单位产出',
+          columnLabel: '人工单位产出',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1241,15 +1243,14 @@ export default {
           isVisible: false // 控制显示的属性
         },
         {
-          userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2LaborCycleTime',
-          tableId: "601006Table2",
-          tableName: "标准工序表",
-          columnProp: 'laborCycleTime',
-          headerAlign: "center",
-          align: "right",
-          columnLabel: '人工处理时间',
+          serialNumber: '601006Table2WorkCenterNo',
+          tableId: '601006Table2',
+          tableName: '标准工序表',
+          columnProp: 'workCenterNo',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '加工中心编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1257,26 +1258,25 @@ export default {
           status: true,
           fixed: '',
           columnWidth: 100,
-          isVisible: false // 控制显示的属性
+          isVisible: true // 控制显示的属性
         },
         {
-          userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2LaborRunFactor',
-          tableId: "601006Table2",
-          tableName: "标准工序表",
-          columnProp: 'laborRunFactor',
-          headerAlign: "center",
-          align: "right",
-          columnLabel: '人工单位产出',
+          serialNumber: '601006Table2WorkCenterDesc',
+          tableId: '601006Table2',
+          tableName: '标准工序表',
+          columnProp: 'workCenterDesc',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '加工中心名称',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 100,
-          isVisible: false // 控制显示的属性
+          columnWidth: 170,
+          isVisible: true // 控制显示的属性
         },
       ],
       columnItemList:  [
diff --git a/src/views/modules/part/standardRoutingOperation.vue b/src/views/modules/part/standardRoutingOperation.vue
index 7c91c5b..7e62619 100644
--- a/src/views/modules/part/standardRoutingOperation.vue
+++ b/src/views/modules/part/standardRoutingOperation.vue
@@ -111,13 +111,13 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item prop="setupLaborClassNo" :rules="rules.setupLaborClassNo">
-          <span style="cursor: pointer" slot="label" @click="getBaseList(217, 2)"><a herf="#">调机过程中人员等级编码</a></span>
+          <span style="cursor: pointer" slot="label" @click="getBaseList(217, 2)"><a herf="#">调机时人员等级编码</a></span>
           <el-input v-model="modalData.setupLaborClassNo" @blur="setupLaborClassBlur(217)" @change="changeSetupLaborClassNo()" style="width: 140px"></el-input>
         </el-form-item>
-        <el-form-item :label="'调机过程中人员等级描述'" prop="setupLaborClassDesc" :rules="rules.setupLaborClassDesc">
+        <el-form-item :label="'调机时人员等级描述'" prop="setupLaborClassDesc" :rules="rules.setupLaborClassDesc">
           <el-input v-model="modalData.setupLaborClassDesc" disabled style="width: 272px"></el-input>
         </el-form-item>
-        <el-form-item :label="'调机过程中人数'" prop="setupCrewSize" :rules="rules.setupCrewSize">
+        <el-form-item :label="'调机过程人数'" prop="setupCrewSize" :rules="rules.setupCrewSize">
           <el-input-number :controls="false" :step="0" v-model="modalData.setupCrewSize" @change="changeSetupCrewSize()" style="width: 99px"></el-input-number>
         </el-form-item>
       </el-form>
@@ -129,7 +129,7 @@
         <el-form-item :label="'人员等级描述'" prop="laborClassDesc" :rules="rules.laborClassDesc">
           <el-input v-model="modalData.laborClassDesc" disabled style="width: 272px"></el-input>
         </el-form-item>
-        <el-form-item :label="'生产过程中人数'" prop="crewSize" :rules="rules.crewSize">
+        <el-form-item :label="'生产过程人数'" prop="crewSize" :rules="rules.crewSize">
           <el-input-number :controls="false" :step="0" v-model="modalData.crewSize" style="width: 100px"></el-input-number>
         </el-form-item>
       </el-form>
@@ -277,13 +277,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 601003,
-          serialNumber: '6010012Table2CrewSize',
+          serialNumber: '6010012Table2SetupCrewSize',
           tableId: '6010012Table2',
           tableName: '标准工序表',
-          columnProp: 'crewSize',
+          columnProp: 'setupCrewSize',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '生产过程人数',
+          columnLabel: '调机过程人数',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -294,55 +294,57 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 601003,
-          serialNumber: '6010012Table2SetupCrewSize',
-          tableId: '6010012Table2',
-          tableName: '标准工序表',
-          columnProp: 'setupCrewSize',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '调机过程人数',
+          functionId: 6010012,
+          serialNumber: '6010012Table1SetupLaborClassNo',
+          tableId: "6010012Table1",
+          tableName: "标准工序表",
+          columnProp: 'setupLaborClassNo',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '调机时人员等级编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 100
+          columnWidth: 118
         },
         {
-          functionId: 601003,
-          serialNumber: '6010012Table1WorkCenterNo',
-          tableId: '6010012Table1',
-          tableName: '标准工序表',
-          columnProp: 'workCenterNo',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '加工中心编码',
+          userId: this.$store.state.user.name,
+          functionId: 6010012,
+          serialNumber: '6010012Table1SetupLaborClassDesc',
+          tableId: "6010012Table1",
+          tableName: "标准工序表",
+          columnProp: 'setupLaborClassDesc',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '调机时人员等级描述',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 100
+          columnWidth: 118
         },
         {
-          functionId: 6010012,
-          serialNumber: '6010012Table1WorkCenterDesc',
-          tableId: '6010012Table1',
+          userId: this.$store.state.user.name,
+          functionId: 601003,
+          serialNumber: '6010012Table2CrewSize',
+          tableId: '6010012Table2',
           tableName: '标准工序表',
-          columnProp: 'workCenterDesc',
+          columnProp: 'crewSize',
           headerAlign: 'center',
-          align: 'center',
-          columnLabel: '加工中心名称',
+          align: 'right',
+          columnLabel: '生产过程人数',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 200
+          columnWidth: 100
         },
         {
           userId: this.$store.state.user.name,
@@ -381,40 +383,38 @@ export default {
           columnWidth: 100
         },
         {
-          userId: this.$store.state.user.name,
-          functionId: 6010012,
-          serialNumber: '6010012Table1SetupLaborClassNo',
-          tableId: "6010012Table1",
-          tableName: "标准工序表",
-          columnProp: 'setupLaborClassNo',
-          headerAlign: "center",
-          align: "center",
-          columnLabel: '调机过程中人员等级编码',
+          functionId: 601003,
+          serialNumber: '6010012Table1WorkCenterNo',
+          tableId: '6010012Table1',
+          tableName: '标准工序表',
+          columnProp: 'workCenterNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '加工中心编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 118
+          columnWidth: 100
         },
         {
-          userId: this.$store.state.user.name,
           functionId: 6010012,
-          serialNumber: '6010012Table1SetupLaborClassDesc',
-          tableId: "6010012Table1",
-          tableName: "标准工序表",
-          columnProp: 'setupLaborClassDesc',
-          headerAlign: "center",
-          align: "center",
-          columnLabel: '调机过程中人员等级描述',
+          serialNumber: '6010012Table1WorkCenterDesc',
+          tableId: '6010012Table1',
+          tableName: '标准工序表',
+          columnProp: 'workCenterDesc',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '加工中心名称',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 118
+          columnWidth: 200
         },
         {
           userId: this.$store.state.user.name,