From df084ef7fc2f3b1a00790ed55616188b280f9594 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 26 三月 2026 18:06:19 +0800
Subject: [PATCH] fix:1.仓储库存单位转换记录和库存关联更新 2.原材料和非原材料的数量区分 3.入库和出库记录删除单位转换库存更新 4.过磅单单位转换更新

---
 src/views/inventoryManagement/stockManagement/Subtract.vue |  179 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 101 insertions(+), 78 deletions(-)

diff --git a/src/views/inventoryManagement/stockManagement/Subtract.vue b/src/views/inventoryManagement/stockManagement/Subtract.vue
index 880a6e7..cc5a12b 100644
--- a/src/views/inventoryManagement/stockManagement/Subtract.vue
+++ b/src/views/inventoryManagement/stockManagement/Subtract.vue
@@ -30,92 +30,115 @@
           <el-input v-model="formState.model"  disabled />
         </el-form-item>
 
+        <!-- 闈炲師鏉愭枡鏄剧ず鏁伴噺瀛楁 -->
         <el-form-item
-            label="杞︾墝鍙�"
-            prop="licensePlateNo"
-            :rules="[{ required: true, message: '璇疯緭鍏ヨ溅鐗屽彿', trigger: ['blur','change'] }]"
+            v-if="props.record.productType !== 0"
+            label="鏁伴噺"
+            prop="qualitity"
+            :rules="[
+              { required: true, message: '璇疯緭鍏ユ暟閲�', trigger: ['blur', 'change'] }
+            ]"
         >
-          <el-input v-model="formState.licensePlateNo" />
-        </el-form-item>
-        <el-form-item
-            label="鍗曚綅"
-            prop="unit"
-        >
-          <el-select
-              v-model="formState.unit"
-              placeholder="璇烽�夋嫨鍗曚綅"
+          <el-input-number
+              v-model="formState.qualitity"
+              :min="0"
+              :step="1"
+              :precision="0"
               style="width: 100%"
-              clearable
+              controls-position="right"
+              placeholder="璇疯緭鍏ユ暟閲�"
+          />
+        </el-form-item>
+
+        <!-- 鍘熸潗鏂欐樉绀鸿繃纾呯浉鍏冲瓧娈� -->
+        <template v-if="props.record.productType === 0">
+          <el-form-item
+              label="杞︾墝鍙�"
+              prop="licensePlateNo"
+              :rules="[{ required: true, message: '璇疯緭鍏ヨ溅鐗屽彿', trigger: ['blur','change'] }]"
           >
-            <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"
-              :step="0.01"
-              :min="0"
-              style="width: 100%"
-              @change="computeNetWeight"
-          />
-        </el-form-item>
+            <el-input v-model="formState.licensePlateNo" />
+          </el-form-item>
+          <el-form-item
+              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"
+                :step="0.01"
+                :min="0"
+                style="width: 100%"
+                @change="computeNetWeight"
+            />
+          </el-form-item>
 
-        <el-form-item
-            label="鐨噸"
-            prop="tareWeight"
-            :rules="[{ required: true, message: '璇疯緭鍏ョ毊閲�', trigger: ['blur','change'] }]"
-        >
-          <el-input-number
-              v-model="formState.tareWeight"
-              :step="0.01"
-              :min="0"
-              style="width: 100%"
-              @change="computeNetWeight"
-          />
-        </el-form-item>
+          <el-form-item
+              label="鐨噸"
+              prop="tareWeight"
+              :rules="[{ required: true, message: '璇疯緭鍏ョ毊閲�', trigger: ['blur','change'] }]"
+          >
+            <el-input-number
+                v-model="formState.tareWeight"
+                :step="0.01"
+                :min="0"
+                style="width: 100%"
+                @change="computeNetWeight"
+            />
+          </el-form-item>
 
-        <el-form-item
-            label="鍑�閲�"
-            prop="netWeight"
-            :rules="[{ required: true, message: '鍑�閲嶇敱姣涢噸鍜岀毊閲嶈嚜鍔ㄨ绠�', trigger: ['blur','change'] }]"
-        >
-          <el-input-number
-              v-model="formState.netWeight"
-              :step="0.01"
-              :min="0"
-              style="width: 100%"
-              disabled
-          />
-        </el-form-item>
+          <el-form-item
+              label="鍑�閲�"
+              prop="netWeight"
+              :rules="[{ required: true, message: '鍑�閲嶇敱姣涢噸鍜岀毊閲嶈嚜鍔ㄨ绠�', trigger: ['blur','change'] }]"
+          >
+            <el-input-number
+                v-model="formState.netWeight"
+                :step="0.01"
+                :min="0"
+                style="width: 100%"
+                disabled
+            />
+          </el-form-item>
 
-        <el-form-item
-            label="杩囩鏃ユ湡"
-            prop="weighingDate"
-            :rules="[{ required: true, message: '璇烽�夋嫨杩囩鏃ユ湡', trigger: 'change' }]"
-        >
-          <el-date-picker
-              style="width: 100%"
-              v-model="formState.weighingDate"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              format="YYYY-MM-DD HH:mm:ss"
-              type="datetime"
-              placeholder="璇烽�夋嫨杩囩鏃ユ湡"
-              clearable
-          />
-        </el-form-item>
+          <el-form-item
+              label="杩囩鏃ユ湡"
+              prop="weighingDate"
+              :rules="[{ required: true, message: '璇烽�夋嫨杩囩鏃ユ湡', trigger: 'change' }]"
+          >
+            <el-date-picker
+                style="width: 100%"
+                v-model="formState.weighingDate"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                format="YYYY-MM-DD HH:mm:ss"
+                type="datetime"
+                placeholder="璇烽�夋嫨杩囩鏃ユ湡"
+                clearable
+            />
+          </el-form-item>
 
-        <el-form-item
-            label="杩囩鍛�"
-            prop="weighingOperator"
-            :rules="[{ required: true, message: '璇疯緭鍏ヨ繃纾呭憳', trigger: ['blur','change'] }]"
-        >
-          <el-input v-model="formState.weighingOperator" />
-        </el-form-item>
+          <el-form-item
+              label="杩囩鍛�"
+              prop="weighingOperator"
+              :rules="[{ required: true, message: '璇疯緭鍏ヨ繃纾呭憳', trigger: ['blur','change'] }]"
+          >
+            <el-input v-model="formState.weighingOperator" />
+          </el-form-item>
+        </template>
 
         <el-form-item label="澶囨敞" prop="remark">
           <el-input v-model="formState.remark" type="textarea" />

--
Gitblit v1.9.3