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>)