From dc8977cdbeb979df84d9b81a3be364223e8f2731 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 29 十月 2026 13:52:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_万通新材料' into dev_宁夏_万通新材料
---
src/views/erp/finance/payment/data.ts | 3 ++-
src/views/erp/finance/payment/modules/form.vue | 9 +++++++++
src/views/wls/salesnotice/data.ts | 6 ------
src/views/erp/finance/payment/modules/item-form.vue | 9 +++++++++
4 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/src/views/erp/finance/payment/data.ts b/src/views/erp/finance/payment/data.ts
index 835f1dc..eab3d11 100644
--- a/src/views/erp/finance/payment/data.ts
+++ b/src/views/erp/finance/payment/data.ts
@@ -168,7 +168,8 @@
placeholder: '鍚堣浠樻',
precision: 2,
formatter: erpPriceInputFormatter,
- disabled: true,
+ // 鐢变粯娆炬槑缁嗚嚜鍔ㄨ绠楋紝涔熷厑璁哥敤鎴锋寜瀹為檯鎯呭喌鎵嬪姩淇敼
+ disabled: formType === 'detail',
},
},
{
diff --git a/src/views/erp/finance/payment/modules/form.vue b/src/views/erp/finance/payment/modules/form.vue
index a37cb41..ea9c530 100644
--- a/src/views/erp/finance/payment/modules/form.vue
+++ b/src/views/erp/finance/payment/modules/form.vue
@@ -73,6 +73,15 @@
formData.value.invoiceId = values.invoiceId;
handleInvoiceChange(values.invoiceId);
}
+ // 鍚堣浠樻鐢辨槑缁嗚嚜鍔ㄨ绠楋紝涔熷厑璁哥敤鎴锋墜鍔ㄤ慨鏀癸紱淇敼鍚庨噸鏂拌绠楀疄闄呬粯娆�
+ if (changedFields.includes('totalPrice')) {
+ formData.value.totalPrice = values.totalPrice ?? 0;
+ formData.value.paymentPrice =
+ formData.value.totalPrice - (values.discountPrice || 0);
+ formApi.setValues({
+ paymentPrice: formData.value.paymentPrice,
+ });
+ }
// 鐩殑锛氬悓姝ュ埌 item-form 缁勪欢锛岃Е鍙戞暣浣撶殑浠锋牸璁＄畻
if (changedFields.includes('discountPrice')) {
formData.value.discountPrice = values.discountPrice;
diff --git a/src/views/erp/finance/payment/modules/item-form.vue b/src/views/erp/finance/payment/modules/item-form.vue
index c582780..590c656 100644
--- a/src/views/erp/finance/payment/modules/item-form.vue
+++ b/src/views/erp/finance/payment/modules/item-form.vue
@@ -51,6 +51,9 @@
const tableData = ref<ErpFinancePaymentApi.FinancePaymentItem[]>([]); // 琛ㄦ牸鏁版嵁
+/** 鍥炴樉鐖剁粍浠朵紶鍏ョ殑鏄庣粏鏃惰烦杩囨�婚閲嶇畻锛岄伩鍏嶈鐩栫敤鎴锋墜鍔ㄤ慨鏀圭殑鍚堣浠樻 */
+const skipTotalCalc = ref(false);
+
/** 宸叉牴鎹鏉ョエ鐢熸垚鐨勬槑缁嗭紝閬垮厤閲嶅鐢熸垚 */
const generatedInvoiceId = ref<number | undefined>();
@@ -100,11 +103,14 @@
if (!items) {
return;
}
+ // 鐖剁粍浠跺洖鏄炬槑缁嗘椂鍙埛鏂拌〃鏍硷紝涓嶉噸绠楁�婚锛堝悎璁′粯娆惧厑璁告墜鍔ㄤ慨鏀癸級
+ skipTotalCalc.value = true;
tableData.value = [...items];
// 缂栬緫鍥炴樉鏃讹紝鏍囪宸叉牴鎹綋鍓嶆潵绁ㄧ敓鎴愯繃锛岄伩鍏嶉噸澶嶇敓鎴�
generatedInvoiceId.value = props.invoice?.id;
await nextTick(); // 鐗规畩锛氫繚璇� gridApi 宸茬粡鍒濆鍖�
await gridApi.grid.reloadData(tableData.value);
+ skipTotalCalc.value = false;
},
{
immediate: true,
@@ -146,6 +152,9 @@
watch(
() => [tableData.value, props.discountPrice],
() => {
+ if (skipTotalCalc.value) {
+ return;
+ }
if (!tableData.value || tableData.value.length === 0) {
return;
}
diff --git a/src/views/wls/salesnotice/data.ts b/src/views/wls/salesnotice/data.ts
index 5254f5c..da115e1 100644
--- a/src/views/wls/salesnotice/data.ts
+++ b/src/views/wls/salesnotice/data.ts
@@ -296,12 +296,6 @@
width: 100,
},
{
- field: 'outCount',
- title: '宸插嚭搴撴暟閲�',
- width: 100,
- formatter: ({ cellValue }: { cellValue: number }) => (cellValue || 0).toFixed(2),
- },
- {
field: 'outProgress',
title: '鍑哄簱杩涘害',
width: 120,
--
Gitblit v1.9.3