diff --git a/src/pages/config/pages/postManage/index.vue b/src/pages/config/pages/postManage/index.vue index 0f19d2965..e3853293a 100644 --- a/src/pages/config/pages/postManage/index.vue +++ b/src/pages/config/pages/postManage/index.vue @@ -45,7 +45,7 @@ width="170px"> diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 712ae4209..78f468019 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -28,24 +28,6 @@ -

清空 - + + + 高级查询 + + 高级查询 @@ -171,6 +157,58 @@ +
+ + + + + + + + + + + + + + + + + + + + + +
+ - + {{ editRowData.standSortShow }} {{ editRowData.standNumber }} @@ -656,6 +700,7 @@ export default { // } return { textStatusMap: {}, + countryAreaMap: {}, typeApplicableMap: {}, nylxMap: {}, zrbmMap: {}, @@ -712,6 +757,7 @@ export default { disabledFlag: false, regionOptions: [], // 基础信息 区域list drawerCountryOptions: [], // 基础信息 国家list + textStatusOptions: [], // 文本状态 applyOptions: [], //基础信息适用领域list applyArcticOptions: [], // 基础车型 适用车型list energyKindOptions: [], // 能源种类list @@ -733,6 +779,9 @@ export default { sarAccessInfoSearch: { id: '', countryArea: '', // 国家 + issueTime: '', + standName: '', + textStatus: '', // applicationScope: '', //适用区域 keywords: '', // 关键字 detailedListName: '', //清单名称 @@ -746,6 +795,7 @@ export default { }, moreSearchBtn: true, // 多属性搜索按钮 状态 showTableFlag: true, // 显示添加列表 状态 + showSelectBox: true, // 显示高级查询 状态 sarAccessInfoSearchList: [], // 数据搜索 table列表数据 importmodalFlag: false, // 导入model 状态 searching: false, @@ -959,6 +1009,15 @@ export default { methods: { // 高级检索 selectMoreBtn () { + this.showSelectBox = !this.showSelectBox + this.showTableFlag = false + if (!this.showSelectBox) { + this.sarAccessInfoSearch.standName = '' + this.sarAccessInfoSearch.issueTime = '' + this.sarAccessInfoSearch.textStatus = '' + this.sarAccessInfoSearch.modifyTime = '' + } + this.selectLawsStands() }, // 法规维护人树 getDept () { @@ -1062,6 +1121,9 @@ export default { this.sarAccessInfoSearch.askType = '' // 监管类型 this.sarAccessInfoSearch.detailedListName = '' // 清单名称 this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源 + this.sarAccessInfoSearch.standName = '' + this.sarAccessInfoSearch.putTime = '' + this.sarAccessInfoSearch.textStatus = '' this.isListType = false this.selectLawsStands() }, @@ -1346,12 +1408,31 @@ export default { this.$refs['sarAccessForm'].validate((valid) => { if (valid) { let rowlist = [] + let rowlist1 = [] + let rowlist2 = [] + let rowlist3 = [] for (let i = 0; i < this.sarAccessInfoList.length; i++) { rowlist.push(this.sarAccessInfoList[i].id) + if (this.sarAccessInfoList[i].putTime === null || this.sarAccessInfoList[i].zccssrqgj ===null || this.sarAccessInfoList[i].xcxssrqgj === null) { + rowlist1.push(this.sarAccessInfoList[i].putTime) + rowlist2.push(this.sarAccessInfoList[i].zccssrqgj) + rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj) + }else { + rowlist1.push(this.sarAccessInfoList[i].putTime.toString()) + rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString()) + rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString()) + } } + console.log(rowlist2) rowlist = rowlist.join(',') + rowlist1 = rowlist1.join(',') + rowlist2 = rowlist2.join(',') + rowlist3 = rowlist3.join(',') let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO)) sarAccessEO.inforlist = JSON.stringify(rowlist) + sarAccessEO.inforlist1 = JSON.stringify(rowlist1) + sarAccessEO.inforlist2 = JSON.stringify(rowlist2) + sarAccessEO.inforlist3 = JSON.stringify(rowlist3) sarAccessEO.countryArea = sarAccessEO.countryArea.join(',') // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',') // 判断是否有附件 @@ -1418,7 +1499,6 @@ export default { this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) }) - console.log(this.sarAccessInfoSearchList) }, e => { }) }, @@ -1883,6 +1963,7 @@ export default { // 将文本状态的id与name对应 setMap(data){ data.forEach(item => { + this.$set(this.countryAreaMap, item.value, item.label) this.$set(this.textStatusMap, item.value, item.label) this.$set(this.typeApplicableMap, item.value, item.label) this.$set(this.nylxMap, item.value, item.label) @@ -1934,6 +2015,7 @@ export default { this.setMap(this.categoryOptions) this.setMap(this.sycpxOptions) this.setMap(this.energyKindOptions) + this.setMap(this.drawerCountryOptions) this.getGzzOption() }, e => { }) @@ -1992,6 +2074,9 @@ export default { } } } + .showSelectBox { + padding: 10px; + } .data-search{ .standards-drawer-table-one{ position: relative; diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index 2321c4cb7..85c83657c 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -4,8 +4,12 @@
-
{{ sarAccessEO.detailedListName }}
+
+ {{ sarAccessEO.detailedListName }} + + +
@@ -88,12 +92,136 @@ icon="export" >导出 - 高级查询 + + + 高级查询 + + + + 高级查询 -
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -142,7 +270,10 @@ width="180px" label="适用车型"> - @@ -280,11 +423,12 @@