From bf110dfc6b55a3ed9f2443821cc45ca2c28ca155 Mon Sep 17 00:00:00 2001 From: fanlin Date: Thu, 22 Jul 2021 11:02:43 +0800 Subject: [PATCH 1/5] =?UTF-8?q?bug:=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 9 ++++++--- .../foreignStandardsAndRegulations/index.vue | 4 ++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index dd246d9a4..6d3099de8 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -116,7 +116,7 @@ 导出 @@ -4256,5 +4257,8 @@ export default { border-radius: 0 !important; } } + .classDisplay{ + display: none; + } } From 6ed583b8140581788f71ef670c95ee48139be2dd Mon Sep 17 00:00:00 2001 From: fanlin Date: Thu, 22 Jul 2021 13:18:03 +0800 Subject: [PATCH 2/5] bug --- .../domesticStandardsAndRegulations/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 6d3099de8..e49258c22 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -2698,6 +2698,7 @@ export default { }, // 表格排序 sortChange (sortObj) { + debugger if (sortObj.column.order !== 'normal') { switch (sortObj.column.property) { case 'issueTime' : @@ -3109,6 +3110,7 @@ export default { }, // 分页查询国内标准 getDomesticStandardTable (item) { + debugger if (item !== '' && item !== null && item !== undefined) { item.pageSize = this.$store.getters.userInfo.configContent } From 56e99637df44dbd4e3cf977a38394d7e5d98db1a Mon Sep 17 00:00:00 2001 From: fanlin Date: Thu, 22 Jul 2021 14:22:09 +0800 Subject: [PATCH 3/5] bug --- src/components/navMenu/index.vue | 2 +- .../domesticStandardsAndRegulations/index.vue | 64 +++++++++++++++---- 2 files changed, 54 insertions(+), 12 deletions(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index bbdbd002c..51a708a74 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -303,7 +303,7 @@ export default { { title: '菜单管理', path: '/menuManage', - menuId: '82665e94d406c6fc0d1f627e5880230b' + menuId: '87b8b4f5817a7829696e63185c744d52' }, { title: '链接管理', diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index e49258c22..c1a4705e5 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -1915,7 +1915,9 @@ export default { synopsis: '', // replaceStandNumCope: '', replacedStandNum: '', - orderBy:'' + orderBy:'', + nowOrder: '', + nowOrderBy: '', }, // 分页查询过程中用到的对象 configStandList: [], configStandtotal: 0, @@ -1931,6 +1933,8 @@ export default { delLoading: false, standState: '', orderBy :'', + nowOrder: '', + nowOrderBy: '', textStatusMap: {} // 文本状态id与name对应 } }, @@ -2698,17 +2702,37 @@ export default { }, // 表格排序 sortChange (sortObj) { + console.log(sortObj, '升降序') debugger if (sortObj.column.order !== 'normal') { - switch (sortObj.column.property) { + switch (sortObj.prop) { case 'issueTime' : // 后台联调 - this.orderBy = 'issueTime ' + sortObj.order - break + this.nowOrderBy = '1' + break; + case 'xcxssrq' : + // 后台联调 + this.nowOrderBy = '2' + break; + case 'zccssrq' : + // 后台联调 + this.nowOrderBy = '3' + break; + case 'textStatus' : + // 后台联调 + this.nowOrderBy = '4' + break; + } + switch (sortObj.order) { + case 'ascending' : + this.nowOrder = '2' + break; + case 'descending' : + this.nowOrder = '1' + break; } } this.getDomesticStandardTable(this.tableFlag) - }, // 修改成表格样式后，选择项勾选改变 standSelectChange (data) { @@ -3128,7 +3152,9 @@ export default { } // 排序 - formData.orderBy = this.orderBy + formData.nowOrder = this.nowOrder + formData.nowOrderBy = this.nowOrderBy + // formData.orderBy = this.orderBy // 处理我的收藏和个性化标签传参 if (this.selectSarMenu.id === 'wdsc') { formData.menuId = undefined @@ -3831,12 +3857,28 @@ export default { switch (sortObj.prop) { case 'issueTime' : // 后台联调 - this.sarConfigStandSearch.orderBy = 'issueTime ' + sortObj.order - break - case 'XCXSSRQ' : + this.sarConfigStandSearch.nowOrderBy = '1' + break; + case 'xcxssrq' : // 后台联调 - this.sarConfigStandSearch.orderBy = 'XCXSSRQ ' + sortObj.order - break + this.sarConfigStandSearch.nowOrderBy = '2' + break; + case 'zccssrq' : + // 后台联调 + this.sarConfigStandSearch.nowOrderBy = '3' + break; + case 'textStatus' : + // 后台联调 + this.sarConfigStandSearch.nowOrderBy = '4' + break; + } + switch (sortObj.order) { + case 'ascending' : + this.sarConfigStandSearch.nowOrder = '2' + break; + case 'descending' : + this.sarConfigStandSearch.nowOrder = '1' + break; } } this.selectConfiguraStand() From e2fdbccd0b13e7fd1efd9a8b9ea6de6d1c3502dc Mon Sep 17 00:00:00 2001 From: fanlin Date: Thu, 22 Jul 2021 14:37:11 +0800 Subject: [PATCH 4/5] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/postManage/index.vue | 2 +- .../domesticStandardsAndRegulations/index.vue | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) 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/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index c1a4705e5..7419e3753 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -2703,7 +2703,6 @@ export default { // 表格排序 sortChange (sortObj) { console.log(sortObj, '升降序') - debugger if (sortObj.column.order !== 'normal') { switch (sortObj.prop) { case 'issueTime' : @@ -3134,7 +3133,6 @@ export default { }, // 分页查询国内标准 getDomesticStandardTable (item) { - debugger if (item !== '' && item !== null && item !== undefined) { item.pageSize = this.$store.getters.userInfo.configContent } From a26b4dcddfe2378cb5c2877331de640296e1abe0 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Thu, 22 Jul 2021 16:10:52 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=E9=AB=98=E7=BA=A7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/addEdit.vue | 129 ++++++++++-- .../pages/details.vue | 198 ++++++++++++++++-- 2 files changed, 288 insertions(+), 39 deletions(-) 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 @@