diff --git a/nladmin-ui/src/views/system/user/index.vue b/nladmin-ui/src/views/system/user/index.vue
new file mode 100644
index 0000000..93e5420
--- /dev/null
+++ b/nladmin-ui/src/views/system/user/index.vue
@@ -0,0 +1,481 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--侧边部门数据-->
+      <el-col :span="4">
+        <div class="head-container">
+          <el-input
+            v-model="deptName"
+            clearable
+            size="mini"
+            placeholder="请输入部门名称"
+            prefix-icon="el-icon-search"
+            class="filter-item"
+            @input="getDeptDatas"
+          />
+        </div>
+        <el-tree
+          :data="deptDatas"
+          :props="defaultProps"
+          @node-click="handleNodeClick"
+        />
+      </el-col>
+      <!--用户数据-->
+      <el-col :span="20">
+        <!--工具栏1-->
+        <div class="head-container">
+          <div v-if="crud.props.searchToggle">
+            <!-- 搜索 -->
+            <el-input
+              v-model="query.blurry"
+              clearable
+              size="mini"
+              placeholder="输入账号或者名称"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+            <el-select
+              v-model="query.is_used"
+              clearable
+              size="mini"
+              placeholder="状态"
+              class="filter-item"
+              style="width: 90px"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in enabledTypeOptions"
+                :key="item.key"
+                :label="item.display_name"
+                :value="item.key"
+              />
+            </el-select>
+            <rrOperation />
+          </div>
+          <crudOperation show="" :permission="permission" />
+        </div>
+        <!--新增跟修改表单渲染-->
+        <el-dialog
+          append-to-body
+          :close-on-click-modal="false"
+          :before-close="crud.cancelCU"
+          :visible.sync="crud.status.cu > 0"
+          :title="crud.status.title"
+          width="700px"
+        >
+          <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
+            <el-form-item label="用户名" prop="username">
+              <el-input v-model="form.username" style="width: 200px;" />
+            </el-form-item>
+            <el-form-item label="电话" prop="phone">
+              <el-input v-model.number="form.phone" style="width: 200px;" />
+            </el-form-item>
+            <el-form-item label="姓名" prop="preson_name">
+              <el-input v-model="form.person_name" style="width: 200px;" />
+            </el-form-item>
+            <el-form-item label="邮箱" prop="email">
+              <el-input v-model="form.email" style="width: 200px;" />
+            </el-form-item>
+            <el-form-item label="部门" prop="depts" :rules="[{ required: true, message: '请选择部门', trigger: 'change' }]">
+              <treeselect
+                v-model="form.depts"
+                :load-options="loadDepts"
+                :options="deptDatas"
+                style="width: 370px;"
+                :multiple="true"
+                :flat="true"
+                :normalizer="normalizer"
+                placeholder="选择部门类目"
+              />
+            </el-form-item>
+            <br v-if="!crud.status.add">
+            <el-form-item v-if="crud.status.add" label="密码" prop="password">
+              <el-input v-model="form.password" style="width: 200px;" show-password auto-complete="new-password" />
+            </el-form-item>
+            <el-form-item label="性别">
+              <el-radio-group v-model="form.gender" style="width: 178px">
+                <el-radio label="男">男</el-radio>
+                <el-radio label="女">女</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="状态" prop="is_uesd">
+              <el-switch
+                v-model="form.is_used"
+                active-color="#409EFF"
+                inactive-color="#F56C6C"
+                active-value="1"
+                inactive-value="0"
+              />
+            </el-form-item>
+            <el-form-item style="margin-bottom: 0;" label="角色" prop="roles">
+              <el-select
+                v-model="roleDatas"
+                style="width: 512px"
+                multiple
+                active-value="1"
+                inactive-value="0"
+                placeholder="请选择"
+                @remove-tag="deleteTag"
+                @change="changeRole"
+              >
+                <!--:disabled="level !== 1 && item.level <= level"-->
+                <el-option
+                  v-for="item in roles"
+                  :key="item.role_id"
+                  :label="item.name"
+                  :value="item.role_id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-form>
+          <div slot="footer" class="dialog-footer">
+            <el-button type="text" @click="crud.cancelCU">取消</el-button>
+            <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+          </div>
+        </el-dialog>
+        <!--表格渲染-->
+        <el-table
+          ref="table"
+          v-loading="crud.loading"
+          :data="crud.data"
+          style="width: 100%;"
+          @selection-change="crud.selectionChangeHandler"
+        >
+          <el-table-column :selectable="checkboxT" type="selection" width="55" />
+          <el-table-column prop="username" label="用户名" :min-width="flexWidth('username',crud.data,'用户名')" />
+          <el-table-column
+            prop="person_name"
+            label="姓名"
+            :min-width="flexWidth('person_name',crud.data,'姓名')"
+          />
+          <el-table-column prop="gender" label="性别" :min-width="flexWidth('person_name',crud.data,'性别')" />
+          <el-table-column prop="phone" label="电话" :min-width="flexWidth('phone',crud.data,'电话')" />
+          <el-table-column prop="email" label="邮箱" :min-width="flexWidth('email',crud.data,'邮箱')" />
+          <el-table-column show-overflow-tooltip prop="deptnames" label="部门" />
+          <el-table-column
+            label="启用"
+            align="center"
+            prop="is_used"
+            :formatter="crud.formatIsOrNot"
+            :min-width="flexWidth('is_used',crud.data,'启用')"
+          />
+          <el-table-column prop="create_time" label="创建日期" :min-width="flexWidth('create_time',crud.data,'创建日期')" />
+          <el-table-column
+            label="操作"
+            fixed="right"
+            align="center"
+            width="200"
+          >
+            <template v-if="scope.row.userId !== 1" slot-scope="scope">
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+              <el-dropdown v-hasPermi="['system:user:resetPwd', 'system:user:edit']" size="mini" @command="(command) => handleCommand(command, scope.row)">
+                <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="handleResetPwd" icon="el-icon-key">重置密码</el-dropdown-item>
+                  <el-dropdown-item command="handleResetPwd" icon="el-icon-key">部门权限</el-dropdown-item>
+                  <el-dropdown-item command="handleResetPwd" icon="el-icon-key">数据权限</el-dropdown-item>
+                  <el-dropdown-item command="handleResetPwd" icon="el-icon-key">锁定账号</el-dropdown-item>
+                  <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check">分配角色</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </template>
+          </el-table-column>
+        </el-table>
+        <!--分页组件-->
+        <pagination />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import crudUser from '@/views/system/user'
+import crudDept from '@/api/system/dept'
+import { getAll, getLevel } from '@/api/system/role'
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+import { mapGetters } from 'vuex'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
+let userRoles = []
+const defaultForm = {
+  dept_id: null,
+  depts: [],
+  username: null,
+  person_name: null,
+  gender: '男',
+  email: null,
+  enabled: 'true',
+  roles: [],
+  phone: null,
+  password: null
+}
+export default {
+  name: 'User',
+  components: { Treeselect, crudOperation, rrOperation, udOperation, pagination },
+  cruds() {
+    return CRUD({ title: '用户', idField: 'user_id', url: 'api/users', crudMethod: { ...crudUser }})
+  },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  // 数据字典
+  dicts: ['user_status'],
+  data() {
+    return {
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      deptName: '', depts: [], deptDatas: [], level: 3, roles: [],
+      roleDatas: [], // 多选时使用
+      defaultProps: { children: 'children', label: 'name' },
+      permission: {
+        add: ['admin', 'user:add'],
+        edit: ['admin', 'user:edit'],
+        del: ['admin', 'user:del']
+      },
+      enabledTypeOptions: [
+        { key: '1', display_name: '激活' },
+        { key: '0', display_name: '锁定' }
+      ],
+      rules: {
+        username: [
+          { required: true, message: '请输入用户名', trigger: 'blur' },
+          { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
+        ],
+        person_name: [
+          { required: true, message: '请输入用户姓名', trigger: 'blur' },
+          { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'user'
+    ])
+  },
+  beforeMount() {
+    this.deptTree()
+  },
+  created() {
+    this.crud.msg.add = '新增成功'
+  },
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+  },
+  methods: {
+    changeRole(value) {
+      userRoles = []
+      value.forEach(function(data, index) {
+        const role = { id: data }
+        userRoles.push(role)
+      })
+    },
+    deleteTag(value) {
+      userRoles.forEach(function(data, index) {
+        if (data.id === value) {
+          userRoles.splice(index, value)
+        }
+      })
+    },
+    // 新增与编辑前做的操作
+    [CRUD.HOOK.afterToCU](crud, form) {
+      this.getRoles()
+      if (form.dept_id == null) {
+        crudDept.getDepts()
+      } else {
+        this.getSupDepts(form.dept_id)
+      }
+      this.getRoleLevel()
+      form.is_used = form.enabled.toString()
+    },
+    // 新增前将多选的值设置为空
+    [CRUD.HOOK.beforeToAdd]() {
+      this.form.password = '123456'
+      this.roleDatas = []
+    },
+    // 初始化编辑时候的角色与岗位
+    [CRUD.HOOK.beforeToEdit](crud, form) {
+      this.roleDatas = []
+      userRoles = []
+      const _this = this
+      const arr = form.roles.split(',')
+      arr.forEach(function(role, index) {
+        _this.roleDatas.push(role.id)
+        const rol = { id: role.id }
+        userRoles.push(rol)
+      })
+    },
+    // 提交前做的操作
+    [CRUD.HOOK.afterValidateCU](crud) {
+      if (!crud.form.depts) {
+        this.$message({
+          message: '部门不能为空',
+          type: 'warning'
+        })
+        return false
+      } else if (this.roleDatas.length === 0) {
+        this.$message({
+          message: '角色不能为空',
+          type: 'warning'
+        })
+        return false
+      }
+      const roles = []
+      userRoles.forEach(function(data, index) {
+        roles.push(data.id)
+      })
+      crud.form.roles = roles.toString()
+      crud.form.depts = crud.form.depts.toString()
+      return true
+    },
+    // 获取左侧部门数据
+    getDeptDatas(node, resolve) {
+      setTimeout(() => {
+        crudDept.getDeptTree({ name: node }).then(res => {
+          console.log('res', res)
+          if (resolve) {
+            resolve(res.content)
+          } else {
+            this.deptDatas = res.content
+          }
+        })
+      }, 100)
+    },
+
+    deptTree() {
+      setTimeout(() => {
+        crudDept.getDeptTree().then(res => {
+          this.deptDatas = res.content
+        })
+      }, 100)
+    },
+    getDepts() {
+      console.log('获取部门')
+      crudDept.getDepts({ is_used: 1 }).then(res => {
+        console.log('获取的部门信息', res)
+
+        this.depts = res.content.map(function(obj) {
+          if (obj.hasChildren) {
+            obj.children = null
+          }
+          return obj
+        })
+      })
+    },
+    getSupDepts(deptId) {
+      crudDept.getDeptSuperior(deptId).then(res => {
+        console.log('父部门', res)
+        const date = res.content
+        this.buildDepts(date)
+        this.depts = date
+      })
+    },
+    buildDepts(depts) {
+      depts.forEach(data => {
+        if (data.children) {
+          this.buildDepts(data.children)
+        }
+        if (data.hasChildren && !data.children) {
+          data.children = null
+        }
+      })
+    },
+    // 获取弹窗内部门数据
+    loadDepts({ action, parentNode, callback }) {
+      if (action === LOAD_CHILDREN_OPTIONS) {
+        crudDept.getDeptvo({ is_used: '1', pid: parentNode.dept_id }).then(res => {
+          parentNode.children = res.content.map(function(obj) {
+            obj.children = null
+            return obj
+          })
+          setTimeout(() => {
+            callback()
+          }, 100)
+        })
+      }
+    },
+    normalizer(node) {
+      return {
+        id: node.dept_id,
+        label: node.name,
+        children: node.children
+      }
+    },
+    // 切换部门
+    handleNodeClick(data) {
+      this.query.deptId = data.dept_id
+      this.query.needAll = true
+      this.crud.toQuery()
+    },
+    // 改变状态
+    changeEnabled(data, val) {
+      this.$confirm('此操作将 "' + this.dict.label.user_status[val] + '" ' + data.username + ', 是否继续？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        crudUser.edit(data).then(res => {
+          this.crud.notify(this.dict.label.user_status[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        }).catch(() => {
+          data.enabled = !data.enabled
+        })
+      }).catch(() => {
+        data.enabled = !data.enabled
+      })
+    },
+    // 获取弹窗内角色数据
+    getRoles() {
+      getAll().then(res => {
+        this.roles = res
+      }).catch(() => {
+      })
+    },
+    // 获取权限级别
+    getRoleLevel() {
+      getLevel().then(res => {
+        this.level = res.level
+      }).catch(() => {
+      })
+    },
+    checkboxT(row, rowIndex) {
+      return row.id !== this.user.id
+    },
+    resetPassword(row) {
+      row.password = null
+      this.$prompt('', '重置密码', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputPlaceholder: '请输入新的密码',
+        inputPattern: /^[A-Z|a-z|0-9|(._~!@#$^&*)]{6,20}$/,
+        inputErrorMessage: '密码格式不正确,只能是6-20位密码',
+        closeOnClickModal: false
+      }).then(({ value }) => {
+        row.password = value
+        crudUser.edit(row).then(res => {
+          this.crud.toQuery()
+          this.crud.notify('密码重置成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '取消输入'
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .vue-treeselect__control, ::v-deep .vue-treeselect__placeholder, ::v-deep .vue-treeselect__single-value {
+  height: 30px;
+  line-height: 30px;
+}
+</style>