From 550658aef16c78c3df882a895095f63ae4700dce Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 27 Sep 2023 16:48:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E5=B7=B2=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E7=9A=84=E4=B8=8D=E8=83=BD=E8=B5=B0=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/listOfRegulations.vue          | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index a5e7839cd..bb22e1442 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -2917,17 +2917,17 @@
               dataSource[i].verifyFlowStatus == 'Regulatory engineer returns' ||
               dataSource[i].designFlowStatus == 'List to be released' ||
               dataSource[i].designFlowStatus == 'Regulatory engineer returns') {
-              if(dataSource[i].projectLawsInventoryEOS && (dataSource[i].projectLawsInventoryEOS.length > 0 || dataSource[i].projectLawsInventoryEOS !== null)){
+              // if(dataSource[i].projectLawsInventoryEOS && (dataSource[i].projectLawsInventoryEOS.length > 0 || dataSource[i].projectLawsInventoryEOS !== null)){
                 if (dataSource[i].regulationOwnerId) {
                   this.detailedSuccessList.push(dataSource[i])
                 } else {
                   this.detailedWarningList.push(
                     < div > { dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') } < /div>)
                 }
-              }else{
-                this.detailedWarningList.push(
-                  < div > { dataSource[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>)
-              }
+              // }else{
+              //   this.detailedWarningList.push(
+              //     < div > { dataSource[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>)
+              // }
             } else {
               this.detailedWarningList.push(
               < div > { dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected') } < /div>)
@@ -3085,8 +3085,13 @@
               dataSource[i].designFlowStatus == 'List to be checked' ||
               dataSource[i].verifyFlowStatus == 'Duty Person Rejected' ||
               dataSource[i].designFlowStatus == 'Duty Person Rejected') {
-              idList.push(dataSource[i].id)
-              this.rowKeysSuccessList.push(dataSource[i])
+              if (dataSource[i].projectLawsInventoryEOS && (dataSource[i].projectLawsInventoryEOS.length > 0 || dataSource[i].projectLawsInventoryEOS !== null)) {
+                this.detailedWarningList.push(
+                  < div > { dataSource[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>)
+              }else{
+                idList.push(dataSource[i].id)
+                this.rowKeysSuccessList.push(dataSource[i])
+              }
             } else if (dataSource[i].designFlowStatus == 'NA' || dataSource[i].verifyFlowStatus == 'NA') {
               this.detailedWarningList.push(
               < div > { dataSource[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>)