From 2a5193a0d6b2590e955798a7727ce0e4dc1a1df4 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 26 May 2022 11:13:08 +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

---
 jero-web/src/components/jero/JLoading.vue     |  2 +-
 .../src/views/dashboard/components/myList.vue |  2 +-
 .../components/engineeringConfirmation.vue    |  9 ++++---
 .../processForm/handshakeProcess/index.vue    | 27 ++++++++++++-------
 .../processForm/taskListProcess/index.vue     | 13 ++++++---
 5 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/jero-web/src/components/jero/JLoading.vue b/jero-web/src/components/jero/JLoading.vue
index eba0c4edd..29a67aea8 100644
--- a/jero-web/src/components/jero/JLoading.vue
+++ b/jero-web/src/components/jero/JLoading.vue
@@ -54,7 +54,7 @@
     position: absolute;
     top: 0;
     left: 0;
-    z-index: 9999900;
+    z-index: 999;
     width: 100%;
     height: 100%;
     background-color: rgba(255, 255, 255, 0.9);
diff --git a/jero-web/src/views/dashboard/components/myList.vue b/jero-web/src/views/dashboard/components/myList.vue
index 2aae52750..cf7ee5be3 100644
--- a/jero-web/src/views/dashboard/components/myList.vue
+++ b/jero-web/src/views/dashboard/components/myList.vue
@@ -14,7 +14,7 @@
           <span class="top-admin" :title="prcTypeName[item.prcType]">{{prcTypeName[item.prcType]}}</span>
         </div>
         <div class="button">
-          {{moment(item.createTime).format('YYYY-MM-DD HH:mm:ss')}}
+          {{item.creatTime}}
         </div>
         <div class="with">
           {{$t('Pending')}}
diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
index ab895aae0..e3a3f0752 100644
--- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
@@ -4,7 +4,7 @@
       <div class="header-text">
         {{$t('engineeringConfirmation')}}
         <a-icon :title="$t('pleaseReviewTask')"
-                type="question-circle" />
+                type="question-circle"/>
       </div>
     </div>
     <div class="header-content">
@@ -395,7 +395,7 @@
           {
             title: 'ID',
             dataIndex: 'serialNumber',
-            align: 'left',
+            align: 'left'
           },
           {
             title: this.$t('completedBy'),
@@ -604,7 +604,7 @@
                 this.dataSourceTable.forEach(val => {
                   this.distributionEngineerList.push({
                     name: val.userName,
-                    id:val.id,
+                    id: val.id,
                     userId: val.userId,
                     deliveryInstructions: val.deliveryInstructions
                   })
@@ -614,7 +614,7 @@
               }
               this.formInline.userId = userId.join(',')
               this.formInline.userName = userName.join(',')
-              this.formInline = {...this.formInline}
+              this.formInline = { ...this.formInline }
             }
             this.loadingTable = false
           } else {
@@ -670,6 +670,7 @@
       },
       PersonnelSelectionChange(value, id) {
         this.formInline[value] = id
+        this.distributionEngineerList = []
         if (id) {
           this.formInline.userName.split(',').forEach((res, index) => {
             this.distributionEngineerList.push({
diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
index 103403f61..57464c805 100644
--- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
@@ -190,7 +190,6 @@
         postAction('/workFlow/completeTask', query).then((res) => {
           if (res.success) {
             this.$message.success(this.$t('OperationSuccessful'))
-            this.loading = false
             if (this.$route.query.taskDefinitionKey == 'zrrjsrw' || this.$route.query.taskDefinitionKey == 'zrrqr') {
               if (value.flag == 0) {
                 if (this.queryProject.verifyDeliverableType) {
@@ -204,21 +203,32 @@
                 }
                 if (!this.queryProject.verifyDeliverableType && !this.queryProject.prehomoDeliverableType &&
                   !this.queryProject.designDeliverableType) {
-                  window.close()
+                  setTimeout(() => {
+                    this.loading = false
+                    window.close()
+                  }, 1000)
                   // this.$router.push({
                   //   path: '/ProcessCenter'
                   // })
                 }
               } else {
-                window.close()
+                setTimeout(() => {
+                  this.loading = false
+                  window.close()
+                }, 1000)
                 // this.$router.push({
                 //   path: '/ProcessCenter'
                 // })
               }
             } else {
-              this.$router.push({
-                path: '/ProcessCenter'
-              })
+              setTimeout(() => {
+                this.loading = false
+                window.close()
+              }, 1000)
+
+              // this.$router.push({
+              //   path: '/ProcessCenter'
+              // })
             }
           } else {
             this.loading = false
@@ -252,13 +262,12 @@
           if (res.success) {
             this.visible = false
             setTimeout(() => {
+              this.loading = false
               window.close()
-            }, 2000)
+            }, 3000)
             // this.$router.push({
             //   path: '/ProcessCenter'
             // })
-          } else {
-            this.$message.warning(this.$t('operationFailed'))
           }
         })
       },
diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
index afa3f81cf..a64d2367e 100644
--- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
@@ -302,13 +302,16 @@
         }
         putAction(this.url.dreSubmit, query).then((res) => {
           if (res.success) {
-            this.loading = false
             this.$message.success(this.$t('OperationSuccessful'))
             // this.$router.push({
             //   path: '/ProjectDetails',
             //   query: this.$route.query
             // })
-            window.close()
+            setTimeout(() => {
+              this.loading = false
+              window.close()
+            }, 1000)
+
           } else {
             this.loading = false
             this.$message.warning(this.$t('operationFailed'))
@@ -326,7 +329,6 @@
         postAction('/workFlow/completeTask', query).then((res) => {
           if (res.success) {
             this.$message.success(this.$t('OperationSuccessful'))
-            this.loading = false
             this.edit()
             // this.$router.push({
             //   path: '/ProjectDetails',
@@ -345,7 +347,10 @@
         }
         putAction(this.url.edit, query).then((res) => {
           if (res.success) {
-            window.close()
+            setTimeout(() => {
+              this.loading = false
+              window.close()
+            }, 1000)
           }
         })
       },