From 42a3c18397ea627b99aee185b93f7e80b37fd152 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 8 Jul 2024 18:09:49 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E6=8A=A5=E8=A1=A8=E5=8A=A0?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/base/inStore/index.vue  | 26 +++++++++++++++++---------
 src/views/base/outStore/index.vue | 18 +++++++++++++++++-
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/src/views/base/inStore/index.vue b/src/views/base/inStore/index.vue
index 410d428..c554588 100644
--- a/src/views/base/inStore/index.vue
+++ b/src/views/base/inStore/index.vue
@@ -1,14 +1,16 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-<!--      <el-form-item label="仓库编号" prop="storeCode">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.storeCode"-->
-<!--          placeholder="请输入仓库编号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <el-form-item label="仓库编号" prop="storeCode">
+        <el-select v-model="queryParams.storeCode" placeholder="请选择所属仓库">
+          <el-option
+            v-for="item in storeList"
+            :key="item.storeCode"
+            :label="item.storeName"
+            :value="item.storeCode"
+          ></el-option>
+        </el-select>
+      </el-form-item>
 <!--      <el-form-item label="货道编号" prop="spaceCode">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.spaceCode"-->
@@ -237,6 +239,7 @@
 
 <script>
 import { listInStore, getInStore, delInStore, addInStore, updateInStore } from "@/api/base/inStore";
+import { findStoreList } from '@//api/base/storeInfo'
 
 export default {
   name: "InStore",
@@ -305,7 +308,9 @@ export default {
             { key: 13, label: `物料条码编号`, visible: true },
             { key: 14, label: `物料名称`, visible: true },
             { key: 15, label: `入库方式`, visible: true },
-        ]
+        ],
+      // 仓库选项
+      storeList: [],
     };
   },
   created() {
@@ -320,6 +325,9 @@ export default {
         this.queryParams.params["beginInStoreTime"] = this.daterangeInStoreTime[0];
         this.queryParams.params["endInStoreTime"] = this.daterangeInStoreTime[1];
       }
+      findStoreList().then(response => {
+        this.storeList = response.data;
+      });
       listInStore(this.queryParams).then(response => {
         this.inStoreList = response.rows;
         this.total = response.total;
diff --git a/src/views/base/outStore/index.vue b/src/views/base/outStore/index.vue
index 92b2dfe..fbc7e3a 100644
--- a/src/views/base/outStore/index.vue
+++ b/src/views/base/outStore/index.vue
@@ -1,6 +1,16 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="仓库编号" prop="storeCode">
+        <el-select v-model="queryParams.storeCode" placeholder="请选择所属仓库">
+          <el-option
+            v-for="item in storeList"
+            :key="item.storeCode"
+            :label="item.storeName"
+            :value="item.storeCode"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="物料名称" prop="materialName">
         <el-input
           v-model="queryParams.materialName"
@@ -224,6 +234,7 @@
 
 <script>
 import { listOutStore, getOutStore, delOutStore, addOutStore, updateOutStore } from "@/api/base/outStore";
+import { findStoreList } from '@//api/base/storeInfo'
 
 export default {
   name: "OutStore",
@@ -292,7 +303,9 @@ export default {
             { key: 13, label: `物料条码编号`, visible: true },
             { key: 14, label: `物料类型`, visible: true },
             { key: 15, label: `出库方式`, visible: true },
-        ]
+        ],
+      // 仓库选项
+      storeList: [],
     };
   },
   created() {
@@ -307,6 +320,9 @@ export default {
         this.queryParams.params["beginOutStoreTime"] = this.daterangeOutStoreTime[0];
         this.queryParams.params["endOutStoreTime"] = this.daterangeOutStoreTime[1];
       }
+      findStoreList().then(response => {
+        this.storeList = response.data;
+      });
       listOutStore(this.queryParams).then(response => {
         this.outStoreList = response.rows;
         this.total = response.total;