From 71234f08cfeb183c605c00ef586e160919e2f69d Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 28 一月 2026 16:56:41 +0800
Subject: [PATCH] 进销存升级 1.供应商往来查询接口调整 2.采购报表添加导出接口联调 3.采购管理来票登记附件上传修改
---
src/views/procurementManagement/procurementInvoiceLedger/index.vue | 13 ++++--
src/views/salesManagement/receiptPayment/index.vue | 26 ++++++++++++
src/views/procurementManagement/procurementInvoiceLedger/Modal/EditModal.vue | 65 ++++++++++++++++++++++++++------
3 files changed, 86 insertions(+), 18 deletions(-)
diff --git a/src/views/procurementManagement/procurementInvoiceLedger/Modal/EditModal.vue b/src/views/procurementManagement/procurementInvoiceLedger/Modal/EditModal.vue
index 9794bb4..4e461dc 100644
--- a/src/views/procurementManagement/procurementInvoiceLedger/Modal/EditModal.vue
+++ b/src/views/procurementManagement/procurementInvoiceLedger/Modal/EditModal.vue
@@ -34,10 +34,14 @@
<el-form-item label="鏉ョエ鏁帮細">
<el-input-number :step="0.1"
:min="0"
+ :max="maxTicketsNum"
style="width: 100%"
v-model="form.ticketsNum"
@change="inputTicketsNum"
:precision="2" />
+ <div style="font-size: 12px; color: #909399; margin-top: 4px;">
+ 鍙～鍐欐暟閲忥細{{ maxTicketsNum }}
+ </div>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -73,7 +77,7 @@
import useFormData from "@/hooks/useFormData";
import { updateRegistration, getProductRecordById } from "@/api/procurementManagement/procurementInvoiceLedger";
import { ElMessage } from "element-plus";
-import { getCurrentInstance, ref, nextTick } from "vue";
+import { getCurrentInstance, ref, nextTick, computed } from "vue";
defineOptions({
name: "鏉ョエ鍙拌处缂栬緫",
@@ -82,7 +86,13 @@
const saleLedgerProjectId = ref("");
const temFutureTickets = ref(0);
+const originalTicketsNum = ref(0); // 鍘熷宸叉潵绁ㄦ暟
const { proxy } = getCurrentInstance();
+
+// 璁＄畻鏈�澶у彲濉啓鏁伴噺 = 鍘熷宸叉潵绁ㄦ暟 + 鏈潵绁ㄦ暟
+const maxTicketsNum = computed(() => {
+ return Number(originalTicketsNum.value) + Number(temFutureTickets.value);
+});
const {
id,
@@ -123,6 +133,8 @@
form.taxInclusiveUnitPrice = data.taxInclusiveUnitPrice;
form.futureTickets = data.futureTickets;
temFutureTickets.value = data.futureTickets;
+ // 淇濆瓨鍘熷宸叉潵绁ㄦ暟
+ originalTicketsNum.value = data.ticketsNum || 0;
}
};
@@ -132,16 +144,30 @@
proxy.$modal.msgWarning("鍚◣鍗曚环涓嶈兘涓洪浂鎴栨湭瀹氫箟");
return;
}
- if (Number(form.ticketsNum) > Number(temFutureTickets.value)) {
- proxy.$modal.msgWarning("寮�绁ㄦ暟涓嶅緱澶т簬鏈紑绁ㄦ暟");
- form.ticketsNum = temFutureTickets.value;
+
+ // 妫�鏌ユ潵绁ㄦ暟涓嶈兘澶т簬锛堝師濮嬪凡鏉ョエ鏁� + 鏈潵绁ㄦ暟锛�
+ const maxNum = maxTicketsNum.value;
+ if (Number(form.ticketsNum) > maxNum) {
+ proxy.$modal.msgWarning(`鏉ョエ鏁颁笉鑳藉ぇ浜�${maxNum}锛堝凡鏉ョエ鏁�${originalTicketsNum.value} + 鏈潵绁ㄦ暟${temFutureTickets.value}锛塦);
+ form.ticketsNum = maxNum;
+ return;
+ }
+
+ // 璁＄畻鏈鏂板鐨勬潵绁ㄦ暟锛堝綋鍓嶆潵绁ㄦ暟 - 鍘熷宸叉潵绁ㄦ暟锛�
+ const newTicketsNum = Number(form.ticketsNum) - Number(originalTicketsNum.value);
+
+ // 濡傛灉鏂板鐨勬潵绁ㄦ暟澶т簬鏈潵绁ㄦ暟锛屽垯闄愬埗
+ if (newTicketsNum > Number(temFutureTickets.value)) {
+ proxy.$modal.msgWarning("鏈鏂板鏉ョエ鏁颁笉寰楀ぇ浜庢湭鏉ョエ鏁�");
+ form.ticketsNum = Number(originalTicketsNum.value) + Number(temFutureTickets.value);
+ return;
}
// 纭繚鎵�鏈夋暟鍊奸兘杞崲涓烘暟瀛楃被鍨嬭繘琛岃绠�
const ticketsAmount =
Number(form.ticketsNum) * Number(form.taxInclusiveUnitPrice);
const futureTickets =
- Number(temFutureTickets.value) - Number(form.ticketsNum);
+ Number(temFutureTickets.value) - newTicketsNum;
form.futureTickets = Number(futureTickets.toFixed(2));
form.ticketsAmount = Number(ticketsAmount.toFixed(2));
};
@@ -153,20 +179,33 @@
return;
}
- if (Number(val) > Number(form.futureTickets * form.taxInclusiveUnitPrice)) {
- proxy.$modal.msgWarning("鏈鏉ョエ閲戦涓嶅緱澶т簬鎬婚噾棰�");
- form.ticketsAmount = (
- form.futureTickets * form.taxInclusiveUnitPrice
- ).toFixed(2);
- const ticketsNum =
- Number(form.ticketsAmount) / Number(form.taxInclusiveUnitPrice);
- form.ticketsNum = Number(ticketsNum.toFixed(2));
+ // 璁＄畻鏈�澶у彲濉啓閲戦 = 锛堝師濮嬪凡鏉ョエ鏁� + 鏈潵绁ㄦ暟锛�* 鍚◣鍗曚环
+ const maxAmount = maxTicketsNum.value * Number(form.taxInclusiveUnitPrice);
+
+ if (Number(val) > maxAmount) {
+ proxy.$modal.msgWarning(`鏈鏉ョエ閲戦涓嶅緱澶т簬${maxAmount.toFixed(2)}鍏僠);
+ form.ticketsAmount = maxAmount.toFixed(2);
+ form.ticketsNum = maxTicketsNum.value;
return;
}
// 纭繚鎵�鏈夋暟鍊奸兘杞崲涓烘暟瀛楃被鍨嬭繘琛岃绠�
const ticketsNum = Number(val) / Number(form.taxInclusiveUnitPrice);
+
+ // 妫�鏌ユ潵绁ㄦ暟涓嶈兘澶т簬鏈�澶у��
+ if (ticketsNum > maxTicketsNum.value) {
+ proxy.$modal.msgWarning(`鏉ョエ鏁颁笉鑳藉ぇ浜�${maxTicketsNum.value}`);
+ form.ticketsNum = maxTicketsNum.value;
+ form.ticketsAmount = maxAmount.toFixed(2);
+ return;
+ }
+
form.ticketsNum = Number(ticketsNum.toFixed(2));
+
+ // 璁＄畻鏈潵绁ㄦ暟
+ const newTicketsNum = form.ticketsNum - originalTicketsNum.value;
+ const futureTickets = Number(temFutureTickets.value) - newTicketsNum;
+ form.futureTickets = Number(futureTickets.toFixed(2));
};
const open = async row => {
diff --git a/src/views/procurementManagement/procurementInvoiceLedger/index.vue b/src/views/procurementManagement/procurementInvoiceLedger/index.vue
index b90ef0d..00ae65a 100644
--- a/src/views/procurementManagement/procurementInvoiceLedger/index.vue
+++ b/src/views/procurementManagement/procurementInvoiceLedger/index.vue
@@ -62,16 +62,16 @@
<el-button
type="primary"
link
- @click="downLoadFile(row)"
+ @click="openEdit(row)"
>
- 闄勪欢
+ 缂栬緫
</el-button>
<el-button
type="primary"
link
- @click="openEdit(row)"
+ @click="downLoadFile(row)"
>
- 缂栬緫
+ 闄勪欢
</el-button>
<el-button
type="primary"
@@ -166,6 +166,11 @@
width: 240,
},
{
+ label: "浜у搧澶х被",
+ prop: "productCategory",
+ width: 150,
+ },
+ {
label: "瑙勬牸鍨嬪彿",
prop: "specificationModel",
width: 150,
diff --git a/src/views/salesManagement/receiptPayment/index.vue b/src/views/salesManagement/receiptPayment/index.vue
index 66af76a..a2a0b2f 100644
--- a/src/views/salesManagement/receiptPayment/index.vue
+++ b/src/views/salesManagement/receiptPayment/index.vue
@@ -433,7 +433,8 @@
specificationModel: row.specificationModel || "",
pendingInvoiceTotal: Number(row.pendingInvoiceTotal || 0),
taxRate: row.taxRate ?? "",
- receiptPaymentAmount: "",
+ // 榛樿鏈鍥炴閲戦 = 寰呭洖娆鹃噾棰�
+ receiptPaymentAmount: Number(row.pendingInvoiceTotal || 0),
receiptPaymentType: "",
registrant: userStore.nickName,
receiptPaymentDate: "",
@@ -518,6 +519,29 @@
// 淇濆瓨鍥炴璁板綍
const saveReceiptPayment = (row) => {
+ // 瀛愯〃鍥炴閲戦鍚堣鏍￠獙锛氭墍鏈夊洖娆捐褰曢噾棰濅箣鍜屼笉鑳藉ぇ浜庣埗鏁版嵁鍚堝悓閲戦
+ // 杩欓噷鐖舵暟鎹�滃悎鍚岄噾棰濃�濇寜锛氬凡鍥炴閲戦( invoiceTotal ) + 寰呭洖娆鹃噾棰�( pendingInvoiceTotal ) 璁＄畻
+ const findParentRowByChildId = (childId) => {
+ return tableData.value.find((p) =>
+ Array.isArray(p.children) && p.children.some((c) => c.id === childId)
+ );
+ };
+ const parentRow = findParentRowByChildId(row.id);
+ if (parentRow) {
+ const contractAmount =
+ Number(parentRow.invoiceTotal || 0) + Number(parentRow.pendingInvoiceTotal || 0);
+ const sumReceipt = (parentRow.children || []).reduce((sum, item) => {
+ const val = Number(item?.receiptPaymentAmount ?? 0);
+ return sum + (Number.isFinite(val) ? val : 0);
+ }, 0);
+ if (sumReceipt > contractAmount) {
+ proxy.$modal.msgError(
+ `鍥炴閲戦鍚堣(${sumReceipt.toFixed(2)})涓嶈兘澶т簬鍚堝悓閲戦(${contractAmount.toFixed(2)})`
+ );
+ return;
+ }
+ }
+
let updateData = {
id: row.id,
receiptPaymentType: row.receiptPaymentType,
--
Gitblit v1.9.3