From c3148091b5adfde56ebb18898c3b44dfc8d38eb2 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 16 十一月 2023 10:04:43 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before

---
 src/views/basic/warehouse/warehouse-form.vue |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/basic/warehouse/warehouse-form.vue b/src/views/basic/warehouse/warehouse-form.vue
index ff506ac..98b4454 100644
--- a/src/views/basic/warehouse/warehouse-form.vue
+++ b/src/views/basic/warehouse/warehouse-form.vue
@@ -60,7 +60,7 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="宸ュ巶" prop="factoryId">
-            <el-select
+            <el-select 
               v-model="dataForm.factoryId"
               filterable
               placeholder="璇烽�夋嫨"
@@ -109,8 +109,8 @@
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="12">
-          <el-form-item label="浠撳簱鍦板浘" prop="warehouseMap">
+        <!-- <el-col :span="12"> -->
+          <!-- <el-form-item label="浠撳簱鍦板浘" prop="warehouseMap">
             <el-upload
               ref="upload"
               action="/mes/warehouse/upload"
@@ -130,9 +130,9 @@
               <div slot="tip" class="el-upload__tip">
                 鍙兘涓婁紶jpg/png鏂囦欢锛屼笖涓嶈秴杩�500kb
               </div>
-            </el-upload>
-          </el-form-item>
-        </el-col>
+            </el-upload> -->
+          <!-- </el-form-item>
+        </el-col> -->
         <el-col :span="12">
           <el-form-item label="浠撳簱鐘舵��" prop="warehouseStatus">
             <el-switch

--
Gitblit v1.9.3