From 123fbb7b2638f55342381a187911a933596e00b9 Mon Sep 17 00:00:00 2001 From: Aoi_Tori <2547614904@qq.com> Date: Mon, 16 Jun 2025 09:05:43 +0800 Subject: [PATCH] 2025/6/16 --- src/views/common/filterSearch.vue | 180 +++++++++--------- .../project/projectInfo/projectInfo.vue | 17 +- .../project/projectPart/searchProjectPart.vue | 17 +- .../modules/proofing/requestForProofing.vue | 17 +- .../modules/quotation/requestForQuote.vue | 17 +- src/views/modules/quotation/toBeQuoted.vue | 19 +- src/views/modules/quote/index.vue | 17 +- .../technicalSpecificationList.vue | 17 +- src/views/modules/test/requestForTest.vue | 17 +- 9 files changed, 206 insertions(+), 112 deletions(-) diff --git a/src/views/common/filterSearch.vue b/src/views/common/filterSearch.vue index ae6b5e8..7237d97 100644 --- a/src/views/common/filterSearch.vue +++ b/src/views/common/filterSearch.vue @@ -80,7 +80,6 @@ export default { searchUserSettingRecordList(params).then(({data})=>{ if (data && data.code === 0){ this.selectList = data.rows - console.log(this.selectList) }else { this.$message.warning(data.msg) } @@ -200,7 +199,6 @@ export default { moveSetting(index,direction){ let arr = [...this.tableList] let temp = arr[index+direction] - console.log(temp) arr[index+direction] = arr[index] arr[index] = temp this.tableList = arr @@ -375,8 +373,7 @@ export default {
- - + @@ -388,80 +385,56 @@ export default { - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -479,43 +452,60 @@ export default { - - - + diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue index 263c0db..66c2cf1 100644 --- a/src/views/modules/project/projectInfo/projectInfo.vue +++ b/src/views/modules/project/projectInfo/projectInfo.vue @@ -453,6 +453,8 @@ activeName: 'info', addOrUpdateVisible:false, filterVisible:false, + isFilterSearch: false, + filterSearchData: {}, searchData:{ page: 1, limit: 100, @@ -1434,6 +1436,7 @@ } } this.dataListLoading = false + this.isFilterSearch = false }) }, //单击切换订单 @@ -1687,12 +1690,20 @@ sizeChangeHandle (val) { this.pageSize = val this.pageIndex = 1 - this.search() + if ( this.isFilterSearch === false){ + this.search() + } else { + this.projectInfoSearchByAnyField(this.filterSearchData) + } }, // 当前页 currentChangeHandle (val) { this.pageIndex = val - this.search() + if ( this.isFilterSearch === false){ + this.search() + } else { + this.projectInfoSearchByAnyField(this.filterSearchData) + } }, // 动态列开始 获取 用户保存的 格式列 async getTableUserColumn(tableId, columnId) { @@ -2011,7 +2022,9 @@ }).catch((error)=>{ this.$message.error(error) }) + this.filterSearchData = params this.filterVisible = false + this.isFilterSearch = true }, }, diff --git a/src/views/modules/project/projectPart/searchProjectPart.vue b/src/views/modules/project/projectPart/searchProjectPart.vue index a911a55..a1eb12f 100644 --- a/src/views/modules/project/projectPart/searchProjectPart.vue +++ b/src/views/modules/project/projectPart/searchProjectPart.vue @@ -265,6 +265,8 @@ height: 200, dataListLoading: false, filterVisible: false, + isFilterSearch: false, + filterSearchData: {}, // 导出 start exportData: [], exportName: "项目物料清单" + this.dayjs().format('YYYYMMDDHHmmss'), @@ -868,12 +870,20 @@ sizeChangeHandle (val) { this.pageSize = val this.pageIndex = 1 - this.search() + if ( this.isFilterSearch === false){ + this.search() + } else { + this.searchByAnyField(this.filterSearchData) + } }, // 当前页 currentChangeHandle (val) { this.pageIndex = val - this.search() + if ( this.isFilterSearch === false){ + this.search() + } else { + this.searchByAnyField(this.filterSearchData) + } }, //单击切换订单 @@ -937,6 +947,7 @@ this.changeData(this.dataList1[0]) } } + this.isFilterSearch = false this.dataListLoading = false }) }, @@ -1050,6 +1061,8 @@ }).catch((error)=>{ this.$message.error(error) }) + this.filterSearchData = params + this.isFilterSearch = true this.filterVisible = false }, diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue index e80d331..98f87da 100644 --- a/src/views/modules/proofing/requestForProofing.vue +++ b/src/views/modules/proofing/requestForProofing.vue @@ -2084,6 +2084,8 @@ export default { proofingCurrentRow: {}, // ======== 模态框开关控制 ======== filterVisible: false, + isFilterSearch: false, + filterSearchData: {}, modalFlag: false, modalDisableFlag: false, enterResultModalFlag: false, @@ -2273,7 +2275,11 @@ export default { sizeChangeHandle(val) { this.pageSize = val this.pageIndex = 1 - this.getDataList() + if ( this.isFilterSearch === false){ + this.getDataList() + } else { + this.searchByAnyField(this.filterSearchData) + } }, /** * 当前页 @@ -2281,7 +2287,11 @@ export default { */ currentChangeHandle(val) { this.pageIndex = val - this.getDataList() + if ( this.isFilterSearch === false){ + this.getDataList() + } else { + this.searchByAnyField(this.filterSearchData) + } }, // ======== 复选框操作相关方法 ======== @@ -2400,6 +2410,7 @@ export default { this.testClickRow({}) } } + this.isFilterSearch = false this.dataListLoading = false }) }, @@ -3789,6 +3800,8 @@ export default { }).catch((error)=>{ this.$message.error(error) }) + this.filterSearchData = params + this.isFilterSearch = true this.filterVisible = false }, } diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue index a39809e..256885e 100644 --- a/src/views/modules/quotation/requestForQuote.vue +++ b/src/views/modules/quotation/requestForQuote.vue @@ -990,6 +990,8 @@ export default { totalPage: 0, selectedDataNum: 0, filterVisible: false, + isFilterSearch: false, + filterSearchData: {}, // 条件查询 searchData: { site: this.$store.state.user.site, @@ -2188,7 +2190,11 @@ export default { sizeChangeHandle(val) { this.pageSize = val this.pageIndex = 1 - this.getDataList() + if ( this.isFilterSearch === false){ + this.getDataList() + } else { + this.searchByAnyField(this.filterSearchData) + } }, /** * 当前页 @@ -2196,7 +2202,11 @@ export default { */ currentChangeHandle(val) { this.pageIndex = val - this.getDataList() + if ( this.isFilterSearch === false){ + this.getDataList() + } else { + this.searchByAnyField(this.filterSearchData) + } }, // ======== 复选框操作相关方法 ======== @@ -2297,6 +2307,7 @@ export default { this.quotationCurrentRow = {} } } + this.isFilterSearch = false this.dataListLoading = false }) }, @@ -3595,6 +3606,8 @@ export default { }).catch((error)=>{ this.$message.error(error) }) + this.filterSearchData = params + this.isFilterSearch = true this.filterVisible = false }, } diff --git a/src/views/modules/quotation/toBeQuoted.vue b/src/views/modules/quotation/toBeQuoted.vue index ab14181..c483bf8 100644 --- a/src/views/modules/quotation/toBeQuoted.vue +++ b/src/views/modules/quotation/toBeQuoted.vue @@ -241,6 +241,8 @@ export default { // 按钮状态 saveBatchQuotationLoading:false, filterVisible: false, + isFilterSearch: false, + filterSearchData: {}, // ======== 列表表头 ======== columnList: [ { @@ -589,17 +591,26 @@ export default { this.totalPage = data.page.totalCount this.$refs.selectDiv.setLengthAll(this.dataList.length) } - this.dataListLoading = false; + this.isFilterSearch = false + this.dataListLoading = false }) }, sizeChangeHandle (val) { this.pageSize = val this.pageIndex = 1 - this.getDataList() + if ( this.isFilterSearch === false){ + this.getDataList() + } else { + this.searchByAnyField(this.filterSearchData) + } }, currentChangeHandle (val) { this.pageIndex = val - this.getDataList() + if ( this.isFilterSearch === false){ + this.getDataList() + } else { + this.searchByAnyField(this.filterSearchData) + } }, // 表格单击事件 quotationClickRow (row) { @@ -664,6 +675,8 @@ export default { }).catch((error)=>{ this.$message.error(error) }) + this.filterSearchData = params + this.isFilterSearch = true this.filterVisible = false }, }, diff --git a/src/views/modules/quote/index.vue b/src/views/modules/quote/index.vue index 30fafd3..027e99b 100644 --- a/src/views/modules/quote/index.vue +++ b/src/views/modules/quote/index.vue @@ -392,6 +392,8 @@ export default { quoterVisible:false, purchaseVisible:false, filterVisible:false, + isFilterSearch: false, + filterSearchData: {}, currentQuote:{ }, @@ -527,6 +529,7 @@ export default { this.$message.error(error) this.searchLoading = false }) + this.isFilterSearch = false }, handleSelect(row){ if (row){ @@ -559,11 +562,19 @@ export default { }, handleSizeChange(size){ this.size = size - this.handleSearch(); + if ( this.isFilterSearch === false){ + this.handleSearch() + } else { + this.searchByAnyField(this.filterSearchData) + } }, handlePageChange(no) { this.no = no - this.handleSearch(); + if ( this.isFilterSearch === false){ + this.handleSearch() + } else { + this.searchByAnyField(this.filterSearchData) + } }, handleQueryBu(){ let params = { @@ -1000,6 +1011,8 @@ export default { }).catch((error)=>{ this.$message.error(error) }) + this.filterSearchData = params + this.isFilterSearch = true this.filterVisible = false }, }, diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue index 9010e7e..fdfec3a 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationList.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue @@ -564,6 +564,8 @@ activeName: 'info', addOrUpdateVisible: false, filterVisible: false, + isFilterSearch: false, + filterSearchData: {}, height: 200, dataList1: [], partList: [], @@ -1187,13 +1189,21 @@ sizeChangeHandle (val) { this.pageSize = val this.pageIndex = 1 - this.search() + if ( this.isFilterSearch === false){ + this.search() + } else { + this.queryByAnyField(this.filterSearchData) + } }, // 当前页 currentChangeHandle (val) { this.pageIndex = val - this.search() + if ( this.isFilterSearch === false){ + this.search() + } else { + this.queryByAnyField(this.filterSearchData) + } }, // 每页数 @@ -1229,6 +1239,7 @@ this.$message.error(error) this.dataListLoading = false }) + this.isFilterSearch = false }, changeData (row) { @@ -1578,6 +1589,8 @@ }).catch((error)=>{ this.$message.error(error) }) + this.filterSearchData = params + this.isFilterSearch = true this.filterVisible = false }, diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue index de1790f..d915640 100644 --- a/src/views/modules/test/requestForTest.vue +++ b/src/views/modules/test/requestForTest.vue @@ -1110,6 +1110,8 @@ export default { activeTabList: ['attribute'], clickTestRow: false, filterVisible: false, + isFilterSearch: false, + filterSearchData: {}, // 导出 exportData: [], exportName: '设备分类' + this.dayjs().format('YYYYMMDDHHmmss'), @@ -2376,7 +2378,11 @@ export default { sizeChangeHandle(val) { this.pageSize = val this.pageIndex = 1 - this.getDataList() + if ( this.isFilterSearch === false){ + this.getDataList() + } else { + this.searchByAnyField(this.filterSearchData) + } }, /** * 当前页 @@ -2384,7 +2390,11 @@ export default { */ currentChangeHandle(val) { this.pageIndex = val - this.getDataList() + if ( this.isFilterSearch === false){ + this.getDataList() + } else { + this.searchByAnyField(this.filterSearchData) + } }, // ======== 复选框操作相关方法 ======== @@ -2532,6 +2542,7 @@ export default { this.testClickRow({}) } } + this.isFilterSearch = false this.dataListLoading = false }) }, @@ -3770,6 +3781,8 @@ export default { }).catch((error)=>{ this.$message.error(error) }) + this.filterSearchData = params + this.isFilterSearch = true this.filterVisible = false }, },