From 7901e112887b40dda614a0ad3a412cf2e7f5ab3b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 12 八月 2026 13:16:38 +0800
Subject: [PATCH] dev_天津_玮苓乐器 1.供应商往来添加付款功能 2.客户往来添加回款功能
---
src/api/salesManagement/indicatorStats.js | 5 +
src/api/procurementManagement/paymentLedger.js | 5 +
src/views/salesManagement/receiptPaymentLedger/index.vue | 90 +++++++++++----------
src/views/procurementManagement/paymentLedger/index.vue | 108 +++++++++++---------------
4 files changed, 104 insertions(+), 104 deletions(-)
diff --git a/src/api/procurementManagement/paymentLedger.js b/src/api/procurementManagement/paymentLedger.js
index 537ba9f..706214e 100644
--- a/src/api/procurementManagement/paymentLedger.js
+++ b/src/api/procurementManagement/paymentLedger.js
@@ -27,3 +27,8 @@
params,
});
}
+
+/** 鏂板浠樻 */
+export function savePayment(data) {
+ return request({ url: "/purchase/report/savePayment", method: "post", data });
+}
diff --git a/src/api/salesManagement/indicatorStats.js b/src/api/salesManagement/indicatorStats.js
index c29eac3..f979301 100644
--- a/src/api/salesManagement/indicatorStats.js
+++ b/src/api/salesManagement/indicatorStats.js
@@ -36,3 +36,8 @@
params: query,
});
}
+
+// 鏂板鍥炴
+export function saveReceiptPayment(data) {
+ return request({ url: "/metricStatistics/saveReceiptPayment", method: "post", data });
+}
diff --git a/src/views/procurementManagement/paymentLedger/index.vue b/src/views/procurementManagement/paymentLedger/index.vue
index 99b4b39..08c3e0b 100644
--- a/src/views/procurementManagement/paymentLedger/index.vue
+++ b/src/views/procurementManagement/paymentLedger/index.vue
@@ -78,87 +78,63 @@
height="calc(100vh - 18.5em)"
@pagination="sonPaginationSearch">
<template #payableAmountSlot="{ row }">
- <el-text type="danger">
- {{ parseFloat(row.payableAmount).toFixed(2) }}
- </el-text>
+ <el-text type="danger">{{ parseFloat(row.payableAmount).toFixed(2) }}</el-text>
+ </template>
+ <template #paymentActionSlot="{ row }">
+ <el-button link type="primary" @click="openPaymentDialog(row)">鏂板浠樻</el-button>
</template>
</PIMTable>
</div>
</el-col>
</el-row>
+
+ <el-dialog v-model="paymentDialogVisible" title="鏂板浠樻" width="35%" @close="closePaymentDialog">
+ <el-form :model="paymentForm" label-width="100px" :rules="paymentRules" ref="paymentFormRef">
+ <el-form-item label="閲囪喘鍚堝悓鍙凤細">{{ currentPaymentRow.purchaseContractNumber || '--' }}</el-form-item>
+ <el-form-item label="浠樻鏃ユ湡锛�" prop="paymentDate">
+ <el-date-picker style="width:100%" v-model="paymentForm.paymentDate" value-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="paymentForm.paymentAmount" :min="0" :max="Math.max(0,(Number(currentPaymentRow.payableAmount)||0)-(Number(currentPaymentRow.paymentAmount)||0))" placeholder="璇疯緭鍏ヤ粯娆鹃噾棰�" controls-position="right" />
+ <div style="color:#e6a23c;font-size:12px;margin-top:4px">褰撳墠鍙粯娆句綑棰濓細{{ Math.max(0,(Number(currentPaymentRow.payableAmount)||0)-(Number(currentPaymentRow.paymentAmount)||0)).toFixed(2) }} 鍏�</div>
+ </el-form-item>
+ <el-form-item label="浠樻鏂瑰紡锛�" prop="paymentMethod">
+ <el-select v-model="paymentForm.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="paymentForm.remark" type="textarea" :rows="3" placeholder="璇疯緭鍏ュ娉ㄤ俊鎭�" clearable />
+ </el-form-item>
+ </el-form>
+ <template #footer><el-button type="primary" @click="submitPaymentForm">纭</el-button><el-button @click="closePaymentDialog">鍙栨秷</el-button></template>
+ </el-dialog>
</div>
</template>
<script setup>
import { ref, toRefs } from "vue";
import { Search } from "@element-plus/icons-vue";
- import {
- paymentLedgerList,
- paymentRecordList,
- } from "@/api/procurementManagement/paymentLedger.js";
+ import { paymentLedgerList, paymentRecordList, savePayment } from "@/api/procurementManagement/paymentLedger.js";
import Pagination from "../../../components/PIMTable/Pagination.vue";
const tableData = ref([]);
const tableLoading = ref(false);
- const data = reactive({
- searchForm: {
- supplierName: "",
- },
- });
- const page = reactive({
- current: 1,
- size: 100,
- });
- const sonPage = reactive({
- current: 1,
- size: 10,
- total: 0,
- layout: "total, sizes, prev, pager, next, jumper",
- });
+ const data = reactive({ searchForm: { supplierName: "" } });
+ const page = reactive({ current: 1, size: 100 });
+ const sonPage = reactive({ current: 1, size: 10, total: 0, layout: "total, sizes, prev, pager, next, jumper" });
const total = ref(0);
const isShowSummary = ref(true);
const { searchForm } = toRefs(data);
const currentSupplierId = ref("");
- const rowClick = row => {
- currentSupplierId.value = row.supplierId;
- sonPage.current = 1;
- getPaymenRecordtList(row.supplierId);
- };
- // 瀛愭ā鍧�
+ const rowClick = row => { currentSupplierId.value = row.supplierId; sonPage.current = 1; getPaymenRecordtList(row.supplierId); };
const tableColumnSon = ref([
- {
- label: "鍚堝悓绛捐鏃ユ湡",
- prop: "executionDate",
- width: 110,
- },
- {
- label: "閲囪喘鍚堝悓鍙�",
- prop: "purchaseContractNumber",
- width: 150,
- },
- {
- label: "鍚堝悓閲戦(鍏�)",
- prop: "contractAmount",
- width: 200,
- formatData: params => {
- return params ? parseFloat(params).toFixed(2) : 0;
- },
- },
- {
- label: "浠樻閲戦(鍏�)",
- prop: "paymentAmount",
- width: 200,
- formatData: params => {
- return params ? parseFloat(params).toFixed(2) : 0;
- },
- },
- {
- label: "搴斾粯閲戦(鍏�)",
- dataType: "slot",
- width: 200,
- prop: "payableAmount",
- slot: "payableAmountSlot",
- },
+ { label:"鍚堝悓绛捐鏃ユ湡", prop:"executionDate", width:110 },
+ { label:"閲囪喘鍚堝悓鍙�", prop:"purchaseContractNumber", width:150 },
+ { label:"鍚堝悓閲戦(鍏�)", prop:"contractAmount", width:200, formatData: p => p ? parseFloat(p).toFixed(2) : 0 },
+ { label:"浠樻閲戦(鍏�)", prop:"paymentAmount", width:200, formatData: p => p ? parseFloat(p).toFixed(2) : 0 },
+ { label:"搴斾粯閲戦(鍏�)", dataType:"slot", width:200, prop:"payableAmount", slot:"payableAmountSlot" },
+ { label:"鎿嶄綔", dataType:"slot", slot:"paymentActionSlot", width:100, fixed:"right", align:"center" },
]);
const tableDataSon = ref([]);
const originalTableDataSon = ref([]);
@@ -166,6 +142,16 @@
const isShowSummarySon = ref(true);
const { proxy } = getCurrentInstance();
+ const paymentDialogVisible = ref(false);
+ const currentPaymentRow = ref({});
+ const paymentFormRef = ref(null);
+ const paymentForm = reactive({ paymentDate:"", paymentAmount:undefined, paymentMethod:"", remark:"" });
+ const vPA = (_,v,cb) => { if(!v) return cb(new Error("璇疯緭鍏ヤ粯娆鹃噾棰�")); const m=Math.max(0,(Number(currentPaymentRow.value.payableAmount)||0)-(Number(currentPaymentRow.value.paymentAmount)||0)); if(v>m) return cb(new Error(`浠樻閲戦涓嶈兘瓒呰繃鍙粯娆句綑棰� ${m.toFixed(2)} 鍏僠)); cb(); };
+ const paymentRules = { paymentDate:[{required:true,message:"璇烽�夋嫨浠樻鏃ユ湡",trigger:"change"}], paymentAmount:[{required:true,validator:vPA,trigger:"blur"}], paymentMethod:[{required:true,message:"璇烽�夋嫨浠樻鏂瑰紡",trigger:"change"}] };
+ const openPaymentDialog = r => { currentPaymentRow.value=r; paymentForm.paymentDate=""; paymentForm.paymentAmount=undefined; paymentForm.paymentMethod=""; paymentForm.remark=""; paymentDialogVisible.value=true; };
+ const closePaymentDialog = () => { paymentFormRef.value?.resetFields(); paymentDialogVisible.value=false; };
+ const submitPaymentForm = () => { paymentFormRef.value?.validate(v=>{ if(v){ savePayment({ supplierId:currentSupplierId.value, purchaseContractNumber:currentPaymentRow.value.purchaseContractNumber, paymentDate:paymentForm.paymentDate, paymentAmount:paymentForm.paymentAmount, paymentMethod:paymentForm.paymentMethod, remark:paymentForm.remark }).then(res=>{ proxy.$modal.msgSuccess("鏂板浠樻鎴愬姛"); closePaymentDialog(); getPaymenRecordtList(currentSupplierId.value); getList(); }); } }); };
+
// 涓昏〃鍚堣鏂规硶
const summarizeMainTable = param => {
return proxy.summarizeTable(
diff --git a/src/views/salesManagement/receiptPaymentLedger/index.vue b/src/views/salesManagement/receiptPaymentLedger/index.vue
index f5a9d8f..aba9596 100644
--- a/src/views/salesManagement/receiptPaymentLedger/index.vue
+++ b/src/views/salesManagement/receiptPaymentLedger/index.vue
@@ -78,32 +78,18 @@
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">
+ <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>
+ <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>
@@ -116,39 +102,57 @@
</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" type="date" placeholder="璇烽�夋嫨鍥炴鏃ユ湡" clearable />
+ </el-form-item>
+ <el-form-item label="鍥炴閲戦锛�" prop="paymentAmount">
+ <el-input-number style="width:100%" v-model="receiptForm.paymentAmount" :min="0" :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,Math.max(0,(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><el-button type="primary" @click="submitReceiptForm">纭</el-button><el-button @click="closeReceiptDialog">鍙栨秷</el-button></template>
+ </el-dialog>
</div>
</template>
<script setup>
import { onMounted, ref, reactive, toRefs, getCurrentInstance } from "vue";
- import {
- customewTransactions,
- customewTransactionsDetails,
- } from "@/api/salesManagement/indicatorStats.js";
+ 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 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 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 vPA = (_,v,cb) => { if(!v) return cb(new Error("璇疯緭鍏ュ洖娆鹃噾棰�")); const m=Math.max(0,(Number(currentRow.value.receiptableAmount)||0)-(Number(currentRow.value.receiptPaymentAmount)||0)); if(v>m) return cb(new Error(`鍥炴閲戦涓嶈兘瓒呰繃鍙洖娆句綑棰� ${m.toFixed(2)} 鍏僠)); cb(); };
+ const receiptRules = { paymentDate:[{required:true,message:"璇烽�夋嫨鍥炴鏃ユ湡",trigger:"change"}], paymentAmount:[{required:true,validator:vPA,trigger:"blur"}], paymentMethod:[{required:true,message:"璇烽�夋嫨鍥炴鏂瑰紡",trigger:"change"}] };
+ const openReceiptDialog = r => { currentRow.value=r; 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(v=>{ if(v){ saveReceiptPayment({ customerId:customerId.value, salesContractNo:currentRow.value.salesContractNo, paymentDate:receiptForm.paymentDate, paymentAmount:receiptForm.paymentAmount, paymentMethod:receiptForm.paymentMethod, remark:receiptForm.remark }).then(res=>{ proxy.$modal.msgSuccess("鏂板鍥炴鎴愬姛"); closeReceiptDialog(); receiptPaymentList(customerId.value); getList(); }); } }); };
// 鏌ヨ鍒楄〃
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
--
Gitblit v1.9.3