From 17fe6da36a53059cf2c28ed5017a5b329d470373 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Mon, 27 Mar 2023 11:43:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B3=95=E8=A7=84=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1-=E5=BD=93=E8=AE=BE=E8=AE=A1=E7=AC=A6=E5=90=88?=
 =?UTF-8?q?=E6=80=A7=E7=A1=AE=E8=AE=A4=E7=BB=93=E6=9E=9C=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=B0=BE=E5=BE=85=E8=BF=BD=E8=B8=AA=E3=80=81=E4=B8=8D=E7=AC=A6?=
 =?UTF-8?q?=E5=90=88=E6=97=B6=EF=BC=8C=E5=8F=91=E8=B5=B7=E4=BA=BA=E5=AE=A1?=
 =?UTF-8?q?=E6=9F=A5=E8=8A=82=E7=82=B9=E5=8F=AA=E8=83=BD=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E9=80=80=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/designCompliance.vue           | 23 +++++++++++++--
 .../reviewedByThePersonInCharge.vue           | 29 +++++--------------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
index 5c50f1ab1..c8e92936e 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
@@ -35,7 +35,9 @@
       </div>
 
 
-      <div class="drawer-review" v-if="this.queryData.isDisplay">
+      <div :class="{'drawer-review':isDrawerClass,
+                    'drawer-review-One':!isDrawerClass}"
+           v-if="this.queryData.isDisplay">
         <reviewedByThePersonInCharge
           v-if="isDisplay"
           ref="reviewedByThePersonInChargeRef"
@@ -135,6 +137,12 @@
           return false
         }
         return true
+      },
+      isDrawerClass() {
+        if (this.queryData.TaskKey == 'dezrrtjjfw' || this.queryData.TaskKey == 'zrrtjjfw') {
+          return true
+        }
+        return false
       }
     },
     mounted() {
@@ -178,7 +186,6 @@
         })
       },
       getList(row, title) {
-        console.log(row)
         this.queryData = row
         this.queryData.isDisplay = JSON.parse(this.queryData.isDisplay)
         this.loading = true
@@ -298,7 +305,17 @@
     background: #fff;
     border-radius: 0 0 2px 2px;
   }
-
+  .drawer-review-One{
+    position: absolute;
+    bottom: 40px;
+    z-index: 1001;
+    height: 334px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
   .circulationHistory {
     margin-bottom: 436px;
   }
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
index 67f882593..82e7dcb05 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
@@ -27,7 +27,7 @@
               <a-radio value="Rejected" v-if="query.TaskKey == 'zrrqr'">
                 {{$t('refuse')}}
               </a-radio>
-              <a-radio value="Adopt" v-if="query.TaskKey == 'fggcssh'">
+              <a-radio value="Adopt" :disabled="isAdopt" v-if="query.TaskKey == 'fggcssh'">
                 {{$t('adopt')}}
               </a-radio>
               <a-radio value="Returned" v-if="query.TaskKey == 'dezrrqr' || query.TaskKey == 'dezrrtjjfw' ||
@@ -116,6 +116,7 @@
           'NA': this.$t('notInvolved'),
           'No rating': this.$t('toBeConfirmed')
         },
+        isAdopt: false,
         isTrue: false,
         rules: {
           disposeResult: [
@@ -162,26 +163,12 @@
     mounted() {
       this.formInline.approvalOpinion = ''
       this.formInline = { ...this.formInline }
-      // this.query.isDisplay = JSON.parse(this.query.isDisplay)
       this.query.isDisplay = true
-      if (this.queryBy && this.$route.query.TaskKey == 'fqrsh') {
-        this.formInline.reviewResult = this.queryBy.reviewResult || undefined
-        this.formInline.PersonChargeFeedback = this.$route.query.PersonChargeFeedback
-        this.formInline = { ...this.formInline }
-      }
-      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') {
-        if (!this.$route.query.isDisplay) {
-          this.formInline.reviewResult = this.queryBy.reviewResult || undefined
-          this.formInline.approvalOpinion = this.$route.query.PersonChargeFeedback
-          this.formInline = { ...this.formInline }
-        }
+      this.isAdopt = false
+      if (this.queryBy.disposeResult == 'To be tracked' || this.queryBy.disposeResult == 'Non-Compliance') {
+        this.isAdopt = true
       }
+      console.log(this.isAdopt)
     },
     methods: {
       submit(callBack) {
@@ -201,9 +188,9 @@
       },
       //转办接口
       SelectedByForm(userIds) {
-        if (this.query.TaskKey == 'zrrtjjfw'){
+        if (this.query.TaskKey == 'zrrtjjfw') {
           this.formInline.dezrrSubmitUserId = userIds
-        }else{
+        } else {
           this.formInline.secondChargePersonUserId = userIds
         }
         this.$refs.SelectedByRef.visible = false