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 | 54 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/src/views/salesManagement/receiptPaymentLedger/index.vue b/src/views/salesManagement/receiptPaymentLedger/index.vue
index 0fbd7ff..fb6c67e 100644
--- a/src/views/salesManagement/receiptPaymentLedger/index.vue
+++ b/src/views/salesManagement/receiptPaymentLedger/index.vue
@@ -17,15 +17,14 @@
<div style="display: flex">
<div class="table_list">
<el-table :data="tableData" border v-loading="tableLoading"
- @selection-change="handleSelectionChange"
:row-key="row => row.id"
show-summary
:summary-method="summarizeMainTable"
+ @row-click = "rowClickMethod"
height="calc(100vh - 18.5em)">
- <el-table-column align="center" type="selection" width="55" />
<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>
@@ -38,14 +37,14 @@
show-summary
:summary-method="summarizeMainTable"
height="calc(100vh - 18.5em)">
- <el-table-column align="center" type="selection" width="55" />
<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="paginationChange" />
+ :limit="recordPage.size" @pagination="recordPaginationChange" />
</div>
</div>
@@ -53,9 +52,7 @@
</template>
<script setup>
-import pagination from '@/components/PIMTable/Pagination.vue'
import { ref } from 'vue'
-import {Search} from "@element-plus/icons-vue";
import {
invoiceLedgerSalesAccount,
} from "../../../api/salesManagement/invoiceLedger.js";
@@ -65,7 +62,6 @@
const tableData = ref([])
const receiptRecord = ref([])
-const selectedRows = ref([])
const tableLoading = ref(false)
const page = reactive({
current: 1,
@@ -83,6 +79,7 @@
invoiceDate:''
}
})
+const customerId = ref('')
const { searchForm } = toRefs(data)
// 鏌ヨ鍒楄〃
/** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -90,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 = () => {
@@ -102,13 +100,11 @@
tableData.value = res.data.records;
total.value = res.data.total;
if(tableData.value.length > 0) {
- receiptPaymentList(recordPage,tableData.value[0].customerId);
+ recordPage.current = 1
+ customerId.value = tableData.value[0].id
+ receiptPaymentList(customerId.value);
}
})
-}
-// 琛ㄦ牸閫夋嫨鏁版嵁
-const handleSelectionChange = (selection) => {
- selectedRows.value = selection
}
// 涓昏〃鍚堣鏂规硶
const summarizeMainTable = (param) => {
@@ -134,18 +130,34 @@
return sums;
};
-const receiptPaymentList = (page,id) => {
+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;
- receiptRecord.total = res.data.total;
+ recordTotal.value = res.data.total;
+
})
}
+// 姹囨璁板綍鍒楄〃鍒嗛〉
+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.id;
+ receiptPaymentList(customerId.value);
+}
+
getList()
</script>
--
Gitblit v1.9.3