From 6c0b0dd81a98a3163e45f1b5b5417e02af165fd8 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 29 八月 2026 10:04:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/mes/pro/feedback/modules/form.vue | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/src/views/mes/pro/feedback/modules/form.vue b/src/views/mes/pro/feedback/modules/form.vue
index a295a40..9e5a9a3 100644
--- a/src/views/mes/pro/feedback/modules/form.vue
+++ b/src/views/mes/pro/feedback/modules/form.vue
@@ -87,20 +87,14 @@
wrapperClass: 'grid-cols-3',
});
-/** 鎻愪氦鍓嶅榻愭暟閲忥細鏍规嵁 checkFlag 鍐冲畾 uncheck/鍚堟牸/涓嶈壇褰掗浂绛栫暐 */
+/** 鎻愪氦鍓嶅榻愭暟閲忥細鎶ュ伐鍙～鍐欐姤宸ユ暟閲忥紝鍚堟牸/涓嶈壇/搴熷搧鏁伴噺鐢辫川妫�纭畾锛屾姤宸ョ幆鑺備笉閲囬泦 */
function alignQuantity(data: MesProFeedbackApi.Feedback) {
- if (data.checkFlag) {
- data.uncheckQuantity = data.feedbackQuantity;
- data.qualifiedQuantity = 0;
- data.unqualifiedQuantity = 0;
- data.laborScrapQuantity = 0;
- data.materialScrapQuantity = 0;
- data.otherScrapQuantity = 0;
- } else {
- data.feedbackQuantity =
- (data.qualifiedQuantity || 0) + (data.unqualifiedQuantity || 0);
- data.uncheckQuantity = 0;
- }
+ data.uncheckQuantity = data.checkFlag ? data.feedbackQuantity : 0;
+ delete data.qualifiedQuantity;
+ delete data.unqualifiedQuantity;
+ delete data.laborScrapQuantity;
+ delete data.materialScrapQuantity;
+ delete data.otherScrapQuantity;
}
/** 璇诲彇骞舵寜鎻愪氦瑙勫垯瀵归綈鍚庣殑琛ㄥ崟鏁版嵁锛岀敤浜庡揩鐓у拰淇濆瓨 */
@@ -149,7 +143,7 @@
}
const batchDialogRef = ref<InstanceType<typeof BatchInputDialog>>();
-const batchActionType = ref<'submit' | 'approve'>('');
+const batchActionType = ref<'' | 'submit' | 'approve'>('');
function syncParamValues(data: MesProFeedbackApi.Feedback) {
data.paramValues = paramDetails.value.map((detail) => ({
--
Gitblit v1.9.3