From a2d73e77585eafd67f79c9ec58f16e4f03761658 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Tue, 13 May 2025 16:34:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?YT-2599=E3=80=8A=E4=B8=B0=E7=94=B0=E4=BB=A5?= =?UTF-8?q?=E5=A4=96=E5=AE=A2=E6=88=B7=E5=8F=91=E8=B4=A7=E3=80=8B=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=20=E2=80=9C=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E2=80=9D=20=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=94=B9=E4=B8=BA=20=E2=80=9C=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E2=80=9D=EF=BC=8C=E6=94=B9=E4=B8=BA=E5=BF=85?= =?UTF-8?q?=E5=A1=AB=E9=A1=B9=EF=BC=8C=E6=96=B0=E5=A2=9E=E3=80=81=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E3=80=81=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E3=80=81?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E9=A1=B5=E9=9D=A2=E9=83=BD=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E6=94=B9=E6=88=90=E5=8F=91=E8=B4=A7=E6=97=A5=E6=9C=9F=E3=80=82?= =?UTF-8?q?=E5=90=8C=E6=97=B6=EF=BC=8C=E7=BB=99QAD=E4=BC=A0=E7=9A=84?= =?UTF-8?q?=E7=94=9F=E6=95=88=E6=97=A5=E6=9C=9F=E4=B9=9F=E4=BC=A0=20?= =?UTF-8?q?=E2=80=9C=E5=8F=91=E8=B4=A7=E6=97=A5=E6=9C=9F=E2=80=9D=E3=80=82?= =?UTF-8?q?=E3=80=8A=E4=B8=B0=E7=94=B0=E8=A1=A5=E7=BB=99=E5=93=81=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E3=80=8B=E9=A1=B5=E9=9D=A2=E4=B8=AD=E7=9A=84=E6=88=AA?= =?UTF-8?q?=E6=AD=A2=E6=97=A5=E6=9C=9F=E4=B9=9F=E6=94=B9=E4=B8=BA=20?= =?UTF-8?q?=E2=80=9C=E5=8F=91=E8=B4=A7=E6=97=A5=E6=9C=9F=E2=80=9D=EF=BC=8C?= =?UTF-8?q?=E5=90=8C=E6=97=B6=EF=BC=8C=E7=BB=99QAD=E4=BC=A0=E7=9A=84?= =?UTF-8?q?=E7=94=9F=E6=95=88=E6=97=A5=E6=9C=9F=E4=B9=9F=E4=BC=A0=20?= =?UTF-8?q?=E2=80=9C=E5=8F=91=E8=B4=A7=E6=97=A5=E6=9C=9F=E2=80=9D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverRequestMain.data.ts | 3 ++ .../deliver/deliverRequestMain/index.vue | 44 +++++++++++++++++++ .../deliverRecordMain/index.vue | 40 +++++++++++++++++ 3 files changed, 87 insertions(+) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index 1a1f4a257..9d044afa5 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -689,6 +689,9 @@ export const DeliverRequestMainRules = reactive({ deliverType: [ { required: true, message: '发货库区类型不能为空', trigger: 'change' } ], + dueTime: [ + { required: false, message: '截止时间不能为空', trigger: 'change' } + ], customerDockCode: [ { required: true, message: '请选择客户月台代码', trigger: 'change' } ], diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index 3baa1316e..d5ed2b2e1 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -131,12 +131,56 @@ const { tableObject, tableMethods } = useTable({ /** * DeliverRequestMain 成品发货申请 */ + DeliverRequestMain.allSchemas.formSchema.forEach(item => { + if (item.field == 'dueTime') { + item.label = '截止时间' + } +}) +DeliverRequestMain.allSchemas.tableColumns.forEach(item => { + if (item.field == 'dueTime') { + item.label = '截止时间' + } +}) +DeliverRequestMain.allSchemas.detailSchema.forEach(item => { + if (item.field == 'dueTime') { + item.label = '截止时间' + } +}) +DeliverRequestMain.allSchemas.searchSchema.forEach(item => { + if (item.field == 'dueTime') { + item.label = '截止时间' + } +}) +DeliverRequestMainRules.dueTime[0].required = false +DeliverRequestMainRules.dueTime[0].message = '截止时间不能为空' if ( routeName.value == 'DeliverRequestMain') { tableObject.params = { businessType: 'Deliver' } businessType.value = 'Deliver' importFileName.value = '成品发货申请' + DeliverRequestMain.allSchemas.formSchema.forEach(item => { + if (item.field == 'dueTime') { + item.label = '发货日期' + } + }) + DeliverRequestMain.allSchemas.tableColumns.forEach(item => { + if (item.field == 'dueTime') { + item.label = '发货日期' + } + }) + DeliverRequestMain.allSchemas.detailSchema.forEach(item => { + if (item.field == 'dueTime') { + item.label = '发货日期' + } + }) + DeliverRequestMain.allSchemas.searchSchema.forEach(item => { + if (item.field == 'dueTime') { + item.label = '发货日期' + } + }) + DeliverRequestMainRules.dueTime[0].required = true + DeliverRequestMainRules.dueTime[0].message = '发货日期不能为空' } else if ( routeName.value == 'ZZBJDeliverRequestMain') { tableObject.params = { businessType: 'ZZBJDeliver' diff --git a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/index.vue index c36d9d8e4..dc7b74b20 100644 --- a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/index.vue @@ -100,6 +100,26 @@ const { tableObject, tableMethods } = useTable({ importUrl.value = '/wms/deliver-record-main/import-shipment-zip' // 判断 路由名称 进行条件过滤 +DeliverRecordMain.allSchemas.formSchema.forEach(item => { + if (item.field == 'dueTime') { + item.label = '截止时间' + } +}) +DeliverRecordMain.allSchemas.tableColumns.forEach(item => { + if (item.field == 'dueTime') { + item.label = '截止时间' + } +}) +DeliverRecordMain.allSchemas.detailSchema.forEach(item => { + if (item.field == 'dueTime') { + item.label = '截止时间' + } +}) +DeliverRecordMain.allSchemas.searchSchema.forEach(item => { + if (item.field == 'dueTime') { + item.label = '截止时间' + } +}) if (routeName.value == 'ToyotaSupplies') { tableObject.params = { businessType: 'ToyotaSupplies' @@ -107,6 +127,26 @@ if (routeName.value == 'ToyotaSupplies') { businessType.value = 'ToyotaSupplies' importFileName.value = '丰田补给品发货记录' importExtend.value = 'ToyotaSupplies' + DeliverRecordMain.allSchemas.formSchema.forEach(item => { + if (item.field == 'dueTime') { + item.label = '发货日期' + } + }) + DeliverRecordMain.allSchemas.tableColumns.forEach(item => { + if (item.field == 'dueTime') { + item.label = '发货日期' + } + }) + DeliverRecordMain.allSchemas.detailSchema.forEach(item => { + if (item.field == 'dueTime') { + item.label = '发货日期' + } + }) + DeliverRecordMain.allSchemas.searchSchema.forEach(item => { + if (item.field == 'dueTime') { + item.label = '发货日期' + } + }) } else if (routeName.value == 'SSProduct') { tableObject.params = { businessType: 'SSProduct' From 882288f0b0b41cb3c3e7699378eece97796830fd Mon Sep 17 00:00:00 2001 From: zhang_li Date: Tue, 13 May 2025 16:46:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?YT-2600=E3=80=8A=E4=B8=B0=E7=94=B0=E4=BB=A5?= =?UTF-8?q?=E5=A4=96=E5=AE=A2=E6=88=B7=E5=8F=91=E8=B4=A7=E3=80=8B=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=94=B3=E8=AF=B7=E6=97=B6=EF=BC=8C=E4=B8=8D=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E6=98=BE=E7=A4=BA=20=E2=80=9C=E6=9C=80=E5=90=8E?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliver/deliverRequestMain/deliverRequestMain.data.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index 9d044afa5..c2aaa8bc2 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -655,7 +655,8 @@ export const DeliverRequestMain = useCrudSchemas( valueFormat: 'x' } }, - isTableForm: false + isTableForm: false, + isForm: false }, { label: '最后更新者',