From 410ec378d80800fe26fc822059acd0575c85f635 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 17 八月 2026 11:42:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/mes/pro/mps/index.vue | 6 +++---
src/api/mes/pro/mps/index.ts | 4 ++--
src/views/erp/finance/payment/modules/item-form.vue | 10 +++++++++-
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/api/mes/pro/mps/index.ts b/src/api/mes/pro/mps/index.ts
index c8b4b8e..0ead6e3 100644
--- a/src/api/mes/pro/mps/index.ts
+++ b/src/api/mes/pro/mps/index.ts
@@ -80,9 +80,9 @@
}
/** 鍒犻櫎 MPS */
-export function deleteMps(ids: number[]) {
+export function deleteMps(id: number) {
return requestClient.delete('/mes/pro-mps/delete', {
- params: { ids: ids.join(',') },
+ params: { id },
});
}
diff --git a/src/views/erp/finance/payment/modules/item-form.vue b/src/views/erp/finance/payment/modules/item-form.vue
index 6843412..f41cbc4 100644
--- a/src/views/erp/finance/payment/modules/item-form.vue
+++ b/src/views/erp/finance/payment/modules/item-form.vue
@@ -41,6 +41,14 @@
'update:paymentPrice',
]);
+/** 杈撳叆鏃朵笉琛ラ浂锛屽け鐒﹀悗浠嶆寜閲戦鏍煎紡淇濈暀涓や綅灏忔暟 */
+const paymentPriceFormatter = (
+ value: number | string | undefined,
+ info: { input: string; userTyping: boolean },
+) => {
+ return info.userTyping ? info.input : erpPriceInputFormatter(value);
+};
+
const tableData = ref<ErpFinancePaymentApi.FinancePaymentItem[]>([]); // 琛ㄦ牸鏁版嵁
/** 宸叉牴鎹鏉ョエ鐢熸垚鐨勬槑缁嗭紝閬垮厤閲嶅鐢熸垚 */
@@ -196,7 +204,7 @@
v-model:value="row.paymentPrice"
:precision="2"
:disabled="disabled"
- :formatter="erpPriceInputFormatter"
+ :formatter="paymentPriceFormatter"
placeholder="璇疯緭鍏ユ湰娆′粯娆�"
@change="handleRowChange(row)"
/>
diff --git a/src/views/mes/pro/mps/index.vue b/src/views/mes/pro/mps/index.vue
index c0dcdbf..f481b13 100644
--- a/src/views/mes/pro/mps/index.vue
+++ b/src/views/mes/pro/mps/index.vue
@@ -66,13 +66,13 @@
}
/** 鍒犻櫎 */
-async function handleDelete(ids: number[]) {
+async function handleDelete(row: MesProMpsApi.Mps) {
const hideLoading = message.loading({
content: $t('ui.actionMessage.deleting'),
duration: 0,
});
try {
- await deleteMps(ids);
+ await deleteMps(row.id!);
message.success($t('ui.actionMessage.deleteSuccess'));
handleRefresh();
} finally {
@@ -310,7 +310,7 @@
ifShow: () => row.status === MpsStatusEnum.DRAFT,
popConfirm: {
title: $t('ui.actionMessage.deleteConfirm', [row.code]),
- confirm: handleDelete.bind(null, [row.id!]),
+ confirm: handleDelete.bind(null, row),
},
},
]"
--
Gitblit v1.9.3