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 {