平台件项目库 认证清单删除逻辑修改

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(',') : []

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({
+          console.log(val)
-            content: _this.$t('ConfirmDelete'),
+          if(val.projectCertificationInventoryEOS && (val.projectCertificationInventoryEOS.length > 0 || val.projectCertificationInventoryEOS !== null)){
-            onOk() {
+            this.$message.warning(val.serialNumber + this.$t('platformitemhasbeenassociated'))
-              deleteAction(_this.url.deleteOne, { id: val.id, projectLibraryId: _this.$route.query.id }).then((res) => {
+          }else{
-                if (res.success) {
+            this.$confirm({
-                  _this.$message.success(_this.$t('OperationSuccessful'))
+              content: _this.$t('ConfirmDelete'),
-                  _this.getList()
+              onOk() {
-                } else {
+                deleteAction(_this.url.deleteOne, { id: val.id, projectLibraryId: _this.$route.query.id }).then((res) => {
-                  _this.$message.warning(_this.$t('operationFailed'))
+                  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'))
         }

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,

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
             // }

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({
+        if(this.platform == 'YES'){
-          path: '/ProjectDetails',
+          let newUrl = this.$router.resolve({
-          query: {
+            path: '/platformItemLibraryDetails',
-            id: item.projectLibraryId,
+            query: {
-            projectName: item.projectName+'-'+item.projectVersion,
+              id: item.projectLibraryId,
-            projectNameId: item.projectNameId,
+              projectName: item.projectName+'-'+item.projectVersion,
-            targetMarket: item.targetMarket,
+              projectNameId: item.projectName,
-            studioEngineer: item.studioEngineer
+              targetMarket: item.targetMarket,
-          }
+              studioEngineer: item.studioEngineer
-        })
+            }
-        window.open(newUrl.href, '_blank')
+          })
+          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')
+        }
+
       },
     }
   }