From 90716e6624825d2cb7cc0784ede7c535930fee56 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 09 六月 2025 11:58:34 +0800
Subject: [PATCH] 分页修改
---
src/views/procurementManagement/paymentHistory/index.vue | 2
src/views/procurementManagement/procurementInvoiceLedger/index.vue | 2
src/views/salesManagement/receiptPayment/index.vue | 2
src/views/procurementManagement/invoiceEntry/index.vue | 2
src/views/salesManagement/receiptPaymentLedger/index.vue | 58 ++++++++++++++++++-----------
src/views/procurementManagement/paymentEntry/index.vue | 2
src/views/salesManagement/salesLedger/index.vue | 4 +-
src/views/salesManagement/invoiceRegistration/index.vue | 2
src/views/procurementManagement/paymentLedger/index.vue | 12 ++++-
src/views/procurementManagement/procurementLedger/index.vue | 2
src/views/salesManagement/invoiceLedger/index.vue | 2
src/views/salesManagement/receiptPaymentHistory/index.vue | 2
src/api/salesManagement/receiptPayment.js | 6 +-
13 files changed, 59 insertions(+), 39 deletions(-)
diff --git a/src/api/salesManagement/receiptPayment.js b/src/api/salesManagement/receiptPayment.js
index 20756ec..741245c 100644
--- a/src/api/salesManagement/receiptPayment.js
+++ b/src/api/salesManagement/receiptPayment.js
@@ -10,10 +10,10 @@
})
}
-// 鍒嗛〉鏌ヨ
-export function receiptPaymentListPage(query) {
+// 瀹㈡埛寰�鏉ヨ褰曟煡璇�
+export function customerInteractions(query) {
return request({
- url: '/receiptPayment/listPage',
+ url: '/receiptPayment/customerInteractions',
method: 'get',
params: query
})
diff --git a/src/views/procurementManagement/invoiceEntry/index.vue b/src/views/procurementManagement/invoiceEntry/index.vue
index 73a5cbe..88ff50c 100644
--- a/src/views/procurementManagement/invoiceEntry/index.vue
+++ b/src/views/procurementManagement/invoiceEntry/index.vue
@@ -165,7 +165,7 @@
const tableLoading = ref(false)
const page = reactive({
current: 1,
- size: 10,
+ size: 100,
})
const total = ref(0)
const fileList = ref([])
diff --git a/src/views/procurementManagement/paymentEntry/index.vue b/src/views/procurementManagement/paymentEntry/index.vue
index c3b22e3..82bc96d 100644
--- a/src/views/procurementManagement/paymentEntry/index.vue
+++ b/src/views/procurementManagement/paymentEntry/index.vue
@@ -156,7 +156,7 @@
const userStore = useUserStore()
const page = reactive({
current: 1,
- size: 10,
+ size: 100,
})
const total = ref(0)
diff --git a/src/views/procurementManagement/paymentHistory/index.vue b/src/views/procurementManagement/paymentHistory/index.vue
index 134b011..13b5100 100644
--- a/src/views/procurementManagement/paymentHistory/index.vue
+++ b/src/views/procurementManagement/paymentHistory/index.vue
@@ -60,7 +60,7 @@
const tableLoading = ref(false)
const page = reactive({
current: 1,
- size: 10,
+ size: 100,
})
const total = ref(0)
const data = reactive({
diff --git a/src/views/procurementManagement/paymentLedger/index.vue b/src/views/procurementManagement/paymentLedger/index.vue
index 24d019e..b0f9a92 100644
--- a/src/views/procurementManagement/paymentLedger/index.vue
+++ b/src/views/procurementManagement/paymentLedger/index.vue
@@ -128,11 +128,11 @@
});
const page = reactive({
current: 1,
- size: 10,
+ size: 100,
});
const sonPage = reactive({
current: 1,
- size: 10,
+ size: 100,
});
const total = ref(0);
const sonTotal = ref(0);
@@ -188,10 +188,16 @@
};
// 瀛愯〃鍚堣鏂规硶
const summarizeMainTable1 = (param) => {
- return proxy.summarizeTable(param, ['invoiceAmount', 'currentPaymentAmount', 'payableAmount'], {
+ let summarizeTable = proxy.summarizeTable(param, ['invoiceAmount', 'currentPaymentAmount'], {
ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
});
+ if(originalTableDataSon.value.length > 0) {
+ summarizeTable[summarizeTable.length -1] = originalTableDataSon.value[originalTableDataSon.value.length - 1].payableAmount.toFixed(2)
+ }else {
+ summarizeTable[summarizeTable.length -1] = 0.00
+ }
+ return summarizeTable
};
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
diff --git a/src/views/procurementManagement/procurementInvoiceLedger/index.vue b/src/views/procurementManagement/procurementInvoiceLedger/index.vue
index 6edbab3..ff9af3b 100644
--- a/src/views/procurementManagement/procurementInvoiceLedger/index.vue
+++ b/src/views/procurementManagement/procurementInvoiceLedger/index.vue
@@ -88,7 +88,7 @@
const tableLoading = ref(false)
const page = reactive({
current: 1,
- size: 10,
+ size: 100,
})
const total = ref(0)
// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index 51110b0..86e9e86 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -296,7 +296,7 @@
const tableLoading = ref(false)
const page = reactive({
current: 1,
- size: 10,
+ size: 100,
})
const total = ref(0)
const fileList = ref([])
diff --git a/src/views/salesManagement/invoiceLedger/index.vue b/src/views/salesManagement/invoiceLedger/index.vue
index 7a2ca0b..5a2a682 100644
--- a/src/views/salesManagement/invoiceLedger/index.vue
+++ b/src/views/salesManagement/invoiceLedger/index.vue
@@ -203,7 +203,7 @@
const tableLoading = ref(false)
const page = reactive({
current: 1,
- size: 10,
+ size: 100,
})
const total = ref(0)
const fileList = ref([])
diff --git a/src/views/salesManagement/invoiceRegistration/index.vue b/src/views/salesManagement/invoiceRegistration/index.vue
index b567396..4995938 100644
--- a/src/views/salesManagement/invoiceRegistration/index.vue
+++ b/src/views/salesManagement/invoiceRegistration/index.vue
@@ -153,7 +153,7 @@
const tableLoading = ref(false)
const page = reactive({
current: 1,
- size: 10,
+ size: 100,
})
const total = ref(0)
// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
diff --git a/src/views/salesManagement/receiptPayment/index.vue b/src/views/salesManagement/receiptPayment/index.vue
index 7a37672..74f5147 100644
--- a/src/views/salesManagement/receiptPayment/index.vue
+++ b/src/views/salesManagement/receiptPayment/index.vue
@@ -133,7 +133,7 @@
const tableLoading = ref(false)
const page = reactive({
current: 1,
- size: 10,
+ size: 100,
})
const total = ref(0)
diff --git a/src/views/salesManagement/receiptPaymentHistory/index.vue b/src/views/salesManagement/receiptPaymentHistory/index.vue
index 9485151..290fb31 100644
--- a/src/views/salesManagement/receiptPaymentHistory/index.vue
+++ b/src/views/salesManagement/receiptPaymentHistory/index.vue
@@ -72,7 +72,7 @@
const tableLoading = ref(false)
const page = reactive({
current: 1,
- size: 10,
+ size: 100,
})
const total = ref(0)
const data = reactive({
diff --git a/src/views/salesManagement/receiptPaymentLedger/index.vue b/src/views/salesManagement/receiptPaymentLedger/index.vue
index 42f61f1..7e527ac 100644
--- a/src/views/salesManagement/receiptPaymentLedger/index.vue
+++ b/src/views/salesManagement/receiptPaymentLedger/index.vue
@@ -9,7 +9,7 @@
placeholder="杈撳叆瀹㈡埛鍚嶇О鎼滅储"
@change="handleQuery"
clearable
- :prefix-icon="Search"
+ prefix-icon="Search"
/>
<el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
</div>
@@ -38,10 +38,10 @@
:summary-method="summarizeMainTable1"
height="calc(100vh - 18.5em)">
<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 :formatter="formattedNumber"/>
- <el-table-column label="寰呮敹閲戦(鍏�)" prop="noReceiptAmount" show-overflow-tooltip :formatter="formattedNumber"/>
- <el-table-column label="搴旀敹閲戦(鍏�)" prop="invoiceTotal" show-overflow-tooltip :formatter="formattedNumber"/>
+ <el-table-column label="鍙戠敓鏃ユ湡" prop="happenTime" show-overflow-tooltip/>
+ <el-table-column label="寮�绁ㄩ噾棰�(鍏�)" prop="invoiceAmount" show-overflow-tooltip :formatter="formattedNumber"/>
+ <el-table-column label="鍥炴閲戦(鍏�)" prop="receiptAmount" show-overflow-tooltip :formatter="formattedNumber"/>
+ <el-table-column label="搴旀敹閲戦(鍏�)" prop="unReceiptAmount" show-overflow-tooltip :formatter="formattedNumber"/>
</el-table>
<pagination v-show="recordTotal > 0" :total="recordTotal" layout="total, sizes, prev, pager, next, jumper" :page="recordPage.current"
:limit="recordPage.size" @pagination="recordPaginationChange" />
@@ -57,7 +57,7 @@
invoiceLedgerSalesAccount,
} from "../../../api/salesManagement/invoiceLedger.js";
import {
- receiptPaymentListPage
+ customerInteractions
} from "../../../api/salesManagement/receiptPayment.js";
import Pagination from "../../../components/PIMTable/Pagination.vue";
const { proxy } = getCurrentInstance()
@@ -66,11 +66,11 @@
const tableLoading = ref(false)
const page = reactive({
current: 1,
- size: 10,
+ size: 100,
})
const recordPage = reactive({
current: 1,
- size: 10,
+ size: 100,
})
const total = ref(0)
const recordTotal = ref(0)
@@ -82,6 +82,7 @@
})
const customerId = ref('')
const { searchForm } = toRefs(data)
+const originReceiptRecord = ref([])
// 鏌ヨ鍒楄〃
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
@@ -119,33 +120,36 @@
};
// 瀛愯〃鍚堣鏂规硶
const summarizeMainTable1 = (param) => {
- return proxy.summarizeTable(param, ['receiptPaymentAmount', 'noReceiptAmount', 'invoiceTotal'], {
+ var summarizeTable = proxy.summarizeTable(param, ['invoiceAmount', 'receiptAmount'], {
ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
});
+ console.log('summarizeTable',summarizeTable)
+ // 鍙栨渶鍚庝竴琛屾暟鎹�
+ if(receiptRecord.value?.length > 0) {
+ summarizeTable[summarizeTable.length - 1] = receiptRecord.value[receiptRecord.value.length - 1].unReceiptAmount.toFixed(2);
+ }else {
+ summarizeTable[summarizeTable.length - 1] = 0.00
+ }
+
+ return summarizeTable
};
const receiptPaymentList = (id) => {
const param = {
- customerId:id,
- current: recordPage.current,
- size: recordPage.size,
+ customerId:id
}
console.log('param', param)
- receiptPaymentListPage(param).then(res => {
- receiptRecord.value = res.data.records;
- recordTotal.value = res.data.total;
-
+ customerInteractions(param).then(res => {
+ originReceiptRecord.value = res.data;
+ handlePagination({ page: 1, limit: recordPage.size });
+ recordTotal.value = res.data.length;
})
}
// 姹囨璁板綍鍒楄〃鍒嗛〉
-const recordPaginationChange = (obj) => {
- console.log('recordPaginationChange', obj );
- recordPage.current = obj.page;
- recordPage.size = obj.limit;
- console.log('recordPage',recordPage)
- receiptPaymentList(customerId.value);
+const recordPaginationChange = (pagination) => {
+ handlePagination(pagination);
}
const rowClickMethod = (row) => {
@@ -153,6 +157,16 @@
receiptPaymentList(customerId.value);
}
+const handlePagination = ({ page, limit }) => {
+ recordPage.current = page;
+ recordPage.size = limit;
+
+ const start = (page - 1) * limit;
+ const end = start + limit;
+
+ receiptRecord.value = originReceiptRecord.value.slice(start, end);
+}
+
getList()
</script>
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 954feac..d9e5747 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -246,7 +246,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="鏁伴噺锛�" prop="quantity">
- <el-input v-model="productForm.quantity" placeholder="璇疯緭鍏�" clearable @change="mathNum" />
+ <el-input type="number" :step="0.1" :min="0" v-model="productForm.quantity" placeholder="璇疯緭鍏�" clearable @change="mathNum" />
</el-form-item>
</el-col>
</el-row>
@@ -327,7 +327,7 @@
const tableLoading = ref(false)
const page = reactive({
current: 1,
- size: 10,
+ size: 100,
})
const total = ref(0)
const fileList = ref([])
--
Gitblit v1.9.3