From e5655ba28bd53c5c302983771b89fb22c1aa178a Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 28 Sep 2023 16:40:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BA=93=20=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../certificationList/components/addModel.vue | 1 + .../components/certificationList/index.vue | 31 ++++++++------ .../components/dealtWith.vue | 2 + .../components/designCompliance.vue | 4 ++ .../components/projectInformation.vue | 41 ++++++++++++++----- 5 files changed, 55 insertions(+), 24 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index 633656b76..d25284a75 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -868,6 +868,7 @@ this.formInline = {} this.dutyTerritoryList = [] this.visible = true + this.flowdisabled = false this.personnelVisible = true value.dutyDepart = value.dutyDepart ? value.dutyDepart.split(',') : [] value.dutyTerritory = value.dutyTerritory ? value.dutyTerritory.split(',') : [] diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 91c1a32d1..80400b7d4 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -1707,19 +1707,24 @@ deleteLib(val) { let _this = this if (val.flowStatus == 'List to be released' || val.flowStatus == 'Review and pass') { - this.$confirm({ - content: _this.$t('ConfirmDelete'), - onOk() { - deleteAction(_this.url.deleteOne, { id: val.id, projectLibraryId: _this.$route.query.id }).then((res) => { - if (res.success) { - _this.$message.success(_this.$t('OperationSuccessful')) - _this.getList() - } else { - _this.$message.warning(_this.$t('operationFailed')) - } - }) - } - }) + console.log(val) + if(val.projectCertificationInventoryEOS && (val.projectCertificationInventoryEOS.length > 0 || val.projectCertificationInventoryEOS !== null)){ + this.$message.warning(val.serialNumber + this.$t('platformitemhasbeenassociated')) + }else{ + this.$confirm({ + content: _this.$t('ConfirmDelete'), + onOk() { + deleteAction(_this.url.deleteOne, { id: val.id, projectLibraryId: _this.$route.query.id }).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.getList() + } else { + _this.$message.warning(_this.$t('operationFailed')) + } + }) + } + }) + } } else { this.$message.warning(this.$t('onlyDataWithProcessStatusDeleted')) } diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index 765c8d342..570ee3989 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -318,6 +318,7 @@ projectName: row.projectName, targetMarket: row.targetMarket, projectNameId: row.projectNameId, + platform:row.platform, primaryKeyId: row.primaryKeyId, PersonChargeFeedback: row.personChargeFeedback } @@ -376,6 +377,7 @@ query = { router: row.router, taskIds: row.taskId, + platform:row.platform, actiProcInstId: row.actiProcInstId, id: row.projectLibraryId, projectLibraryId: row.projectLibraryId, diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue index c55695f3e..a5623af7c 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue @@ -20,6 +20,7 @@ :title="$t('basicInformation')" :projectInformationList="projectInformationList" :url="url" + :platform="this.queryData.platform" :projectInformationId="this.queryBy.projectLibraryId" :queryProject="queryProject" /> @@ -294,6 +295,9 @@ getAction(this.url.queryProjectLawsInventoryInfoById, query).then((res) => { if (res.success) { this.queryProject = res.result[0] || {} + if(this.queryData.platform){ + this.queryProject.platform = this.queryData.platform + } // if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr') { // this.queryProject.endTime = this.queryData.endTime // } diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue index f3719541d..e88c17ea3 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue @@ -55,6 +55,10 @@ type: String, default: '' }, + platform: { + type: String, + default: '' + }, queryProject: { type: Object, default: {} @@ -101,17 +105,32 @@ }, RelatedItemsClick(item) { - let newUrl = this.$router.resolve({ - path: '/ProjectDetails', - query: { - id: item.projectLibraryId, - projectName: item.projectName+'-'+item.projectVersion, - projectNameId: item.projectNameId, - targetMarket: item.targetMarket, - studioEngineer: item.studioEngineer - } - }) - window.open(newUrl.href, '_blank') + if(this.platform == 'YES'){ + let newUrl = this.$router.resolve({ + path: '/platformItemLibraryDetails', + query: { + id: item.projectLibraryId, + projectName: item.projectName+'-'+item.projectVersion, + projectNameId: item.projectName, + targetMarket: item.targetMarket, + studioEngineer: item.studioEngineer + } + }) + window.open(newUrl.href, '_blank') + }else{ + let newUrl = this.$router.resolve({ + path: '/ProjectDetails', + query: { + id: item.projectLibraryId, + projectName: item.projectName+'-'+item.projectVersion, + projectNameId: item.projectNameId, + targetMarket: item.targetMarket, + studioEngineer: item.studioEngineer + } + }) + window.open(newUrl.href, '_blank') + } + }, } }