diff --git a/jero-web/src/views/projectManagement/components/associatedplat.vue b/jero-web/src/views/projectManagement/components/associatedplat.vue index ac007c0e1..e6c0466d5 100644 --- a/jero-web/src/views/projectManagement/components/associatedplat.vue +++ b/jero-web/src/views/projectManagement/components/associatedplat.vue @@ -18,7 +18,7 @@ {{$t('entryName')}} + v-model="queryParam.projectNameId"> diff --git a/jero-web/src/views/projectManagement/components/flowstatusdetial.vue b/jero-web/src/views/projectManagement/components/flowstatusdetial.vue index 714d9c6c5..a708b55dc 100644 --- a/jero-web/src/views/projectManagement/components/flowstatusdetial.vue +++ b/jero-web/src/views/projectManagement/components/flowstatusdetial.vue @@ -16,16 +16,16 @@
{{$t('regulationNo')}} - - {{form.vdr}} + + {{form.serialNumber}}
{{$t('title')}} - - {{form.summary}} + + {{form.title}}
@@ -34,8 +34,8 @@
{{$t('subtitle')}} - - {{form.homologationImpact}} + + {{form.subtitle}}
@@ -49,14 +49,14 @@
-
{{item.title}}
+
{{item.projectName}}
{{$t('ProcessStatus')}} - - {{item.ProcessStatus}} + + {{flag == 'design'?item.designFlowStatusName : item.verifyFlowStatusName}}
@@ -66,15 +66,15 @@
{{$t('Sponsor')}} - - {{item.Sponsor}} + + {{item.createBy}}
{{$t('personLiable')}} - - {{item.personLiable}} + + {{flag == 'design'?item.designDutyIdName : item.verifyDutyIdName}}
@@ -82,15 +82,15 @@
{{$t('statisticalNodes')}} - - {{item.statisticalNodes}} + + {{item.dutyDepart}}
{{$t('areaOfResponsibility')}} - - {{item.areaOfResponsibility}} + + {{item.dutyTerritory_dictText}}
@@ -98,15 +98,15 @@
{{$t('deliverableTemplate')}} - - {{item.deliverableTemplate}} + + {{flag == 'design'?item.designDeliverableTemplateName : item.verifyDeliverableTemplateName }}
{{$t('typeOfDeliverables')}} - - {{item.typeOfDeliverables}} + + {{flag == 'design'?item.designDeliverableTypeName : item.verifyDeliverableTypeName}}
@@ -114,8 +114,8 @@
{{$t('descriptionDeliverables')}} - - {{item.descriptionDeliverables}} + + {{flag == 'design'?item.designRemark : item.verifyRemark}}
@@ -134,7 +134,7 @@ diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 3676fec0d..7c837d07c 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -273,12 +273,6 @@ {{ $t('Associatedplatform') }}
-
- - {{ $t('Associatedplatform1') }} -
@@ -1832,7 +1826,11 @@ primaryKeyId: row.primaryKeyId } } - this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), name) + if(row.projectLawsInventoryEOS && row.projectLawsInventoryEOS.length > 1){ + this.$refs.flowstatusdetialRef.addModel(row, name) + }else{ + this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), name) + } }, @@ -1963,6 +1961,7 @@ if(this.selectedRowKeys && this.selectedRowKeys.length > 0){ this.detailedWarningList = [] let dataSource = [] + let status = '' 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]) { @@ -1974,12 +1973,17 @@ if (dataSource[i].verifyFlowStatus == 'List to be released' && dataSource[i].designFlowStatus == 'List to be released') { flag = '1' - this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(',')) + status = '1' } else { - this.$message.warning(this.$t('unpublishedregulationsselected')) - return + status = '2' } } + console.log(status) + if(status == '1'){ + this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(',')) + }else{ + this.$message.warning(this.$t('unpublishedregulationsselected')) + } }else{ flag = '2' this.selectedRowKeys = this.dataSource.map(val => val.id)