Browse Source

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

master_hella_20240701
yufei0306 7 months ago
parent
commit
e15431c208
  1. 2
      src/views/mes/productOffline/index.vue
  2. 2
      src/views/mes/productionPlan/productionPlan.data.ts
  3. 2
      src/views/mes/workScheduling/index.vue
  4. 2
      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 = {}
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

2
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: {

2
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 }">

2
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,

Loading…
Cancel
Save