From b31c4a85ee6d08958dc44bc824169580dc87efaa Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 13 三月 2026 17:56:06 +0800
Subject: [PATCH] 原料页面

---
 src/views/inventoryManagement/stockManagement/New.vue |   82 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 68 insertions(+), 14 deletions(-)

diff --git a/src/views/inventoryManagement/stockManagement/New.vue b/src/views/inventoryManagement/stockManagement/New.vue
index 5d3ac53..001e897 100644
--- a/src/views/inventoryManagement/stockManagement/New.vue
+++ b/src/views/inventoryManagement/stockManagement/New.vue
@@ -37,21 +37,57 @@
           <el-input v-model="formState.unit"  disabled />
         </el-form-item>
 
+        <!-- productType === 0锛氬師鏉愭枡 -->
         <el-form-item
-            label="搴撳瓨鏁伴噺"
-            prop="qualitity"
+            v-if="type === 'qualified' && formState.productType === 0"
+            label="杞︾墝鍙�"
+            prop="licensePlateNo"
         >
-          <el-input-number v-model="formState.qualitity" :step="1" :min="1" style="width: 100%" />
+          <el-input v-model="formState.licensePlateNo" />
         </el-form-item>
 
         <el-form-item
-            v-if="type === 'qualified'"
-            label="搴撳瓨棰勮鏁伴噺"
-            prop="warnNum"
+            v-if="type === 'qualified' && formState.productType === 0"
+            label="姣涢噸(鍚�)"
+            prop="grossWeight"
         >
-          <el-input-number v-model="formState.warnNum" :step="1" :min="0" :max="formState.qualitity" style="width: 100%" />
+          <el-input-number
+              v-model="formState.grossWeight"
+              :step="0.01"
+              :min="0"
+              style="width: 100%"
+              @change="computeNetWeight"
+          />
         </el-form-item>
-        <!-- productType === 0锛氬師鏉愭枡 -->
+
+        <el-form-item
+            v-if="type === 'qualified' && formState.productType === 0"
+            label="鐨噸(鍚�)"
+            prop="tareWeight"
+        >
+          <el-input-number
+              v-model="formState.tareWeight"
+              :step="0.01"
+              :min="0"
+              style="width: 100%"
+              @change="computeNetWeight"
+          />
+        </el-form-item>
+
+        <el-form-item
+            v-if="type === 'qualified' && formState.productType === 0"
+            label="鍑�閲�(鍚�)"
+            prop="netWeight"
+        >
+          <el-input-number
+              v-model="formState.netWeight"
+              :step="0.01"
+              :min="0"
+              style="width: 100%"
+              disabled
+          />
+        </el-form-item>
+
         <el-form-item
             v-if="type === 'qualified' && formState.productType === 0"
             label="杩囩鏃ユ湡"
@@ -70,10 +106,10 @@
 
         <el-form-item
             v-if="type === 'qualified' && formState.productType === 0"
-            label="鍑�閲�(鍚�)"
-            prop="netWeight"
+            label="杩囩鍛�"
+            prop="weighingOperator"
         >
-          <el-input-number v-model="formState.netWeight" :step="0.01" :min="0" style="width: 100%" />
+          <el-input v-model="formState.weighingOperator" />
         </el-form-item>
 
         <el-form-item label="澶囨敞" prop="remark">
@@ -125,11 +161,14 @@
   productName: "",
   productModelName: "",
   unit: "",
-  weighingDate: undefined,
   productType: undefined,
-  qualitity: 0,
-  warnNum: 0,
+  // 杩囩鐩稿叧瀛楁锛堜粎鍘熸潗鏂欏悎鏍煎搧浣跨敤锛�
+  licensePlateNo: "",
+  grossWeight: undefined,
+  tareWeight: undefined,
   netWeight: undefined,
+  weighingDate: undefined,
+  weighingOperator: "",
   remark: '',
 });
 
@@ -161,6 +200,8 @@
 // 浜у搧閫夋嫨澶勭悊
 const handleProductSelect = async (products) => {
   formState.value.weighingDate = undefined;
+  formState.value.grossWeight = undefined;
+  formState.value.tareWeight = undefined;
   formState.value.netWeight = undefined;
   if (products && products.length > 0) {
     const product = products[0];
@@ -176,6 +217,19 @@
   }
 };
 
+// 鍑�閲� = 姣涢噸 - 鐨噸
+const computeNetWeight = () => {
+  const { grossWeight, tareWeight } = formState.value;
+  if (grossWeight != null && tareWeight != null) {
+    const net = Number(grossWeight) - Number(tareWeight);
+    // 淇濈暀涓や綅灏忔暟锛屼笖涓嶄负璐�
+    const safeNet = Number(net.toFixed(2));
+    formState.value.netWeight = safeNet > 0 ? safeNet : 0;
+  } else {
+    formState.value.netWeight = undefined;
+  }
+};
+
 const handleSubmit = () => {
   proxy.$refs["formRef"].validate(valid => {
     if (valid) {

--
Gitblit v1.9.3