From 4625c24fe9cbb87574ec1a31d03a61ec29f86cdc Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 19 May 2022 13:52:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E4=BB=BB=E5=8A=A1=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  1 +
 jero-web/src/common/lang/zh-cn.js             |  1 +
 .../components/engineeringConfirmation.vue    | 44 ++++++++++---------
 .../components/taskCirculationHistory.vue     | 20 ++++-----
 .../processForm/taskListProcess/index.vue     |  2 +-
 5 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index bd556dc5a..85af32664 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -844,4 +844,5 @@ module.exports = {
   endMonth:'End Month',
   Importing:'Importing...',
   projectDeliveryDescription:'Project delivery description',
+  cancelConfirm:'Cancel Confirm',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index cebfbdcb1..7308948ce 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -849,4 +849,5 @@ module.exports = {
   endMonth:'结束日期',
   Importing:'导入中...',
   projectDeliveryDescription:'工程交付说明',
+  cancelConfirm:'取消确认',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
index 2dcfbe1dc..d874dc5d1 100644
--- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
@@ -18,10 +18,6 @@
         <a-icon type="sound"/>
         {{ $t('reminderHandling') }}
       </div>
-      <a class="text"
-         @click="detailsClick()">
-        {{$t('details')}}
-      </a>
       <div class="operator-text"
            v-if="$route.query.TaskKey == 'zrrclrw' || $route.query.TaskKey == 'dreDispose'"
            @click="distributionEngineerClick($t('addFeedback'))">
@@ -53,6 +49,11 @@
          <a class="text"
             @click="detailsClick(result)">
            {{$t('details')}}
+         </a>
+           <a class="text"
+              v-if="$route.query.TaskKey == 'zrrclrw'"
+              @click="answerClick(result,$t('replyFromProjectContactPerson'))">
+           {{$t('confirm')}}
          </a>
          <a class="text"
             v-if="$route.query.TaskKey == 'zrrclrw'"
@@ -419,7 +420,24 @@
         })
       },
       distributionEngineer() {
-        postAction(this.url.DetailEOAdd, this.distributionEngineerList).then((res) => {
+        let msgType = ''
+        if (this.$route.query.flowType == 2) {
+          msgType = 'designRemindMsg'
+        } else if (this.$route.query.flowType == 3) {
+          msgType = 'prehomoRemindMsg'
+        } else if (this.$route.query.flowType == 4) {
+          msgType = 'verifyRemindMsg'
+        }
+        let query = {
+          status: 'NotDone',
+          actiProcInstId: this.$route.query.actiProcInstId,
+          projectTaskInventoryId: this.$route.query.projectTaskInventoryId,
+          flowType: this.$route.query.flowType,
+          taskDefinitionKey: 'dreDispose',
+          msgType: msgType,
+          distributionEngineerList: this.distributionEngineerList
+        }
+        postAction(this.url.DetailEOAdd, query).then((res) => {
           if (res.success) {
             if (res.success) {
               this.confirmLoading = false
@@ -514,25 +532,11 @@
       PersonnelSelectionChange(value, id) {
         this.formInline[value] = id
         if (id) {
-          let msgType = ''
-          if (this.$route.query.flowType == 2) {
-            msgType = 'designIssueDreMsg'
-          } else if (this.$route.query.flowType == 3) {
-            msgType = 'prehomoIssueDreMsg'
-          } else if (this.$route.query.flowType == 4) {
-            msgType = 'verifyIssueDreMsg'
-          }
           this.formInline.userName.split(',').forEach((res, index) => {
             this.distributionEngineerList.push({
               deliveryInstructions: '',
               name: res,
-              status: 'NotDone',
-              actiProcInstId: this.$route.query.actiProcInstId,
-              projectTaskInventoryId: this.$route.query.projectTaskInventoryId,
-              flowType: this.$route.query.flowType,
-              userIds: this.formInline[value].split(',')[index],
-              taskDefinitionKey: 'dreDispose',
-              msgType: msgType
+              userId: this.formInline[value].split(',')[index]
             })
           })
         }
diff --git a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
index 7aedb1c56..4efb871ed 100644
--- a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
+++ b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
@@ -42,6 +42,16 @@
           'No rating': this.$t('toBeConfirmed')
         },
         columns: [
+          {
+            title: this.$t('operationNode'),
+            dataIndex: 'name',
+            align: 'center'
+          },
+          {
+            title: this.$t('Operator'),
+            dataIndex: 'assignee',
+            align: 'center'
+          },
           {
             title: this.$t('result'),
             dataIndex: 'reviewResult',
@@ -53,16 +63,6 @@
             dataIndex: 'approvalOpinion',
             align: 'center'
           },
-          {
-            title: this.$t('operationNode'),
-            dataIndex: 'name',
-            align: 'center'
-          },
-          {
-            title: this.$t('Operator'),
-            dataIndex: 'assignee',
-            align: 'center'
-          },
           {
             title: this.$t('operationTime'),
             dataIndex: 'operatorTime',
diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
index 1eb42282f..71648ba3b 100644
--- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
@@ -147,7 +147,7 @@
         return false
       },
       isTerminationProcess() {
-        if (this.$route.query.TaskKey == 'fqrsh' || this.$route.query.TaskKey == 'zrrclrw') {
+        if (this.$route.query.TaskKey == 'fqrsh') {
           return true
         }
         return false