项目法规任务-当设计符合性确认结果选择尾待追踪、不符合时，发起人审查节点只能选择退回

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;
   }

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