From ec501653ab34263055f2a821238d1e727dec10a8 Mon Sep 17 00:00:00 2001
From: lihua <531456470@qq.com>
Date: Wed, 31 Jul 2019 14:39:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=A4=B4=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/material/warehouse/index.vue | 6 +++---
 src/views/material/warn/index.vue      | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/material/warehouse/index.vue b/src/views/material/warehouse/index.vue
index c02f7e2..dc230c9 100644
--- a/src/views/material/warehouse/index.vue
+++ b/src/views/material/warehouse/index.vue
@@ -152,15 +152,15 @@
           <el-form-item v-if="!subVisible" label="公司名称" prop="company">
             <el-input v-model="form.company" autocomplete="off" placeholder="请输入公司名称"/>
           </el-form-item>
-          <el-form-item v-if="!subVisible" label="备注" prop="description">
+          <el-form-item label="备注" prop="description">
             <el-input
               v-model="form.description"
               :rows="2"
               type="textarea"
               placeholder="请输入物料备注"/>
           </el-form-item>
-          <el-form-item v-if="!subVisible" label="物料基数">
-            <el-input-number v-model="form.baseNum" :min="0" label="请输入物料基数"/>
+          <el-form-item v-if="!subVisible" label="基数">
+            <el-input-number v-model="form.baseNum" :min="0" label="请输入基数"/>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
diff --git a/src/views/material/warn/index.vue b/src/views/material/warn/index.vue
index d191eca..9a9deb6 100644
--- a/src/views/material/warn/index.vue
+++ b/src/views/material/warn/index.vue
@@ -20,10 +20,6 @@
             prop="num"
             label="数量"
             min-width="10%"/>
-          <el-table-column
-            prop="baseNum"
-            label="物料基数"
-            min-width="10%"/>
           <el-table-column
             prop="value"
             label="值"
@@ -48,6 +44,10 @@
             prop="description"
             label="备注"
             min-width="10%"/>
+          <el-table-column
+            prop="baseNum"
+            label="基数"
+            min-width="10%"/>
         </el-table>
       </el-row>
       <el-pagination