招标

src/components/FileUpload/index.vue

@@ -310,11 +310,11 @@ const uploadedSuccessfully = (res: any) => {
     emit('update:modelValue', listToString(fileList.value));
     proxy?.$modal.closeLoading();
   }
-  if (props.autoUpload && props.limit === fileList.value.length) {
-    fileUploadRef.value?.clearFiles();
-    fileList.value = [];
-    emit('update:modelValue', ''); // 同步到外部 v-model
-  }
+  // if (props.autoUpload && props.limit === fileList.value.length) {
+  //   fileUploadRef.value?.clearFiles();
+  //   fileList.value = [];
+  //   emit('update:modelValue', ''); // 同步到外部 v-model
+  // }
   props.onUploadSuccess?.(fileList.value, res);
 };
 
@@ -359,6 +359,8 @@ const customUpload = async (options: any) => {
       });
       handleUploadSuccess(res.data, options.file);
     } catch (err) {
+      console.log(err, 'err');
+
       handleUploadError();
     }
   } else {

src/components/Process/submitVerify.vue

@@ -34,7 +34,7 @@
     </el-form>
     <template #footer>
       <span class="dialog-footer">
-        <el-button :disabled="buttonDisabled" type="primary" @click="handleCompleteTask"> 通过 </el-button>
+        <el-button :disabled="buttonDisabled" type="primary" @click="handleCompleteTask"> 提交 </el-button>
         <el-button v-if="task.flowStatus === 'waiting' && buttonObj.trust" :disabled="buttonDisabled" type="primary" @click="openDelegateTask">
           委托
         </el-button>
@@ -304,7 +304,6 @@ const emits = defineEmits(['submitCallback', 'cancelCallback']);
 const handleCompleteTask = async () => {
   form.value.taskId = taskId.value;
   form.value.variables = props.taskVariables;
-
   let verify = false;
   if (buttonObj.value.pop && nestNodeList.value && nestNodeList.value.length > 0) {
     nestNodeList.value.forEach((e) => {
@@ -353,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 () => {
@@ -525,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 () => {