From 8a338a08d044e171d4f548b4c3b1d0c4bcc10387 Mon Sep 17 00:00:00 2001
From: "wenkuan.shi" <wenkuan.shi@xujiesoft.com>
Date: Tue, 18 Jun 2024 11:42:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/material/seekByTrans.vue | 36 +++++++++++-----------
 src/views/modules/warehouse/allFind.vue    |  4 +--
 src/views/modules/warehouse/location.vue   |  6 +++-
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/views/modules/material/seekByTrans.vue b/src/views/modules/material/seekByTrans.vue
index 02effeb..2adb38d 100644
--- a/src/views/modules/material/seekByTrans.vue
+++ b/src/views/modules/material/seekByTrans.vue
@@ -264,24 +264,24 @@ export default {
           status: true,
           fixed: '',
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 200003,
-          serialNumber: '200003TableRollNo',
-          tableId: "200003Table",
-          tableName: "卷号",
-          columnWidth: 100,
-          columnProp: 'rollNo',
-          headerAlign: 'center',
-          align: "center",
-          columnLabel: '卷号',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-        },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 200003,
+        //   serialNumber: '200003TableRollNo',
+        //   tableId: "200003Table",
+        //   tableName: "卷号",
+        //   columnWidth: 100,
+        //   columnProp: 'rollNo',
+        //   headerAlign: 'center',
+        //   align: "center",
+        //   columnLabel: '卷号',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        // },
         {
           userId: this.$store.state.user.name,
           functionId: 200003,
diff --git a/src/views/modules/warehouse/allFind.vue b/src/views/modules/warehouse/allFind.vue
index 3c86b94..d524aaf 100644
--- a/src/views/modules/warehouse/allFind.vue
+++ b/src/views/modules/warehouse/allFind.vue
@@ -14,7 +14,7 @@
       <el-form-item :label="'工厂ID:'">
          <el-input v-model="searchData.site" clearable style="width: 120px" :rules="rules.site" :disabled="!isNew"></el-input>
       </el-form-item>
-      <el-form-item :label="'工厂编号:'">
+      <el-form-item :label="'产品卷号:'">
         <el-input v-model="searchData.rollNo" clearable style="width: 120px" :rules="rules.rollNo"></el-input>
       </el-form-item>
 
@@ -546,7 +546,7 @@ export default {
   },
 
   created () {
-    this.getDataList()
+    // this.getDataList()
   },
 
   methods: {
diff --git a/src/views/modules/warehouse/location.vue b/src/views/modules/warehouse/location.vue
index 8a5d945..bd76265 100644
--- a/src/views/modules/warehouse/location.vue
+++ b/src/views/modules/warehouse/location.vue
@@ -38,8 +38,12 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="仓位编码:">
+      <el-form-item label="仓库编码:">
         <el-select v-model="searchData.warehouseId" placeholder="请选择" clearable style="width: 120px">
+          <el-option
+            :label="null"
+            :value="全部">
+          </el-option>
           <el-option
             v-for="i in wareHouseList"
             :key ="i.warehouseId"