From 5d8164fd62a93459090660a4c8fe0214b7e706c7 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 01 六月 2026 17:09:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_大罗素马铃薯new' into dev_新疆_大罗素马铃薯new

---
 src/views/inventoryManagement/stockManagement/Subtract.vue |   66 ++++++++++++++++++++++++++------
 1 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/src/views/inventoryManagement/stockManagement/Subtract.vue b/src/views/inventoryManagement/stockManagement/Subtract.vue
index a277a00..34b1ac1 100644
--- a/src/views/inventoryManagement/stockManagement/Subtract.vue
+++ b/src/views/inventoryManagement/stockManagement/Subtract.vue
@@ -38,10 +38,37 @@
         </el-form-item>
 
         <el-form-item
+            label="搴撳瓨绫诲瀷"
+            prop="type"
+            :rules="[
+                {
+                required: true,
+                message: '璇烽�夋嫨搴撳瓨绫诲瀷',
+                trigger: 'change',
+              }
+            ]"
+        >
+          <el-select v-model="formState.type" placeholder="璇烽�夋嫨搴撳瓨绫诲瀷" @change="handleTypeChange">
+            <el-option label="鍚堟牸搴撳瓨" value="qualified" :disabled="(props.record.qualifiedUnLockedQuantity || 0) + (props.record.qualifiedPendingOutQuantity || 0) <= 0" />
+            <el-option label="涓嶅悎鏍煎簱瀛�" value="unqualified" :disabled="(props.record.unQualifiedUnLockedQuantity || 0) + (props.record.unQualifiedPendingOutQuantity || 0) <= 0" />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item
             label="鏁伴噺"
             prop="qualitity"
         >
           <el-input-number v-model="formState.qualitity" :step="1" :min="1" :max="maxQuality" style="width: 100%" />
+        </el-form-item>
+
+        <el-form-item label="鍑哄簱鎵规" prop="outboundBatches">
+          <el-input 
+            v-model="formState.outboundBatches" 
+            placeholder="鐣欑┖鑷姩鐢熸垚"
+            maxlength="100"
+            show-word-limit
+          />
+          <div class="form-tip">涓嶅～鍒欒嚜鍔ㄧ敓鎴愶紝鏍煎紡锛欳K骞存湀鏃�-搴忓彿</div>
         </el-form-item>
 
         <el-form-item label="澶囨敞" prop="remark">
@@ -68,8 +95,8 @@
 <script setup>
 import {ref, computed, getCurrentInstance} from "vue";
 import ProductSelectDialog from "@/views/basicData/product/ProductSelectDialog.vue";
-import {subtractStockInventory} from "@/api/inventoryManagement/stockInventory.js";
-import {subtractStockUnInventory} from "@/api/inventoryManagement/stockUninventory.js";
+import {addStockOutRecordOnly} from "@/api/inventoryManagement/stockInventory.js";
+import {addUnqualifiedStockOutRecordOnly} from "@/api/inventoryManagement/stockUninventory.js";
 
 const props = defineProps({
   visible: {
@@ -79,12 +106,7 @@
   record: {
     type: Object,
     default: () => {},
-  },
-  type: {
-    type: String,
-    required: true,
-    default: 'qualified',
-  },
+  }
 });
 
 const emit = defineEmits(['update:visible', 'completed']);
@@ -94,8 +116,17 @@
 })
 
 const maxQuality = computed(() => {
-  return props.record.unLockedQuantity ? props.record.unLockedQuantity :  0;
+  if (formState.value.type === 'qualified') {
+    // 鍚堟牸鍙嚭 = 鏈喕缁撻噺 + 寰呭鏍稿嚭搴撻噺锛堝嵆宸茬敵璇蜂絾灏氭湭瀹℃壒鐨勬暟閲忥級
+    return Math.max(1, Number(props.record.qualifiedUnLockedQuantity || 0) + Number(props.record.qualifiedPendingOutQuantity || 0));
+  } else {
+    return Math.max(1, Number(props.record.unQualifiedUnLockedQuantity || 0) + Number(props.record.unQualifiedPendingOutQuantity || 0));
+  }
 })
+
+const handleTypeChange = () => {
+  formState.value.qualitity = undefined;
+}
 
 const initFormData = () => {
   if (props.record) {
@@ -113,6 +144,7 @@
   model: "",
   unit: "",
   qualitity: 0,
+  outboundBatches: "",
   remark: '',
 });
 
@@ -136,6 +168,7 @@
     productModelId: undefined,
     productName: "",
     productModelName: "",
+    outboundBatches: "",
     description: '',
   };
   isShow.value = false;
@@ -145,7 +178,6 @@
 const handleProductSelect = async (products) => {
   if (products && products.length > 0) {
     const product = products[0];
-    console.log(product)
     formState.value.productId = product.productId;
     formState.value.productName = product.productName;
     formState.value.productModelName = product.model;
@@ -169,8 +201,8 @@
         proxy.$modal.msgError("璇烽�夋嫨瑙勬牸");
         return;
       }
-      if (props.type === 'qualified') {
-        subtractStockInventory(formState.value).then(res => {
+      if (formState.value.type === 'qualified') {
+        addStockOutRecordOnly(formState.value).then(res => {
           // 鍏抽棴妯℃�佹
           isShow.value = false;
           // 鍛婄煡鐖剁粍浠跺凡瀹屾垚
@@ -178,7 +210,7 @@
           proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
         })
       } else {
-        subtractStockUnInventory(formState.value).then(res => {
+        addUnqualifiedStockOutRecordOnly(formState.value).then(res => {
           // 鍏抽棴妯℃�佹
           isShow.value = false;
           // 鍛婄煡鐖剁粍浠跺凡瀹屾垚
@@ -197,3 +229,11 @@
   isShow,
 });
 </script>
+
+<style scoped>
+.form-tip {
+  font-size: 12px;
+  color: #909399;
+  margin-top: 4px;
+}
+</style>
\ No newline at end of file

--
Gitblit v1.9.3