修改提交

src/store/modules/user.js

@@ -59,6 +59,28 @@ const user = {
         getInfo(state.token).then(res => {
           const user = res.data.user
           const avatar = user.avatar === null ? require('@/assets/image/profile.jpg') : user.avatar
+          res.data.roles = [
+            {
+              businessId: 1,
+              code: null,
+              createBy: "admin",
+              createDate: "2020-10-09 09:33:00",
+              dataScope: null,
+              delFlag: "0",
+              deptCheckStrictly: false,
+              deptIds: null,
+              flag: "1",
+              menuCheckStrictly: true,
+              menuId: null,
+              menuIds: null,
+              remarks: "超级管理员",
+              roleKey: "admin",
+              roleName: "超级管理员",
+              roleSort: "1",
+              updateBy: "admin",
+              updateDate: "2020-10-09 09:33:00"
+            }
+          ]
           if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
             commit('SET_ROLES', res.data.roles)
             commit('SET_PERMISSIONS', res.data.permissions)

src/views/system/menu/index.vue

@@ -84,6 +84,7 @@
         </template>-->
           <template slot-scope="scope">
             <el-button
+              v-hasPermi="['sys:menu:update']"
               size="mini"
               type="text"
               style="color: #49cec9"
@@ -91,6 +92,7 @@
             >修改</el-button>
             <el-switch
               v-model="scope.row.flag"
+              v-hasPermi="['sys:menu:toggle']"
               active-value="1"
               inactive-value="0"
               @change="handleStatusChange(scope.row)"
@@ -102,6 +104,7 @@
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item>
                   <el-button
+                    v-hasPermi="['sys:menu:delete']"
                     size="mini"
                     type="text"
                     @click="handleDelete(scope.row)"
@@ -109,6 +112,7 @@
                 </el-dropdown-item>
                 <el-dropdown-item>
                   <el-button
+                    v-hasPermi="['sys:menu:add']"
                     size="mini"
                     type="text"
                     @click="handleAdd(scope.row)"

src/views/system/user/index.vue

@@ -274,12 +274,12 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="岗位" prop="postId">
+            <el-form-item class="labelHeight" label="部门" prop="parentId">
               <treeSelect
-                v-model="form.postId"
-                :disable-branch-nodes="true"
-                multiple
-                :options="deptChildren"
+                v-model="form.deptId"
+                :disable-branch-nodes="false"
+                :default-expand-level="1"
+                :options="deptOptions"
                 :show-count="true"
                 placeholder="请选择归属部门"
                 @input="changeValue"
@@ -287,13 +287,13 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注">
-              <el-input v-model="form.remarks" type="textarea" placeholder="请输入内容" />
-            </el-form-item>
-          </el-col>
-        </el-row>
+<!--        <el-row>-->
+<!--          <el-col :span="24">-->
+<!--            <el-form-item label="备注">-->
+<!--              <el-input v-model="form.remarks" type="textarea" placeholder="请输入内容" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
@@ -632,13 +632,9 @@ export default {
     /** 查询部门下拉树结构 */
     getTreeSelect() {
       treeselect().then(response => {
-        this.deptOptionsTree = response.data.concat({
-          id: -1,
-          label: '无部门人员',
-          children: undefined
-        })
+        this.deptOptionsTree = response.data
         if (response.data && response.data.length > 0) {
-          this.deptOptions = response.data[0].children
+          this.deptOptions = response.data
         }
       })
     },
@@ -739,7 +735,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset()
-      this.getChildrenDept(0)
+      // this.getChildrenDept(0)
       this.open = true
       this.title = '添加用户'
     },
@@ -752,7 +748,7 @@ export default {
         this.form = response.data
         this.title = '修改'
       })
-      this.getChildrenDept(userId)
+      // this.getChildrenDept(userId)
     },
     /** 重置密码按钮操作 */
     handleResetPwd(row) {