From f55adecded60838d830a429eae2b1b92c78873a2 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 20 May 2022 14:27:36 +0800
Subject: [PATCH] =?UTF-8?q?der=E6=8F=90=E4=BA=A4=E5=8A=A0=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/engineeringConfirmation.vue    |  3 ++-
 .../reviewedByThePersonInCharge.vue           | 24 +++++++++++++++----
 .../components/taskCirculationHistory.vue     |  2 +-
 .../processForm/taskListProcess/index.vue     | 12 +++++++++-
 4 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
index 1c889d789..896903852 100644
--- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
@@ -53,7 +53,7 @@
            {{$t('edit')}}
          </a>
            <a class="text"
-              v-if="$route.query.TaskKey == 'zrrclrw'"
+              v-if="$route.query.TaskKey == 'zrrclrw' && result.status"
               :disabled="!result.status"
               @click="confirm(result)">
              <span v-if="result.status == 'NotDone'">
@@ -607,6 +607,7 @@
                 this.dataSourceTable.forEach(val => {
                   this.distributionEngineerList.push({
                     name: val.userName,
+                    id:val.id,
                     userId: val.userId,
                     deliveryInstructions: val.deliveryInstructions
                   })
diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
index 8a919040e..1631f0d12 100644
--- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
+++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
@@ -2,7 +2,8 @@
   <div class="box">
     <div class="box-text">
       <div class="header-text">
-        {{$route.query.TaskKey == 'zrrclrw' ? $t('personLiableConfirm'):$t('fillInProjectDelivery')}}
+        {{$route.query.TaskKey == 'zrrclrw' || $route.query.TaskKey == 'fqrsh'
+        ? $t('personLiableConfirm'):$t('fillInProjectDelivery')}}
       </div>
     </div>
     <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
@@ -110,7 +111,7 @@
             </div>
             <a-form-model-item class="itemModel">
               <span class="text-header">
-                 爱上克里夫就的撒开了房间圣诞快乐房价士大夫打扫房间圣诞快乐房价是罚款乱收费考虑是否就但是考虑
+                {{reviewResult[formInline.reviewResult]}}
               </span>
             </a-form-model-item>
           </div>
@@ -170,6 +171,14 @@
     data() {
       return {
         formInline: {},
+        reviewResult: {
+          'launch': this.$t('Launch'),
+          'Compliance': this.$t('accord'),
+          'Non-Compliance': this.$t('nonConformity'),
+          'To be tracked': this.$t('Tracked'),
+          'NA': this.$t('notInvolved'),
+          'No rating': this.$t('toBeConfirmed')
+        },
         isTrue: false,
         rules: {
           reviewResult: [
@@ -210,17 +219,22 @@
     },
     mounted() {
       this.$route.query.isDisplay = JSON.parse(this.$route.query.isDisplay)
-      if (this.queryBy) {
+      if (this.queryBy && this.$route.query.TaskKey == 'fqrsh') {
         this.formInline.reviewResult = this.queryBy.reviewResult || undefined
-        this.formInline.approvalOpinion = ''
+        this.formInline.approvalOpinion = this.queryBy.approvalOpinion
         this.formInline = { ...this.formInline }
       }
-      if (this.queryPersonInCharge) {
+      if (this.queryPersonInCharge && this.$route.query.TaskKey == 'dreDispose') {
         this.formInline.deliveryRequirements = this.queryPersonInCharge.deliveryRequirements
         this.formInline.engineerFeedbackContent = this.queryPersonInCharge.engineerFeedbackContent
         this.formInline.fileId = this.queryPersonInCharge.fileId
         this.formInline = { ...this.formInline }
       }
+      if (this.queryBy && this.$route.query.TaskKey == 'zrrclrw') {
+        this.formInline.reviewResult = this.queryBy.reviewResult || undefined
+        this.formInline.approvalOpinion = this.queryBy.approvalOpinion
+        this.formInline = { ...this.formInline }
+      }
     },
     methods: {
       submit(callBack) {
diff --git a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
index 900d7d4c6..ad4dd00b0 100644
--- a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
+++ b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
@@ -15,7 +15,7 @@
         :columns="columns"
       >
         <span slot="reviewResult" slot-scope="text,result">
-            {{reviewResult[text]}}
+            {{text}}
         </span>
       </a-table>
     </div>
diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
index 1b3629873..2bd386343 100644
--- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
@@ -20,6 +20,7 @@
         />
         <engineeringConfirmation
           v-if="isDisplay"
+          ref="engineeringConfirmationRef"
         />
         <reviewedByThePersonInCharge
           v-if="isDisplay"
@@ -257,7 +258,16 @@
           this.loading = true
           res.operatorTime = operatorTime
           if (this.$route.query.TaskKey == 'dreDispose') {
-            this.dreSubmit(res)
+            let dataSource = this.$refs.engineeringConfirmationRef.dataSource
+            let isTrue
+            for (let i = 0; i < dataSource.length; i++) {
+              if (dataSource[i].status == 'status' || !dataSource[i].status) {
+
+              }
+            }
+            if (isTrue) {
+              this.dreSubmit(res)
+            }
           } else {
             this.completeTask(res)
           }