From 10d4c82e729694bd49a29f589d607690dc4b71f8 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 26 五月 2025 16:42:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/salesManagement/receiptPaymentLedger/index.vue | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/views/salesManagement/receiptPaymentLedger/index.vue b/src/views/salesManagement/receiptPaymentLedger/index.vue
index 603e734..fb6c67e 100644
--- a/src/views/salesManagement/receiptPaymentLedger/index.vue
+++ b/src/views/salesManagement/receiptPaymentLedger/index.vue
@@ -24,7 +24,7 @@
height="calc(100vh - 18.5em)">
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column label="瀹㈡埛鍚嶇О" prop="customerName" show-overflow-tooltip/>
- <el-table-column label="寮�绁ㄩ噾棰�" prop="invoiceAmount" show-overflow-tooltip/>
+ <el-table-column label="寮�绁ㄩ噾棰�" prop="invoiceTotal" show-overflow-tooltip/>
<el-table-column label="鍥炴閲戦" prop="receiptPaymentAmount" show-overflow-tooltip/>
<el-table-column label="鏈洖娆鹃噾棰�" prop="unReceiptPaymentAmount" show-overflow-tooltip/>
</el-table>
@@ -40,7 +40,8 @@
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column label="鍙戠敓鏃ユ湡" prop="receiptPaymentDate" show-overflow-tooltip/>
<el-table-column label="鍥炴閲戦" prop="receiptPaymentAmount" show-overflow-tooltip/>
- <el-table-column label="搴旀敹閲戦" prop="invoiceAmount" show-overflow-tooltip/>
+ <el-table-column label="寰呮敹閲戦" prop="noReceiptAmount" show-overflow-tooltip/>
+ <el-table-column label="搴旀敹閲戦" prop="invoiceTotal" show-overflow-tooltip/>
</el-table>
<pagination v-show="recordTotal > 0" :total="recordTotal" layout="total, sizes, prev, pager, next, jumper" :page="recordPage.current"
:limit="recordPage.size" @pagination="recordPaginationChange" />
@@ -86,9 +87,10 @@
page.current = 1
getList()
}
-const paginationChange = ({ current, limit }) => {
- page.current = current;
- page.size = limit;
+const paginationChange = (obj) => {
+ console.log('paginationChange', current,limit)
+ page.current = obj.page;
+ page.size = obj.limit;
getList()
}
const getList = () => {
@@ -99,7 +101,7 @@
total.value = res.data.total;
if(tableData.value.length > 0) {
recordPage.current = 1
- customerId.value = tableData.value[0].customerId
+ customerId.value = tableData.value[0].id
receiptPaymentList(customerId.value);
}
})
@@ -131,24 +133,28 @@
const receiptPaymentList = (id) => {
const param = {
customerId:id,
- current: page.current,
- size: page.size,
+ current: recordPage.current,
+ size: recordPage.size,
}
+ console.log('param', param)
receiptPaymentListPage(param).then(res => {
receiptRecord.value = res.data.records;
recordTotal.value = res.data.total;
+
})
}
// 姹囨璁板綍鍒楄〃鍒嗛〉
-const recordPaginationChange = (currentPage, pageSize) => {
- recordPage.current = currentPage;
- recordPage.size = pageSize;
+const recordPaginationChange = (obj) => {
+ console.log('recordPaginationChange', obj );
+ recordPage.current = obj.page;
+ recordPage.size = obj.limit;
+ console.log('recordPage',recordPage)
receiptPaymentList(customerId.value);
}
const rowClickMethod = (row) => {
- customerId.value = row.customerId;
+ customerId.value = row.id;
receiptPaymentList(customerId.value);
}
--
Gitblit v1.9.3