diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 1837e9eed..01af020ad 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -68,6 +68,28 @@ + + + + {{ $t('statisticalNodes') }} + + + + + {{ item.key }} + + + + + @@ -143,10 +165,10 @@ {{ $t('copy') }} - + + > - - - + + + @@ -685,6 +707,7 @@ confirmLoadingQuestion: false, isDesignCompliance: false, isVerifyingCompliance: false, + firstLevelDutyTerritoryList: [], pageNo: 1, pageSize: 50, total: 0, @@ -749,7 +772,7 @@ ellipsis: true, dataIndex: 'attestationType_dictText', width: 180, - sorter: true, + sorter: true }, { title: this.$t('certificationLevel'), @@ -757,7 +780,7 @@ ellipsis: true, dataIndex: 'attestationRank_dictText', width: 180, - sorter: true, + sorter: true }, { title: this.$t('areaOfResponsibility'), @@ -1250,7 +1273,7 @@ value: 'attestationRank', text: this.$t('certificationLevel'), dictCode: 'attestation_rank'//只要 dictCode 有值,无论 type 是什么,都显示为字典下拉框 - }, + } // { // type: 'deliverables', // value: 'designDeliverableType', @@ -1433,8 +1456,9 @@ }, mounted() { - if (this.areaOfResponsibilityList && this.areaOfResponsibilityList.dutyTerritory) { - this.queryParam.dutyTerritory = this.areaOfResponsibilityList.dutyTerritory + this.getFirstLevelDutyTerritory() + if (this.areaOfResponsibilityList && this.areaOfResponsibilityList.dutyTerritoryName) { + this.queryParam.firstLevelDutyTerritory = this.areaOfResponsibilityList.dutyTerritoryName this.queryParam = { ...this.queryParam } } this.JLoading = true @@ -1483,6 +1507,15 @@ }, methods: { ...mapGetters(['userInfo']), + getFirstLevelDutyTerritory() { + getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => { + if (res.success) { + this.firstLevelDutyTerritoryList = res.result + } else { + this.firstLevelDutyTerritoryList = [] + } + }) + }, modifyOperatorClick(name) { if (this.selectedRowKeys.length == 0) { this.$message.warning(this.$t('selectLeastOne')) @@ -1800,7 +1833,7 @@ content: _this.$t('ConfirmReplication'), onOk() { let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys)) - getAction(_this.url.copyUrl, { ids: idList.join(','),operateType:operateType }).then((res) => { + getAction(_this.url.copyUrl, { ids: idList.join(','), operateType: operateType }).then((res) => { if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) _this.selectedRowKeys = [] @@ -2367,9 +2400,9 @@ this.orderByField = 'designDutyId' } else if (sorter.columnKey == 'verifyDutyIdName') { this.orderByField = 'verifyDutyId' - } else if (sorter.columnKey == 'verifyFlowStatusName') { + } else if (sorter.columnKey == 'verifyFlowStatusName') { this.orderByField = 'verifyFlowStatus' - } else if (sorter.columnKey == 'designFlowStatusName') { + } else if (sorter.columnKey == 'designFlowStatusName') { this.orderByField = 'designFlowStatus' } else if (sorter.columnKey == 'attestationType_dictText') { this.orderByField = 'attestationType'