From d3230d4bb80fbc7c2adb63c588c580ab94234ee8 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 26 八月 2026 10:12:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/erp/finance/payment/modules/form.vue | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/src/views/erp/finance/payment/modules/form.vue b/src/views/erp/finance/payment/modules/form.vue
index d00de4a..3a29e85 100644
--- a/src/views/erp/finance/payment/modules/form.vue
+++ b/src/views/erp/finance/payment/modules/form.vue
@@ -17,6 +17,7 @@
getFinancePayment,
updateFinancePayment,
} from '#/api/erp/finance/payment';
+import { getPurchaseInvoiceSimpleList } from '#/api/erp/purchase/invoice';
import { useFormSchema } from '../data';
import ItemForm from './item-form.vue';
@@ -28,7 +29,7 @@
id: undefined,
no: '',
supplierId: undefined,
- accountId: undefined,
+ accountName: undefined,
financeUserId: undefined,
paymentTime: undefined,
remark: '',
@@ -68,6 +69,11 @@
if (changedFields.includes('supplierId')) {
formData.value.supplierId = values.supplierId;
}
+ // 鍏宠仈鏉ョエ鍙樺寲鏃讹紝鍔犺浇鏉ョエ淇℃伅渚涙槑缁嗚嚜鍔ㄧ敓鎴�
+ if (changedFields.includes('invoiceId')) {
+ formData.value.invoiceId = values.invoiceId;
+ handleInvoiceChange(values.invoiceId);
+ }
// 鐩殑锛氬悓姝ュ埌 item-form 缁勪欢锛岃Е鍙戞暣浣撶殑浠锋牸璁＄畻
if (changedFields.includes('discountPrice')) {
formData.value.discountPrice = values.discountPrice;
@@ -80,6 +86,27 @@
}
},
});
+
+/** 鍏宠仈鏉ョエ鍙樺寲鏃讹紝鍔犺浇鏉ョエ淇℃伅锛屼緵浠樻鏄庣粏鑷姩鐢熸垚 */
+async function handleInvoiceChange(invoiceId: number | undefined) {
+ if (formType.value === 'detail' || !invoiceId) {
+ if (!invoiceId) {
+ formData.value.invoice = undefined;
+ }
+ return;
+ }
+ const supplierId = formData.value.supplierId;
+ if (!supplierId) {
+ return;
+ }
+ const invoices = await getPurchaseInvoiceSimpleList(supplierId);
+ // 璇锋眰鏈熼棿鏉ョエ宸插啀娆″垏鎹㈡椂锛屼涪寮冭繃鏈熺粨鏋滐紝閬垮厤鍥炴樉閿欎贡
+ if (formData.value.invoiceId !== invoiceId) {
+ return;
+ }
+ const invoice = invoices.find((item) => item.id === invoiceId);
+ formData.value.invoice = invoice;
+}
/** 鏇存柊浠樻椤� */
function handleUpdateItems(items: ErpFinancePaymentApi.FinancePaymentItem[]) {
@@ -149,11 +176,11 @@
formApi.setDisabled(formType.value === 'detail');
formApi.updateSchema(useFormSchema(formType.value));
if (!data || !data.id) {
- // 鏂板鏃讹紝榛樿閫変腑璐︽埛
+ // 鏂板鏃讹紝榛樿濉叆榛樿缁撶畻璐︽埛鍚嶇О
const accountList = await getAccountSimpleList();
const defaultAccount = accountList.find((item) => item.defaultStatus);
if (defaultAccount) {
- await formApi.setValues({ accountId: defaultAccount.id });
+ await formApi.setValues({ accountName: defaultAccount.name });
}
return;
}
@@ -198,6 +225,7 @@
:supplier-id="formData?.supplierId"
:disabled="formType === 'detail'"
:discount-price="formData?.discountPrice ?? 0"
+ :invoice="formData?.invoice"
@update:items="handleUpdateItems"
@update:total-price="handleUpdateTotalPrice"
@update:payment-price="handleUpdatePaymentPrice"
--
Gitblit v1.9.3