From cc0ed4513213c1210606deaef82de1587ee1c21d Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 14 五月 2026 16:41:30 +0800
Subject: [PATCH] 仓库

---
 src/views/inventoryManagement/dispatchLog/Record.vue |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/views/inventoryManagement/dispatchLog/Record.vue b/src/views/inventoryManagement/dispatchLog/Record.vue
index 7ba8dfd..c7135b3 100644
--- a/src/views/inventoryManagement/dispatchLog/Record.vue
+++ b/src/views/inventoryManagement/dispatchLog/Record.vue
@@ -150,7 +150,7 @@
           <el-input v-model="formState.unit" disabled />
         </el-form-item>
         <el-form-item label="浠撳簱"
-                      prop="warehouseId"
+                      prop="warehouseInfoId"
                       :rules="[
                         {
                           required: true,
@@ -158,15 +158,14 @@
                           trigger: 'change',
                         }
                       ]">
-          <el-select v-model="formState.warehouseId"
+          <el-select v-model="formState.warehouseInfoId"
                      placeholder="璇烽�夋嫨浠撳簱"
                      clearable
-                     :disabled="isEdit || !formState.productId"
                      @change="handleWarehouseChange"
                      style="width: 100%">
             <el-option v-for="warehouse in warehouseList"
                        :key="warehouse.id"
-                       :label="warehouse.name"
+                       :label="warehouse.warehouseName"
                        :value="warehouse.id" />
           </el-select>
         </el-form-item>
@@ -182,7 +181,6 @@
           <el-select v-model="formState.batchNo"
                      placeholder="璇烽�夋嫨鎵瑰彿"
                      clearable
-                     :disabled="isEdit"
                      @change="handleBatchNoChange"
                      style="width: 100%">
             <el-option v-for="batch in batchNoList"
@@ -244,7 +242,7 @@
                       ]">
           <el-select v-model="formState.type"
                      placeholder="璇烽�夋嫨搴撳瓨绫诲瀷"
-                     :disabled="isEdit">
+                     >
             <el-option label="鍚堟牸搴撳瓨"
                        value="qualified" />
             <el-option label="涓嶅悎鏍煎簱瀛�"
@@ -293,6 +291,7 @@
 import { addStockOutRecordOnly } from "@/api/inventoryManagement/stockInventory.js";
 import { addUnqualifiedStockOutRecordOnly } from "@/api/inventoryManagement/stockUninventory.js";
 import { getWarehouseList } from "@/api/inventoryManagement/warehouse.js";
+import { productModelListByUrl } from "@/api/basicData/productModel.js";
 
 const userStore = useUserStore();
 const { proxy } = getCurrentInstance();
@@ -357,7 +356,7 @@
   productName: "",
   productModelName: "",
   unit: "",
-  warehouseId: null, // 浠撳簱ID
+  warehouseInfoId: null, // 浠撳簱ID
   type: undefined,
   qualitity: 0,
   batchNo: null,
@@ -477,9 +476,10 @@
     type: props.type === '0' ? 'qualified' : 'unqualified',
     qualitity: row.stockOutNum,
     batchNo: row.batchNo,
+    warehouseInfoId: row.warehouseInfoId,
     recordType: row.recordType,
     remark: row.remark || "",
-    maxStock: row.stockOutNum || 0, // 缂栬緫鏃朵娇鐢ㄥ綋鍓嶅嚭搴撴暟閲忎綔涓烘渶澶у簱瀛橈紙鍥犱负鏄慨鏀瑰凡鏈夎褰曪級
+    maxStock: row.stockOutNum || 0,
   };
   // 缂栬緫鏃朵粠batchNoMaps鑾峰彇鎵瑰彿鍒楄〃
   if (row.batchNoMaps && Object.keys(row.batchNoMaps).length > 0) {
@@ -504,7 +504,7 @@
     productName: "",
     productModelName: "",
     unit: "",
-    warehouseId: null,
+    warehouseInfoId: null,
     type: undefined,
     qualitity: 0,
     batchNo: null,
@@ -551,7 +551,7 @@
     batchNoList.value = [];
     batchNoStockMap.value = {};
     rawBatchNoMaps.value = {};
-    formState.value.warehouseId = null;
+    formState.value.warehouseInfoId = null;
     formState.value.batchNo = null;
     formState.value.maxStock = 0;
 
@@ -564,9 +564,9 @@
         warehouseMap[w.id] = w.warehouseName || w.name || w.warehouseCode || `浠撳簱${w.id}`;
       });
       // 鏋勫缓浠撳簱鍒楄〃
-      warehouseList.value = Object.keys(product.batchNoMaps).map(warehouseId => ({
-        id: warehouseId,
-        name: warehouseMap[warehouseId] || `浠撳簱${warehouseId}`
+      warehouseList.value = Object.keys(product.batchNoMaps).map(warehouseInfoId => ({
+        id: warehouseInfoId,
+        warehouseName: warehouseMap[warehouseInfoId] || `浠撳簱${warehouseInfoId}`
       }));
     }
     showProductSelect.value = false;
@@ -576,15 +576,15 @@
 };
 
 // 浠撳簱閫夋嫨鍙樺寲澶勭悊
-const handleWarehouseChange = (warehouseId) => {
+const handleWarehouseChange = (warehouseInfoId) => {
   batchNoList.value = [];
   batchNoStockMap.value = {};
   formState.value.batchNo = null;
   formState.value.maxStock = 0;
 
-  if (warehouseId && rawBatchNoMaps.value[warehouseId]) {
+  if (warehouseInfoId && rawBatchNoMaps.value[warehouseInfoId]) {
     // 瑙ｆ瀽璇ヤ粨搴撲笅鐨勬壒鍙锋暟鎹紝鏍煎紡涓猴細[{鎵瑰彿: 搴撳瓨}, {鎵瑰彿: 搴撳瓨}]
-    const batchArray = rawBatchNoMaps.value[warehouseId];
+    const batchArray = rawBatchNoMaps.value[warehouseInfoId];
     const batchMap = {};
     const batches = [];
 

--
Gitblit v1.9.3