From 051330940e8dbeb973c62b47a9e4d1b95562e14f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Wed, 20 Mar 2024 14:05:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=A1=A8=E5=8D=95=20?= =?UTF-8?q?=E9=81=AE=E7=BD=A9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BasicForm/src/BasicForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 3a5aa7429..4c96ef8e5 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -4,12 +4,12 @@ v-model="dialogVisible" :width="dialogWidth" :close-on-click-modal="false" + v-loading="formLoading" >
Date: Wed, 20 Mar 2024 14:56:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchasePlanMain/index.vue | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 157816868..8d4556556 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -441,6 +441,7 @@ // 主子数据 提交 const submitForm = async (formType, data) => { data.subList = [] + let flag = false for (let item of tableData.value) { await PurchaseDetailApi.getPurchaseDetailPageCheckData({ number: item.poNumber, @@ -449,13 +450,20 @@ console.log("【要货计划】-每条数据结果",item) if(res.list[0].type == 'DISCRETE'){//只有离散单需要这个校验 if (item.planQty > res.list[0].orderQty - res.list[0].plannedQty) { + flag = true; message.error('要货计划数量不得大于订单数量-已计划数量') return + }else{ + data.subList.push(item) // 拼接子表数据参数 } + }else{ + data.subList.push(item) // 拼接子表数据参数 } - data.subList.push(item) // 拼接子表数据参数 }) } + if(flag){ + return; + } if (data.subList.length == tableData.value.length) { try { if (formType === 'create') { From ee9a4a9506a87b2928ca04fa6560151ca3b83f76 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 20 Mar 2024 16:09:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierManage/supplieritem/supplieritem.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts index 2395499b8..1e891afbf 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts @@ -319,7 +319,7 @@ export const SupplieritemRules = reactive({ ], supplierItemCode: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' }, - { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'} + // { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'} ], // packUnit: [ // { required: true, message: '请选择供应商包装单位', trigger: 'change' }