diff --git a/klp-ui/package.json b/klp-ui/package.json index 262f9d40..619c4b2a 100644 --- a/klp-ui/package.json +++ b/klp-ui/package.json @@ -77,7 +77,6 @@ "three": "^0.160.1", "vditor": "^3.11.1", "video.js": "^8.23.3", - "vis-network": "^8.5.2", "vue": "2.6.12", "vue-count-to": "1.0.13", "vue-cropper": "0.5.5", diff --git a/klp-ui/src/components/KLPService/ContractSelect/index.vue b/klp-ui/src/components/KLPService/ContractSelect/index.vue index 58f8ee04..86405ec4 100644 --- a/klp-ui/src/components/KLPService/ContractSelect/index.vue +++ b/klp-ui/src/components/KLPService/ContractSelect/index.vue @@ -55,13 +55,14 @@
- - +
- + @@ -93,6 +94,10 @@ + +
暂无合同数据
@@ -125,6 +130,9 @@ export default { searchKeyword: '', allContracts: [], activeTab: 'configured', // 默认显示已配置合同tab + allPageNum: 1, + allPageSize: 20, + allTotal: 0, } }, computed: { @@ -227,15 +235,12 @@ export default { async loadAllContracts() { try { const res = await listOrder({ - pageNum: 1, - pageSize: 1000, + pageNum: this.allPageNum, + pageSize: this.allPageSize, keyword: this.searchKeyword || undefined, }); - // 合并现有合同(包括手动添加的) - const existingContracts = this.contractList; - this.allContracts = [...res.rows || [], ...existingContracts].filter((item, index, self) => - index === self.findIndex(t => t.orderId === item.orderId) - ); + this.allTotal = res.total || 0; + this.allContracts = res.rows || []; } catch (error) { console.error('Failed to load all contracts:', error); this.allContracts = []; @@ -244,6 +249,12 @@ export default { // 搜索合同 handleSearch() { + this.allPageNum = 1; + this.loadAllContracts(); + }, + + handleAllPageChange(page) { + this.allPageNum = page; this.loadAllContracts(); }, diff --git a/klp-ui/src/views/crm/contract/selectConfig/index.vue b/klp-ui/src/views/crm/contract/selectConfig/index.vue index 98836bd6..3a824fcb 100644 --- a/klp-ui/src/views/crm/contract/selectConfig/index.vue +++ b/klp-ui/src/views/crm/contract/selectConfig/index.vue @@ -64,58 +64,63 @@

暂无合同数据

- - - - - - - - - - - - - - - - - - +
@@ -135,6 +140,9 @@ export default { allContracts: [], allLoading: false, activeTab: 'configured', + pageNum: 1, + pageSize: 20, + total: 0, } }, mounted() { @@ -190,14 +198,12 @@ export default { this.allLoading = true; try { const res = await listOrder({ - pageNum: 1, - pageSize: 10000, + pageNum: this.pageNum, + pageSize: this.pageSize, keyword: this.searchKeyword || undefined, }); - const existingContracts = this.contractList; - this.allContracts = [...(res.rows || []), ...existingContracts].filter((item, index, self) => - index === self.findIndex(t => t.orderId === item.orderId) - ); + this.total = res.total || 0; + this.allContracts = res.rows || []; } catch (error) { console.error('Failed to load all contracts:', error); this.allContracts = []; @@ -207,6 +213,12 @@ export default { }, handleSearch() { + this.pageNum = 1; + this.loadAllContracts(); + }, + + handlePageChange(page) { + this.pageNum = page; this.loadAllContracts(); }, @@ -338,4 +350,10 @@ export default { font-size: 13px; color: #909399; } + +.pagination-wrapper { + display: flex; + justify-content: flex-end; + padding: 12px 0; +}