Merge remote-tracking branch 'origin/dev-sunyu' into dev-sunyu

src/views/employee/index.vue

@@ -43,15 +43,34 @@
             <!--                @keyup.enter.native="handleQuery"-->
             <!--              />-->
             <!--            </el-form-item>-->
+            <el-form-item prop="userName">
+              <el-input
+                v-model="queryParams.userName"
+                placeholder="请输入账号"
+                clearable
+                style="width: 200px"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item prop="nickName">
+              <el-input
+                v-model="queryParams.nickName"
+                placeholder="请输入员工姓名"
+                clearable
+                style="width: 200px"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
             <el-form-item prop="phonenumber">
               <el-input
                 v-model="queryParams.phonenumber"
-                placeholder="请输入账号/员工姓名/手机号码"
+                placeholder="请输入手机号码"
                 clearable
-                style="width: 240px"
+                style="width: 200px"
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
+
             <el-form-item prop="status">
               <el-select
                 v-model="queryParams.status"
@@ -169,14 +188,14 @@
                   icon="el-icon-view"
                 ></el-button>-->
                 <el-button
-                  size="mini"
+                  size="medium"
                   style="border: transparent"
                   icon="el-icon-edit"
                   @click="handleUpdate(scope.row)"
                 ></el-button>
                 <el-button
-                  size="mini"
-                  style="border: transparent"
+                  size="medium"
+                  style="border: transparent "
                   icon="el-icon-delete"
                   @click="handleDelete(scope.row)"
                 ></el-button>
@@ -560,6 +579,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         userName: undefined,
+        nickName: undefined,
         phonenumber: undefined,
         status: undefined,
         deptId: undefined,