diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 8c523b79d..77f5bc836 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1979,4 +1979,5 @@ module.exports = { Processdetails:'Process Details', matchempty:'The match is empty', onlyDataProcessStatusDeleted:'Data can only be deleted if the process status is task ready, approved, or rejected by the responsible person', + platformitemhasbeenassociated:'A platform item has been associated', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 5f96284a8..892faa965 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -3934,5 +3934,6 @@ module.exports = { unpublishedregulationsselected:'仅能选择未发布的法规', PlatformInformation:'平台件信息', Processdetails:'流程详情', - matchempty:'匹配项为空' + matchempty:'匹配项为空', + platformitemhasbeenassociated:'已关联平台件项目', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 67b63745f..5f95c5ba6 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1986,6 +1986,7 @@ this.detailedWarningList = [] let dataSource = [] let status = '' + flag = '1' for (let i = 0; i < this.dataSource.length; i++) { for (let j = 0; j < this.selectedRowKeys.length; j++) { if (this.dataSource[i].id == this.selectedRowKeys[j]) { @@ -1996,7 +1997,6 @@ for (let i = 0; i < dataSource.length; i++) { if (dataSource[i].verifyFlowStatus !== 'List to be released' && dataSource[i].designFlowStatus !== 'List to be released') { - flag = '1' status = '1' } } @@ -2008,11 +2008,12 @@ this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(',')) } }else{ + let ids = [] this.dataSource.forEach(item => { - this.selectedRowKeys.push(item.id) + ids.push(item.id) }) flag = '2' - this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(',')) + this.$refs.associatedplatRef.transferModel(flag,type,ids) } }, associatedplatForm(id,flag,type,ids){ @@ -2916,11 +2917,16 @@ dataSource[i].verifyFlowStatus == 'Regulatory engineer returns' || dataSource[i].designFlowStatus == 'List to be released' || dataSource[i].designFlowStatus == 'Regulatory engineer returns') { - if (dataSource[i].regulationOwnerId) { - this.detailedSuccessList.push(dataSource[i]) - } else { + 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('TheEngineerAndCertification') } < /div>) + < div > { dataSource[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>) } } else { this.detailedWarningList.push( diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue index ce86526cb..4833b0c05 100644 --- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue +++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue @@ -22,6 +22,7 @@