diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue index 9b0e2148b..41811ade2 100644 --- a/jero-web/src/components/search/index.vue +++ b/jero-web/src/components/search/index.vue @@ -263,13 +263,15 @@ getAction(this.url.seachList, params).then((res) => { if (res.success) { this.searchList = res.result + console.log(this.searchQueryList) if (this.searchQueryList && this.searchQueryList.length > 0) { + console.log(this.searchList) for (let i = 0; i < this.searchList.length; i++) { if (this.searchList[i].db_field_name == 'issue_time') { this.searchList.splice(i, 1) i-- } - if (this.searchList[i].db_field_name == 'title') { + if (this.searchList[i].db_field_name == 'title' || this.searchList[i].db_field_name == 'title_en') { let data = this.searchList[i + 1] this.searchList[i + 1] = this.searchQueryList[0] this.searchList.push(data) diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index cf8046bb1..2061146c6 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -104,6 +104,29 @@ @change="onChangedatet"> + +
+
+ {{ $t('statisticalNodes') }} +
+ + + + {{ item.key }} + + + +
+
@@ -1043,7 +1066,8 @@ text: this.$t('areaOfResponsibility'), dictCode: 'duty_territory'//只要 dictCode 有值,无论 type 是什么,都显示为字典下拉框 } - ] + ], + firstLevelDutyTerritoryList:[], } }, created() { @@ -1058,6 +1082,7 @@ this.isTrue = this.$route.query.title == '市场清单详情' ? false : true this.getHeader() this.getList() + this.getFirstLevelDutyTerritory() }, computed: { columns() { @@ -1079,6 +1104,15 @@ }, methods: { ...mapGetters(['userInfo']), + getFirstLevelDutyTerritory() { + getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => { + if (res.success) { + this.firstLevelDutyTerritoryList = res.result + } else { + this.firstLevelDutyTerritoryList = [] + } + }) + }, sVisible() { this.getDataAdmin() }, diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 2e5448823..62c423b60 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -461,7 +461,7 @@ - + + +
+
+ {{ $t('statisticalNodes') }} +
+ + + + {{ item.key }} + + + +
+
@@ -320,6 +343,7 @@ }, queryParam: {}, orderByField: '', + firstLevelDutyTerritoryList:[], columns: [ { title: this.$t('category'), @@ -429,10 +453,20 @@ this.isTrue = this.$route.query.title == '市场认证清单详情' ? false : true this.isFalse = this.$route.query.title == '市场认证清单详情' ? true : false this.getList() + this.getFirstLevelDutyTerritory() }, computed: {}, methods: { ...mapGetters(['userInfo']), + getFirstLevelDutyTerritory() { + getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => { + if (res.success) { + this.firstLevelDutyTerritoryList = res.result + } else { + this.firstLevelDutyTerritoryList = [] + } + }) + }, onSelectChange(value) { this.selectedRowKeys = value },