diff --git a/src/views/sales/Customer/components/createForm.vue b/src/views/sales/Customer/components/createForm.vue index 0f4c0c6..a77ad52 100644 --- a/src/views/sales/Customer/components/createForm.vue +++ b/src/views/sales/Customer/components/createForm.vue @@ -679,10 +679,12 @@ if (type) { data?.id && (formState.id = data.id) data?.cuCode && (formState.cuCode = data.cuCode) - notification.success({ - message: 'Tip', - description: data?.id ? t('新增成功!') : t('修改成功!') - }); //提示消息 + if (!type) { + notification.success({ + message: 'Tip', + description: data?.id ? t('新增成功!') : t('修改成功!') + }); //提示消息 + } } // formRef.value.resetFields(); return data?.id ? data : formState diff --git a/src/views/secondDev/approveFlowPage.vue b/src/views/secondDev/approveFlowPage.vue index 0d5bc0d..dac87e7 100644 --- a/src/views/secondDev/approveFlowPage.vue +++ b/src/views/secondDev/approveFlowPage.vue @@ -38,7 +38,7 @@ - + { + bus.emit(FLOW_PROCESSED); + close(); + }, 500); } else { notification.open({ type: 'error', @@ -335,6 +339,10 @@ } } async function saveDraft() { + if (customFormConfig.codeList.includes(curPageCode.value)) { + await formInformation.value.handleSubmit(); + return + } try { spinning.value = true; let formModels = await formInformation.value.saveDraftData(); @@ -402,6 +410,7 @@ return; } } else { + await formInformation.value.handleSubmit(true); validateSuccess.value = true } const params = await getApproveParams(); diff --git a/src/views/secondDev/createFlow.vue b/src/views/secondDev/createFlow.vue index 8a39d25..f009f65 100644 --- a/src/views/secondDev/createFlow.vue +++ b/src/views/secondDev/createFlow.vue @@ -331,7 +331,7 @@ }; } async function onSave() { - let value = await formInformation.value.handleSubmit(true); + let value = await formInformation.value.handleSubmit(); } async function saveLaunchNew() { if (!taskId.value && rDraftsId.value != '0') {