From 261f2ed00235d47df3754291a4fdca9ba5cb8e7a Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 21 五月 2026 17:16:09 +0800
Subject: [PATCH] fix: 合并财务数据
---
src/views/salesManagement/receiptPaymentLedger/index.vue | 486 ++++++++++++++++++++++++++---------------------------
1 files changed, 235 insertions(+), 251 deletions(-)
diff --git a/src/views/salesManagement/receiptPaymentLedger/index.vue b/src/views/salesManagement/receiptPaymentLedger/index.vue
index e41e24f..d92843d 100644
--- a/src/views/salesManagement/receiptPaymentLedger/index.vue
+++ b/src/views/salesManagement/receiptPaymentLedger/index.vue
@@ -1,268 +1,252 @@
<template>
<div class="app-container">
- <div class="search_form" style="margin-bottom: 20px;">
+ <div class="search_form"
+ style="margin-bottom: 20px;">
<div>
<span class="search_title">瀹㈡埛鍚嶇О锛�</span>
- <el-input
- v-model="searchForm.searchText"
- style="width: 240px"
- placeholder="杈撳叆瀹㈡埛鍚嶇О鎼滅储"
- @change="handleQuery"
- clearable
- prefix-icon="Search"
- />
- <el-button type="primary" @click="handleQuery" style="margin-left: 10px"
- >鎼滅储</el-button
- >
+ <el-input v-model="searchForm.searchText"
+ style="width: 240px"
+ placeholder="杈撳叆瀹㈡埛鍚嶇О鎼滅储"
+ @change="handleQuery"
+ clearable
+ prefix-icon="Search" />
+ <el-button type="primary"
+ @click="handleQuery"
+ style="margin-left: 10px">鎼滅储</el-button>
</div>
</div>
- <div style="display: flex">
- <div class="table_list">
- <el-table
- :data="tableData"
- border
- v-loading="tableLoading"
- :row-key="(row) => row.id"
- show-summary
- :summary-method="summarizeMainTable"
- @row-click="rowClickMethod"
- height="calc(100vh - 18.5em)"
- >
- <el-table-column
- align="center"
- label="搴忓彿"
- type="index"
- width="60"
- />
- <el-table-column
- label="瀹㈡埛鍚嶇О"
- prop="customerName"
- show-overflow-tooltip
- width="200"
- />
- <el-table-column
- label="鍚堝悓閲戦(鍏�)"
- prop="invoiceTotal"
- show-overflow-tooltip
- :formatter="formattedNumber"
- width="200"
- />
- <el-table-column
- label="鍥炴閲戦(鍏�)"
- prop="receiptPaymentAmount"
- show-overflow-tooltip
- :formatter="formattedNumber"
- width="200"
- />
- <el-table-column
- label="搴旀敹閲戦(鍏�)"
- prop="unReceiptPaymentAmount"
- show-overflow-tooltip
- width="200"
- >
- <template #default="{ row, column }">
- <el-text type="danger">
- {{ formattedNumber(row, column, row.unReceiptPaymentAmount) }}
- </el-text>
- </template>
- </el-table-column>
- </el-table>
- <pagination
- v-show="total > 0"
- :total="total"
- layout="total, sizes, prev, pager, next, jumper"
- :page="page.current"
- :limit="page.size"
- @pagination="paginationChange"
- />
- </div>
- <div class="table_list">
- <el-table
- :data="receiptRecord"
- border
- :row-key="(row) => row.id"
- show-summary
- :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
- width="110"
- />
- <el-table-column
- label="閿�鍞悎鍚屽彿"
- prop="salesContractNo"
- show-overflow-tooltip
- width="200"
- />
- <el-table-column
- label="鍚堝悓閲戦(鍏�)"
- prop="invoiceTotal"
- show-overflow-tooltip
- :formatter="formattedNumber"
- width="200"
- />
- <el-table-column
- label="鍥炴閲戦(鍏�)"
- prop="receiptPaymentAmount"
- show-overflow-tooltip
- :formatter="formattedNumber"
- width="200"
- />
- <el-table-column
- label="搴旀敹閲戦(鍏�)"
- prop="unReceiptPaymentAmount"
- show-overflow-tooltip
- width="200"
- >
- <template #default="{ row, column }">
- <el-text type="danger">
- {{ formattedNumber(row, column, row.unReceiptPaymentAmount) }}
- </el-text>
- </template>
- </el-table-column>
- </el-table>
- </div>
- </div>
+ <el-row :gutter="20">
+ <el-col :span="12">
+ <div class="table_list"
+ style="width: 100%">
+ <el-table :data="tableData"
+ border
+ v-loading="tableLoading"
+ :row-key="(row) => row.customerId"
+ show-summary
+ :summary-method="summarizeMainTable"
+ @row-click="rowClickMethod"
+ highlight-current-row
+ height="calc(100vh - 18.5em)">
+ <el-table-column align="center"
+ label="搴忓彿"
+ type="index"
+ width="60" />
+ <el-table-column label="瀹㈡埛鍚嶇О"
+ prop="customerName"
+ show-overflow-tooltip
+ width="200" />
+ <el-table-column label="鍚堝悓閲戦(鍏�)"
+ prop="invoiceTotal"
+ show-overflow-tooltip
+ :formatter="formattedNumber"
+ width="200" />
+ <el-table-column label="鍥炴閲戦(鍏�)"
+ prop="receiptPaymentAmount"
+ show-overflow-tooltip
+ :formatter="formattedNumber"
+ width="200" />
+ <el-table-column label="搴旀敹閲戦(鍏�)"
+ prop="unReceiptPaymentAmount"
+ show-overflow-tooltip
+ width="200">
+ <template #default="{ row, column }">
+ <el-text type="danger">
+ {{ formattedNumber(row, column, row.unReceiptPaymentAmount) }}
+ </el-text>
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination v-show="total > 0"
+ :total="total"
+ layout="total, sizes, prev, pager, next, jumper"
+ :page="page.current"
+ :limit="page.size"
+ @pagination="paginationChange" />
+ </div>
+ </el-col>
+ <el-col :span="12">
+ <div class="table_list"
+ style="width: 100%">
+ <el-table :data="receiptRecord"
+ border
+ :row-key="(row) => row.id"
+ show-summary
+ :summary-method="summarizeMainTable1"
+ height="calc(100vh - 18.5em)">
+ <el-table-column align="center"
+ label="搴忓彿"
+ type="index"
+ width="60" />
+ <el-table-column label="鍚堝悓绛捐鏃ユ湡"
+ prop="executionDate"
+ show-overflow-tooltip
+ width="110" />
+ <el-table-column label="閿�鍞悎鍚屽彿"
+ prop="salesContractNo"
+ show-overflow-tooltip
+ width="200" />
+ <el-table-column label="鍚堝悓閲戦(鍏�)"
+ prop="contractAmount"
+ show-overflow-tooltip
+ :formatter="formattedNumber"
+ width="200" />
+ <el-table-column label="鍥炴閲戦(鍏�)"
+ prop="receiptPaymentAmount"
+ show-overflow-tooltip
+ :formatter="formattedNumber"
+ width="200" />
+ <el-table-column label="搴旀敹閲戦(鍏�)"
+ prop="receiptableAmount"
+ show-overflow-tooltip
+ width="200">
+ <template #default="{ row, column }">
+ <el-text type="danger">
+ {{ formattedNumber(row, column, row.receiptableAmount) }}
+ </el-text>
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination v-show="recordTotal > 0"
+ :total="recordTotal"
+ layout="total, sizes, prev, pager, next, jumper"
+ :page="recordPage.current"
+ :limit="recordPage.size"
+ @pagination="recordPaginationChange" />
+ </div>
+ </el-col>
+ </el-row>
</div>
</template>
<script setup>
-import {onMounted, ref} from "vue";
-import { invoiceLedgerSalesAccount } from "../../../api/salesManagement/invoiceLedger.js";
-import { customerInteractions } from "../../../api/salesManagement/receiptPayment.js";
-import Pagination from "../../../components/PIMTable/Pagination.vue";
-const { proxy } = getCurrentInstance();
-const tableData = ref([]);
-const receiptRecord = ref([]);
-const tableLoading = ref(false);
-const page = reactive({
- current: 1,
- size: 100,
-});
-const recordPage = reactive({
- current: 1,
- size: 100,
-});
-const total = ref(0);
-const recordTotal = ref(0);
-const data = reactive({
- searchForm: {
- searchText: "",
- invoiceDate: "",
- },
-});
-const customerId = ref("");
-const { searchForm } = toRefs(data);
-const originReceiptRecord = ref([]);
-// 鏌ヨ鍒楄〃
-/** 鎼滅储鎸夐挳鎿嶄綔 */
-const handleQuery = () => {
- page.current = 1;
- getList();
-};
-const paginationChange = (obj) => {
- page.current = obj.page;
- page.size = obj.limit;
- getList();
-};
-const getList = () => {
- tableLoading.value = true;
- invoiceLedgerSalesAccount({ ...searchForm.value, ...page }).then((res) => {
- tableLoading.value = false;
- tableData.value = res.data.records;
- total.value = res.data.total;
- if (tableData.value.length > 0) {
- recordPage.current = 1;
- customerId.value = tableData.value[0].id;
- receiptPaymentList(customerId.value);
- }
+ import { onMounted, ref, reactive, toRefs, getCurrentInstance } from "vue";
+ import {
+ customewTransactions,
+ customewTransactionsDetails,
+ } from "@/api/salesManagement/indicatorStats.js";
+ import Pagination from "../../../components/PIMTable/Pagination.vue";
+ const { proxy } = getCurrentInstance();
+ const tableData = ref([]);
+ const receiptRecord = ref([]);
+ const tableLoading = ref(false);
+ const page = reactive({
+ current: 1,
+ size: 100,
});
-};
-const formattedNumber = (row, column, cellValue) => {
- return parseFloat(cellValue).toFixed(2);
-};
-// 涓昏〃鍚堣鏂规硶
-const summarizeMainTable = (param) => {
- return proxy.summarizeTable(
- param,
- ["invoiceTotal", "receiptPaymentAmount", "unReceiptPaymentAmount"],
- {
- ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
- futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
- }
- );
-};
-// 瀛愯〃鍚堣鏂规硶
-const summarizeMainTable1 = (param) => {
- var summarizeTable = proxy.summarizeTable(
- param,
- ["invoiceAmount", "receiptAmount", "unReceiptAmount"],
- {
- ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
- futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
- }
- );
- // 鍙栨渶鍚庝竴琛屾暟鎹�;
- if (receiptRecord.value?.length > 0) {
- const index = tableData.value.findIndex(
- (item) => item.id == customerId.value
- );
- summarizeTable[summarizeTable.length - 1] =
- tableData.value[index].unReceiptPaymentAmount.toFixed(2);
- } else {
- summarizeTable[summarizeTable.length - 1] = 0.0;
- }
- return summarizeTable;
-};
-
-const receiptPaymentList = (id) => {
- const param = {
- customerId: id,
+ const recordPage = reactive({
+ current: 1,
+ size: 100,
+ });
+ const total = ref(0);
+ const recordTotal = ref(0);
+ const data = reactive({
+ searchForm: {
+ searchText: "",
+ invoiceDate: "",
+ },
+ });
+ const customerId = ref("");
+ const { searchForm } = toRefs(data);
+ const originReceiptRecord = ref([]);
+ // 鏌ヨ鍒楄〃
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ const handleQuery = () => {
+ page.current = 1;
+ getList();
};
- console.log("param", param);
- customerInteractions(param).then((res) => {
- originReceiptRecord.value = res.data;
- handlePagination({ page: 1, limit: recordPage.size });
- recordTotal.value = res.data.length;
+ const paginationChange = obj => {
+ page.current = obj.page;
+ page.size = obj.limit;
+ getList();
+ };
+ const getList = () => {
+ tableLoading.value = true;
+ customewTransactions({ ...searchForm.value, ...page }).then(res => {
+ tableLoading.value = false;
+ tableData.value = res.data.records;
+ total.value = res.data.total;
+ if (tableData.value.length > 0) {
+ recordPage.current = 1;
+ customerId.value = tableData.value[0].customerId;
+ receiptPaymentList(customerId.value);
+ }
+ });
+ };
+ const formattedNumber = (row, column, cellValue) => {
+ return cellValue ? parseFloat(cellValue).toFixed(2) : "0.00";
+ };
+ // 涓昏〃鍚堣鏂规硶
+ const summarizeMainTable = param => {
+ return proxy.summarizeTable(
+ param,
+ ["invoiceTotal", "receiptPaymentAmount", "unReceiptPaymentAmount"],
+ {
+ ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
+ futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
+ }
+ );
+ };
+ // 瀛愯〃鍚堣鏂规硶
+ const summarizeMainTable1 = param => {
+ var summarizeTable = proxy.summarizeTable(
+ param,
+ ["contractAmount", "receiptPaymentAmount", "receiptableAmount"],
+ {
+ ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
+ futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
+ }
+ );
+ return summarizeTable;
+ };
+
+ const receiptPaymentList = id => {
+ const param = {
+ customerId: id,
+ current: recordPage.current,
+ size: recordPage.size,
+ };
+ customewTransactionsDetails(param).then(res => {
+ if (Array.isArray(res.data)) {
+ originReceiptRecord.value = res.data;
+ recordTotal.value = res.data.length;
+ handlePagination({ page: 1, limit: recordPage.size });
+ } else {
+ receiptRecord.value = res.data.records;
+ recordTotal.value = res.data.total;
+ }
+ });
+ };
+
+ // 姹囨璁板綍鍒楄〃鍒嗛〉
+ const recordPaginationChange = pagination => {
+ recordPage.current = pagination.page;
+ recordPage.size = pagination.limit;
+ receiptPaymentList(customerId.value);
+ };
+
+ const rowClickMethod = row => {
+ customerId.value = row.customerId;
+ 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);
+ };
+
+ onMounted(() => {
+ getList();
});
-};
-
-// 姹囨璁板綍鍒楄〃鍒嗛〉
-const recordPaginationChange = (pagination) => {
- handlePagination(pagination);
-};
-
-const rowClickMethod = (row) => {
- customerId.value = row.id;
- 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);
-};
-
-onMounted(() => {
- getList();
-});
</script>
<style scoped lang="scss">
-.table_list {
- width: 50%;
-}
+ .table_list {
+ width: 50%;
+ }
</style>
--
Gitblit v1.9.3