From d961ee85e246dc7e4e3f113a5083b4e96eac96f8 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期六, 25 四月 2026 11:39:06 +0800
Subject: [PATCH] change

---
 src/views/inventoryManagement/stockManagement/New.vue |   61 +++++++++++++++++++++++++-----
 1 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/src/views/inventoryManagement/stockManagement/New.vue b/src/views/inventoryManagement/stockManagement/New.vue
index 1f86fd6..c5976b6 100644
--- a/src/views/inventoryManagement/stockManagement/New.vue
+++ b/src/views/inventoryManagement/stockManagement/New.vue
@@ -38,6 +38,23 @@
         </el-form-item>
 
         <el-form-item
+            label="搴撳瓨绫诲瀷"
+            prop="type"
+            :rules="[
+                {
+                required: true,
+                message: '璇烽�夋嫨搴撳瓨绫诲瀷',
+                trigger: 'change',
+              }
+            ]"
+        >
+          <el-select v-model="formState.type" placeholder="璇烽�夋嫨搴撳瓨绫诲瀷">
+            <el-option label="鍚堟牸搴撳瓨" value="qualified" />
+            <el-option label="涓嶅悎鏍煎簱瀛�" value="unqualified" />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item
             label="搴撳瓨鏁伴噺"
             prop="qualitity"
         >
@@ -45,7 +62,14 @@
         </el-form-item>
 
         <el-form-item
-            v-if="type === 'qualified'"
+            label="鎵瑰彿"
+            prop="batchNo"
+        >
+          <el-input v-model="formState.batchNo" placeholder="璇疯緭鍏ユ壒鍙�" />
+        </el-form-item>
+
+        <el-form-item
+            v-if="formState.type === 'qualified'"
             label="搴撳瓨棰勮鏁伴噺"
             prop="warnNum"
         >
@@ -61,8 +85,9 @@
       <ProductSelectDialog
           v-model="showProductSelectDialog"
           @confirm="handleProductSelect"
+          :top-product-parent-id="props.topProductParentId"
           single
-      />
+        />
       <template #footer>
         <div class="dialog-footer">
           <el-button type="primary" @click="handleSubmit">纭</el-button>
@@ -74,7 +99,7 @@
 </template>
 
 <script setup>
-import {ref, computed, getCurrentInstance} from "vue";
+import {ref, computed, watch, getCurrentInstance} from "vue";
 import ProductSelectDialog from "@/views/basicData/product/ProductSelectDialog.vue";
 import {createStockInventory} from "@/api/inventoryManagement/stockInventory.js";
 import {createStockUnInventory} from "@/api/inventoryManagement/stockUninventory.js";
@@ -84,12 +109,11 @@
     type: Boolean,
     required: true,
   },
-
-  type: {
-    type: String,
-    required: true,
-    default: 'qualified',
-  },
+  topProductParentId: {
+    type: Number,
+    default: undefined,
+    required: false,
+  }
 });
 
 const emit = defineEmits(['update:visible', 'completed']);
@@ -101,7 +125,9 @@
   productName: "",
   productModelName: "",
   unit: "",
+  type: undefined,
   qualitity: 0,
+  batchNo: null,
   warnNum: 0,
   remark: '',
 });
@@ -117,6 +143,13 @@
 
 const showProductSelectDialog = ref(false);
 
+// 鎵瑰彿涓虹┖鏃惰浆涓� null
+watch(() => formState.value.batchNo, (val) => {
+  if (val === '') {
+    formState.value.batchNo = null;
+  }
+});
+
 let { proxy } = getCurrentInstance()
 
 const closeModal = () => {
@@ -126,7 +159,12 @@
     productModelId: undefined,
     productName: "",
     productModelName: "",
-    description: '',
+    unit: "",
+    type: undefined,
+    qualitity: 0,
+    batchNo: null,
+    warnNum: 0,
+    remark: '',
   };
   isShow.value = false;
 };
@@ -158,7 +196,7 @@
         proxy.$modal.msgError("璇烽�夋嫨瑙勬牸");
         return;
       }
-      if (props.type === 'qualified') {
+      if (formState.value.type === 'qualified') {
         createStockInventory(formState.value).then(res => {
           // 鍏抽棴妯℃�佹
           isShow.value = false;
@@ -167,6 +205,7 @@
           proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
         })
       } else {
+        formState.value.warnNum = 0;
         createStockUnInventory(formState.value).then(res => {
           // 鍏抽棴妯℃�佹
           isShow.value = false;

--
Gitblit v1.9.3