From aae6bca988ce7330ad3a18b9d8ada8eadbf3a7b0 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 25 三月 2026 16:01:14 +0800
Subject: [PATCH] fix: 生产订单加上单位字段
---
src/views/inventoryManagement/stockManagement/Subtract.vue | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/src/views/inventoryManagement/stockManagement/Subtract.vue b/src/views/inventoryManagement/stockManagement/Subtract.vue
index 88cfad3..880a6e7 100644
--- a/src/views/inventoryManagement/stockManagement/Subtract.vue
+++ b/src/views/inventoryManagement/stockManagement/Subtract.vue
@@ -31,22 +31,30 @@
</el-form-item>
<el-form-item
- label="鍗曚綅"
- prop="unit"
- >
- <el-input v-model="formState.unit" disabled />
- </el-form-item>
-
- <el-form-item
label="杞︾墝鍙�"
prop="licensePlateNo"
+ :rules="[{ required: true, message: '璇疯緭鍏ヨ溅鐗屽彿', trigger: ['blur','change'] }]"
>
<el-input v-model="formState.licensePlateNo" />
</el-form-item>
-
<el-form-item
- label="姣涢噸(鍚�)"
+ label="鍗曚綅"
+ prop="unit"
+ >
+ <el-select
+ v-model="formState.unit"
+ placeholder="璇烽�夋嫨鍗曚綅"
+ style="width: 100%"
+ clearable
+ >
+ <el-option label="鍚�" value="鍚�" />
+ <el-option label="鍏枻" value="鍏枻" />
+ </el-select>
+ </el-form-item>
+ <el-form-item
+ label="姣涢噸"
prop="grossWeight"
+ :rules="[{ required: true, message: '璇疯緭鍏ユ瘺閲�', trigger: ['blur','change'] }]"
>
<el-input-number
v-model="formState.grossWeight"
@@ -58,8 +66,9 @@
</el-form-item>
<el-form-item
- label="鐨噸(鍚�)"
+ label="鐨噸"
prop="tareWeight"
+ :rules="[{ required: true, message: '璇疯緭鍏ョ毊閲�', trigger: ['blur','change'] }]"
>
<el-input-number
v-model="formState.tareWeight"
@@ -71,8 +80,9 @@
</el-form-item>
<el-form-item
- label="鍑�閲�(鍚�)"
+ label="鍑�閲�"
prop="netWeight"
+ :rules="[{ required: true, message: '鍑�閲嶇敱姣涢噸鍜岀毊閲嶈嚜鍔ㄨ绠�', trigger: ['blur','change'] }]"
>
<el-input-number
v-model="formState.netWeight"
@@ -86,6 +96,7 @@
<el-form-item
label="杩囩鏃ユ湡"
prop="weighingDate"
+ :rules="[{ required: true, message: '璇烽�夋嫨杩囩鏃ユ湡', trigger: 'change' }]"
>
<el-date-picker
style="width: 100%"
@@ -101,6 +112,7 @@
<el-form-item
label="杩囩鍛�"
prop="weighingOperator"
+ :rules="[{ required: true, message: '璇疯緭鍏ヨ繃纾呭憳', trigger: ['blur','change'] }]"
>
<el-input v-model="formState.weighingOperator" />
</el-form-item>
@@ -168,6 +180,8 @@
formState.value = {
...props.record,
}
+ // 鍒濆鍖栨椂涔熻Е鍙戜竴娆″噣閲嶈绠楋紝閬垮厤鎺ュ彛鍥炲～鍚庡噣閲嶄负绌�
+ computeNetWeight()
}
}
@@ -229,7 +243,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