From d57248b15b6eafbc66497b4f7647d8ea5006a3f3 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:03:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-=E8=BD=AC?=
 =?UTF-8?q?=E5=8A=9E=E6=97=B6-=E5=8F=AA=E8=83=BD=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E4=BA=BA=EF=BC=9B=20=E8=B4=A3=E4=BB=BB?=
 =?UTF-8?q?=E4=BA=BA=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/listOfRegulations.vue           | 18 ++++++++++++++----
 .../components/SentList.vue                    |  4 ++--
 .../components/dealtWith.vue                   |  4 ++--
 .../components/doneList.vue                    |  4 ++--
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index ce68da751..da433c8e8 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1279,7 +1279,7 @@
             isDisplay: false,
             flowType: 2,
             Sponsor: 'regulationOwnerName',
-            personLiable: 'designDutyName',
+            personLiable: 'designDutyIdName',
             typeOfDeliverables: 'designDeliverableTypeName',
             deliverableTemplate: 'designDeliverableTemplate',
             DueDate: 'designDueDate',
@@ -1309,7 +1309,7 @@
             flowType: 4,
             isDisplay: false,
             Sponsor: 'regulationOwnerName',
-            personLiable: 'verifyDutyName',
+            personLiable: 'verifyDutyIdName',
             typeOfDeliverables: 'verifyDeliverableTypeName',
             deliverableTemplate: 'verifyDeliverableTemplate',
             DueDate: 'verifyDueDate',
@@ -1685,13 +1685,23 @@
           let _this = this
           let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
           let isTrue
+          let content = []
           for (let i = 0; i < this.dataSource.length; i++) {
             for (let j = 0; j < selectedRowKeys.length; j++) {
               if (this.dataSource[i].id == selectedRowKeys[j]) {
-                isTrue = true
+                content.push(this.dataSource[i])
               }
             }
           }
+          for (let i = 0; i < content.length; i++) {
+            if (content[i].designFlowStatus == 'List to be released' &&
+              content[i].verifyFlowStatus == 'List to be released') {
+              isTrue = false
+
+            } else {
+              isTrue = true
+            }
+          }
           if (isTrue) {
             this.changeInterface(selectedRowKeys)
           }
@@ -2559,7 +2569,7 @@
       },
       download(item) {
         downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username })
-      },
+      }
     }
   }
 </script>
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
index 9c6ba1c7d..c547327ad 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
@@ -242,7 +242,7 @@
             isDisplay: false,
             flowType: 2,
             Sponsor: 'regulationOwnerName',
-            personLiable: 'designDutyName',
+            personLiable: 'designDutyIdName',
             typeOfDeliverables: 'designDeliverableTypeName',
             deliverableTemplate: 'designDeliverableTemplate',
             DueDate: 'designDueDate',
@@ -310,7 +310,7 @@
             flowType: 4,
             isDisplay: false,
             Sponsor: 'regulationOwnerName',
-            personLiable: 'verifyDutyName',
+            personLiable: 'verifyDutyIdName',
             typeOfDeliverables: 'verifyDeliverableTypeName',
             deliverableTemplate: 'verifyDeliverableTemplate',
             DueDate: 'verifyDueDate',
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
index f358d744f..cf7ab0361 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
@@ -297,7 +297,7 @@
             isDisplay: true,
             flowType: 2,
             Sponsor: 'regulationOwnerName',
-            personLiable: 'designDutyName',
+            personLiable: 'designDutyIdName',
             typeOfDeliverables: 'designDeliverableTypeName',
             deliverableTemplate: 'designDeliverableTemplate',
             DueDate: 'designDueDate',
@@ -367,7 +367,7 @@
             flowType: 4,
             isDisplay: true,
             Sponsor: 'regulationOwnerName',
-            personLiable: 'verifyDutyName',
+            personLiable: 'verifyDutyIdName',
             typeOfDeliverables: 'verifyDeliverableTypeName',
             deliverableTemplate: 'verifyDeliverableTemplate',
             DueDate: 'verifyDueDate',
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
index a6a52ff80..615696db6 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
@@ -237,7 +237,7 @@
             isDisplay: false,
             flowType: 2,
             Sponsor: 'regulationOwnerName',
-            personLiable: 'designDutyName',
+            personLiable: 'designDutyIdName',
             typeOfDeliverables: 'designDeliverableTypeName',
             deliverableTemplate: 'designDeliverableTemplate',
             DueDate: 'designDueDate',
@@ -304,7 +304,7 @@
             flowType: 4,
             isDisplay: false,
             Sponsor: 'regulationOwnerName',
-            personLiable: 'verifyDutyName',
+            personLiable: 'verifyDutyIdName',
             typeOfDeliverables: 'verifyDeliverableTypeName',
             deliverableTemplate: 'verifyDeliverableTemplate',
             DueDate: 'verifyDueDate',