From 7b9e65394cf349cee3e6f8077252cb8fef7c8a0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Tue, 28 Mar 2023 16:37:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-=E8=8B=B1?=
 =?UTF-8?q?=E6=96=87=E7=89=88-=E5=88=97=E8=A1=A8=E7=9A=84=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=B4=E5=A4=AA=E5=AE=BD=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectRegulationTasks/components/dealtWith.vue  | 12 ++++++++++++
 .../components/designCompliance.vue                  |  3 +++
 2 files changed, 15 insertions(+)

diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
index cf7ab0361..ab9143c9f 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
@@ -284,6 +284,12 @@
           if (row.taskId.length > 30) {
             row.taskId = ''
           }
+          let designDueDate = ''
+          if (row.taskDefinitionKey == 'zrrqr' || row.taskDefinitionKey == 'dezrrqr') {
+            designDueDate = 'endTime'
+          } else {
+            designDueDate = 'designDueDate'
+          }
           query = {
             router: row.router,
             taskIds: row.taskId,
@@ -354,6 +360,12 @@
           if (row.taskId.length > 30) {
             row.taskId = ''
           }
+          let verifyDueDate = ''
+          if (row.taskDefinitionKey == 'zrrqr' || row.taskDefinitionKey == 'dezrrqr') {
+            verifyDueDate = 'endTime'
+          } else {
+            verifyDueDate = 'verifyDueDate'
+          }
           query = {
             router: row.router,
             taskIds: row.taskId,
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
index c8e92936e..0d7de755b 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
@@ -266,6 +266,9 @@
         getAction(this.url.queryProjectLawsInventoryInfoById, query).then((res) => {
           if (res.success) {
             this.queryProject = res.result[0] || {}
+            if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr'){
+              this.queryProject.endTime = this.queryData.endTime
+            }
             this.loading = false
             this.isDisplay = true
           } else {