From 4ca4f1c141b434d9d780008dd261407194405e00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Mon, 20 Mar 2023 16:23:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/designCompliance.vue           | 82 ++-----------------
 1 file changed, 7 insertions(+), 75 deletions(-)

diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
index aa6b4c8ed..67199f91d 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
@@ -36,15 +36,10 @@
           v-if="isDisplay"
           :is-adopt="isAdopt"
           :isSendBack="isSendBack"
-          :isSubmit="isSubmit"
-          :is-resubmit="isResubmit"
           :is-cancel="isCancel"
           :is-confirm="isConfirm"
-          @terminationProcess="terminationProcess"
           @adopt="adopt"
           @sendBack="sendBack"
-          @submit="submit"
-          @Resubmit="Resubmit"
           @cancel="handleCancel"
           @confirm="confirm"
         />
@@ -133,20 +128,6 @@
         }
         return false
       },
-      isSubmit() {
-        if (this.queryData.TaskKey == 'zrrclrw' && this.queryData.isDisplay) {
-          return true
-        }
-        return false
-      },
-      isResubmit() {
-        if (this.queryData.TaskKey == 'dreDispose' && this.queryData.isDisplay) {
-          if (this.queryPersonInCharge.engineerFeedbackContent && this.queryPersonInCharge.status != 'haveDone') {
-            return true
-          }
-        }
-        return false
-      },
       isCancel() {
         if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr' || this.queryData.TaskKey == 'zrrtjjfw') {
           return true
@@ -167,75 +148,26 @@
       handleCancel() {
         this.visible = false
       },
-      terminationProcess(operatorTime) {
-        this.textLoading = this.$t('terminationProcessing')
-        this.loading = true
-        this.queryBy.reviewResult = 'Termination of task'
-        this.$refs.reviewedByThePersonInChargeRef.submitNoRule((res) => {
-          this.completeTask({ flag: 2, operatorTime: operatorTime, ...res })
-        })
-      },
       adopt(operatorTime) {
-        this.$refs.reviewedByThePersonInChargeRef.submit((res) => {
+        this.$refs.reviewedByThePersonInChargeRef.submitNoRule((res) => {
           this.textLoading = this.$t('Submitting')
           this.loading = true
-          res.flag = 0
           res.operatorTime = operatorTime
+          res.disposeResult = 'Accepted'
           this.completeTask(res)
         })
       },
       sendBack(operatorTime) {
         this.textLoading = this.$t('Returning')
         this.loading = true
-        if (this.queryBy.reviewResult == 'Non-Compliance' || this.queryBy.reviewResult == 'To be tracked') {
-
-        } else {
-          this.queryBy.reviewResult = 'No rating'
-        }
         this.$refs.reviewedByThePersonInChargeRef.submitNoRule((res) => {
-          this.completeTask({ flag: 1, operatorTime: operatorTime, ...res })
-        })
-      },
-      Resubmit(operatorTime) {
-        this.$refs.reviewedByThePersonInChargeRef.submit((res) => {
-          this.textLoading = this.$t('Submitting')
-          this.loading = true
-          res.operatorTime = operatorTime
-          if (this.$route.query.TaskKey == 'dreDispose') {
-            this.dreSubmit(res)
-          }
-        })
-      },
-      submit(operatorTime) {
-        this.$refs.reviewedByThePersonInChargeRef.submit((res) => {
-          this.textLoading = this.$t('Submitting')
-          this.loading = true
-          res.operatorTime = operatorTime
-          if (this.$route.query.TaskKey == 'dreDispose') {
-            this.dreSubmit(res)
+          if (this.queryData.TaskKey == 'fggcssh"') {
+            res.disposeResult = 'Rejected'
           } else {
-            if (this.$route.query.TaskKey == 'zrrclrw') {
-              let dataSource = this.$refs.engineeringConfirmationRef.dataSource
-              let isTrue
-              if (dataSource && dataSource.length > 0) {
-                for (let i = 0; i < dataSource.length; i++) {
-                  if (dataSource[i].status == 'haveDone' || dataSource[i].createUser) {
-                    isTrue = true
-                  } else {
-                    isTrue = false
-                    this.$message.warning(this.$t('pleaseSubmitStatus'))
-                    this.loading = false
-                    return
-                  }
-                }
-              } else {
-                isTrue = true
-              }
-              if (isTrue) {
-                this.completeTask(res)
-              }
-            }
+            res.disposeResult = 'Returned'
           }
+          res.secondChargePersonUserId = ''
+          this.completeTask({ operatorTime: operatorTime, ...res })
         })
       },
       confirm(operatorTime) {