Browse Source

字段修复

planMaserCode改为"planMasterCode"
master_hella_20240701
TengXF 7 months ago
parent
commit
efd02dcf12
  1. 2
      src/views/mes/productOffline/index.vue
  2. 2
      src/views/mes/productionPlan/productionPlan.data.ts
  3. 10
      src/views/mes/workScheduling/index.vue
  4. 6
      src/views/mes/workScheduling/workScheduling.data.ts

2
src/views/mes/productOffline/index.vue

@ -83,7 +83,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
const setV = {} const setV = {}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
setV['workBillno'] = val[0]['schedulingCode']// setV['workBillno'] = val[0]['schedulingCode']//
setV['planCode'] = val[0]['planMaserCode']// setV['planCode'] = val[0]['planMasterCode']//
setV['processCode'] = val[0]['workingNode']// setV['processCode'] = val[0]['workingNode']//
setV['stationCode'] = val[0]['currentWorkstation']// setV['stationCode'] = val[0]['currentWorkstation']//
// job_mes_work_scheduling // job_mes_work_scheduling

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

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

10
src/views/mes/workScheduling/index.vue

@ -29,7 +29,7 @@
> >
<template #schedulingCode="{row}"> <template #schedulingCode="{row}">
<el-button type="primary" link @click="openDetail(row, '工单详情', row.schedulingCode)"> <el-button type="primary" link @click="openDetail(row, '工单详情', row.schedulingCode)">
<span>{{ row.planMaserCode }}</span> <span>{{ row.planMasterCode }}</span>
</el-button> </el-button>
</template> </template>
<template #action="{ row }"> <template #action="{ row }">
@ -169,10 +169,10 @@ const buttonBaseClick = (val, item) => {
const butttondata=(row) =>{ return [ const butttondata=(row) =>{ return [
defaultButtons.mainListEditBtn({label:"调序",hasPermi:'mes:workScheduling:update'}), // defaultButtons.mainListEditBtn({label:"调序",hasPermi:'mes:workScheduling:update'}), //
//defaultButtons.mainListDeleteBtn({hasPermi:'mes:workScheduling:delete'}), // //defaultButtons.mainListDeleteBtn({hasPermi:'mes:workScheduling:delete'}), //
defaultButtons.mainListHandleBtn({label:"终止",name:'terminate',hide: isShowMainButton(row,['-1','0']),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:'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:'resume',hide: isShowMainButton(row,['3']),hasPermi:'mes:workScheduling:update'}),
//defaultButtons.mainListHandleBtn({label:"",name:'change', hasPermi:'mes:workScheduling:update'}), // //defaultButtons.mainListHandleBtn({label:"",name:'change', hasPermi:'mes:workScheduling:update'}), //
]} ]}
// - // -

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

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

Loading…
Cancel
Save