From fd7342e865140f3e81eea1241bc830b61ca76c2d Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Tue, 27 Jul 2021 11:29:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/addEdit.vue | 117 ++++++------------ .../pages/details.vue | 11 +- .../pages/otherAddEit.vue | 66 ++++++---- .../pages/projectAddEit.vue | 110 +++++++--------- 4 files changed, 136 insertions(+), 168 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 24dcc9a41..2f3209ac2 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -80,7 +80,7 @@ - + - - - - - - - - -
- - + + + + + - + - - - - - - - - - - - - - - {{$t('m.dataAcquisition')}} @@ -746,7 +684,7 @@ export default { {value: 'FOREIGN_STAND', label: '海外标准法规'}, //{value: 'FOREIGN_LAWS', label: '国内外政策'}, // {value: 'BUSINESS', label: '企业标准 '}, - {value: 'TEMP', label: '标准法规清单 '} + // {value: 'TEMP', label: '标准法规清单 '} ], // 新增、编辑 数据搜索字段 sarAccessInfoSearch: { @@ -766,6 +704,22 @@ export default { validFlag: 0, advanceSearchVOStr: '' }, + sarAccessInfo: { + id: '', + issueTime: '', + standName: '', + textStatus: '', + // applicationScope: '', //适用区域 + keywords: '', // 关键字 + detailedListName: '', //清单名称 + applyArctic: '', // 能源种类 + askType: '', // 监管类型 + dataSource: 'INLAND_STAND', // 数据来源 + page: 1, + pageSize: this.$store.getters.userInfo.configContent, + validFlag: 0, + advanceSearchVOStr: '' + }, moreSearchBtn: true, // 多属性搜索按钮 状态 showTableFlag: true, // 显示添加列表 状态 showSelectBox: true, // 显示高级查询 状态 @@ -1474,7 +1428,12 @@ export default { }, // 查询数据搜索 table 数据 selectLawsStands () { - StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{ + if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { + this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' + } else { + this.sarAccessInfoSearch.standType = 'FOREIGN' + } + StandardsInfoPage(this.sarAccessInfoSearch, this.sarAccessInfo).then(res =>{ this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList.forEach(item => { if (item.standYear === null) { @@ -1482,8 +1441,6 @@ export default { } else { item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear } - }) - this.sarAccessInfoSearchList.forEach(item => { this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index b868827c8..65ae89739 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -191,13 +191,13 @@ align="center"> { this.standinfoList = res.data; + this.standinfoList.forEach(item => { + if (item.standYear === null) { + item.standNumber = item.standSortShow + ' ' + item.standNumber + } else { + item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear + } + }) this.total = res.data.total; }, e => { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index 8cfff16a1..464ccc753 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -115,7 +115,11 @@ @click="clearSearchLaws">清空 - + + + 高级查询 + + 高级查询 @@ -124,10 +128,17 @@
- - + + + + + - + - - - { + if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { + this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' + } else { + this.sarAccessInfoSearch.standType = 'FOREIGN' + } + StandardsInfoPage(this.sarAccessInfoSearch, this.sarAccessInfo).then(res =>{ this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList.forEach(item => { if (item.standYear === null) { @@ -1288,8 +1309,6 @@ export default { } else { item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear } - }) - this.sarAccessInfoSearchList.forEach(item => { this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) @@ -1303,7 +1322,6 @@ export default { }) this.drawerTotal = res.data.list.length }, e => { - }) }, // 数据搜索table判断checked状态 diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 67196879a..f801e9a9e 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -65,7 +65,7 @@ - +
- - + + + + + - + - - - - - - - - - - - - - - - - {{$t('m.dataAcquisition')}} @@ -519,7 +477,7 @@ import CustomRoleTree from '@/components/CustomFormComponents/roleTree' import stand from "../../../config/pages/attributeCustom/components/stand"; import { mapGetters } from 'vuex' import {interfaceUrl} from "@/sysConfig"; -import {dicTypeData} from "@/api/unqualProcess"; +import {dicTypeData, StandardsInfoPage} from "@/api/unqualProcess" export default { name: 'OtherAddEit', components: { @@ -601,9 +559,9 @@ export default { dataSourceOptions: [ {value: 'INLAND_STAND', label: '国内标准法规'}, {value: 'FOREIGN_STAND', label: '海外标准法规'}, - {value: 'FOREIGN_LAWS', label: '国内外政策'}, + // {value: 'FOREIGN_LAWS', label: '国内外政策'}, // {value: 'BUSINESS', label: '企业标准 '}, - {value: 'TEMP', label: '标准法规清单 '} + // {value: 'TEMP', label: '标准法规清单 '} ], // 新增、编辑 数据搜索字段 sarAccessInfoSearch: { @@ -620,6 +578,22 @@ export default { validFlag: 0, advanceSearchVOStr: '' }, + sarAccessInfo: { + id: '', + issueTime: '', + standName: '', + textStatus: '', + // applicationScope: '', //适用区域 + keywords: '', // 关键字 + detailedListName: '', //清单名称 + applyArctic: '', // 能源种类 + askType: '', // 监管类型 + dataSource: 'INLAND_STAND', // 数据来源 + page: 1, + pageSize: this.$store.getters.userInfo.configContent, + validFlag: 0, + advanceSearchVOStr: '' + }, moreSearchBtn: true, // 多属性搜索按钮 状态 showTableFlag: true, // 显示添加列表 状态 showSelectBox: true, // 显示高级查询 状态 @@ -1276,9 +1250,12 @@ export default { }, // 查询数据搜索 table 数据 selectLawsStands () { - this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, { - _this: this - }, res =>{ + if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { + this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' + } else { + this.sarAccessInfoSearch.standType = 'FOREIGN' + } + StandardsInfoPage(this.sarAccessInfoSearch, this.sarAccessInfo).then(res =>{ this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList.forEach(item => { if (item.standYear === null) { @@ -1286,10 +1263,19 @@ export default { } else { item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear } + this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) + this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) + this.$set(item, 'nylx', item.attrInfoMap.NYLX) + this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) + this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) + this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) + this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) + this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) }) this.drawerTotal = res.data.list.length }, e => { - }) }, // 数据搜索table判断checked状态 From 818b620c20e78f5eed33cc90aa76c63b15fb2235 Mon Sep 17 00:00:00 2001 From: zqx0221 <2119066161@qq.com> Date: Tue, 27 Jul 2021 11:29:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E9=93=BE=E6=8E=A5=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=93=BE=E6=8E=A5=E5=AE=9E=E7=8E=B0=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/linkManage/index.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/pages/config/pages/linkManage/index.vue b/src/pages/config/pages/linkManage/index.vue index f23611502..783a6a8dc 100644 --- a/src/pages/config/pages/linkManage/index.vue +++ b/src/pages/config/pages/linkManage/index.vue @@ -48,8 +48,10 @@ width="220px"> +