From 3cd0964299bf9e83c6b2d10d8d37ddbeecf2a6e7 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 12 八月 2026 10:54:18 +0800
Subject: [PATCH] Merge branch 'dev_天津_意博凯信' of http://114.132.189.42:9002/r/product-inventory-management into dev_天津_意博凯信
---
src/views/salesManagement/receiptPaymentLedger/index.vue | 545 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 382 insertions(+), 163 deletions(-)
diff --git a/src/views/salesManagement/receiptPaymentLedger/index.vue b/src/views/salesManagement/receiptPaymentLedger/index.vue
index 2155737..c759985 100644
--- a/src/views/salesManagement/receiptPaymentLedger/index.vue
+++ b/src/views/salesManagement/receiptPaymentLedger/index.vue
@@ -1,180 +1,399 @@
<template>
<div class="app-container">
- <div class="search_form">
+ <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/>
- <el-table-column label="寮�绁ㄩ噾棰�(鍏�)" prop="invoiceTotal" show-overflow-tooltip :formatter="formattedNumber"/>
- <el-table-column label="鍥炴閲戦(鍏�)" prop="receiptPaymentAmount" show-overflow-tooltip :formatter="formattedNumber"/>
- <el-table-column label="鏈洖娆鹃噾棰�(鍏�)" prop="unReceiptPaymentAmount" show-overflow-tooltip :formatter="formattedNumber"/>
- </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="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" />
- </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="contractAmounts"
+ 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="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-column label="鎿嶄綔"
+ fixed="right"
+ align="center"
+ width="100">
+ <template #default="{ row }">
+ <el-button link type="primary" @click="openReceiptDialog(row)">
+ 鏂板鍥炴
+ </el-button>
+ </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>
+ <!-- 鏂板鍥炴寮规 -->
+ <el-dialog
+ v-model="receiptDialogVisible"
+ title="鏂板鍥炴"
+ width="35%"
+ @close="closeReceiptDialog"
+ >
+ <el-form
+ :model="receiptForm"
+ label-width="100px"
+ :rules="receiptRules"
+ ref="receiptFormRef"
+ >
+ <el-form-item label="閿�鍞悎鍚屽彿锛�"> {{ currentRow.salesContractNo || '--' }} </el-form-item>
+ <el-form-item label="鍥炴鏃ユ湡锛�" prop="paymentDate">
+ <el-date-picker
+ style="width: 100%"
+ v-model="receiptForm.paymentDate"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ type="date"
+ placeholder="璇烽�夋嫨鍥炴鏃ユ湡"
+ clearable
+ />
+ </el-form-item>
+ <el-form-item label="鍥炴閲戦锛�" prop="paymentAmount">
+ <el-input-number
+ style="width: 100%"
+ v-model="receiptForm.paymentAmount"
+ :precision="2"
+ :min="0.01"
+ :max="Math.max(0, (Number(currentRow.receiptableAmount) || 0) - (Number(currentRow.receiptPaymentAmount) || 0))"
+ placeholder="璇疯緭鍏ュ洖娆鹃噾棰�"
+ controls-position="right"
+ />
+ <div style="color: #e6a23c; font-size: 12px; margin-top: 4px">
+ 褰撳墠鍙洖娆句綑棰濓細{{ formattedNumber(null, null, (Number(currentRow.receiptableAmount) || 0) - (Number(currentRow.receiptPaymentAmount) || 0)) }} 鍏�
+ </div>
+ </el-form-item>
+ <el-form-item label="鍥炴鏂瑰紡锛�" prop="paymentMethod">
+ <el-select
+ v-model="receiptForm.paymentMethod"
+ placeholder="璇烽�夋嫨鍥炴鏂瑰紡"
+ style="width: 100%"
+ clearable
+ >
+ <el-option label="閾惰杞处" value="閾惰杞处" />
+ <el-option label="鐜伴噾" value="鐜伴噾" />
+ <el-option label="鏀エ" value="鏀エ" />
+ <el-option label="寰俊/鏀粯瀹�" value="寰俊/鏀粯瀹�" />
+ <el-option label="鍏朵粬" value="鍏朵粬" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="澶囨敞锛�" prop="remark">
+ <el-input
+ v-model="receiptForm.remark"
+ type="textarea"
+ :rows="3"
+ placeholder="璇疯緭鍏ュ娉ㄤ俊鎭�"
+ clearable
+ />
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="primary" @click="submitReceiptForm">纭</el-button>
+ <el-button @click="closeReceiptDialog">鍙栨秷</el-button>
+ </div>
+ </template>
+ </el-dialog>
</div>
</template>
<script setup>
-import { 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) => {
- console.log('paginationChange', current,limit)
- 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,
+ saveReceiptPayment,
+ } 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 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 receiptDialogVisible = ref(false);
+ const currentRow = ref({});
+ const receiptFormRef = ref(null);
+ const receiptForm = reactive({
+ paymentDate: "",
+ paymentAmount: undefined,
+ paymentMethod: "",
+ remark: "",
+ });
+ const validatePaymentAmount = (_, value, callback) => {
+ if (!value) {
+ return callback(new Error("璇疯緭鍏ュ洖娆鹃噾棰�"));
}
- })
-}
-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 remaining =
+ (Number(currentRow.value.receiptableAmount) || 0) -
+ (Number(currentRow.value.receiptPaymentAmount) || 0);
+ if (value > remaining) {
+ return callback(new Error(`鍥炴閲戦涓嶈兘瓒呰繃鍙洖娆句綑棰� ${remaining.toFixed(2)} 鍏僠));
+ }
+ callback();
+ };
+ const receiptRules = {
+ paymentDate: [
+ { required: true, message: "璇烽�夋嫨鍥炴鏃ユ湡", trigger: "change" },
+ ],
+ paymentAmount: [
+ { required: true, validator: validatePaymentAmount, trigger: "blur" },
+ ],
+ paymentMethod: [
+ { required: true, message: "璇烽�夋嫨鍥炴鏂瑰紡", trigger: "change" },
+ ],
+ };
+ const openReceiptDialog = row => {
+ currentRow.value = row;
+ receiptForm.paymentDate = "";
+ receiptForm.paymentAmount = undefined;
+ receiptForm.paymentMethod = "";
+ receiptForm.remark = "";
+ receiptDialogVisible.value = true;
+ };
+ const closeReceiptDialog = () => {
+ receiptFormRef.value?.resetFields();
+ receiptDialogVisible.value = false;
+ };
+ const submitReceiptForm = () => {
+ receiptFormRef.value?.validate(valid => {
+ if (valid) {
+ const payload = {
+ customerId: customerId.value,
+ salesContractNo: currentRow.value.salesContractNo,
+ paymentDate: receiptForm.paymentDate,
+ paymentAmount: receiptForm.paymentAmount,
+ paymentMethod: receiptForm.paymentMethod,
+ remark: receiptForm.remark,
+ };
+ saveReceiptPayment(payload).then(res => {
+ proxy.$modal.msgSuccess("鏂板鍥炴鎴愬姛");
+ closeReceiptDialog();
+ receiptPaymentList(customerId.value);
+ getList();
+ });
+ }
+ });
+ };
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ const handleQuery = () => {
+ page.current = 1;
+ getList();
+ };
+ 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 summarizeMainTable1 = (param) => {
- 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
- }
- console.log('param', param)
- customerInteractions(param).then(res => {
- originReceiptRecord.value = res.data;
- handlePagination({ page: 1, limit: recordPage.size });
- recordTotal.value = res.data.length;
- })
-}
-
-// 姹囨璁板綍鍒楄〃鍒嗛〉
-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);
-}
-
-
-getList()
</script>
<style scoped lang="scss">
-
-.table_list {
- width: 50%;
-}
-
+ .table_list {
+ width: 50%;
+ }
</style>
--
Gitblit v1.9.3