From 608daf674c429cd7e82c970a59036809de61ae77 Mon Sep 17 00:00:00 2001
From: lihua <531456470@qq.com>
Date: Wed, 21 Aug 2019 10:57:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/material/warehouse/index.vue | 2 +-
 src/views/user/manage.vue              | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/material/warehouse/index.vue b/src/views/material/warehouse/index.vue
index 8d595cd..9a68159 100644
--- a/src/views/material/warehouse/index.vue
+++ b/src/views/material/warehouse/index.vue
@@ -152,7 +152,7 @@
           <el-form-item v-if="!subVisible" label="公司名称" prop="company">
             <el-input v-model="form.company" autocomplete="off" placeholder="请输入公司名称"/>
           </el-form-item>
-          <el-form-item label="备注" prop="description">
+          <el-form-item v-if="!subVisible" label="备注" prop="description">
             <el-input
               v-model="form.description"
               :rows="2"
diff --git a/src/views/user/manage.vue b/src/views/user/manage.vue
index 72851e6..6bf99d1 100644
--- a/src/views/user/manage.vue
+++ b/src/views/user/manage.vue
@@ -93,6 +93,7 @@
             <el-select v-model="form.post" style="width: 60%" placeholder="请选择职位">
               <el-option label="管理" value="管理" />
               <el-option label="研发" value="研发"/>
+              <el-option label="硬件" value="硬件"/>
               <el-option label="测试" value="测试"/>
             </el-select>
           </el-form-item>
@@ -179,7 +180,7 @@ export default {
   },
   methods: {
     handleCurrentChange(val) {
-      this.fetchAssetList(this.field, this.content, val, this.pageSize)
+      this.fetchUserList(this.field, this.content, val, this.pageSize)
     },
     fetchUserList(field, content, pageNum, pageSize) {
       this.listLoading = true