From c7dfb0cd7b6c9604754072842b8a6ab1be8b3d25 Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Wed, 5 Mar 2025 15:13:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=A0=B8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pro/apply/consEnterApply.vue       |  2 +-
 src/views/pro/apply/supervisorEnterApply.vue | 56 +++++++++-----------
 2 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/src/views/pro/apply/consEnterApply.vue b/src/views/pro/apply/consEnterApply.vue
index 731a800..9a88d02 100644
--- a/src/views/pro/apply/consEnterApply.vue
+++ b/src/views/pro/apply/consEnterApply.vue
@@ -776,7 +776,7 @@
                   <el-button
                     type="primary"
                     plain
-                    icon="el-icon-download"
+                    icon="el-icon-plus"
                     size="mini"
                     v-if="this.paramsData.type !== 'view'"
                     @click="equipAddBtn"
diff --git a/src/views/pro/apply/supervisorEnterApply.vue b/src/views/pro/apply/supervisorEnterApply.vue
index 54d792e..029afb9 100644
--- a/src/views/pro/apply/supervisorEnterApply.vue
+++ b/src/views/pro/apply/supervisorEnterApply.vue
@@ -971,8 +971,8 @@ export default {
       })
     },
     submitForm(formName, submitType) {
-      // this.loading = true
-
+      this.loading = true
+      let isReturn = false
       if (submitType === '提交') {
         const param = {
           ...this.getParams(),
@@ -981,28 +981,37 @@ export default {
           uuid: this.$store.state.user.thisIds.uuid,
           parentUuid: this.$store.state.user.thisIds.parentUuid,
         }
-        if (
-          this.formData.enterpriseQualificationFiles.length === 0 ||
-          this.formData.securityAgreementFiles.length === 0 ||
-          this.formData.supervisionPlanningFiles.length === 0 ||
-          this.formData.implementationRulesFiles.length === 0
-        ) {
+        if (this.formData.enterpriseQualificationFiles.length === 0 || this.formData.securityAgreementFiles.length === 0 ||
+          this.formData.supervisionPlanningFiles.length === 0 || this.formData.implementationRulesFiles.length === 0) {
           this.$message({
             message: '请先上传企业资质、安全协议书、监理规划、实施细则文件！',
             type: 'error',
           })
-          // this.loading = false
+          this.loading = false
+          return false
         }
-
-        judgeIsFileComplete(param).then(response => {
+        //查询判断当前下所以人员文件是否上传
+        try {
+          const response = judgeIsFileComplete(param)
           console.log('response=====', response)
           if (response.msg === '部分人员文件不存在，请先仔细核对，上传相关文件！') {
             this.$message({
               message: '部分人员文件不存在，请先仔细核对，上传相关文件！',
-              type: 'error',
+              type: 'error'
             })
-            // this.loading = false
-          } else {
+            // return false
+            isReturn = true
+          }
+        } catch (error) {
+          this.$message({
+            message: '文件检查失败，请稍后重试！',
+            type: 'error'
+          })
+          // return false
+        }
+      }
+
+          if(isReturn)  return
             this.$refs[formName].validate(valid => {
               if (submitType === '提交' && !valid) {
                 return this.$modal.msgError('请完善全部上传信息')
@@ -1065,25 +1074,8 @@ export default {
                       this.loading = false
                       this.$modal.msgError('提交失败')
                     })
-                }
-              )
+                })
             })
-          }
-        })
-        //查询判断当前下所以人员文件是否上传
-
-        // try {
-        //   // const response = judgeIsFileComplete(param)
-
-        //   new Promise((resolve, reject) => {})
-        // } catch (error) {
-        //   this.$message({
-        //     message: '文件检查失败，请稍后重试！',
-        //     type: 'error',
-        //   })
-        //   // return false
-        // }
-      }
     },
     /**
      * 提交审批