From 269678fabbee0a6f8edcb599cc3120bfb0552035 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 19 三月 2026 09:52:32 +0800
Subject: [PATCH] fix: 库存bug修改
---
src/views/inventoryManagement/stockManagement/New.vue | 2 +-
src/views/consumablesLogistics/stockManagement/Subtract.vue | 8 +++++++-
src/views/inventoryManagement/stockManagement/Subtract.vue | 8 +++++++-
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/views/consumablesLogistics/stockManagement/Subtract.vue b/src/views/consumablesLogistics/stockManagement/Subtract.vue
index 8e7961d..29fa533 100644
--- a/src/views/consumablesLogistics/stockManagement/Subtract.vue
+++ b/src/views/consumablesLogistics/stockManagement/Subtract.vue
@@ -229,7 +229,13 @@
const computedNet = safeNet > 0 ? safeNet : 0;
const maxNet = ledgerNetWeight.value;
if (Number.isFinite(maxNet) && maxNet > 0 && computedNet > maxNet) {
- formState.value.netWeight = Number(maxNet.toFixed(2));
+ const cappedNet = Number(maxNet.toFixed(2));
+ formState.value.netWeight = cappedNet;
+ // 鍚屾姣涢噸锛屼繚鎸侊細鍑�閲� = 姣涢噸 - 鐨噸
+ const tare = Number(tareWeight);
+ if (Number.isFinite(tare)) {
+ formState.value.grossWeight = Number((tare + cappedNet).toFixed(2));
+ }
proxy?.$modal?.msgWarning?.(`棰嗙敤鍑�閲嶄笉鑳借秴杩囧彴璐﹀噣閲嶏紙${maxNet.toFixed(2)} 鍚級`);
return;
}
diff --git a/src/views/inventoryManagement/stockManagement/New.vue b/src/views/inventoryManagement/stockManagement/New.vue
index 22e73ac..e1b378c 100644
--- a/src/views/inventoryManagement/stockManagement/New.vue
+++ b/src/views/inventoryManagement/stockManagement/New.vue
@@ -39,7 +39,7 @@
<!-- 鍗婃垚鍝侊細鍏佽鎵嬪姩濉啓鏁伴噺鍏ュ簱 -->
<el-form-item
- v-if="type === 'qualified' && (formState.parentName === '鍗婃垚鍝�' || formState.productType === 1)"
+ v-if="type === 'qualified' && (formState.parentName === '鍗婃垚鍝�' || formState.parentName === '鎴愬搧' || formState.productType === 1)"
label="鏁伴噺"
prop="qualitity"
:rules="[
diff --git a/src/views/inventoryManagement/stockManagement/Subtract.vue b/src/views/inventoryManagement/stockManagement/Subtract.vue
index 88cfad3..2766910 100644
--- a/src/views/inventoryManagement/stockManagement/Subtract.vue
+++ b/src/views/inventoryManagement/stockManagement/Subtract.vue
@@ -229,7 +229,13 @@
const computedNet = safeNet > 0 ? safeNet : 0;
const maxNet = ledgerNetWeight.value;
if (Number.isFinite(maxNet) && maxNet > 0 && computedNet > maxNet) {
- formState.value.netWeight = Number(maxNet.toFixed(2));
+ const cappedNet = Number(maxNet.toFixed(2));
+ formState.value.netWeight = cappedNet;
+ // 鍚屾姣涢噸锛屼繚鎸侊細鍑�閲� = 姣涢噸 - 鐨噸
+ const tare = Number(tareWeight);
+ if (Number.isFinite(tare)) {
+ formState.value.grossWeight = Number((tare + cappedNet).toFixed(2));
+ }
proxy?.$modal?.msgWarning?.(`棰嗙敤鍑�閲嶄笉鑳借秴杩囧彴璐﹀噣閲嶏紙${maxNet.toFixed(2)} 鍚級`);
return;
}
--
Gitblit v1.9.3