diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 80400b7d4..bb101e315 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -1207,7 +1207,12 @@ for (let i = 0; i < this.selectedRowKeysList.length; i++) { if (this.selectedRowKeysList[i].flowStatus == 'List to be released' || this.selectedRowKeysList[i].flowStatus == 'Review and pass') { - ids.push(this.selectedRowKeysList[i].id) + if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + return + }else{ + ids.push(this.selectedRowKeysList[i].id) + } } else { notConditions.push(this.selectedRowKeysList[i].inspectionItem) } diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue index e88c17ea3..d7920faa6 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue @@ -109,7 +109,7 @@ let newUrl = this.$router.resolve({ path: '/platformItemLibraryDetails', query: { - id: item.projectLibraryId, + id: item.id, projectName: item.projectName+'-'+item.projectVersion, projectNameId: item.projectName, targetMarket: item.targetMarket,