From e85195f9ea4a402138f860a56a5c51b703b7b013 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Thu, 6 Apr 2023 15:58:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E4=BA=BA=E5=AE=A1=E6=9F=A5=E6=97=B6=E5=BA=94=E8=83=BD?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=99=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/circulationHistory.vue             | 13 +++++++++++--
 .../components/designCompliance.vue               |  5 ++++-
 .../components/reviewedByThePersonInCharge.vue    | 15 ++++++++++++---
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
index bf8f01fc2..b382da530 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
@@ -40,6 +40,14 @@
         <span slot="approvalResult" slot-scope="text,result">
             {{approvalResult[text]}}
         </span>
+        <span slot="approvalOpinion" slot-scope="text,result">
+      <a-tooltip placement="top">
+        <template slot="title">
+          <span>{{text}}</span>
+        </template>
+        {{text}}
+      </a-tooltip>
+        </span>
         <span slot="resultofhandling" slot-scope="text,result">
             <span :class="statusClass[result.operatorResult]" :title="result.operatorResultName">
                  {{result.operatorResultName}}
@@ -159,7 +167,8 @@
             dataIndex: 'approvalOpinion',
             align: 'left',
             width: 200,
-            ellipsis: true
+            ellipsis: true,
+            scopedSlots: { customRender: 'approvalOpinion' }
           },
           {
             title: this.$t('resultofhandling'),
@@ -186,7 +195,7 @@
             customRender: function(t, r, index) {
               return moment(t).format('YYYY-MM-DD HH:mm:ss')
             }
-          },
+          }
         ]
       }
     },
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
index 0d7de755b..a4fcddf1f 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
@@ -139,7 +139,9 @@
         return true
       },
       isDrawerClass() {
-        if (this.queryData.TaskKey == 'dezrrtjjfw' || this.queryData.TaskKey == 'zrrtjjfw') {
+        if (this.queryData.TaskKey == 'dezrrtjjfw' ||
+          this.queryData.TaskKey == 'zrrtjjfw' ||
+          this.queryData.TaskKey == 'fggcssh') {
           return true
         }
         return false
@@ -263,6 +265,7 @@
           operatorType: 'taskAffirmQuery'
         }
         this.queryBy.approvalOpinion = ''
+        this.queryBy.approvalFile = ''
         getAction(this.url.queryProjectLawsInventoryInfoById, query).then((res) => {
           if (res.success) {
             this.queryProject = res.result[0] || {}
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
index 8b31bb419..3d1d5d251 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
@@ -49,6 +49,9 @@
               <a-radio value="Transfer" v-if="query.TaskKey == 'zrrtjjfw' || query.TaskKey == 'zrrqr'">
                 {{$t('turnToDo')}}
               </a-radio>
+              <a-button type="primary" v-if="isPersonnel" @click="PersonnelSelectionClick">
+                {{this.$t('PersonnelSelection')}}
+              </a-button>
               <span>
                 {{this.formInline.dezrrSubmitUserName}}
               </span>
@@ -71,7 +74,8 @@
           </a-form-model-item>
         </a-col>
       </a-row>
-      <a-row :gutter="24" v-if="query.TaskKey == 'dezrrtjjfw' || query.TaskKey == 'zrrtjjfw'">
+      <a-row :gutter="24"
+             v-if="query.TaskKey == 'dezrrtjjfw' || query.TaskKey == 'zrrtjjfw' || query.TaskKey == 'fggcssh'">
         <a-col :span="24">
           <div class="box-title-text">
             <div class="title-text">
@@ -111,6 +115,7 @@
     data() {
       return {
         formInline: {},
+        isPersonnel: false,
         reviewResult: {
           'launch': this.$t('Launch'),
           'Compliance': this.$t('accord'),
@@ -171,7 +176,6 @@
       if (this.queryBy.disposeResult == 'To be tracked' || this.queryBy.disposeResult == 'Non-Compliance') {
         this.isAdopt = true
       }
-      console.log(this.isAdopt)
     },
     methods: {
       submit(callBack) {
@@ -181,11 +185,16 @@
           }
         })
       },
+      PersonnelSelectionClick() {
+        this.$refs.SelectedByRef.getPush()
+      },
       reviewResultChange(value) {
         if (value.target.value == 'Transfer') {
-          this.$refs.SelectedByRef.getPush()
+          this.isPersonnel = true
+          // this.$refs.SelectedByRef.getPush()
         } else {
           this.$refs.SelectedByRef.visible = false
+          this.isPersonnel = false
           this.formInline.secondChargePersonUserId = ''
           this.formInline.dezrrSubmitUserName = ''
           this.formInline.dezrrSubmitUserId = ''