From 5abe582142405569435c7cd0a479908aa5bff992 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 06 六月 2025 17:04:53 +0800
Subject: [PATCH] 分页修改
---
src/views/salesManagement/invoiceLedger/index.vue | 6 +-
src/api/salesManagement/salesLedger.js | 9 ++++
src/views/basicData/supplierManage/index.vue | 8 ++--
src/views/salesManagement/receiptPayment/index.vue | 6 +-
src/views/basicData/customerFile/index.vue | 8 ++--
src/api/basicData/product.js | 9 ++++
src/views/basicData/product/index.vue | 20 ++++++---
src/views/salesManagement/salesLedger/index.vue | 6 +-
src/views/salesManagement/invoiceRegistration/index.vue | 12 +++---
src/views/salesManagement/receiptPaymentHistory/index.vue | 12 +++---
src/api/salesManagement/receiptPayment.js | 13 ++++++
11 files changed, 71 insertions(+), 38 deletions(-)
diff --git a/src/api/basicData/product.js b/src/api/basicData/product.js
index 1cf7625..10f8fd1 100644
--- a/src/api/basicData/product.js
+++ b/src/api/basicData/product.js
@@ -48,4 +48,11 @@
method: 'get',
params: query
})
-}
\ No newline at end of file
+}
+export function modelListPage(query) {
+ return request({
+ url: '/basic/product/modelListPage',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/src/api/salesManagement/receiptPayment.js b/src/api/salesManagement/receiptPayment.js
index 0311aaf..20756ec 100644
--- a/src/api/salesManagement/receiptPayment.js
+++ b/src/api/salesManagement/receiptPayment.js
@@ -55,7 +55,7 @@
})
}
-// 鍒嗛〉鏌ヨ
+// 璇㈠洖娆捐褰�
export function receiptPaymentHistoryList(query) {
return request({
url: '/receiptPayment/receiptPaymentHistoryList',
@@ -63,3 +63,14 @@
params: query
})
}
+
+/**
+ * 鏌ヨ鍥炴璁板綍鍒嗛〉鏌ヨ
+ */
+export function receiptPaymentHistoryListPage(query) {
+ return request({
+ url: '/receiptPayment/receiptPaymentHistoryListPage',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/src/api/salesManagement/salesLedger.js b/src/api/salesManagement/salesLedger.js
index 0c9371f..272a5f7 100644
--- a/src/api/salesManagement/salesLedger.js
+++ b/src/api/salesManagement/salesLedger.js
@@ -91,3 +91,12 @@
params: query
})
}
+
+// 鍒嗛〉鏌ヨ
+export function ledgerListPage(query) {
+ return request({
+ url: '/sales/ledger/listPage',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/src/views/basicData/customerFile/index.vue b/src/views/basicData/customerFile/index.vue
index e3d020f..640d651 100644
--- a/src/views/basicData/customerFile/index.vue
+++ b/src/views/basicData/customerFile/index.vue
@@ -236,16 +236,16 @@
page.current = 1
getList()
}
-const pagination = ({ current, limit }) => {
- page.current = current;
- page.size = limit;
+const pagination = (obj) => {
+ page.current = obj.page;
+ page.size = obj.limit;
getList()
}
const getList = () => {
tableLoading.value = true
listCustomer({...searchForm.value, ...page}).then(res => {
tableLoading.value = false
- tableData.value = res.rows
+ tableData.value = res.records
total.value = res.total
})
}
diff --git a/src/views/basicData/product/index.vue b/src/views/basicData/product/index.vue
index d496069..0da3e12 100644
--- a/src/views/basicData/product/index.vue
+++ b/src/views/basicData/product/index.vue
@@ -103,7 +103,7 @@
addOrEditProduct,
addOrEditProductModel,
delProduct, delProductModel,
- modelList,
+ modelListPage,
productTreeList
} from "@/api/basicData/product.js";
const { proxy } = getCurrentInstance()
@@ -292,16 +292,22 @@
}
// 鏌ヨ瑙勬牸鍨嬪彿
-const pagination = ({ current, limit }) => {
- page.current = current;
- page.size = limit;
+const pagination = (obj) => {
+ page.current = obj.page;
+ page.size = obj.limit;
getModelList()
}
const getModelList = () => {
tableLoading.value = true
- modelList({id: currentId.value}).then(res => {
+ modelListPage({id: currentId.value,
+ current: page.current,
+ size: page.size,
+ }
+ ).then(res => {
+ console.log('res',res)
+ tableData.value = res.records
+ total.value = res.total
tableLoading.value = false
- tableData.value = res
})
}
// 鍒犻櫎瑙勬牸鍨嬪彿
@@ -393,4 +399,4 @@
font-size: 14px;
padding-right: 8px;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/basicData/supplierManage/index.vue b/src/views/basicData/supplierManage/index.vue
index 6d428a5..47b4a36 100644
--- a/src/views/basicData/supplierManage/index.vue
+++ b/src/views/basicData/supplierManage/index.vue
@@ -223,9 +223,9 @@
page.current = 1
getList()
}
-const pagination = ({ current, limit }) => {
- page.current = current;
- page.size = limit;
+const pagination = (obj) => {
+ page.current = obj.page;
+ page.size = obj.limit;
getList()
}
const getList = () => {
@@ -233,7 +233,7 @@
listSupplier({...searchForm.value, ...page}).then(res => {
tableLoading.value = false
tableData.value = res.data.records
- total.value = res.total
+ total.value = res.data.total
})
}
// 琛ㄦ牸閫夋嫨鏁版嵁
diff --git a/src/views/salesManagement/invoiceLedger/index.vue b/src/views/salesManagement/invoiceLedger/index.vue
index 473969a..7a2ca0b 100644
--- a/src/views/salesManagement/invoiceLedger/index.vue
+++ b/src/views/salesManagement/invoiceLedger/index.vue
@@ -255,9 +255,9 @@
page.current = 1
getList()
}
-const paginationChange = ({ current, limit }) => {
- page.current = current;
- page.size = limit;
+const paginationChange = (obj) => {
+ page.current = obj.page;
+ page.size = obj.limit;
getList()
}
const getList = () => {
diff --git a/src/views/salesManagement/invoiceRegistration/index.vue b/src/views/salesManagement/invoiceRegistration/index.vue
index b97e26e..b567396 100644
--- a/src/views/salesManagement/invoiceRegistration/index.vue
+++ b/src/views/salesManagement/invoiceRegistration/index.vue
@@ -140,7 +140,7 @@
// import {userListNoPage} from "@/api/system/user.js";
import {
getSalesLedgerWithProducts,
- ledgerList,
+ ledgerListPage,
productList,
} from "@/api/salesManagement/salesLedger.js";
import {
@@ -189,16 +189,16 @@
page.current = 1
getList()
}
-const paginationChange = ({ current, limit }) => {
- page.current = current;
- page.size = limit;
+const paginationChange = (obj) => {
+ page.current = obj.page;
+ page.size = obj.limit;
getList()
}
const getList = () => {
tableLoading.value = true
- ledgerList({...searchForm.value, ...page}).then(res => {
+ ledgerListPage({...searchForm.value, ...page}).then(res => {
tableLoading.value = false
- tableData.value = res.rows;
+ tableData.value = res.records;
total.value = res.total
expandedRowKeys.value = []
})
diff --git a/src/views/salesManagement/receiptPayment/index.vue b/src/views/salesManagement/receiptPayment/index.vue
index 31f7491..7a37672 100644
--- a/src/views/salesManagement/receiptPayment/index.vue
+++ b/src/views/salesManagement/receiptPayment/index.vue
@@ -178,9 +178,9 @@
page.current = 1
getList()
}
-const paginationChange = ({ current, limit }) => {
- page.current = current;
- page.size = limit;
+const paginationChange = (obj) => {
+ page.current = obj.page;
+ page.size = obj.limit;
getList()
}
const getList = () => {
diff --git a/src/views/salesManagement/receiptPaymentHistory/index.vue b/src/views/salesManagement/receiptPaymentHistory/index.vue
index 4d7eaf5..9485151 100644
--- a/src/views/salesManagement/receiptPaymentHistory/index.vue
+++ b/src/views/salesManagement/receiptPaymentHistory/index.vue
@@ -22,7 +22,7 @@
import { ref } from 'vue'
import { Search } from "@element-plus/icons-vue";
import {
- receiptPaymentHistoryList
+ receiptPaymentHistoryListPage
} from "@/api/salesManagement/receiptPayment.js";
const { proxy } = getCurrentInstance()
const tableColumn = ref([
@@ -89,16 +89,16 @@
page.current = 1
getList()
}
-const pagination = ({ current, limit }) => {
- page.current = current;
- page.size = limit;
+const pagination = (obj) => {
+ page.current = obj.page;
+ page.size = obj.limit;
getList()
}
const getList = () => {
tableLoading.value = true
- receiptPaymentHistoryList({ ...searchForm.value, ...page }).then(res => {
+ receiptPaymentHistoryListPage({ ...searchForm.value, ...page }).then(res => {
tableLoading.value = false
- tableData.value = res.rows
+ tableData.value = res.records
total.value = res.total
})
}
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 13b72fe..954feac 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -307,7 +307,7 @@
import useUserStore from '@/store/modules/user'
import {userListNoPage} from "@/api/system/user.js";
import {
- ledgerList,
+ ledgerListPage,
productList,
customerList,
addOrUpdateSalesLedger,
@@ -411,9 +411,9 @@
}
const getList = () => {
tableLoading.value = true
- ledgerList({...searchForm.value, ...page}).then(res => {
+ ledgerListPage({...searchForm.value, ...page}).then(res => {
tableLoading.value = false
- tableData.value = res.rows
+ tableData.value = res.records
tableData.value.map(item => {
item.children = []
})
--
Gitblit v1.9.3