Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/layout/components/Navbar.vue

src/api/auth/authAdmin.js

@@ -74,4 +74,27 @@ export function updateInv(data) {
     data: data
   });
 }
+//获取当前登陆人用户信息
+export function selectUser(query) {
+  return axios({
+    url: "/admin/auth/admin/selectUser",
+    method: "get",
+    params: query
+  });
+}
+
+export function modifyPasswd(data) {
+  return axios({
+    url: "/admin/auth/admin/updateUser",
+    method: "post",
+    data: data
+  });
+}
 
+export function filterByUser(query) {
+  return axios({
+    url: "/admin/auth/admin/selectUser",
+    method: "get",
+    params: query
+  });
+}

src/views/system/user/authUser.vue

@@ -1,10 +1,14 @@
 <template>
   <div>
     <el-card>
-      <el-form :inline="true" :model="query" size="mini">
+      <el-form :inline="true" :model="query" size="mini" v-show="showSearch">
+        <el-row>
+          <el-col :span="8">
             <el-form-item label="用户账号:">
               <el-input v-model="query.userName" placeholder="用户账号" clearable></el-input>
             </el-form-item>
+          </el-col>
+          <el-col :span="8">
             <el-form-item class="query-form-item" label="账号状态:">
               <el-select v-model="query.userFlag" placeholder="请选择账号状态:">
                 <el-option label="全部" value=""></el-option>
@@ -12,27 +16,27 @@
                 <el-option label="正常" value="1"></el-option>
               </el-select>
             </el-form-item>
-        <el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="所属部门:">
+              <el-input v-model="query.deptName" placeholder="所属部门" clearable></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </el-form>
+      <div class="top-right-btn">
         <el-button-group>
-            <el-button
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
-              type="primary"
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
-              icon="el-icon-refresh"
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
-              @click="onReset"
-            >重置
-            </el-button>
-            <el-button type="primary" icon="el-icon-search" @click="onSubmit"
-            >查询
-            </el-button
-            >
           <el-button type="primary" @click.native="handleForm(null, null)" icon="el-icon-plus"
                      :disabled="!configParms.sysUser && query.customerId == 110"
-                       v-hasPermi="['system:user:add']"
+                     v-hasPermi="['system:user:add']">新增</el-button>
-            >新增
-            </el-button
-            >
         </el-button-group>
-        </el-form-item>
+      </div>
-      </el-form>
+
+      <el-divider style="margin: 15px"></el-divider>
       <el-table v-loading="loading" :data="list"
                 style="width: 100%"
                 border highlight-current-row>
@@ -71,7 +75,7 @@
             </el-button>
             <el-button
               type="text"
-              :disabled="scope.row.id === 1 || !configParms.sysUser"
+              :disabled="scope.row.id === '1' || !configParms.sysUser"
               @click.native="handleDel(scope.$index, scope.row)"
               v-hasPermi="['system:user:remove']"
             >删除
@@ -102,13 +106,14 @@
           <el-row type="flex">
             <el-col :span="11" type="flex">
               <el-form-item label="用户账号" prop="userName">
-                <el-input v-model="formData.userName" size="small" style="width: 90%"></el-input>
+                <el-input v-model="formData.userName" size="small" style="width: 90%"
+                          :disabled="formData.id == 1"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="11" class="el-col">
               <el-form-item label="用户名称" prop="employeeName">
                 <el-input v-model="formData.employeeName" size="small"
-                          style="width: 90%"></el-input>
+                          style="width: 90%" :disabled="formData.id == 1"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -167,7 +172,7 @@
             </el-col>
             <el-col :span="11" type="flex">
               <el-form-item label="状态" prop="userFlag">
-                <el-radio-group v-model="formData.userFlag" :disabled="formData.id === 1">
+                <el-radio-group v-model="formData.userFlag" :disabled="formData.id == 1">
                   <el-radio :label="1">正常</el-radio>
                   <el-radio :label="0">禁用</el-radio>
 
@@ -205,8 +210,8 @@
           </el-row>
           <el-row :gutter="20" type="flex">
             <el-col :span="11" type="flex">
-              <el-form-item label="角色">
+              <el-form-item label="角色" prop="roles">
-                <el-checkbox-group v-model="formData.roles" :disabled="formData.id === 1" >
+                <el-checkbox-group v-model="formData.roles" :disabled="formData.id == 1">
                   <el-checkbox
                     v-for="item in roles"
                     :key="item.roleId"
@@ -291,10 +296,12 @@ export default {
       }
     };
     return {
+      showSearch: true,
       roles: [],
       query: {
         userName: "",
-        userFlag: "",
+        userFlag: "1",
+        deptName: "",
         page: 1,
         limit: 10,
         roleId: "",
@@ -340,6 +347,12 @@ export default {
         depts: [
           {required: true, message: "请选择所属部门", trigger: "change"}
         ],
+        roles: [
+          {required: true, message: "请选择用户角色"}
+        ],
+        employeeName: [
+          {required: true, message: "请输入用户名称", trigger: "blur"}
+        ]
       },
       editRules: {
         userName: [
@@ -356,13 +369,20 @@ export default {
     };
   },
   methods: {
+    getDeptList(){
+
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
     onReset() {
       this.$router.push({
         path: ""
       });
       this.query = {
         userName: "",
-        userFlag: "",
+        userFlag: "1",
+        deptName: null,
         page: 1,
         limit: 10,
         roleId: "",
@@ -617,7 +637,6 @@ export default {
     this.getSyncConfig();
     this.findDeptMethod();
 
-
     //查询是否启用多级仓库，判断是否启用部门
     selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
       if (res.code === 20000) {