diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 67124a799..7b1fbc7d7 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -83,18 +83,16 @@ - - @@ -105,7 +103,7 @@ size="mini" class="common-button-primary" v-btn-permission="'967c8b1402459951b5f75fcd1c548665'" - @click="searchBtnClick(standCommonlySearch, 1)"> + @click="searchBtnClick(sarStandardsSearch, 1)"> 查询 - - - - - - - + + + + + + + + + + + + + + + @@ -1634,6 +1640,14 @@ placeholder="根据标准年份查找"> + + + + {{ opt.label }} + + + - - - - - - - - - - - - - - - - - @@ -1696,13 +1686,21 @@ placeholder="根据标准发布日期查找"> - - - - {{ opt.label }} - - + + + + + + + + + + + + @@ -3720,11 +3718,11 @@ export default { this.sarStandardsSearch.page = 1 this.standCommonlySearch.page = 1 //搜索后点击属性菜单依然显示搜索条件的数据 - this.getDomesticStandardTable(this.standCommonlySearch) + this.getDomesticStandardTable(this.sarStandardsSearch) }, // 点击搜索按钮 - searchBtnClick(standCommonlySearch, type) { - let item = this.standCommonlySearch + searchBtnClick(sarStandardsSearch, type) { + let item = this.sarStandardsSearch this.getDomesticStandardTable(item, type) }, // 搜索 @@ -3798,10 +3796,10 @@ export default { this.sarStandardsSearch.category = '' this.isAdvancedSearch = false // } else if (flag === 'standCommonlySearch') { - this.standCommonlySearch.standName = '' - this.standCommonlySearch.standNumber = '' + this.sarStandardsSearch.standName = '' + this.sarStandardsSearch.standNumber = '' this.pageChange(1) - this.getDomesticStandardTable(this.standCommonlySearch) + this.getDomesticStandardTable(this.sarStandardsSearch) } else if (flag === 2) { // 标准条目搜索 this.standItemSearch.responsibleUnit = '' @@ -4524,35 +4522,35 @@ export default { }, // 分页点击后方法 pageChange(page) { + debugger if (this.tableFlag !== '') { this.tableFlag.page = page } else { this.sarStandardsSearch.page = page } - this.standCommonlySearch.page = page - this.standCommonlySearch.pageNo = 1 - if (this.sarStandardsSearch.standNumber !== '' || this.sarStandardsSearch.standName !== '') { - this.getDomesticStandardTable(this.sarStandardsSearch) - } else { - this.getDomesticStandardTable(this.standCommonlySearch) - } - + this.sarStandardsSearch.page = page + this.getDomesticStandardTable(this.sarStandardsSearch) }, // 分页每页显示数改变后方法 pageSizeChange(pageSize) { + debugger this.sarStandardsSearch.pageSize = this.$store.getters.userInfo.configContent let tabFlag = JSON.parse(sessionStorage.getItem('tableFlag')) - this.getDomesticStandardTable(tabFlag) + if (tabFlag !== '') { + this.sarStandardsSearch.page = tabFlag.page + } + this.getDomesticStandardTable(this.sarStandardsSearch) this.selectConfiguraStand() // 此处需要调用接口,修改个人配置 }, // 分页查询国内标准 getDomesticStandardTable(item, type) { + debugger if (item !== '' && item !== null && item !== undefined) { item.pageSize = this.$store.getters.userInfo.configContent } this.sarStandardsSearch.pageSize = this.$store.getters.userInfo.configContent - const data = item || this.sarStandardsSearch || this.advanceSearchMapping + const data = item || this.sarStandardsSearch || this.advanceSearchMapping || this.standCommonlySearch if (item) { this.sarStandardsSearch.advanceSearchStr = item.advanceSearchStr } @@ -4670,9 +4668,6 @@ export default { if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.sarStandardsSearch.page !== 1) { this.pageChange(1) } - if (type === 1) { - this.sarStandardsSearch = {} - } } else { this.$message.error(res.message) }