Selaa lähdekoodia

🎨 修改审核提交显示细节

快乐的梦鱼 1 viikko sitten
vanhempi
commit
23b57b9ad3

+ 2 - 6
src/pages/collect/assessment/argeement-sign.vue

@@ -188,12 +188,6 @@ async function createAgreement() {
 }
 
 async function saveAgreement() {
-  try {
-    await agreementFormRef.value?.validate();
-  } catch {
-    message.warning('请填写完整信息');
-    return;
-  }
   submitLoading.value = true;
   try {
     const d = currentAgreement.value;
@@ -203,6 +197,8 @@ async function saveAgreement() {
     }
     await AssessmentContentApi.saveAgreement(d as AgreementDetail);
     message.success('保存传承协议成功');
+    await waitTimeOut(500);
+    await loader.load();
   } catch (error) {
     Modal.error({
       title: '保存传承协议失败',

+ 15 - 12
src/pages/collect/assessment/evaluation-form.vue

@@ -146,24 +146,27 @@ async function createForm() {
 }
 
 async function saveForm() {
-  try {
-    await blockRef.value?.validate();
-  } catch (e: unknown) {
-    if (e && typeof e === 'object' && 'errorFields' in (e as object))
-      message.warning('请填写完整信息');
-    else if (e instanceof Error)
-      message.warning(e.message);
-    else
-      message.warning('请填写完整信息');
-    return;
-  }
-  submitLoading.value = true;
   const cf = currentForm.value;
+  submitLoading.value = true;
   if (!cf) {
     submitLoading.value = false;
     return;
   }
   if (cf.progress > 0) {
+    try {
+      await blockRef.value?.validate();
+    } catch (e: unknown) {
+      if (e && typeof e === 'object' && 'errorFields' in (e as object))
+        message.warning('请填写完整信息');
+      else if (e instanceof Error)
+        message.warning(e.message);
+      else
+        message.warning('请填写完整信息');
+      submitLoading.value = false;
+      return;
+    }
+  }
+  if (cf.progress > 0) {
     const confirmed = await new Promise<boolean>((resolve) => {
       Modal.confirm({
         title: '提示',