用户列表部分分配

nladmin-ui/src/views/system/menu/index.vue

@@ -16,7 +16,7 @@
         <el-select
           v-model="query.systemType"
           style="width: 100px; height: 35px;top: -5px;"
-          placeholder="切换系统"
+          placeholder="所属系统"
           @change="changetype"
         >
           <el-option
@@ -150,9 +150,9 @@
     >
       <el-table-column type="selection" width="55" />
       <el-table-column label="菜单标题" prop="title" :min-width="100" />
-      <el-table-column label="子系统" prop="systemType" :min-width="flexWidth('systemType',crud.data,'子系统')">
+      <el-table-column label="所属系统" prop="systemType" :min-width="flexWidth('systemType',crud.data,'所属系统')">
         <template slot-scope="scope">
-          {{ dict.label.system_type[scope.row.systemType] }}
+          {{ dict.label.system_type[scope.row.systemType] }} : {{scope.row.systemType}}
         </template>
       </el-table-column>
       <el-table-column prop="icon" label="图标" align="center" :min-width="flexWidth('icon',crud.data,'图标')">
@@ -185,7 +185,7 @@
           <span v-else>是</span>
         </template>
       </el-table-column>
-      <el-table-column prop="create_time" label="创建日期" :min-width="flexWidth('create_time',crud.data,'创建日期')" />
+      <el-table-column prop="createTime" label="创建日期" :min-width="flexWidth('createTime',crud.data,'创建日期')" />
       <el-table-column
         v-permission="['admin','menu:edit','menu:del']"
         label="操作"

nladmin-ui/src/views/system/user/index.vue

@@ -509,7 +509,12 @@ export default {
     // 获取左侧部门数据
     getDeptDatas(node, resolve) {
       setTimeout(() => {
-        crudDept.getDeptTree({ name: node }).then(res => {
+        var q = {}
+        // eslint-disable-next-line eqeqeq
+        if (node != '') {
+          q = { name: node }
+        }
+        crudDept.getDeptTree(q).then(res => {
           console.log('res', res)
           if (resolve) {
             resolve(res.content)
@@ -584,6 +589,7 @@ export default {
       this.query.deptId = data.deptId
       this.query.needAll = true
       this.crud.toQuery()
+      this.query.deptId = null
     },
     // 改变状态
     changeEnabled(row) {
@@ -803,7 +809,6 @@ export default {
       } else {
         user.rolesIds = this.crud.selections.map(item => (item.roleId))
       }
-      debugger
       crudUser.edit(user).then(res => {
         this.cancelForm()
         this.crud.notify('保存成功', CRUD.NOTIFICATION_TYPE.SUCCESS)