From 24a8874df73fb3c6f9911e1d22a708bf76b5eddf Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Sat, 25 May 2024 11:53:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=20=E9=80=80=E8=B4=A7=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=95=B0=E9=87=8F=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=80=80=E8=B4=A7=E6=95=B0=E9=87=8F=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnJobMain.data.ts | 26 ++++++++--------- .../purchasereturnRecordMain.data.ts | 28 +++++++++---------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts index 14699c0c1..8cad3f9ab 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts @@ -837,21 +837,21 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive([ sortTableDefault: 18, hiddenInMain:true, }, - { - label: '数量', - field: 'qty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - }, - sortTableDefault: 12, - }, + // { + // label: '数量', + // field: 'qty', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'InputNumber', + // }, + // sortTableDefault: 12, + // }, { label: '退货数量', - field: 'returnedQty', + field: 'qty', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts index 9b8147bd6..23eae21a2 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts @@ -484,7 +484,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive( }, { label: '退货数量', - field: 'returnedQty', + field: 'qty', sort: 'custom', table: { width: 150 @@ -733,19 +733,19 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive( sortSearchDefault: 7, hiddenInMain: true }, - { - label: '数量', - field: 'qty', - sort: 'custom', - table: { - width: 150 - }, - isTable:true, - sortTableDefault: 1005, - form: { - component: 'InputNumber', - } - }, + // { + // label: '数量', + // field: 'qty', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable:true, + // sortTableDefault: 1005, + // form: { + // component: 'InputNumber', + // } + // }, { label: '计量单位', field: 'uom', From b0fd164fd5c7c8eb3064bc8c366392cd5883ca1b Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Sat, 25 May 2024 14:06:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?WMS=20=E5=BA=93=E5=86=85=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=AE=A1=E7=90=86->=E8=B0=83=E6=8B=A8=E5=87=BA=E5=BA=93->?= =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=87=BA=E5=BA=93=E7=94=B3=E8=AF=B7=20?= =?UTF-8?q?=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=E5=BF=85=E5=A1=AB=E9=A1=B9?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../transferissueRequestMain/transferissueRequestMain.data.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts index 5fa888a32..5ad9b5c71 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts @@ -534,6 +534,9 @@ export const TransferissueRequestMainRules = reactive({ remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], + dueTime: [ + { required: true, message: '请选择截止时间', trigger: 'change' } + ], }) /** From 3e995e60a6a8936cc9c16c2acdde4cc4f1b25397 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Sat, 25 May 2024 15:17:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicDataManage/factoryModeling/workshop/workshop.data.ts | 1 + .../factoryModeling/workstation/workstation.data.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts b/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts index 9290a46a0..ac2dccee5 100644 --- a/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts @@ -139,6 +139,7 @@ export const WorkshopRules = reactive({ { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'} ], name: [ + { required: true, message: '请输入代码', trigger: 'blur' }, { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], remark: [ diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts index 4e3b6a855..7dae0132b 100644 --- a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts @@ -291,6 +291,7 @@ export const WorkstationRules = reactive({ { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'} ], name: [ + { required: true, message: '请输入名称', trigger: 'change' }, { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], remark: [