From 0b846220049ef991e7326661d0bd9bc384cd2c72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Tue, 19 Dec 2023 15:36:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliver/deliverRequestMain/index.vue | 4 ++-- .../productionreturn/productionreturnRequestMain/index.vue | 4 ++-- .../productreceipt/productreceiptRequestMain/index.vue | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index 10edf47ce..2a313ca18 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -247,7 +247,7 @@ const buttonTableClick = async (val, row) => { console.log(err) }) } else if (val == 'mainSubmit') { // 提交审批 - await message.confirm('确认要重新添加吗？') + await message.confirm('确认要提交审批吗？') DeliverRequestMainApi.submit(row.id).then(() => { message.success(t('common.updateSuccess')) getList() @@ -255,7 +255,7 @@ const buttonTableClick = async (val, row) => { console.log(err) }) } else if (val == 'mainTurnDown') { // 驳回 - await message.confirm('确认要重新添加吗？') + await message.confirm('确认要驳回吗？') DeliverRequestMainApi.refused(row.id).then(() => { message.success(t('common.updateSuccess')) getList() diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index 3d3a765c5..8f0ed2e63 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -263,7 +263,7 @@ const buttonTableClick = async (val, row) => { console.log(err) }) } else if (val == 'mainSubmit') { // 提交审批 - await message.confirm('确认要重新添加吗？') + await message.confirm('确认要提交审批吗？') ProductionreturnRequestMainApi.submit(row.id).then(() => { message.success(t('common.updateSuccess')) getList() @@ -271,7 +271,7 @@ const buttonTableClick = async (val, row) => { console.log(err) }) } else if (val == 'mainTurnDown') { // 驳回 - await message.confirm('确认要重新添加吗？') + await message.confirm('确认要驳回吗？') ProductionreturnRequestMainApi.refused(row.id).then(() => { message.success(t('common.updateSuccess')) getList() diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index 9eb5990cb..441f4313b 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -287,7 +287,7 @@ const buttonTableClick = async (val, row) => { console.log(err) }) } else if (val == 'mainSubmit') { // 提交审批 - await message.confirm('确认要重新添加吗？') + await message.confirm('确认要提交审批吗？') ProductreceiptRequestMainApi.submit(row.id).then(() => { message.success(t('common.updateSuccess')) getList() @@ -295,7 +295,7 @@ const buttonTableClick = async (val, row) => { console.log(err) }) } else if (val == 'mainTurnDown') { // 驳回 - await message.confirm('确认要重新添加吗？') + await message.confirm('确认要驳回吗？') ProductreceiptRequestMainApi.refused(row.id).then(() => { message.success(t('common.updateSuccess')) getList() From fbae9ee25c7a88efd71c53c0a268fab4fa4586eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Tue, 19 Dec 2023 15:50:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=B6=E5=93=81=E6=8B=86=E8=A7=A3?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=20bom=E4=BF=A1=E6=81=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productdismantleRequestMain/index.vue | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue index 084a4104f..6e24cfdd2 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue +++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue @@ -434,14 +434,27 @@ const handleDeleteTable = (item, index) => { // 主子数据 提交 const submitForm = async (formType, data) => { data.subList = tableData.value // 拼接子表数据参数 - try { - if (formType === 'create') { - await ProductdismantleRequestMainApi.createProductdismantleRequestMain(data) - message.success(t('common.createSuccess')) - } else { - await ProductdismantleRequestMainApi.updateProductdismantleRequestMain(data) - message.success(t('common.updateSuccess')) + // 判断 bom 是否添加 + let childListRs = true + // 根据 填写的数量 为基准 不填写数量的忽略 + tableData.value.forEach((item) => { + if (!item.childList) { + childListRs = false } + }) + if (!childListRs) { + message.warning('请填写Bom信息！') + formRef.value.dialogVisible = false + return + } + try { + if (formType === 'create') { + await ProductdismantleRequestMainApi.createProductdismantleRequestMain(data) + message.success(t('common.createSuccess')) + } else { + await ProductdismantleRequestMainApi.updateProductdismantleRequestMain(data) + message.success(t('common.updateSuccess')) + } formRef.value.dialogVisible = false // 刷新当前列表 getList()