From c1e56016650fa70a1451fedf64bc28c6c2c8cd01 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 27 Nov 2024 15:52:14 +0800 Subject: [PATCH] =?UTF-8?q?YT-1320=E8=A1=A5=E7=BB=99=E5=93=81=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E3=80=81=E5=8F=B7=E5=8F=A3=E6=94=B6=E8=B4=A7=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8E=BB=E6=8E=89=E7=8F=AD=E6=AC=A1=E5=BF=85?= =?UTF-8?q?=E5=A1=AB=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionplan/productionMain/index.vue | 1 + .../productionMain/productionMain.data.ts | 72 +++++++++---------- .../productionMainAssemble/index.vue | 1 + .../productionMainAssemble.data.ts | 72 +++++++++---------- 4 files changed, 74 insertions(+), 72 deletions(-) diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue index 8bf2be24c..754b5ed19 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue @@ -94,6 +94,7 @@ import { usePageLoading } from '@/hooks/web/usePageLoading' const { loadStart, loadDone } = usePageLoading() // 生产计划主 // 预生产计划 +// 补给品生产计划 defineOptions({ name: 'ProductionMain' }) const message = useMessage() // 消息弹窗 diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts index 729bfb45a..dc2f86c04 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts @@ -199,39 +199,39 @@ export const ProductionMain = useCrudSchemas(reactive([ } } }, - { - label: '班次', - field: 'shift', - sort: 'custom', - table: { - width: 150 - }, - form: { - // labelMessage: '信息提示说明!!!', - componentProps: { - enterSearch: true, - isSearchList: true, - searchListPlaceholder: '请选择班次', - searchField: 'code', - searchTitle: '班次信息', - searchAllSchemas: Shift.allSchemas, - searchPage: ShiftApi.getShiftPage, - searchCondition:[{ - key: 'available', - value: 'TRUE', - isMainValue: false - }], - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 - } - } - }, + // { + // label: '班次', + // field: 'shift', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // // labelMessage: '信息提示说明!!!', + // componentProps: { + // enterSearch: true, + // isSearchList: true, + // searchListPlaceholder: '请选择班次', + // searchField: 'code', + // searchTitle: '班次信息', + // searchAllSchemas: Shift.allSchemas, + // searchPage: ShiftApi.getShiftPage, + // searchCondition:[{ + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // }], + // verificationParams: [{ + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true, + // }], // 失去焦点校验参数 + // } + // } + // }, // { // label: '物料代码', // field: 'detailItemCode', @@ -640,9 +640,9 @@ export const ProductionMainRules = reactive({ productionLine: [ { required: true, message: '请选择生产线', trigger: 'change' } ], - shift: [ - { required: true, message: '请选择班次', trigger: 'change' } - ], + // shift: [ + // { required: true, message: '请选择班次', trigger: 'change' } + // ], // team: [ // { required: true, message: '请选择班组', trigger: 'change' } // ], diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue index a5335ec3c..9573cc3ba 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue @@ -93,6 +93,7 @@ import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' const { loadStart, loadDone } = usePageLoading() // 装配计划 +// 号口生产计划 defineOptions({ name: 'ProductionMainAssemble' }) const message = useMessage() // 消息弹窗 diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts index 080efd908..c901d1e5f 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts @@ -198,39 +198,39 @@ export const ProductionMain = useCrudSchemas(reactive([ } } }, - { - label: '班次', - field: 'shift', - sort: 'custom', - table: { - width: 150 - }, - form: { - // labelMessage: '信息提示说明!!!', - componentProps: { - enterSearch: true, - isSearchList: true, - searchListPlaceholder: '请选择班次', - searchField: 'code', - searchTitle: '班次信息', - searchAllSchemas: Shift.allSchemas, - searchPage: ShiftApi.getShiftPage, - searchCondition:[{ - key: 'available', - value: 'TRUE', - isMainValue: false - }], - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 - } - } - }, + // { + // label: '班次', + // field: 'shift', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // // labelMessage: '信息提示说明!!!', + // componentProps: { + // enterSearch: true, + // isSearchList: true, + // searchListPlaceholder: '请选择班次', + // searchField: 'code', + // searchTitle: '班次信息', + // searchAllSchemas: Shift.allSchemas, + // searchPage: ShiftApi.getShiftPage, + // searchCondition:[{ + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // }], + // verificationParams: [{ + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true, + // }], // 失去焦点校验参数 + // } + // } + // }, // { // label: '物料代码', // field: 'detailItemCode', @@ -639,9 +639,9 @@ export const ProductionMainRules = reactive({ productionLine: [ { required: true, message: '请选择生产线', trigger: 'change' } ], - shift: [ - { required: true, message: '请选择班次', trigger: 'change' } - ], + // shift: [ + // { required: true, message: '请选择班次', trigger: 'change' } + // ], // team: [ // { required: true, message: '请选择班组', trigger: 'change' } // ],