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/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() 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()