diff --git a/.env.development b/.env.development index a27fa3f..b59befd 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VITE_APP_TITLE = 煤科建管平台 VITE_APP_ENV = 'development' # 开发环境 -VITE_APP_BASE_API = 'http://192.168.110.185:8899' +VITE_APP_BASE_API = 'http://192.168.110.180:8899' # 无人机接口地址 diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue index b816583..ab58fbf 100644 --- a/src/components/Process/submitVerify.vue +++ b/src/components/Process/submitVerify.vue @@ -352,13 +352,13 @@ const handleCompleteTask = async () => { } }; const handleShowSubmit = async () => { - await completeTask(form.value).finally(() => { - // 提交设计验证 - detailFormTeRef.value.submit(businessId.value); + detailFormTeRef.value.submit(businessId.value, () => { + completeTask(form.value).finally(() => { + dialog.visible = false; + emits('submitCallback'); + proxy?.$modal.msgSuccess('操作成功'); + }); }); - dialog.visible = false; - emits('submitCallback'); - proxy?.$modal.msgSuccess('操作成功'); }; /** 驳回弹窗打开 */ const handleBackProcessOpen = async () => { @@ -524,15 +524,15 @@ const handleTermination = async () => { taskId: taskId.value, comment: form.value.message }; - await terminationTask(params).finally(() => { - // 提交设计验证 - detailFormTeRef.value.submit(businessId.value); - loading.value = false; - buttonDisabled.value = false; + detailFormTeRef.value.submit(businessId.value, () => { + terminationTask(params).finally(() => { + loading.value = false; + buttonDisabled.value = false; + dialog.visible = false; + emits('submitCallback'); + proxy?.$modal.msgSuccess('操作成功'); + }); }); - dialog.visible = false; - emits('submitCallback'); - proxy?.$modal.msgSuccess('操作成功'); }; //终止任务 const handleTerminationTask = async () => { diff --git a/src/views/design/drawingreview/detailForm.vue b/src/views/design/drawingreview/detailForm.vue index c74bec8..0d24569 100644 --- a/src/views/design/drawingreview/detailForm.vue +++ b/src/views/design/drawingreview/detailForm.vue @@ -10,6 +10,7 @@ + @@ -269,21 +270,16 @@ const setFormData = (data: Partial) => { }; // 提交表单 -const submit = async (businessId) => { - try { - // 先验证表单 - const isValid = await validate(); - if (isValid) { - formData.subprojectName = subProjectMap.get(formData.subprojectId); - formData.drawingreviewId = businessId; - const res = await drawingreviewReceipts(formData); - if (res.code === 200) { - // // 提交成功处理逻辑 - // console.log('提交成功'); - } - } - } catch (error) { - console.error('提交失败:', error); +const submit = async (businessId, cb) => { + // 先验证表单 + await formRef.value?.validate(); + cb(); + formData.subprojectName = subProjectMap.get(formData.subprojectId); + formData.drawingreviewId = businessId; + const res = await drawingreviewReceipts(formData); + if (res.code === 200) { + // // 提交成功处理逻辑 + // console.log('提交成功'); } }; onMounted(() => { diff --git a/src/views/design/volumeCatalog/index.vue b/src/views/design/volumeCatalog/index.vue index a627908..13c6ff9 100644 --- a/src/views/design/volumeCatalog/index.vue +++ b/src/views/design/volumeCatalog/index.vue @@ -65,9 +65,7 @@ @@ -427,6 +425,7 @@ const handleAdd = () => { const handleView = (row?: any) => { fileList.value = row.fileVoList; design.value = row.design; + activeName.value = '3'; getVolumeFileList('3'); viewVisible.value = true; }; @@ -447,6 +446,9 @@ const onSubmitOpinion = async () => { return; } await updateVolumeCatalog({ ...updateRow.value }); + proxy?.$modal.msgSuccess('操作成功'); + uploadOpinionVisible.value = false; + await getList(); }; const onUploadSuccess = (fileList, res) => { if (res.code == 200) {