diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 62fa258af..7f2d602f4 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -1812,6 +1812,8 @@ export default { }, data() { return { + seniorQuery: false, // 是否为高级查询 + seniorQueryForm: {}, // 人员树形和部门树形参数 nodeList: [], nodeList2: [], @@ -3146,6 +3148,13 @@ export default { }, // 点击搜索按钮 searchBtnClick() { + if (this.seniorQuery === true) { + this.standCommonlySearch.page = 1 + this.seniorQuery = false + } + for (let key in this.sarStandardsSearch) { + this.sarStandardsSearch[key] = '' + } this.getDomesticStandardTable() }, // 搜索 @@ -3190,6 +3199,8 @@ export default { item.page = 1 this.standCommonlySearch.page = 1 this.standCommonlySearch.sarStandardsSearch = JSON.stringify(item) || '' + this.seniorQuery = true + this.seniorQueryForm = item this.getDomesticStandardTable(item) }, // 清空搜索框 @@ -3883,13 +3894,23 @@ export default { // 分页点击后方法 pageChange(page) { this.standCommonlySearch.page = page - this.getDomesticStandardTable() + if (this.seniorQuery === false) { + this.getDomesticStandardTable() + } else { + this.seniorQueryForm.page = page + this.getDomesticStandardTable(this.seniorQueryForm) + } }, // 分页每页显示数改变后方法 pageSizeChange(pageSize) { this.standCommonlySearch.pageSize = pageSize this.standCommonlySearch.page = 1 - this.getDomesticStandardTable() + if (this.seniorQuery === false) { + this.getDomesticStandardTable() + } else { + this.seniorQueryForm.page = page + this.getDomesticStandardTable(this.seniorQueryForm) + } }, /** * // 分页查询标准 @@ -4031,9 +4052,9 @@ export default { this.advanceSearchMapping[key] = '' } //情况基本字段 - for (let key in this.sarStandardsSearch) { - this.sarStandardsSearch[key] = '' - } + // for (let key in this.sarStandardsSearch) { + // this.sarStandardsSearch[key] = '' + // } }, // 查询处于游离态的标准 selectConfiguraStand() { diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index 9bdd9ccad..7dd6c03b5 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -932,6 +932,7 @@ export default { }, // 切换tabs handleClick(tab, event) { + this.page = 1 this.localProEO.prodectCode = this.ifMaintaince; this.insideHandleClick(); }, @@ -1203,8 +1204,9 @@ export default { }, // 条件分页查询 getLocalProductTableBtn() { + this.page = 1 this.projectLibrarySearch.page = 1; - this.isAdvancedSearch = false; + this.isAdvancedSearch = true; this.getLocalProductTable(); }, // 查询本地产品 @@ -1236,6 +1238,7 @@ export default { }, getLocalProductTableBtns() { + this.page = 1 this.projectLibrarySearch.page = 1; this.isAdvancedSearch = false; this.getLocalProductTables(); @@ -1415,12 +1418,20 @@ export default { // 分页点击后方法 pageChange(page) { this.page = page; - this.getLocalProductTable(); + if (this.isAdvancedSearch = true) { + this.getLocalProductTable() + } else { + this.getLocalProductTables() + } }, // 分页每页显示数改变后方法 pageSizeChange(pageSize) { this.pageSize = pageSize; - this.getLocalProductTable(); + if (this.isAdvancedSearch = true) { + this.getLocalProductTable() + } else { + this.getLocalProductTables() + } // 此处需要调用接口,修改个人配置 }, /**