Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/views/mes/productOffline/index.vue

@@ -83,7 +83,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
     const setV = {}
     setV[formField] = val[0][searchField]
     setV['workBillno'] = val[0]['schedulingCode']//工单编码
-    setV['planCode'] = val[0]['planMaserCode']//计划编码
+    setV['planCode'] = val[0]['planMasterCode']//计划编码
     setV['processCode'] = val[0]['workingNode']//工序编码
     setV['stationCode'] = val[0]['currentWorkstation']//工位编码
     // 以上字段的值从job_mes_work_scheduling表中获取

src/views/mes/productionPlan/productionPlan.data.ts

@@ -213,7 +213,7 @@ export const workscheduling = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '计划编号',
-    field: 'planMaserCode',
+    field: 'planMasterCode',
     sort: 'custom',
     isSearch: true,
     table: {

src/views/mes/workScheduling/index.vue

@@ -29,7 +29,7 @@
     >
       <template #schedulingCode="{row}">
         <el-button type="primary" link @click="openDetail(row, '工单详情', row.schedulingCode)">
-          <span>{{ row.planMaserCode }}</span>
+          <span>{{ row.planMasterCode }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
@@ -169,10 +169,10 @@ const buttonBaseClick = (val, item) => {
 const butttondata=(row) =>{ return [
   defaultButtons.mainListEditBtn({label:"调序",hasPermi:'mes:workScheduling:update'}), // 编辑
   //defaultButtons.mainListDeleteBtn({hasPermi:'mes:workScheduling:delete'}), // 删除
-  defaultButtons.mainListHandleBtn({label:"终止",name:'terminate',hide: isShowMainButton(row,['-1','0']),hasPermi:'mes:workScheduling:update'}), // 
-  defaultButtons.mainListHandleBtn({label:"暂停",name:'pause',hide: isShowMainButton(row,['1']),hasPermi:'mes:workScheduling:update'}), 
-  defaultButtons.mainListHandleBtn({label:"恢复",name:'resume',hide: isShowMainButton(row,['3']),hasPermi:'mes:workScheduling:update'}), 
-  //defaultButtons.mainListHandleBtn({label:"变更",name:'change', hasPermi:'mes:workScheduling:update'}), // 
+  defaultButtons.mainListHandleBtn({label:"终止",name:'terminate',hide: isShowMainButton(row,['-1','0']),hasPermi:'mes:workScheduling:update'}), //
+  defaultButtons.mainListHandleBtn({label:"暂停",name:'pause',hide: isShowMainButton(row,['1']),hasPermi:'mes:workScheduling:update'}),
+  defaultButtons.mainListHandleBtn({label:"恢复",name:'resume',hide: isShowMainButton(row,['3']),hasPermi:'mes:workScheduling:update'}),
+  //defaultButtons.mainListHandleBtn({label:"变更",name:'change', hasPermi:'mes:workScheduling:update'}), //
 ]}
 
 // 列表-操作按钮事件

src/views/mes/workScheduling/workScheduling.data.ts

@@ -44,7 +44,7 @@ export const WorkScheduling = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '计划编号',
-    field: 'planMaserCode',
+    field: 'planMasterCode',
     sort: 'custom',
     isSearch: true,
     isForm: true,
@@ -138,7 +138,7 @@ export const WorkScheduling = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isForm: true,
   },
-  
+
   {
     label: '工单模式',
     field: 'formType',
@@ -150,7 +150,7 @@ export const WorkScheduling = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'Select',
     },
   },
-  
+
   {
     label: '操作',
     field: 'action',