From 6ed55e0fa3130a71d9ef21efdcd1da32bf68de90 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 25 May 2022 15:49:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../library/docDetail/index.vue               |  6 +++---
 .../components/examineInformation.vue         |  6 +++++-
 .../reviewedByThePersonInCharge.vue           |  1 +
 .../processForm/handshakeProcess/index.vue    |  4 +++-
 .../processForm/taskListProcess/index.vue     | 20 +++++++++++--------
 5 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue
index 92379a71d..17d51f430 100644
--- a/jero-web/src/views/documentManage/library/docDetail/index.vue
+++ b/jero-web/src/views/documentManage/library/docDetail/index.vue
@@ -3,9 +3,9 @@
     <div class="doc-detail-wrap">
       <div class="doc-detail-header" style="position: fixed;top: 0">
         <div class="doc-detail-title">
-          <span style="line-height: 66px;display: inline-block;float: left">
-            <a-icon type="home" style="margin-right: 6px;"/>
-          </span>
+<!--          <span style="line-height: 66px;display: inline-block;float: left">-->
+<!--            <a-icon type="home" style="margin-right: 6px;"/>-->
+<!--          </span>-->
           <a-tooltip placement="topLeft">
             <template slot="title">
               <span
diff --git a/jero-web/src/views/processCenter/components/examineInformation.vue b/jero-web/src/views/processCenter/components/examineInformation.vue
index b890edfb6..1b21c6aa6 100644
--- a/jero-web/src/views/processCenter/components/examineInformation.vue
+++ b/jero-web/src/views/processCenter/components/examineInformation.vue
@@ -149,6 +149,7 @@
       }
     },
     mounted() {
+      this.formInline.approvalOpinion = ''
     },
     methods: {
       clickButtonToUpload(item) {
@@ -192,7 +193,10 @@
             callBack(this.formInline)
           }
         })
-      }
+      },
+      submitNoRule(callBack) {
+        callBack(this.formInline)
+      },
     }
   }
 </script>
diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
index 83255d637..2bbc1a265 100644
--- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
+++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
@@ -225,6 +225,7 @@
       }
     },
     mounted() {
+      this.formInline.approvalOpinion = ''
       this.$route.query.isDisplay = JSON.parse(this.$route.query.isDisplay)
       if (this.queryBy && this.$route.query.TaskKey == 'fqrsh') {
         this.formInline.reviewResult = this.queryBy.reviewResult || undefined
diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
index 547be4ed6..a61fa6986 100644
--- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
@@ -162,7 +162,9 @@
       sendBack(handlingTime) {
         this.textLoading = this.$t('Returning')
         this.loading = true
-        this.completeTask({ flag: 1 }, handlingTime)
+        this.$refs.examineInformationRef.submitNoRule((res) => {
+          this.completeTask({ ...res,flag: 1 }, handlingTime,)
+        })
       },
       queryTaskDetailByTask(callback) {
         this.loading = true
diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
index 7dd2bde28..90b1b0d64 100644
--- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
@@ -268,15 +268,19 @@
             if (this.$route.query.TaskKey == 'zrrclrw') {
               let dataSource = this.$refs.engineeringConfirmationRef.dataSource
               let isTrue
-              for (let i = 0; i < dataSource.length; i++) {
-                if (dataSource[i].status == 'haveDone' || !dataSource[i].status) {
-                  isTrue = true
-                } else {
-                  isTrue = false
-                  this.$message.warning(this.$t('pleaseSubmitStatus'))
-                  this.loading = false
-                  return
+              if (dataSource && dataSource.length > 0) {
+                for (let i = 0; i < dataSource.length; i++) {
+                  if (dataSource[i].status == 'haveDone' || !dataSource[i].status) {
+                    isTrue = true
+                  } else {
+                    isTrue = false
+                    this.$message.warning(this.$t('pleaseSubmitStatus'))
+                    this.loading = false
+                    return
+                  }
                 }
+              } else {
+                isTrue = true
               }
               if (isTrue) {
                 this.completeTask(res)