diff --git a/lms/nladmin-ui/src/components/Dict/Dict.js b/lms/nladmin-ui/src/components/Dict/Dict.js
index 48554de74..b6a9cc697 100644
--- a/lms/nladmin-ui/src/components/Dict/Dict.js
+++ b/lms/nladmin-ui/src/components/Dict/Dict.js
@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import { get as getDictDetail } from '@/api/system/dictDetail'
+import { get as getDictDetail } from '@/views/system/dict/dictDetail'
 
 export default class Dict {
   constructor(dict) {
diff --git a/lms/nladmin-ui/src/router/index.js b/lms/nladmin-ui/src/router/index.js
index 2bc3d9086..b00e2ca80 100644
--- a/lms/nladmin-ui/src/router/index.js
+++ b/lms/nladmin-ui/src/router/index.js
@@ -3,7 +3,7 @@ import store from '@/store'
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css' // progress bar style
 import { getToken } from '@/utils/auth' // getToken from cookie
-import { buildMenus } from '@/api/system/menu'
+import { buildMenus } from '@/views/system/menu/menu'
 import { filterAsyncRouter } from '@/store/modules/permission'
 
 NProgress.configure({ showSpinner: false })// NProgress Configuration
@@ -53,7 +53,7 @@ router.beforeEach((to, from, next) => {
 })
 
 export const loadMenus = (next, to) => {
-  buildMenus().then(res => {
+  buildMenus(1).then(res => {
     const sdata = JSON.parse(JSON.stringify(res))
     const rdata = JSON.parse(JSON.stringify(res))
     const sidebarRoutes = filterAsyncRouter(sdata)
diff --git a/lms/nladmin-ui/src/settings.js b/lms/nladmin-ui/src/settings.js
index 860639a7a..22fe90be8 100644
--- a/lms/nladmin-ui/src/settings.js
+++ b/lms/nladmin-ui/src/settings.js
@@ -40,7 +40,7 @@ module.exports = {
   /**
    * @description token key
    */
-  TokenKey: 'NL-LMS-TOEKN',
+  TokenKey: 'Authorization',
   /**
    * @description 请求超时时间，毫秒（默认2分钟）
    */
diff --git a/lms/nladmin-ui/src/store/modules/user.js b/lms/nladmin-ui/src/store/modules/user.js
index 10d237566..dd8a8ce1a 100644
--- a/lms/nladmin-ui/src/store/modules/user.js
+++ b/lms/nladmin-ui/src/store/modules/user.js
@@ -32,6 +32,7 @@ const user = {
       return new Promise((resolve, reject) => {
         login(userInfo.username, userInfo.password, userInfo.code, userInfo.uuid).then(res => {
           console.log('登录信息：', res)
+          window.localStorage.setItem('sso_domain',res.domain);
           setToken(res.token, rememberMe)
           commit('SET_TOKEN', res.token)
           setUserInfo(res.user, commit)
diff --git a/lms/nladmin-ui/src/utils/auth.js b/lms/nladmin-ui/src/utils/auth.js
index b643e734a..87d6d70d7 100644
--- a/lms/nladmin-ui/src/utils/auth.js
+++ b/lms/nladmin-ui/src/utils/auth.js
@@ -8,11 +8,14 @@ export function getToken() {
 }
 
 export function setToken(token, rememberMe) {
+  const domain = window.localStorage.getItem('sso_domain')
   if (rememberMe) {
-    return Cookies.set(TokenKey, token, { expires: Config.tokenCookieExpires })
-  } else return Cookies.set(TokenKey, token)
+    return Cookies.set(TokenKey, token, { domain: domain, path: '/', expires: Config.tokenCookieExpires })
+  } else return Cookies.set(TokenKey, { domain: domain, path: '/' })
 }
 
 export function removeToken() {
-  return Cookies.remove(TokenKey)
+  const domain = window.localStorage.getItem('sso_domain')
+  window.localStorage.clear()
+  return Cookies.remove(TokenKey, { domain: domain, path: '/' })
 }
diff --git a/lms/nladmin-ui/src/views/generator/config.vue b/lms/nladmin-ui/src/views/generator/config.vue
index 98f0286c2..6ce472021 100644
--- a/lms/nladmin-ui/src/views/generator/config.vue
+++ b/lms/nladmin-ui/src/views/generator/config.vue
@@ -201,7 +201,7 @@
 import crud from '@/mixins/crud'
 import { update, get } from '@/api/generator/genConfig'
 import { save, sync, generator } from '@/api/generator/generator'
-import { getDicts } from '@/api/system/dict'
+import { getDicts } from '@/views/system/dict/dict'
 export default {
   name: 'GeneratorConfig',
   components: {},
diff --git a/lms/nladmin-ui/src/views/system/auto/index.vue b/lms/nladmin-ui/src/views/system/auto/index.vue
index d2b85aeeb..c0bd41c68 100644
--- a/lms/nladmin-ui/src/views/system/auto/index.vue
+++ b/lms/nladmin-ui/src/views/system/auto/index.vue
@@ -49,7 +49,7 @@ import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
-import crudJob from '@/api/system/timing'
+import crudJob from '@/views/system/timing/timing'
 
 export default {
   name: 'Autorun',
diff --git a/lms/nladmin-ui/src/views/system/dataPermission/dataPermission.js b/lms/nladmin-ui/src/views/system/dataPermission/dataPermission.js
new file mode 100644
index 000000000..687545ad5
--- /dev/null
+++ b/lms/nladmin-ui/src/views/system/dataPermission/dataPermission.js
@@ -0,0 +1,65 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/dataPermission',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/dataPermission/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/dataPermission',
+    method: 'put',
+    data
+  })
+}
+
+export function getDataScopeType() {
+  return request({
+    url: 'api/dataPermission/scopeType',
+    method: 'get'
+  })
+}
+
+export function getDataPermissionOption() {
+  return request({
+    url: 'api/dataPermission/dataPermissionOption',
+    method: 'get'
+  })
+}
+
+export function saveDataPermission(data) {
+  return request({
+    url: 'api/dataPermission/saveDataPermission',
+    method: 'post',
+    data
+  })
+}
+
+export function getDataShow(id) {
+  return request({
+    url: 'api/dataPermission/dataShow',
+    method: 'post',
+    data: id
+  })
+}
+
+export function getDataDetail(data) {
+  return request({
+    url: 'api/dataPermission/dataDetail',
+    method: 'post',
+    data: data
+  })
+}
+
+export default { add, edit, del, getDataScopeType, getDataPermissionOption, saveDataPermission, getDataShow, getDataDetail }
diff --git a/lms/nladmin-ui/src/views/system/dataPermission/index.vue b/lms/nladmin-ui/src/views/system/dataPermission/index.vue
new file mode 100644
index 000000000..d5d447db1
--- /dev/null
+++ b/lms/nladmin-ui/src/views/system/dataPermission/index.vue
@@ -0,0 +1,109 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表单组件-->
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
+          <el-form-item label="编码" prop="code">
+            <el-input v-model="form.code" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="名称" prop="name">
+            <el-input v-model="form.name" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="排序">
+            <el-input-number
+              v-model.number="form.orderSort"
+              :min="0"
+              :max="999"
+              controls-position="right"
+              style="width: 370px;"
+            />
+          </el-form-item>
+          <el-form-item label="备注">
+            <el-input v-model="form.remark" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="是否启用">
+            <el-switch v-model="form.isUsed" active-value="1" inactive-value="0" />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="false" prop="permissionId" label="permissionId" :min-width="flexWidth('permissionId',crud.data,'permissionId')" />
+        <el-table-column prop="code" label="编码" :min-width="flexWidth('code',crud.data,'编码')" />
+        <el-table-column prop="name" label="名称" :min-width="flexWidth('name',crud.data,'名称')" />
+        <el-table-column prop="orderSort" label="排序" :min-width="flexWidth('orderSort',crud.data,'排序')" />
+        <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
+        <el-table-column prop="createName" label="创建人" :min-width="flexWidth('createName',crud.data,'创建人')" />
+        <el-table-column prop="isUsed" label="是否启用" :min-width="flexWidth('isUsed',crud.data,'是否启用')" >
+          <template slot-scope="scope">
+            {{ scope.row.isUsed==1?'是':'否' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="createName" label="创建人" :min-width="flexWidth('createName',crud.data,'创建人')" />
+        <el-table-column prop="updateTime" label="修改时间" :min-width="flexWidth('updateTime',crud.data,'修改时间')" />
+        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudDataPermission from './dataPermission'
+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'
+
+const defaultForm = { permissionId: null, code: null, name: null, orderSort: '1', remark: null, createName: null, isUsed: '1', createId: null, createTime: null, updateTime: null, updateId: null, updateName: null }
+export default {
+  name: 'DataPermission',
+  components: { pagination, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({ title: '数据权限', url: 'api/dataPermission', idField: 'permissionId', sort: 'order_sort,asc', crudMethod: { ...crudDataPermission }})
+  },
+  data() {
+    return {
+      permission: {
+      },
+      rules: {
+        code: [
+          { required: true, message: '编码不能为空', trigger: 'blur' }
+        ],
+        name: [
+          { required: true, message: '名称不能为空', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/lms/nladmin-ui/src/api/system/dept.js b/lms/nladmin-ui/src/views/system/dept/dept.js
similarity index 67%
rename from lms/nladmin-ui/src/api/system/dept.js
rename to lms/nladmin-ui/src/views/system/dept/dept.js
index ed4f944bc..145887a88 100644
--- a/lms/nladmin-ui/src/api/system/dept.js
+++ b/lms/nladmin-ui/src/views/system/dept/dept.js
@@ -8,6 +8,14 @@ export function getDepts(params) {
   })
 }
 
+export function getDeptTree(params) {
+  return request({
+    url: '/api/dept/allTree',
+    method: 'get',
+    params
+  })
+}
+
 export function getDeptSuperior(ids) {
   const data = ids.length || ids.length === 0 ? ids : Array.of(ids)
   return request({
@@ -17,6 +25,14 @@ export function getDeptSuperior(ids) {
   })
 }
 
+export function getDeptvo(params) {
+  return request({
+    url: 'api/dept/vo',
+    method: 'get',
+    params
+  })
+}
+
 export function add(data) {
   return request({
     url: 'api/dept',
@@ -41,4 +57,4 @@ export function edit(data) {
   })
 }
 
-export default { add, edit, del, getDepts, getDeptSuperior }
+export default { add, edit, del, getDepts, getDeptSuperior, getDeptvo, getDeptTree }
diff --git a/lms/nladmin-ui/src/views/system/dept/index.vue b/lms/nladmin-ui/src/views/system/dept/index.vue
index 18b0db262..02565b0ed 100644
--- a/lms/nladmin-ui/src/views/system/dept/index.vue
+++ b/lms/nladmin-ui/src/views/system/dept/index.vue
@@ -14,7 +14,7 @@
           @keyup.enter.native="crud.toQuery"
         />
         <el-select
-          v-model="query.enabled"
+          v-model="query.isUsed"
           clearable
           size="mini"
           placeholder="状态"
@@ -28,7 +28,6 @@
       </div>
       <crudOperation :permission="permission" />
     </div>
-    <!--表单组件-->
     <el-dialog
       append-to-body
       :close-on-click-modal="false"
@@ -39,7 +38,7 @@
     >
       <el-form ref="form" inline :model="form" :rules="rules" size="mini" label-width="80px">
         <el-form-item label="部门编码" prop="code">
-          <el-input v-model="form.code" style="width: 370px;" />
+          <el-input v-model="form.code" :disabled="true" style="width: 370px;" />
         </el-form-item>
         <el-form-item label="部门名称" prop="name">
           <el-input v-model="form.name" style="width: 370px;" />
@@ -56,19 +55,20 @@
         <el-form-item label="外部标识" prop="extId">
           <el-input v-model="form.extId" style="width: 370px;" />
         </el-form-item>
-        <el-form-item label="版本ID" prop="versionId">
-          <el-input v-model="form.versionId" style="width: 370px;" />
-        </el-form-item>
         <el-form-item label="顶级部门">
           <el-radio-group v-model="form.isTop" style="width: 140px">
             <el-radio label="1">是</el-radio>
             <el-radio label="0">否</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="状态" prop="enabled">
-          <el-radio v-for="item in dict.dept_status" :key="item.id" v-model="form.enabled" :label="item.value">
-            {{ item.label }}
-          </el-radio>
+        <el-form-item label="状态" prop="isUesd">
+          <el-switch
+            v-model="form.isUsed"
+            active-color="#409EFF"
+            inactive-color="#F56C6C"
+            active-value = 'true'
+            inactive-valu='false'
+          />
         </el-form-item>
         <el-form-item v-if="form.isTop === '0'" style="margin-bottom: 0;" label="上级部门" prop="pid">
           <treeselect
@@ -76,7 +76,8 @@
             :load-options="loadDepts"
             :options="depts"
             style="width: 370px;"
-            placeholder="选择上级类目"
+            :normalizer="normalizer"
+            placeholder="选择部门类目"
           />
         </el-form-item>
       </el-form>
@@ -85,7 +86,7 @@
         <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
       </div>
     </el-dialog>
-    <!--表格渲染-->
+    <!--表格渲染  :load="getDeptDatas" 点击事件 row-key需要指定唯一的数据id-->
     <el-table
       ref="table"
       v-loading="crud.loading"
@@ -93,7 +94,7 @@
       :load="getDeptDatas"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
       :data="crud.data"
-      row-key="id"
+      row-key="deptId"
       @select="crud.selectChange"
       @select-all="crud.selectAllChange"
       @selection-change="crud.selectionChangeHandler"
@@ -102,22 +103,18 @@
       <!--      <el-table-column label="编码" prop="code" />-->
       <el-table-column label="名称" prop="name" />
       <el-table-column label="排序" prop="deptSort" />
-      <el-table-column label="状态" align="center" prop="enabled">
+      <el-table-column label="状态" align="center" prop="isUsed">
         <template slot-scope="scope">
           <el-switch
-            v-model="scope.row.enabled"
+            v-model="scope.row.isUsed"
             :disabled="scope.row.id === 1"
             active-color="#409EFF"
             inactive-color="#F56C6C"
-            @change="changeEnabled(scope.row, scope.row.enabled,)"
+            @change="changeEnabled(scope.row, scope.row.isUsed,)"
           />
         </template>
       </el-table-column>
-      <el-table-column prop="createTime" label="创建日期">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column prop="createTime" label="创建日期" />
       <el-table-column
         v-permission="['admin','dept:edit','dept:del']"
         label="操作"
@@ -139,7 +136,7 @@
 </template>
 
 <script>
-import crudDept from '@/api/system/dept'
+import crudDept from '@/views/system/dept/dept'
 import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
@@ -148,22 +145,20 @@ import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 
 const defaultForm = {
-  id: null,
   code: null,
   name: null,
   isTop: '1',
-  subCount: 0,
+  sub_count: 0,
   pid: null,
   deptSort: 999,
-  enabled: 'true',
-  extId: null,
-  versionId: null
+  isUsed: true,
+  extId: null
 }
 export default {
   name: 'Dept',
   components: { Treeselect, crudOperation, rrOperation, udOperation },
   cruds() {
-    return CRUD({ title: '部门', url: 'api/dept', crudMethod: { ...crudDept }})
+    return CRUD({ title: '部门', idField: 'deptId', url: 'api/dept/vo', crudMethod: { ...crudDept }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   // 设置数据字典
@@ -172,9 +167,6 @@ export default {
     return {
       depts: [],
       rules: {
-        code: [
-          { required: true, message: '请输入编码', trigger: 'blur' }
-        ],
         name: [
           { required: true, message: '请输入名称', trigger: 'blur' }
         ],
@@ -188,16 +180,16 @@ export default {
         del: ['admin', 'dept:del']
       },
       enabledTypeOptions: [
-        { key: 'true', display_name: '正常' },
-        { key: 'false', display_name: '禁用' }
+        { key: true, display_name: '启用' },
+        { key: false, display_name: '禁用' }
       ]
     }
   },
   methods: {
     getDeptDatas(tree, treeNode, resolve) {
-      const params = { pid: tree.id }
+      const params = { pid: tree.deptId }
       setTimeout(() => {
-        crudDept.getDepts(params).then(res => {
+        crudDept.getDeptvo(params).then(res => {
           resolve(res.content)
         })
       }, 100)
@@ -206,12 +198,12 @@ export default {
     [CRUD.HOOK.afterToCU](crud, form) {
       if (form.pid !== null) {
         form.isTop = '0'
-      } else if (form.id !== null) {
+      } else {
         form.isTop = '1'
       }
-      form.enabled = `${form.enabled}`
-      if (form.id != null) {
-        this.getSupDepts(form.id)
+      form.isUsed = `${form.isUsed}`
+      if (form.pid != null) {
+        this.getSupDepts(form.pid)
       } else {
         this.getDepts()
       }
@@ -234,7 +226,7 @@ export default {
       })
     },
     getDepts() {
-      crudDept.getDepts({ enabled: true }).then(res => {
+      crudDept.getDeptvo({ isUsed: true }).then(res => {
         this.depts = res.content.map(function(obj) {
           if (obj.hasChildren) {
             obj.children = null
@@ -246,11 +238,9 @@ export default {
     // 获取弹窗内部门数据
     loadDepts({ action, parentNode, callback }) {
       if (action === LOAD_CHILDREN_OPTIONS) {
-        crudDept.getDepts({ enabled: true, pid: parentNode.id }).then(res => {
+        crudDept.getDeptvo({ isUsed: true, pid: parentNode.deptId }).then(res => {
           parentNode.children = res.content.map(function(obj) {
-            if (obj.hasChildren) {
-              obj.children = null
-            }
+            obj.children = null
             return obj
           })
           setTimeout(() => {
@@ -261,7 +251,7 @@ export default {
     },
     // 提交前的验证
     [CRUD.HOOK.afterValidateCU]() {
-      if (this.form.pid !== null && this.form.pid === this.form.id) {
+      if (this.form.isTop !== '1' && this.form.pid == null) {
         this.$message({
           message: '上级部门不能为空',
           type: 'warning'
@@ -275,23 +265,29 @@ export default {
     },
     // 改变状态
     changeEnabled(data, val) {
-      this.$confirm('此操作将 "' + this.dict.label.dept_status[val] + '" ' + data.name + '部门, 是否继续？', '提示', {
+      const satus = this.enabledTypeOptions.find(item => { return item.key == data.isUsed })
+
+      this.$confirm('此操作将 "' + satus.display_name + '" ' + data.name + '部门, 是否继续？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         crudDept.edit(data).then(res => {
-          this.crud.notify(this.dict.label.dept_status[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        }).catch(err => {
-          data.enabled = !data.enabled
-          console.log(err.response.data.message)
+          this.crud.notify(satus.display_name + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
         })
       }).catch(() => {
-        data.enabled = !data.enabled
+        data.isUsed = !data.isUsed
       })
     },
     checkboxT(row, rowIndex) {
       return row.id !== 1
+    },
+    normalizer(node) {
+      return {
+        id: node.deptId,
+        label: node.name,
+        children: node.children
+      }
     }
   }
 }
diff --git a/lms/nladmin-ui/src/api/system/dict.js b/lms/nladmin-ui/src/views/system/dict/dict.js
similarity index 100%
rename from lms/nladmin-ui/src/api/system/dict.js
rename to lms/nladmin-ui/src/views/system/dict/dict.js
diff --git a/lms/nladmin-ui/src/api/system/dictDetail.js b/lms/nladmin-ui/src/views/system/dict/dictDetail.js
similarity index 67%
rename from lms/nladmin-ui/src/api/system/dictDetail.js
rename to lms/nladmin-ui/src/views/system/dict/dictDetail.js
index e8dc51204..b9f5ea31f 100644
--- a/lms/nladmin-ui/src/api/system/dictDetail.js
+++ b/lms/nladmin-ui/src/views/system/dict/dictDetail.js
@@ -1,13 +1,13 @@
 import request from '@/utils/request'
 
-export function get(dictName) {
+export function get(code) {
   const params = {
-    dictName,
+    code,
     page: 0,
     size: 9999
   }
   return request({
-    url: 'api/dictDetail',
+    url: 'api/dict/dictDetail',
     method: 'get',
     params
   })
@@ -20,7 +20,7 @@ export function getDictMap(dictName) {
     size: 9999
   }
   return request({
-    url: 'api/dictDetail/map',
+    url: 'api/dict/dictDetail/map',
     method: 'get',
     params
   })
@@ -28,7 +28,7 @@ export function getDictMap(dictName) {
 
 export function add(data) {
   return request({
-    url: 'api/dictDetail',
+    url: 'api/dict/dictDetail',
     method: 'post',
     data
   })
@@ -36,17 +36,17 @@ export function add(data) {
 
 export function del(id) {
   return request({
-    url: 'api/dictDetail/' + id,
+    url: 'api/dict/dictDetail/' + id,
     method: 'delete'
   })
 }
 
 export function edit(data) {
   return request({
-    url: 'api/dictDetail',
+    url: 'api/dict/dictDetail',
     method: 'put',
     data
   })
 }
 
-export default { add, edit, del }
+export default { get, add, edit, del, getDictMap }
diff --git a/lms/nladmin-ui/src/views/system/dict/dictDetail.vue b/lms/nladmin-ui/src/views/system/dict/dictDetail.vue
index 1c439fd56..b99733d50 100644
--- a/lms/nladmin-ui/src/views/system/dict/dictDetail.vue
+++ b/lms/nladmin-ui/src/views/system/dict/dictDetail.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div v-if="query.dictName === ''">
+    <div v-if="query.code === ''">
       <div class="my-code">点击字典查看详情</div>
     </div>
     <div v-else>
@@ -8,12 +8,27 @@
       <div class="head-container">
         <div v-if="crud.props.searchToggle">
           <!-- 搜索 -->
-          <el-input v-model="query.label" clearable size="mini" placeholder="输入字典标签查询" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+          <el-input
+            v-model="query.label"
+            clearable
+            size="mini"
+            placeholder="输入字典标签查询"
+            style="width: 200px;"
+            class="filter-item"
+            @keyup.enter.native="toQuery"
+          />
           <rrOperation />
         </div>
       </div>
       <!--表单组件-->
-      <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible="crud.status.cu > 0" :title="crud.status.title" width="500px">
+      <el-dialog
+        append-to-body
+        :close-on-click-modal="false"
+        :before-close="crud.cancelCU"
+        :visible="crud.status.cu > 0"
+        :title="crud.status.title"
+        width="500px"
+      >
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
           <el-form-item label="字典标签" prop="label">
             <el-input v-model="form.label" style="width: 370px;" />
@@ -21,8 +36,23 @@
           <el-form-item label="字典值" prop="value">
             <el-input v-model="form.value" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="排序" prop="dictSort">
-            <el-input-number v-model.number="form.dictSort" :min="0" :max="999" controls-position="right" style="width: 370px;" />
+          <el-form-item label="排序" prop="dict_sort">
+            <el-input-number
+              v-model.number="form.dictSort"
+              :min="0"
+              :max="999"
+              controls-position="right"
+              style="width: 370px;"
+            />
+          </el-form-item>
+          <el-form-item label="参数1" prop="para1">
+            <el-input v-model="form.para1" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="参数2" prop="para2">
+            <el-input v-model="form.para2" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="参数3" prop="para3">
+            <el-input v-model="form.para3" style="width: 370px;" />
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -31,14 +61,30 @@
         </div>
       </el-dialog>
       <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" highlight-current-row style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column label="所属字典" width="135">
-          {{ query.dictName }}
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        highlight-current-row
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column label="所属字典" min-width="150" show-overflow-tooltip>
+          {{ query.code }}
         </el-table-column>
-        <el-table-column prop="label" label="字典标签" align="center" width="100" />
+        <el-table-column prop="label" label="字典标签" align="center" width="120" show-overflow-tooltip />
         <el-table-column prop="value" label="字典值" align="center" width="60" />
         <el-table-column prop="dictSort" label="排序" align="center" width="65" />
-        <el-table-column v-permission="['admin','dict:edit','dict:del']" label="操作" align="center" fixed="right">
+        <el-table-column prop="para1" label="参数1" align="center" width="65" />
+        <el-table-column prop="para2" label="参数2" align="center" width="65" />
+        <el-table-column prop="para3" label="参数3" align="center" width="65" />
+        <el-table-column
+          v-permission="['admin','dict:edit','dict:del']"
+          label="操作"
+          align="center"
+          width="115px"
+          fixed="right"
+        >
           <template slot-scope="scope">
             <udOperation
               :data="scope.row"
@@ -54,19 +100,24 @@
 </template>
 
 <script>
-import crudDictDetail from '@/api/system/dictDetail'
-import CRUD, { presenter, header, form } from '@crud/crud'
+import crudDictDetail from '@/views/system/dict/dictDetail'
+import CRUD, { form, header, presenter } from '@crud/crud'
 import pagination from '@crud/Pagination'
 import rrOperation from '@crud/RR.operation'
 import udOperation from '@crud/UD.operation'
 
-const defaultForm = { id: null, label: null, value: null, dictSort: 999 }
+const defaultForm = { dictId: null, name: null, label: null, value: null, dictSort: null, dictType: null, para1: null, para2: null, para3: null, createId: null, createName: null, createTime: null, updateId: null, updateName: null, updateTime: null }
 
 export default {
   components: { pagination, rrOperation, udOperation },
   cruds() {
     return [
-      CRUD({ title: '字典详情', url: 'api/dictDetail', query: { dictName: '' }, sort: ['dictSort,asc', 'id,desc'],
+      CRUD({
+        title: '字典详情',
+        url: 'api/dict/dictDetail',
+        query: { code: '' },
+        idField: 'dictId',
+        sort: ['dictSort,asc', 'dictId,desc'],
         crudMethod: { ...crudDictDetail },
         optShow: {
           add: true,
@@ -82,7 +133,7 @@ export default {
     presenter(),
     header(),
     form(function() {
-      return Object.assign({ dict: { id: this.dictId }}, defaultForm)
+      return Object.assign({ dict: { dictId: this.dictId }}, defaultForm)
     })],
   data() {
     return {
@@ -109,7 +160,7 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
- ::v-deep .el-input-number .el-input__inner {
-    text-align: left;
-  }
+::v-deep .el-input-number .el-input__inner {
+  text-align: left;
+}
 </style>
diff --git a/lms/nladmin-ui/src/views/system/dict/index.vue b/lms/nladmin-ui/src/views/system/dict/index.vue
index c205c5643..76bbe736c 100644
--- a/lms/nladmin-ui/src/views/system/dict/index.vue
+++ b/lms/nladmin-ui/src/views/system/dict/index.vue
@@ -3,11 +3,11 @@
     <!--表单组件-->
     <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible="crud.status.cu > 0" :title="crud.status.title" width="500px">
       <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
-        <el-form-item label="字典名称" prop="name">
-          <el-input v-model="form.name" style="width: 370px;" />
+        <el-form-item label="字典编码" prop="code">
+          <el-input v-model="form.code" style="width: 370px;" />
         </el-form-item>
-        <el-form-item label="描述">
-          <el-input v-model="form.description" style="width: 370px;" />
+        <el-form-item label="名称">
+          <el-input v-model="form.name" style="width: 370px;" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -29,10 +29,17 @@
             <crudOperation :permission="permission" />
           </div>
           <!--表格渲染-->
-          <el-table ref="table" v-loading="crud.loading" :data="crud.data" highlight-current-row style="width: 100%;" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange">
+          <el-table
+            ref="table"
+            v-loading="crud.loading"
+            :data="crud.data"
+            highlight-current-row
+            style="width: 100%;"
+            @selection-change="crud.selectionChangeHandler"
+            @current-change="handleCurrentChange">
             <el-table-column type="selection" width="55" />
+            <el-table-column show-overflow-tooltip prop="code" label="编码" />
             <el-table-column show-overflow-tooltip prop="name" label="名称" />
-            <el-table-column show-overflow-tooltip prop="description" label="描述" />
             <el-table-column v-permission="['admin','dict:edit','dict:del']" label="操作" width="130px" align="center" fixed="right">
               <template slot-scope="scope">
                 <udOperation
@@ -52,7 +59,7 @@
           <div slot="header" class="clearfix">
             <span>字典详情</span>
             <el-button
-              v-if="checkPermission(['admin','dict:add']) && this.$refs.dictDetail && this.$refs.dictDetail.query.dictName"
+              v-if="checkPermission(['admin','dict:add']) && this.$refs.dictDetail && this.$refs.dictDetail.query.code"
               class="filter-item"
               size="mini"
               style="float: right;padding: 4px 10px"
@@ -70,8 +77,8 @@
 
 <script>
 import checkPermission from '@/utils/permission'
-import dictDetail from './dictDetail'
-import crudDict from '@/api/system/dict'
+import dictDetail from './dictDetail.vue'
+import crudDict from '@/views/system/dict/dict'
 
 import CRUD, { presenter, header, form } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
@@ -79,14 +86,14 @@ import pagination from '@crud/Pagination'
 import rrOperation from '@crud/RR.operation'
 import udOperation from '@crud/UD.operation'
 
-const defaultForm = { id: null, name: null, description: null, dictDetails: [] }
+const defaultForm = { dictId: null, code: null, name: null, label: null, value: null, dictSort: null, dictType: null, para1: null, para2: null, para3: null, createId: null, createName: null, createTime: null, updateId: null, updateName: null, updateTime: null }
 
 export default {
   name: 'Dict',
   components: { crudOperation, pagination, rrOperation, udOperation, dictDetail },
   cruds() {
     return [
-      CRUD({ title: '字典', url: 'api/dict', crudMethod: { ...crudDict }})
+      CRUD({ title: '字典', url: 'api/dict', idField: 'dictId', crudMethod: { ...crudDict }})
     ]
   },
   mixins: [presenter(), header(), form(defaultForm)],
@@ -97,8 +104,8 @@ export default {
         { key: 'description', display_name: '描述' }
       ],
       rules: {
-        name: [
-          { required: true, message: '请输入名称', trigger: 'blur' }
+        code: [
+          { required: true, message: '请输入编码', trigger: 'blur' }
         ]
       },
       permission: {
@@ -113,15 +120,15 @@ export default {
     // 获取数据前设置好接口地址
     [CRUD.HOOK.beforeRefresh]() {
       if (this.$refs.dictDetail) {
-        this.$refs.dictDetail.query.dictName = ''
+        this.$refs.dictDetail.query.code = ''
       }
       return true
     },
     // 选中字典后，设置字典详情数据
     handleCurrentChange(val) {
       if (val) {
-        this.$refs.dictDetail.query.dictName = val.name
-        this.$refs.dictDetail.dictId = val.id
+        this.$refs.dictDetail.query.code = val.code
+        this.$refs.dictDetail.form.code = val.code
         this.$refs.dictDetail.crud.toQuery()
       }
     }
diff --git a/lms/nladmin-ui/src/views/system/grid/index.vue b/lms/nladmin-ui/src/views/system/grid/index.vue
deleted file mode 100644
index 2593a07d8..000000000
--- a/lms/nladmin-ui/src/views/system/grid/index.vue
+++ /dev/null
@@ -1,387 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <div v-if="crud.props.searchToggle">
-        <!-- 搜索 -->
-        <el-input
-          v-model="query.name"
-          size="mini"
-          clearable
-          placeholder="输入表格名称搜索"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <rrOperation />
-      </div>
-      <crudOperation :permission="permission">
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-circle-plus-outline"
-          size="mini"
-          :disabled="crud.selections.length !== 1"
-          @click="toAdd(crud.selections[0])"
-        >
-          添加字段
-        </el-button>
-      </crudOperation>
-    </div>
-    <!-- 表单渲染 -->
-    <el-table
-      ref="table"
-      v-loading="crud.loading"
-      :data="crud.data"
-      size="mini"
-      style="width: 100%;"
-      @selection-change="crud.selectionChangeHandler"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column v-if="false" prop="id" label="id" />
-      <el-table-column prop="code" label="编码" />
-      <el-table-column prop="name" label="名称" />
-      <el-table-column prop="remark" label="备注" />
-      <el-table-column prop="is_active" label="启用" width="75px">
-        <template slot-scope="scope">
-          <span v-if="scope.row.is_active==0">否</span>
-          <span v-else>是</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="create_name" label="创建者" />
-      <el-table-column v-permission="['admin','grid:edit','grid:del']" label="操作" width="150px" align="center">
-        <template slot-scope="scope">
-          <udOperation
-            :data="scope.row"
-            :permission="permission"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页组件-->
-    <pagination />
-    <!--增改表单-->
-    <el-dialog
-      :close-on-click-modal="false"
-      :before-close="crud.cancelCU"
-      :visible.sync="crud.status.cu > 0"
-      :title="crud.status.title"
-      width="500px"
-    >
-      <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
-        <el-form-item label="编码" prop="code">
-          <el-input v-model="form.code" style="width: 370px;" />
-        </el-form-item>
-        <el-form-item label="名字" prop="name">
-          <el-input v-model="form.name" style="width: 370px;" />
-        </el-form-item>
-        <el-form-item label="启用" prop="is_active">
-          <el-radio-group v-model="form.is_active" size="mini">
-            <el-radio-button label="1">是</el-radio-button>
-            <el-radio-button label="0">否</el-radio-button>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="备注" prop="description">
-          <el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="crud.cancelCU">取消</el-button>
-        <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-      </div>
-    </el-dialog>
-    <!--添加字段-->
-    <el-dialog
-      :close-on-click-modal="false"
-      :visible.sync="addFieldVisible"
-      title="添加字段"
-      fullscreen
-      width="500px"
-    >
-      <div style="text-align: right; padding: 0 0 10px 0">
-        <el-button type="primary" @click="addItem">添加一行</el-button>
-      </div>
-      <el-form ref="gridFieldFrom" :model="gridFieldFrom">
-        <el-table
-          :header-cell-style="{'text-align':'center'}"
-          class="mt-10"
-          :data="gridFieldFrom.gridFieldData"
-          stripe
-          border
-        >
-          <el-table-column type="index" label="序号" min-width="50" />
-          <el-table-column label="编码" prop="code" min-width="120">
-            <template slot-scope="scope">
-              <el-form-item
-                :prop="'gridFieldData.'+ scope.$index + '.code'"
-                :rules="[
-                  { required: true, message: '编码不能为空!', trigger: 'blur' }
-                ]"
-              >
-                <el-input v-model="scope.row.code" style="text-align: center" />
-              </el-form-item>
-            </template>
-          </el-table-column>
-          <el-table-column label="字段名字" prop="name" min-width="120" align="right">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.name" />
-            </template>
-          </el-table-column>
-          <el-table-column label="宽度" prop="width" min-width="60">
-            <template slot-scope="scope">
-              <el-form-item
-                :prop="'gridFieldData.'+ scope.$index + '.width'"
-                :rules="[
-                  { required: true, message: '宽度不能为空!', trigger: 'blur' }
-                ]"
-              >
-                <el-input-number v-model="scope.row.width" style="width: 100%" controls-position="right" :min="60" :step="5" />
-              </el-form-item>
-            </template>
-          </el-table-column>
-          <el-table-column label="对齐方式" prop="align" min-width="60">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.align" placeholder="请选择">
-                <el-option
-                  v-for="item in alignOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column label="格式列" prop="format" min-width="60">
-            <template slot-scope="scope">
-              <el-form-item
-                :prop="'gridFieldData.'+ scope.$index + '.format'"
-                :rules="[
-                  { required: true, message: '格式列不能为空!', trigger: 'blur' }
-                ]"
-              >
-                <el-input v-model="scope.row.format" />
-              </el-form-item>
-            </template>
-          </el-table-column>
-          <el-table-column label="排序号" prop="" min-width="60">
-            <template slot-scope="scope">
-              <el-form-item
-                :prop="'gridFieldData.'+ scope.$index + '.sort_num'"
-                :rules="[
-                  { required: true, message: '排序号不能为空!', trigger: 'blur' }
-                ]"
-              >
-                <el-input-number v-model="scope.row.sort_num" style="width: 100%" controls-position="right" :min="1" :step="5" />
-              </el-form-item>
-            </template>
-          </el-table-column>
-          <el-table-column label="隐藏" prop="is_hidden" min-width="60" align="center">
-            <template slot-scope="scope">
-              <el-radio-group v-model="scope.row.is_hidden" size="mini">
-                <el-radio-button label="1">是</el-radio-button>
-                <el-radio-button label="0">否</el-radio-button>
-              </el-radio-group>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" min-width="30" align="center">
-            <template slot-scope="scope">
-              <el-button size="mini" type="danger" icon="el-icon-minus" circle @click="deleteField(scope.$index)" />
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="addFieldVisible = false">取消</el-button>
-        <el-button :loading="crud.cu === 2" type="primary" @click="commitData('gridFieldFrom')">确认</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-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 crudTables from '@/api/system/grid'
-import crudGridFields from '@/api/system/gridField'
-const defaultForm = {
-  id: null,
-  code: null,
-  name: null,
-  remark: null,
-  create_name: null,
-  create_time: null,
-  update_optname: null,
-  update_time: null
-}
-export default {
-  name: 'Grid',
-  components: { rrOperation, crudOperation, udOperation, pagination },
-  cruds() {
-    return CRUD({
-      title: '表格',
-      url: 'api/grid',
-      sort: 'update_time,asc',
-      crudMethod: {
-        ...crudTables
-      },
-      optShow: {
-        add: true,
-        edit: true,
-        del: true
-      }
-    })
-  },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  data() {
-    return {
-      permission: {
-        add: ['admin', 'grid:add'],
-        edit: ['admin', 'grid:edit'],
-        del: ['admin', 'grid:del']
-      },
-      rules: {
-        code: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        name: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        value: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        create_time: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ]
-      },
-      addFieldVisible: false,
-      gridFieldFrom: {
-        grid_id: null,
-        gridFieldData: [
-          {
-            id: null,
-            code: null,
-            name: null,
-            width: 370,
-            align: null,
-            format: null,
-            sort_num: null,
-            remark: null,
-            is_hidden: 0,
-            create_name: null,
-            create_time: null,
-            update_optname: null,
-            update_time: null,
-            grid_id: null
-          }
-        ]
-      },
-      alignOptions: [{
-        value: 'center',
-        label: '居中'
-      }, {
-        value: 'left',
-        label: '左对齐'
-      }, {
-        value: 'right',
-        label: '右对齐'
-      }]
-    }
-  },
-  methods: {
-    initGridFieldFrom() {
-      this.gridFieldFrom = {
-        grid_id: null,
-        gridFieldData: [
-          {
-            id: null,
-            code: null,
-            name: null,
-            width: 370,
-            align: null,
-            format: null,
-            sort_num: null,
-            remark: null,
-            is_hidden: 0,
-            create_name: null,
-            create_time: null,
-            update_optname: null,
-            update_time: null,
-            grid_id: null
-          }
-        ]
-      }
-    },
-    toAdd(val) {
-      // 初始化
-      this.initGridFieldFrom()
-      this.gridFieldFrom.grid_id = val.id
-      // 先获取数据在打开
-      // 根据grid_id获取数据
-      crudGridFields.getGridFieldsById(val.id).then(res => {
-        // console.log(res)
-        if (res.length !== 0) {
-          this.gridFieldFrom.gridFieldData = res
-        }
-      })
-      // console.log(val.id)
-      this.addFieldVisible = true
-    },
-    addItem() {
-      this.gridFieldFrom.gridFieldData.push(
-        {
-          id: null,
-          code: null,
-          name: null,
-          width: 370,
-          align: null,
-          format: null,
-          sort_num: null,
-          remark: null,
-          is_hidden: 0,
-          create_name: null,
-          create_time: null,
-          update_optname: null,
-          update_time: null,
-          grid_id: null
-        }
-      )
-    },
-    commitData(gridFieldFrom) {
-      this.$refs[gridFieldFrom].validate((valid) => {
-        if (valid) {
-          // 提交保存
-          crudGridFields.batchAdd(this.gridFieldFrom).then(res => {
-            this.$notify({
-              title: '成功',
-              message: '数据添加成功',
-              type: 'success'
-            })
-          }).finally(() => {
-            this.addFieldVisible = false
-          })
-        } else {
-          console.log('error submit!!')
-          return false
-        }
-      })
-    },
-    deleteField(index) { // 添加字段的时候删除一条数据
-      console.log(index)
-      if (this.gridFieldFrom.gridFieldData.length > 1) {
-        this.gridFieldFrom.gridFieldData.splice(index, 1)
-      }
-      console.log(this.gridFieldFrom.gridFieldData)
-    }
-  }
-}
-</script>
-
-<style scoped>
-.el-form-item--mini.el-form-item {
-  margin: 5px !important;
-}
-</style>
diff --git a/lms/nladmin-ui/src/views/system/grid/table.vue b/lms/nladmin-ui/src/views/system/grid/table.vue
deleted file mode 100644
index e91dfded9..000000000
--- a/lms/nladmin-ui/src/views/system/grid/table.vue
+++ /dev/null
@@ -1,93 +0,0 @@
-<template>
-  <div style="padding: 10px">
-    <el-table
-      ref="table"
-      v-loading="crud.loading"
-      highlight-current-row
-      style="width: 100%;"
-      :data="crud.data"
-      border
-      @selection-change="crud.selectionChangeHandler"
-    >
-      <el-table-column type="selection" width="55" />
-      <div v-for="(item, index) in tableHeader" :key="index">
-        <el-table-column
-          v-if="item.code === 'level' && item.is_hidden === '0'"
-          :prop="item.code"
-          :label="item.name"
-          :width="item.width"
-          :align="item.align"
-        >
-          <template slot-scope="scope">
-            <el-switch
-              v-model="scope.row.level === 1"
-              active-color="#13ce66"
-              inactive-color="#ff4949"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-else-if="item.code === 'name' && item.is_hidden === '0'"
-          :label="item.name"
-          :width="item.width"
-          :align="item.align"
-        >
-          <template slot-scope="scope">
-            <el-tag type="success">
-              {{ scope.row.name }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-else-if="item.is_hidden === '0'"
-          :prop="item.code"
-          :label="item.name"
-          :width="item.width"
-          :align="item.align"
-        />
-      </div>
-      <el-table-column label="操作" align="center">
-        <template slot-scope="scope">
-          <el-button size="mini" type="danger" icon="el-icon-minus" @click="del(scope.row)" />
-        </template>
-      </el-table-column>
-    </el-table>
-  </div>
-</template>
-
-<script>
-import crudGridFields from '@/api/system/gridField'
-import CRUD, { crud, header, presenter } from '@crud/crud'
-import crudRoles from '@/api/system/role'
-
-const role_grid_code = 'roleGrid' // 定义角色表格样式code
-export default {
-  name: 'TableTest',
-  cruds() {
-    return CRUD({ title: '角色', url: 'api/roles', sort: 'level,asc', crudMethod: { ...crudRoles }})
-  },
-  mixins: [presenter(), header(), crud()],
-  data() {
-    return {
-      tableHeader: []
-    }
-  },
-  created() {
-    this.initRoleGridData()
-  },
-  methods: {
-    initRoleGridData() { // 获取表格字段属性
-      crudGridFields.getGridFieldsByCode(role_grid_code).then(res => {
-        this.tableHeader = res
-      })
-    },
-    del(row) {
-      console.log(row)
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/lms/nladmin-ui/src/views/system/logicflow/editor/components/Diagram.vue b/lms/nladmin-ui/src/views/system/logicflow/editor/components/Diagram.vue
index fbd00de05..81a0a0218 100644
--- a/lms/nladmin-ui/src/views/system/logicflow/editor/components/Diagram.vue
+++ b/lms/nladmin-ui/src/views/system/logicflow/editor/components/Diagram.vue
@@ -193,7 +193,6 @@ export default {
         } else {
           this.showChoice = false
         }
-        // debugger
         properties = { ...properties, ...node.properties }
       })
       edges.forEach(edge => {
@@ -203,7 +202,6 @@ export default {
       return properties
     },
     $_dragInNode(type) {
-      // debugger
       this.lf.dnd.startDrag({ // 拖拽创建结点
         type
       })
@@ -240,8 +238,6 @@ export default {
       lf.render(data)
     },
     $_saveGraph() { // 保存数据
-      // debugger
-      // console.log(this.defaultForm)
       if (this.defaultForm.stage_code === null) {
         this.$message.error('请选择舞台！')
       } else {
diff --git a/lms/nladmin-ui/src/views/system/logicflow/image/index.vue b/lms/nladmin-ui/src/views/system/logicflow/image/index.vue
index 6c1eb6492..713f1e639 100644
--- a/lms/nladmin-ui/src/views/system/logicflow/image/index.vue
+++ b/lms/nladmin-ui/src/views/system/logicflow/image/index.vue
@@ -115,7 +115,7 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
-import { get } from '@/api/system/dictDetail'
+import { get } from '@/views/system/dict/dictDetail'
 import { mapGetters } from 'vuex'
 import { getToken } from '@/utils/auth'
 
diff --git a/lms/nladmin-ui/src/views/system/menu/dd/index.vue b/lms/nladmin-ui/src/views/system/menu/dd/index.vue
new file mode 100644
index 000000000..da266f5f4
--- /dev/null
+++ b/lms/nladmin-ui/src/views/system/menu/dd/index.vue
@@ -0,0 +1,304 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <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"
+        />
+        <rrOperation />
+      </div>
+      <crudOperation :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="650px"
+    >
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="80px">
+        <el-form-item label="菜单类型" prop="type">
+          <el-radio-group v-model="form.type" size="mini">
+            <el-radio-button label="1">系统</el-radio-button>
+            <el-radio-button label="2">目录</el-radio-button>
+            <el-radio-button label="3">菜单</el-radio-button>
+            <el-radio-button label="4">按钮</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item v-show="form.type.toString() !== '1' && form.type.toString() !== '4' " label="菜单图标" prop="icon">
+          <el-popover
+            placement="bottom-start"
+            width="450"
+            trigger="click"
+            @show="$refs['iconSelect'].reset()"
+          >
+            <IconSelect ref="iconSelect" @selected="selected" />
+            <el-input slot="reference" v-model="form.icon" style="width: 450px;" placeholder="点击选择图标" readonly>
+              <svg-icon
+                v-if="form.icon"
+                slot="prefix"
+                :icon-class="form.icon"
+                class="el-input__icon"
+                style="height: 32px;width: 16px;"
+              />
+              <i v-else slot="prefix" class="el-icon-search el-input__icon" />
+            </el-input>
+          </el-popover>
+        </el-form-item>
+        <el-form-item v-show="form.type.toString() !== '2' && form.type.toString() !== '1'" label="外链菜单" prop="iframe">
+          <el-radio-group v-model="form.iframe" size="mini">
+            <el-radio-button label="1">是</el-radio-button>
+            <el-radio-button label="0">否</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item v-show="form.type.toString() === '2'" label="菜单缓存" prop="cache">
+          <el-radio-group v-model="form.cache" size="mini">
+            <el-radio-button label="1">是</el-radio-button>
+            <el-radio-button label="0">否</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item v-show="form.type.toString() !== '2' && form.type.toString() !== '1' " label="菜单可见" prop="hidden">
+          <el-radio-group v-model="form.hidden" size="mini">
+            <el-radio-button label="1">是</el-radio-button>
+            <el-radio-button label="0">否</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item v-if="form.type.toString() !== '2'" label="菜单标题" prop="title">
+          <el-input
+            v-model="form.title"
+            :style=" form.type.toString() === '0' ? 'width: 450px' : 'width: 190px'"
+            placeholder="菜单标题"
+          />
+        </el-form-item>
+        <el-form-item v-if="form.type.toString() === '2'" label="按钮名称" prop="title">
+          <el-input v-model="form.title" placeholder="按钮名称" style="width: 190px;" />
+        </el-form-item>
+        <el-form-item v-show="form.type.toString() !== '1' " label="权限标识" prop="permission">
+          <el-input v-model="form.permission" :disabled="form.iframe=='1'" placeholder="权限标识" style="width: 190px;" />
+        </el-form-item>
+        <el-form-item v-if="form.type.toString() !== '1' && form.type.toString() !== '2'" label="路由地址" prop="path">
+          <el-input v-model="form.path" placeholder="路由地址" style="width: 190px;" />
+        </el-form-item>
+        <el-form-item label="菜单排序" prop="menuSort">
+          <el-input-number
+            v-model.number="form.menuSort"
+            :min="0"
+            :max="999"
+            controls-position="right"
+            style="width: 190px;"
+          />
+        </el-form-item>
+        <el-form-item v-show="!form.iframe && form.type.toString() === '3' " label="组件名称" prop="componentName">
+          <el-input v-model="form.componentName" style="width: 190px;" placeholder="匹配组件内Name字段" />
+        </el-form-item>
+        <el-form-item v-show="!form.iframe && (form.type.toString() === '2' ||form.type.toString() === '3' ) " label="组件路径" prop="component">
+          <el-input v-model="form.component" style="width: 190px;" placeholder="组件路径" />
+        </el-form-item>
+        <el-form-item label="上级类目" prop="pid">
+          <!--         normalizer转换-  loadMenus 点击扩展的时候会调用该方法-->
+          <treeselect
+            v-model="form.pid"
+            :options="menus"
+            :load-options="loadMenus"
+            :normalizer="normalizer"
+            style="width: 450px;"
+            placeholder="选择上级类目"
+          />
+        </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"
+      lazy
+      :load="getMenus"
+      :auto-load-root-options="false"
+      :data="crud.data"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      row-key="menuId"
+
+      @select="crud.selectChange"
+      @select-all="crud.selectAllChange"
+      @selection-change="crud.selectionChangeHandler"
+    >
+      <el-table-column type="selection" width="55" />
+      <el-table-column label="菜单标题" prop="title" :min-width="flexWidth('title',crud.data,'菜单标题')" />
+      <el-table-column label="子系统" prop="system_type" :min-width="flexWidth('system_type',crud.data,'子系统')" />
+      <el-table-column prop="icon" label="图标" align="center" :min-width="flexWidth('icon',crud.data,'图标')">
+        <template slot-scope="scope">
+          <svg-icon :icon-class="scope.row.icon ? scope.row.icon : ''" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="menuSort" align="center" label="排序" :min-width="flexWidth('menuSort',crud.data,'排序')">
+        <template slot-scope="scope">
+          {{ scope.row.menuSort }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="permission" label="权限标识" :min-width="flexWidth('permission',crud.data,'权限标识')" />
+      <el-table-column prop="component" label="组件路径" min-width="120" />
+      <el-table-column prop="iframe" label="外链" :formatter="crud.formatIsOrNot" :min-width="flexWidth('iframe',crud.data,'外链')" />
+
+      <el-table-column prop="cache" label="缓存" :formatter="crud.formatIsOrNot" :min-width="flexWidth('cache',crud.data,'缓存')" />
+      <el-table-column prop="hidden" label="可见" :formatter="crud.formatIsOrNot" :min-width="flexWidth('hidden',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="操作"
+        width="130px"
+        align="center"
+        fixed="right"
+      >
+        <template slot-scope="scope">
+          <udOperation
+            :data="scope.row"
+            :permission="permission"
+            msg="确定删除吗,如果存在下级节点则一并删除，此操作不能撤销！"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import crudMenu from '@/views/system/menu/menu'
+import IconSelect from '@/components/IconSelect'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+
+// crud交由presenter持有
+const defaultForm = {
+  menuId: null,
+  title: null,
+  menuSort: 999,
+  path: null,
+  system_type: null,
+  category: null,
+  component: null,
+  componentName: null,
+  iframe: 0,
+  roles: [],
+  pid: 0,
+  icon: null,
+  cache: 0,
+  hidden: 0,
+  type: 0,
+  permission: null
+}
+export default {
+  name: 'Menu',
+  components: { Treeselect, IconSelect, crudOperation, rrOperation, udOperation },
+  cruds() {
+    return CRUD({ title: '菜单', idField: 'menuId', url: 'api/sysMenu', crudMethod: { ...crudMenu }})
+  },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  data() {
+    return {
+      menus: [],
+      permission: {
+        add: ['admin', 'menu:add'],
+        edit: ['admin', 'menu:edit'],
+        del: ['admin', 'menu:del']
+      },
+      normalizer(node) {
+        return {
+          id: node.menuId,
+          label: node.title,
+          children: node.children
+        }
+      },
+      rules: {
+        title: [
+          { required: true, message: '请输入标题', trigger: 'blur' }
+        ],
+        path: [
+          { required: true, message: '请输入地址', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    // 新增与编辑前做的操作
+    [CRUD.HOOK.afterToCU](crud, form) {
+      this.menus = []
+      if (form.menuId) { // 修改
+        if (!form.pid) { // 一级菜单，一级的父级菜单的pid为0.
+          form.pid = 0
+        }
+        this.getSupDepts(form.menuId)
+      } else { // 新增
+        this.menus.push({ menuId: 0, title: '顶级类目', children: null })
+      }
+    },
+    getMenus(tree, treeNode, resolve) {
+      const params = { pid: tree.menuId }
+      setTimeout(() => {
+        crudMenu.getMenus(params).then(res => {
+          resolve(res.content)
+        })
+      }, 100)
+    },
+    getSupDepts(menuId) {
+      crudMenu.getMenuSuperior(menuId).then(res => {
+        const children = res.map(function(obj) {
+          if (!obj.leaf && !obj.children) {
+            obj.children = null
+          }
+          return obj
+        })
+        this.menus = [{ menuId: 0, title: '顶级类目', children: children }]
+      })
+    },
+    loadMenus({ action, parentNode, callback }) {
+      if (action === LOAD_CHILDREN_OPTIONS) {
+        crudMenu.getMenusTree(parentNode.menuId).then(res => {
+          parentNode.children = res.map(function(obj) {
+            if (!obj.leaf) {
+              obj.children = null
+            }
+            return obj
+          })
+          setTimeout(() => {
+            callback()
+          }, 100)
+        })
+      }
+    },
+    // 选中图标
+    selected(name) {
+      this.form.icon = name
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-input-number .el-input__inner {
+  text-align: left;
+}
+
+::v-deep .vue-treeselect__control, ::v-deep .vue-treeselect__placeholder, ::v-deep .vue-treeselect__single-value {
+  height: 30px;
+  line-height: 30px;
+}
+</style>
diff --git a/lms/nladmin-ui/src/views/system/menu/index.vue b/lms/nladmin-ui/src/views/system/menu/index.vue
index f88c5c24c..91f85cf30 100644
--- a/lms/nladmin-ui/src/views/system/menu/index.vue
+++ b/lms/nladmin-ui/src/views/system/menu/index.vue
@@ -4,22 +4,50 @@
     <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-input
+          v-model="query.blurry"
+          clearable
+          size="mini"
+          placeholder="模糊搜索"
+          style="width: 200px;margin-bottom: 10px"
+          class="filter-item"
+          @keyup.enter.native="queryBlurry"
+        />
+        <el-select
+          v-model="query.systemType"
+          style="width: 100px; height: 35px;top: -5px;"
+          placeholder="所属系统"
+          @change="changetype"
+        >
+          <el-option
+            v-for="item in dict.system_type"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
         <rrOperation />
       </div>
       <crudOperation :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="580px">
+    <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="650px"
+    >
       <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="80px">
         <el-form-item label="菜单类型" prop="type">
-          <el-radio-group v-model="form.type" size="mini" style="width: 178px">
-            <el-radio-button label="0">目录</el-radio-button>
-            <el-radio-button label="1">菜单</el-radio-button>
-            <el-radio-button label="2">按钮</el-radio-button>
+          <el-radio-group v-model="form.type" size="mini">
+            <el-radio-button label="1">系统</el-radio-button>
+            <el-radio-button label="2">目录</el-radio-button>
+            <el-radio-button label="3">菜单</el-radio-button>
+            <el-radio-button label="4">按钮</el-radio-button>
           </el-radio-group>
         </el-form-item>
-        <el-form-item v-show="form.type.toString() !== '2'" label="菜单图标" prop="icon">
+        <el-form-item v-show="form.type.toString() !== '1' && form.type.toString() !== '4' " label="菜单图标" prop="icon">
           <el-popover
             placement="bottom-start"
             width="450"
@@ -28,61 +56,73 @@
           >
             <IconSelect ref="iconSelect" @selected="selected" />
             <el-input slot="reference" v-model="form.icon" style="width: 450px;" placeholder="点击选择图标" readonly>
-              <svg-icon v-if="form.icon" slot="prefix" :icon-class="form.icon" class="el-input__icon" style="height: 32px;width: 16px;" />
+              <svg-icon
+                v-if="form.icon"
+                slot="prefix"
+                :icon-class="form.icon"
+                class="el-input__icon"
+                style="height: 32px;width: 16px;"
+              />
               <i v-else slot="prefix" class="el-icon-search el-input__icon" />
             </el-input>
           </el-popover>
         </el-form-item>
-        <el-form-item v-show="form.type.toString() !== '2'" label="外链菜单" prop="iframe">
+        <el-form-item v-show="form.type.toString() !== '2' && form.type.toString() !== '1'" label="外链菜单" prop="iframe">
           <el-radio-group v-model="form.iframe" size="mini">
             <el-radio-button label="true">是</el-radio-button>
             <el-radio-button label="false">否</el-radio-button>
           </el-radio-group>
         </el-form-item>
-        <el-form-item v-show="form.type.toString() === '1'" label="菜单缓存" prop="cache">
+        <el-form-item v-show="form.type.toString() === '2'" label="菜单缓存" prop="cache">
           <el-radio-group v-model="form.cache" size="mini">
-            <el-radio-button label="true">是</el-radio-button>
-            <el-radio-button label="false">否</el-radio-button>
+            <el-radio-button label="1">是</el-radio-button>
+            <el-radio-button label="0">否</el-radio-button>
           </el-radio-group>
         </el-form-item>
-        <el-form-item v-show="form.type.toString() !== '2'" label="菜单可见" prop="hidden">
+        <el-form-item v-show="form.type.toString() !== '2' && form.type.toString() !== '1' " label="菜单可见" prop="hidden">
           <el-radio-group v-model="form.hidden" size="mini">
-            <el-radio-button label="false">是</el-radio-button>
-            <el-radio-button label="true">否</el-radio-button>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item v-show="form.type.toString() !== '2'" label="PC菜单" prop="hidden">
-          <el-radio-group v-model="form.isPc" size="mini">
-            <el-radio-button label="false">否</el-radio-button>
-            <el-radio-button label="true">是</el-radio-button>
+            <el-radio-button label="0">是</el-radio-button>
+            <el-radio-button label="1">否</el-radio-button>
           </el-radio-group>
         </el-form-item>
         <el-form-item v-if="form.type.toString() !== '2'" label="菜单标题" prop="title">
-          <el-input v-model="form.title" :style=" form.type.toString() === '0' ? 'width: 450px' : 'width: 178px'" placeholder="菜单标题" />
+          <el-input
+            v-model="form.title"
+            :style=" form.type.toString() === '0' ? 'width: 450px' : 'width: 190px'"
+            placeholder="菜单标题"
+          />
         </el-form-item>
         <el-form-item v-if="form.type.toString() === '2'" label="按钮名称" prop="title">
-          <el-input v-model="form.title" placeholder="按钮名称" style="width: 178px;" />
+          <el-input v-model="form.title" placeholder="按钮名称" style="width: 190px;" />
         </el-form-item>
-        <el-form-item v-show="form.type.toString() !== '0'" label="权限标识" prop="permission">
-          <el-input v-model="form.permission" :disabled="form.iframe" placeholder="权限标识" style="width: 178px;" />
+        <el-form-item v-show="form.type.toString() !== '1' " label="权限标识" prop="permission">
+          <el-input v-model="form.permission" :disabled="form.iframe" placeholder="权限标识" style="width: 190px;" />
         </el-form-item>
-        <el-form-item v-if="form.type.toString() !== '2'" label="路由地址" prop="path">
-          <el-input v-model="form.path" placeholder="路由地址" style="width: 178px;" />
+        <el-form-item v-if="form.type.toString() !== '1' && form.type.toString() !== '2'" label="路由地址" prop="path">
+          <el-input v-model="form.path" placeholder="路由地址" style="width: 190px;" />
         </el-form-item>
         <el-form-item label="菜单排序" prop="menuSort">
-          <el-input-number v-model.number="form.menuSort" :min="0" :max="999" controls-position="right" style="width: 178px;" />
+          <el-input-number
+            v-model.number="form.menuSort"
+            :min="0"
+            :max="999"
+            controls-position="right"
+            style="width: 190px;"
+          />
         </el-form-item>
-        <el-form-item v-show="!form.iframe && form.type.toString() === '1'" label="组件名称" prop="componentName">
-          <el-input v-model="form.componentName" style="width: 178px;" placeholder="匹配组件内Name字段" />
+        <el-form-item v-show="!form.iframe && form.type.toString() === '3' " label="组件名称" prop="componentName">
+          <el-input v-model="form.componentName" style="width: 190px;" placeholder="匹配组件内Name字段" />
         </el-form-item>
-        <el-form-item v-show="!form.iframe && form.type.toString() === '1'" label="组件路径" prop="component">
-          <el-input v-model="form.component" style="width: 178px;" placeholder="组件路径" />
+        <el-form-item v-show="!form.iframe && (form.type.toString() === '2' ||form.type.toString() === '3' ) " label="组件路径" prop="component">
+          <el-input v-model="form.component" style="width: 190px;" placeholder="组件路径" />
         </el-form-item>
         <el-form-item label="上级类目" prop="pid">
+          <!--         normalizer转换-  loadMenus 点击扩展的时候会调用该方法-->
           <treeselect
             v-model="form.pid"
             :options="menus"
             :load-options="loadMenus"
+            :normalizer="normalizer"
             style="width: 450px;"
             placeholder="选择上级类目"
           />
@@ -99,57 +139,60 @@
       v-loading="crud.loading"
       lazy
       :load="getMenus"
+      :auto-load-root-options="false"
       :data="crud.data"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-      row-key="id"
+      row-key="menuId"
+
       @select="crud.selectChange"
       @select-all="crud.selectAllChange"
       @selection-change="crud.selectionChangeHandler"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column show-overflow-tooltip label="菜单标题" width="125px" prop="title" />
-      <el-table-column prop="icon" label="图标" align="center" width="60px">
+      <el-table-column label="菜单标题" prop="title" :min-width="100" />
+      <el-table-column label="所属系统" prop="systemType" :min-width="flexWidth('systemType',crud.data,'所属系统')">
+        <template slot-scope="scope">
+          {{ 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,'图标')">
         <template slot-scope="scope">
           <svg-icon :icon-class="scope.row.icon ? scope.row.icon : ''" />
         </template>
       </el-table-column>
-      <el-table-column prop="menuSort" align="center" label="排序">
+      <el-table-column prop="menuSort" align="center" label="排序" :min-width="flexWidth('menuSort',crud.data,'排序')">
         <template slot-scope="scope">
           {{ scope.row.menuSort }}
         </template>
       </el-table-column>
-      <el-table-column show-overflow-tooltip prop="permission" label="权限标识" />
-      <el-table-column show-overflow-tooltip prop="component" label="组件路径" />
-      <el-table-column prop="iframe" label="外链" width="75px">
+      <el-table-column prop="permission" label="权限标识" :min-width="flexWidth('permission',crud.data,'权限标识')" />
+      <el-table-column prop="component" label="组件路径" min-width="120" />
+      <el-table-column prop="iframe" label="外链" :formatter="crud.formatIsOrNot" :min-width="flexWidth('iframe',crud.data,'外链')">
         <template slot-scope="scope">
           <span v-if="scope.row.iframe">是</span>
           <span v-else>否</span>
         </template>
       </el-table-column>
-      <el-table-column prop="cache" label="缓存" width="75px">
+      <el-table-column prop="cache" label="缓存" :formatter="crud.formatIsOrNot" :min-width="flexWidth('cache',crud.data,'缓存')">
         <template slot-scope="scope">
           <span v-if="scope.row.cache">是</span>
           <span v-else>否</span>
         </template>
       </el-table-column>
-      <el-table-column prop="hidden" label="可见" width="75px">
+      <el-table-column prop="hidden" label="可见" :formatter="crud.formatIsOrNot" :min-width="flexWidth('hidden',crud.data,'可见')">
         <template slot-scope="scope">
           <span v-if="scope.row.hidden">否</span>
           <span v-else>是</span>
         </template>
       </el-table-column>
-      <el-table-column prop="hidden" label="是否PC" width="75px">
-        <template slot-scope="scope">
-          <span v-if="scope.row.isPc">是</span>
-          <span v-else>否</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="createTime" label="创建日期" width="135px">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column v-permission="['admin','menu:edit','menu:del']" label="操作" width="130px" align="center" fixed="right">
+      <el-table-column prop="createTime" label="创建日期" :min-width="flexWidth('createTime',crud.data,'创建日期')" />
+      <el-table-column
+        v-permission="['admin','menu:edit','menu:del']"
+        label="操作"
+        width="130px"
+        align="center"
+        fixed="right"
+      >
         <template slot-scope="scope">
           <udOperation
             :data="scope.row"
@@ -163,7 +206,7 @@
 </template>
 
 <script>
-import crudMenu from '@/api/system/menu'
+import crudMenu from '@/views/system/menu/menu'
 import IconSelect from '@/components/IconSelect'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
@@ -173,18 +216,39 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import DateRangePicker from '@/components/DateRangePicker'
+import Dict from '../../../components/Dict/Dict'
 
 // crud交由presenter持有
-const defaultForm = { id: null, title: null, menuSort: 999, path: null, component: null, componentName: null, iframe: false, roles: [], pid: 0, icon: null, cache: false, hidden: false, type: 0, permission: null, isPc: true }
+const defaultForm = {
+  menuId: null,
+  title: null,
+  menuSort: 999,
+  path: null,
+  systemType: null,
+  category: null,
+  component: null,
+  componentName: null,
+  iframe: false,
+  roles: [],
+  pid: 0,
+  icon: null,
+  cache: 0,
+  hidden: 0,
+  type: 0,
+  permission: null
+}
 export default {
   name: 'Menu',
   components: { Treeselect, IconSelect, crudOperation, rrOperation, udOperation, DateRangePicker },
   cruds() {
-    return CRUD({ title: '菜单', url: 'api/menus', crudMethod: { ...crudMenu }})
+    return CRUD({ title: '菜单', idField: 'menuId', url: 'api/sysMenu', crudMethod: { ...crudMenu }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
+  dicts: ['system_type'],
   data() {
     return {
+      typeList: [],
+      defaultType: '',
       menus: [],
       permission: {
         add: ['admin', 'menu:add'],
@@ -202,40 +266,83 @@ export default {
     }
   },
   methods: {
+    normalizer(node) {
+      return {
+        id: node.menuId,
+        label: node.title,
+        children: node.children
+      }
+    },
+    queryBlurry() {
+      if (this.query.blurry) {
+        this.query.pid = null
+      }
+      this.crud.toQuery()
+    },
+    changetype() {
+      const sysType = this.dict.dict.system_type[this.query.systemType]
+      this.query.pid = sysType.para1
+      this.crud.toQuery()
+    },
+    [CRUD.HOOK.beforeRefresh]() {
+      // if (this.crud.query.system_type == null) {
+      //   this.crud.query.system_type = '1'
+      // }
+      return true
+    },
     // 新增与编辑前做的操作
     [CRUD.HOOK.afterToCU](crud, form) {
+      console.log(this.dict)
       this.menus = []
-      if (form.id != null) {
-        if (form.pid === null) {
+      if (form.menuId) { // 修改
+        if (!form.pid) { // 一级菜单，一级的父级菜单的pid为0.
           form.pid = 0
         }
-        this.getSupDepts(form.id)
-      } else {
-        this.menus.push({ id: 0, label: '顶级类目', children: null })
+        this.getSupMenus(form.menuId)
+      } else { // 新增
+        this.menus.push({ menuId: 0, title: '顶级类目', children: null })
+      }
+    },
+    [CRUD.HOOK.afterSubmit](crud, form) {
+      if (this.$options.dicts instanceof Array) {
+        new Dict(this.dict).init(this.$options.dicts, () => {
+          this.$nextTick(() => {
+            this.$emit('dictReady')
+          })
+        })
+      }
+    },
+    [CRUD.HOOK.afterDelete](crud, form) {
+      if (this.$options.dicts instanceof Array) {
+        new Dict(this.dict).init(this.$options.dicts, () => {
+          this.$nextTick(() => {
+            this.$emit('dictReady')
+          })
+        })
       }
     },
     getMenus(tree, treeNode, resolve) {
-      const params = { pid: tree.id }
+      const params = { pid: tree.menuId, systemType: tree.systemType }
       setTimeout(() => {
         crudMenu.getMenus(params).then(res => {
           resolve(res.content)
         })
       }, 100)
     },
-    getSupDepts(id) {
-      crudMenu.getMenuSuperior(id).then(res => {
+    getSupMenus(menuId) {
+      crudMenu.getMenuSuperior(menuId).then(res => {
         const children = res.map(function(obj) {
           if (!obj.leaf && !obj.children) {
             obj.children = null
           }
           return obj
         })
-        this.menus = [{ id: 0, label: '顶级类目', children: children }]
+        this.menus = [{ menuId: 0, title: '顶级类目', children: children }]
       })
     },
     loadMenus({ action, parentNode, callback }) {
       if (action === LOAD_CHILDREN_OPTIONS) {
-        crudMenu.getMenusTree(parentNode.id).then(res => {
+        crudMenu.getMenusTree(parentNode.menuId).then(res => {
           parentNode.children = res.map(function(obj) {
             if (!obj.leaf) {
               obj.children = null
@@ -257,11 +364,12 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
- ::v-deep .el-input-number .el-input__inner {
-    text-align: left;
-  }
- ::v-deep .vue-treeselect__control,::v-deep .vue-treeselect__placeholder,::v-deep .vue-treeselect__single-value {
-    height: 30px;
-    line-height: 30px;
-  }
+::v-deep .el-input-number .el-input__inner {
+  text-align: left;
+}
+
+::v-deep .vue-treeselect__control, ::v-deep .vue-treeselect__placeholder, ::v-deep .vue-treeselect__single-value {
+  height: 30px;
+  line-height: 30px;
+}
 </style>
diff --git a/lms/nladmin-ui/src/api/system/menu.js b/lms/nladmin-ui/src/views/system/menu/menu.js
similarity index 59%
rename from lms/nladmin-ui/src/api/system/menu.js
rename to lms/nladmin-ui/src/views/system/menu/menu.js
index 329854396..acdda0486 100644
--- a/lms/nladmin-ui/src/api/system/menu.js
+++ b/lms/nladmin-ui/src/views/system/menu/menu.js
@@ -2,23 +2,33 @@ import request from '@/utils/request'
 
 export function getMenusTree(pid) {
   return request({
-    url: 'api/menus/lazy?pid=' + pid,
+    url: 'api/sysMenu/lazy?pid=' + pid,
     method: 'get'
   })
 }
 
 export function getMenus(params) {
   return request({
-    url: 'api/menus',
+    url: 'api/sysMenu',
     method: 'get',
     params
   })
 }
 
-export function getMenuSuperior(ids) {
-  const data = ids.length || ids.length === 0 ? ids : Array.of(ids)
+export function getMenusByRole(params) {
   return request({
-    url: 'api/menus/superior',
+    url: 'api/sysMenu/getMenusByRole',
+    method: 'post',
+    data: params
+  })
+}
+
+export function getMenuSuperior(ids) {
+  const data = {
+    'ids': ids
+  }
+  return request({
+    url: 'api/sysMenu/superior',
     method: 'post',
     data
   })
@@ -26,21 +36,21 @@ export function getMenuSuperior(ids) {
 
 export function getChild(id) {
   return request({
-    url: 'api/menus/child?id=' + id,
+    url: 'api/sysMenu/child?id=' + id,
     method: 'get'
   })
 }
 
-export function buildMenus() {
+export function buildMenus(data) {
   return request({
-    url: 'api/menus/build',
+    url: 'api/sysMenu/build?systemType=' + data,
     method: 'get'
   })
 }
 
 export function add(data) {
   return request({
-    url: 'api/menus',
+    url: 'api/sysMenu',
     method: 'post',
     data
   })
@@ -48,7 +58,7 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: 'api/menus',
+    url: 'api/sysMenu',
     method: 'delete',
     data: ids
   })
@@ -56,10 +66,10 @@ export function del(ids) {
 
 export function edit(data) {
   return request({
-    url: 'api/menus',
+    url: 'api/sysMenu',
     method: 'put',
     data
   })
 }
 
-export default { add, edit, del, getMenusTree, getMenuSuperior, getMenus, getChild }
+export default { add, edit, del, getMenusTree, getMenuSuperior, getMenus, getChild, getMenusByRole }
diff --git a/lms/nladmin-ui/src/views/system/monitor/device/index.vue b/lms/nladmin-ui/src/views/system/monitor/device/index.vue
index 904947a9b..1367f725d 100644
--- a/lms/nladmin-ui/src/views/system/monitor/device/index.vue
+++ b/lms/nladmin-ui/src/views/system/monitor/device/index.vue
@@ -8,7 +8,7 @@
 
 <script>
 import crudStage from '@/api/logicflow/stage'
-import paramCrud from '@/api/system/param'
+import paramCrud from '@/views/system/param/param'
 import '@logicflow/core/dist/style/index.css'
 import '@logicflow/extension/lib/style/index.css'
 
diff --git a/lms/nladmin-ui/src/views/system/param/index.vue b/lms/nladmin-ui/src/views/system/param/index.vue
index dddbcabf6..0225f3b14 100644
--- a/lms/nladmin-ui/src/views/system/param/index.vue
+++ b/lms/nladmin-ui/src/views/system/param/index.vue
@@ -62,7 +62,7 @@
 </template>
 
 <script>
-import crudParam from '@/api/system/param'
+import crudParam from '@/views/system/param/param'
 import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
@@ -75,11 +75,11 @@ const defaultForm = {
   name: null,
   value: null,
   remark: null,
-  is_active: 1,
-  create_name: null,
-  create_time: null,
-  update_optname: null,
-  update_time: null
+  isActive: 1,
+  createName: null,
+  createTime: null,
+  updateOptname: null,
+  updateTime: null
 }
 export default {
   name: 'Param',
diff --git a/lms/nladmin-ui/src/views/system/param/param.js b/lms/nladmin-ui/src/views/system/param/param.js
new file mode 100644
index 000000000..9050af5e8
--- /dev/null
+++ b/lms/nladmin-ui/src/views/system/param/param.js
@@ -0,0 +1,34 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/param',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/param/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/param',
+    method: 'put',
+    data
+  })
+}
+
+export function getValueByCode(code) {
+  return request({
+    url: 'api/param/getValueByCode/' + code,
+    method: 'post'
+  })
+}
+
+export default { add, edit, del, getValueByCode }
diff --git a/lms/nladmin-ui/src/views/system/role/index.vue b/lms/nladmin-ui/src/views/system/role/index.vue
index 795285496..7938412b8 100644
--- a/lms/nladmin-ui/src/views/system/role/index.vue
+++ b/lms/nladmin-ui/src/views/system/role/index.vue
@@ -8,14 +8,14 @@
           v-model="query.blurry"
           size="mini"
           clearable
-          placeholder="输入名称或者描述搜索"
+          placeholder="输入名称"
           style="width: 200px;"
           class="filter-item"
           @keyup.enter.native="crud.toQuery"
         />
-        <rrOperation />
+        <rrOperation/>
       </div>
-      <crudOperation :permission="permission" />
+      <crudOperation :permission="permission"/>
     </div>
     <!-- 表单渲染 -->
     <el-dialog
@@ -28,33 +28,10 @@
     >
       <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="80px">
         <el-form-item label="角色名称" prop="name">
-          <el-input v-model="form.name" style="width: 380px;" />
+          <el-input v-model="form.name" style="width: 380px;"/>
         </el-form-item>
-        <el-form-item label="角色级别" prop="level">
-          <el-input-number v-model.number="form.level" :min="1" controls-position="right" style="width: 145px;" />
-        </el-form-item>
-        <el-form-item label="数据范围" prop="dataScope">
-          <el-select v-model="form.dataScope" style="width: 140px" placeholder="请选择数据范围" @change="changeScope">
-            <el-option
-              v-for="item in dateScopes"
-              :key="item"
-              :label="item"
-              :value="item"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item v-if="form.dataScope === '自定义'" label="数据权限" prop="depts">
-          <treeselect
-            v-model="deptDatas"
-            :load-options="loadDepts"
-            :options="depts"
-            multiple
-            style="width: 380px"
-            placeholder="请选择"
-          />
-        </el-form-item>
-        <el-form-item label="描述信息" prop="description">
-          <el-input v-model="form.description" style="width: 380px;" rows="5" type="textarea" />
+        <el-form-item label="备注" prop="description">
+          <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -64,7 +41,7 @@
     </el-dialog>
     <el-row :gutter="15">
       <!--角色管理-->
-      <el-col :xs="24" :sm="24" :md="16" :lg="16" :xl="17" style="margin-bottom: 10px">
+      <el-col :span="12" style="margin-bottom: 10px">
         <el-card class="box-card" shadow="never">
           <div slot="header" class="clearfix">
             <span class="role-span">角色列表</span>
@@ -78,11 +55,9 @@
             @selection-change="crud.selectionChangeHandler"
             @current-change="handleCurrentChange"
           >
-            <el-table-column :selectable="checkboxT" type="selection" width="55" />
-            <el-table-column prop="name" label="名称" min-width="100" show-overflow-tooltip />
-            <el-table-column prop="dataScope" label="数据权限" />
-            <el-table-column prop="level" label="角色级别" />
-            <el-table-column show-overflow-tooltip prop="description" label="描述" />
+            <el-table-column type="selection" width="55"/>
+            <el-table-column prop="name" label="名称" min-width="100" show-overflow-tooltip/>
+            <el-table-column show-overflow-tooltip prop="remark" label="描述"/>
             <el-table-column show-overflow-tooltip width="135px" prop="createTime" label="创建日期">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -97,7 +72,6 @@
             >
               <template slot-scope="scope">
                 <udOperation
-                  v-if="scope.row.level >= level"
                   :data="scope.row"
                   :permission="permission"
                 />
@@ -105,11 +79,11 @@
             </el-table-column>
           </el-table>
           <!--分页组件-->
-          <pagination />
+          <pagination/>
         </el-card>
       </el-col>
       <!-- 菜单授权 -->
-      <el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="7">
+      <el-col :span="12">
         <el-card class="box-card" shadow="never">
           <div slot="header" class="clearfix">
             <el-tooltip class="item" effect="dark" content="选择指定角色分配菜单" placement="top">
@@ -121,12 +95,13 @@
               :loading="menuLoading"
               icon="el-icon-check"
               size="mini"
-              style="float: right; padding: 6px 9px"
+              style="float: right; padding: 6px 10px"
               type="primary"
               @click="saveMenu"
             >保存
             </el-button>
           </div>
+
           <el-tree
             ref="menu"
             lazy
@@ -137,7 +112,7 @@
             check-strictly
             accordion
             show-checkbox
-            node-key="id"
+            node-key="menuId"
             @check="menuChange"
           />
         </el-card>
@@ -147,32 +122,28 @@
 </template>
 
 <script>
-import crudRoles from '@/api/system/role'
-import { getDepts, getDeptSuperior } from '@/api/system/dept'
-import { getChild, getMenusTree } from '@/api/system/menu'
+import crudRoles from './role'
+import crudMenu from '@/views/system/menu'
+import { getChild, getMenusTree } from '@/views/system/menu/menu'
 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 '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import DateRangePicker from '@/components/DateRangePicker'
 
-const defaultForm = { id: null, name: null, depts: [], description: null, dataScope: '全部', level: 3 }
+const defaultForm = { roleId: null, name: null, remark: null }
 export default {
   name: 'Role',
-  components: { Treeselect, pagination, crudOperation, rrOperation, udOperation, DateRangePicker },
+  components: { pagination, crudOperation, rrOperation, udOperation, crudMenu },
   cruds() {
-    return CRUD({ title: '角色', url: 'api/roles', sort: 'level,asc', crudMethod: { ...crudRoles }})
+    return CRUD({ idField: 'roleId', title: '角色', url: 'api/sysRole', crudMethod: { ...crudRoles } })
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   data() {
     return {
-      defaultProps: { children: 'children', label: 'label', isLeaf: 'leaf' },
-      dateScopes: ['全部', '本级', '自定义'], level: 3,
+      defaultProps: { children: 'children', label: 'title', isLeaf: 'leaf' },
       currentId: 0, menuLoading: false, showButton: false,
-      menus: [], menuIds: [], depts: [], deptDatas: [], // 多选时使用
+      menus: [], menuIds: [], // 多选时使用
       permission: {
         add: ['admin', 'roles:add'],
         edit: ['admin', 'roles:edit'],
@@ -189,54 +160,40 @@ export default {
     }
   },
   created() {
-    crudRoles.getLevel().then(data => {
-      this.level = data.level
-    })
   },
   methods: {
     getMenuDatas(node, resolve) {
       setTimeout(() => {
-        getMenusTree(node.data.id ? node.data.id : 0).then(res => {
+        getMenusTree(node.data.menuId ? node.data.menuId : 0).then(res => {
           resolve(res)
         })
       }, 100)
     },
+    getMenusByRole(val) {
+      if (this.currentId && val[0] && val[1]) {
+        const param = {
+          role_id: this.currentId,
+          system_type: val[0],
+          category: val[1]
+        }
+
+        const _this = this
+        crudMenu.getMenusByRole(param).then(res => {
+          _this.menus = res
+
+          // 初始化默认选中的key
+          _this.menuIds = []
+          _this.menus.forEach(function(data) {
+            _this.menuIds.push(data)
+          })
+        })
+      }
+    },
     [CRUD.HOOK.afterRefresh]() {
       this.$refs.menu.setCheckedKeys([])
     },
-    // 新增前初始化部门信息
-    [CRUD.HOOK.beforeToAdd]() {
-      this.deptDatas = []
-    },
-    // 编辑前初始化自定义数据权限的部门信息
-    [CRUD.HOOK.beforeToEdit](crud, form) {
-      this.deptDatas = []
-      if (form.dataScope === '自定义') {
-        this.getSupDepts(form.depts)
-      }
-      const _this = this
-      form.depts.forEach(function(dept) {
-        _this.deptDatas.push(dept.id)
-      })
-    },
     // 提交前做的操作
     [CRUD.HOOK.afterValidateCU](crud) {
-      if (crud.form.dataScope === '自定义' && this.deptDatas.length === 0) {
-        this.$message({
-          message: '自定义数据权限不能为空',
-          type: 'warning'
-        })
-        return false
-      } else if (crud.form.dataScope === '自定义') {
-        const depts = []
-        this.deptDatas.forEach(function(data) {
-          const dept = { id: data }
-          depts.push(dept)
-        })
-        crud.form.depts = depts
-      } else {
-        crud.form.depts = []
-      }
       return true
     },
     // 触发单选
@@ -246,20 +203,20 @@ export default {
         // 清空菜单的选中
         this.$refs.menu.setCheckedKeys([])
         // 保存当前的角色id
-        this.currentId = val.id
+        this.currentId = val.roleId
         // 初始化默认选中的key
         this.menuIds = []
         val.menus.forEach(function(data) {
-          _this.menuIds.push(data.id)
+          _this.menuIds.push(data)
         })
         this.showButton = true
       }
     },
     menuChange(menu) {
       // 获取该节点的所有子节点，id 包含自身
-      getChild(menu.id).then(childIds => {
+      getChild(menu.menuId).then(childIds => {
         // 判断是否在 menuIds 中，如果存在则删除，否则添加
-        if (this.menuIds.indexOf(menu.id) !== -1) {
+        if (this.menuIds.indexOf(menu.menuId) !== -1) {
           for (let i = 0; i < childIds.length; i++) {
             const index = this.menuIds.indexOf(childIds[i])
             if (index !== -1) {
@@ -280,16 +237,17 @@ export default {
     // 保存菜单
     saveMenu() {
       this.menuLoading = true
-      const role = { id: this.currentId, menus: [] }
+      const role = { roleId: this.currentId, menus: [] }
       // 得到已选中的 key 值
-      this.menuIds.forEach(function(id) {
-        const menu = { id: id }
+      this.menuIds.forEach(function(menuId) {
+        const menu = { menuId: menuId }
         role.menus.push(menu)
       })
       crudRoles.editMenu(role).then(() => {
         this.crud.notify('保存成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.menuLoading = false
-        this.update()
+        this.crud.toQuery()
+        // this.update()
       }).catch(err => {
         this.menuLoading = false
         console.log(err.response.data.message)
@@ -300,69 +258,12 @@ export default {
       // 无刷新更新 表格数据
       crudRoles.get(this.currentId).then(res => {
         for (let i = 0; i < this.crud.data.length; i++) {
-          if (res.id === this.crud.data[i].id) {
+          if (res.menuId === this.crud.data[i].menuId) {
             this.crud.data[i] = res
             break
           }
         }
       })
-    },
-    // 获取部门数据
-    getDepts() {
-      getDepts({ enabled: true }).then(res => {
-        this.depts = res.content.map(function(obj) {
-          if (obj.hasChildren) {
-            obj.children = null
-          }
-          return obj
-        })
-      })
-    },
-    getSupDepts(depts) {
-      const ids = []
-      depts.forEach(dept => {
-        ids.push(dept.id)
-      })
-      getDeptSuperior(ids).then(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) {
-        getDepts({ enabled: true, pid: parentNode.id }).then(res => {
-          parentNode.children = res.content.map(function(obj) {
-            if (obj.hasChildren) {
-              obj.children = null
-            }
-            return obj
-          })
-          setTimeout(() => {
-            callback()
-          }, 200)
-        })
-      }
-    },
-    // 如果数据权限为自定义则获取部门数据
-    changeScope() {
-      if (this.form.dataScope === '自定义') {
-        this.getDepts()
-      }
-    },
-    checkboxT(row) {
-      return row.level >= this.level
     }
   }
 }
@@ -381,12 +282,12 @@ export default {
   text-align: left;
 }
 
-::v-deep .vue-treeselect__multi-value {
-  margin-bottom: 0;
+::v-deep .el-card__header {
+  padding: 5px 0 5px 10px;
+  background-color: #f8f8f9;
 }
 
-::v-deep .vue-treeselect__multi-value-item {
-  border: 0;
-  padding: 0;
+::v-deep .el-card__body {
+  padding: 10px 0 10px 0;
 }
 </style>
diff --git a/lms/nladmin-ui/src/api/system/role.js b/lms/nladmin-ui/src/views/system/role/role.js
similarity index 78%
rename from lms/nladmin-ui/src/api/system/role.js
rename to lms/nladmin-ui/src/views/system/role/role.js
index 1f7bc1ebf..6932c75d6 100644
--- a/lms/nladmin-ui/src/api/system/role.js
+++ b/lms/nladmin-ui/src/views/system/role/role.js
@@ -3,14 +3,14 @@ import request from '@/utils/request'
 // 获取所有的Role
 export function getAll() {
   return request({
-    url: 'api/roles/all',
+    url: 'api/sysRole/all',
     method: 'get'
   })
 }
 
 export function add(data) {
   return request({
-    url: 'api/roles',
+    url: 'api/sysRole',
     method: 'post',
     data
   })
@@ -18,21 +18,21 @@ export function add(data) {
 
 export function get(id) {
   return request({
-    url: 'api/roles/' + id,
+    url: 'api/sysRole/' + id,
     method: 'get'
   })
 }
 
 export function getLevel() {
   return request({
-    url: 'api/roles/level',
+    url: 'api/sysRole/level',
     method: 'get'
   })
 }
 
 export function del(ids) {
   return request({
-    url: 'api/roles',
+    url: 'api/sysRole',
     method: 'delete',
     data: ids
   })
@@ -40,7 +40,7 @@ export function del(ids) {
 
 export function edit(data) {
   return request({
-    url: 'api/roles',
+    url: 'api/sysRole',
     method: 'put',
     data
   })
@@ -48,7 +48,7 @@ export function edit(data) {
 
 export function editMenu(data) {
   return request({
-    url: 'api/roles/menu',
+    url: 'api/sysRole/menu',
     method: 'put',
     data
   })
diff --git a/lms/nladmin-ui/src/views/system/timing/components/result.vue b/lms/nladmin-ui/src/views/system/timing/components/result.vue
index e4124d956..6559a804a 100644
--- a/lms/nladmin-ui/src/views/system/timing/components/result.vue
+++ b/lms/nladmin-ui/src/views/system/timing/components/result.vue
@@ -316,15 +316,15 @@ export default {
                           resetDay()
                           if (Mi == MDate.length - 1) {
                             resetMonth()
-                            continue goYear
+                            continue // goYear
                           }
-                          continue goMonth
+                          continue // goMonth
                         }
-                        continue goDay
+                        continue // goDay
                       }
-                      continue goHour
+                      continue // goHour
                     }
-                    continue goMin
+                    continue // goMin
                   }
                 } // goSecond
               } // goMin
diff --git a/lms/nladmin-ui/src/views/system/timing/index.vue b/lms/nladmin-ui/src/views/system/timing/index.vue
index ca1474c11..1016adfba 100644
--- a/lms/nladmin-ui/src/views/system/timing/index.vue
+++ b/lms/nladmin-ui/src/views/system/timing/index.vue
@@ -49,7 +49,7 @@
         <el-form-item label="子任务ID">
           <el-input v-model="form.subTask" placeholder="多个用逗号隔开，按顺序执行" style="width: 220px;" />
         </el-form-item>
-        <el-form-item label="任务负责人" prop="personInCharge">
+        <el-form-item label="任务负责人" prop="person_in_charge">
           <el-input v-model="form.personInCharge" style="width: 220px;" />
         </el-form-item>
         <el-form-item label="告警邮箱" prop="email">
@@ -79,7 +79,7 @@
     <!--表格渲染-->
     <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 show-overflow-tooltip prop="id" label="任务ID" />
+      <el-table-column show-overflow-tooltip prop="jobId" label="任务ID" />
       <el-table-column show-overflow-tooltip prop="jobName" label="任务名称" min-width="120" />
       <el-table-column show-overflow-tooltip prop="beanName" label="Bean名称" />
       <el-table-column show-overflow-tooltip prop="methodName" label="执行方法" />
@@ -99,20 +99,20 @@
       <el-table-column v-permission="['admin','timing:edit','timing:del']" label="操作" width="170px" align="center" fixed="right">
         <template slot-scope="scope">
           <el-button v-permission="['admin','timing:edit']" size="mini" style="margin-right: 3px;" type="text" @click="crud.toEdit(scope.row)">编辑</el-button>
-          <el-button v-permission="['admin','timing:edit']" style="margin-left: -2px" type="text" size="mini" @click="execute(scope.row.id)">执行</el-button>
-          <el-button v-permission="['admin','timing:edit']" style="margin-left: 3px" type="text" size="mini" @click="updateStatus(scope.row.id,scope.row.isPause ? '恢复' : '暂停')">
+          <el-button v-permission="['admin','timing:edit']" style="margin-left: -2px" type="text" size="mini" @click="execute(scope.row.jobId)">执行</el-button>
+          <el-button v-permission="['admin','timing:edit']" style="margin-left: 3px" type="text" size="mini" @click="updateStatus(scope.row.jobId,scope.row.isPause ? '恢复' : '暂停')">
             {{ scope.row.isPause ? '恢复' : '暂停' }}
           </el-button>
           <el-popover
-            :ref="scope.row.id"
+            :ref="scope.row.jobId"
             v-permission="['admin','timing:del']"
             placement="top"
             width="200"
           >
             <p>确定停止并删除该任务吗？</p>
             <div style="text-align: right; margin: 0">
-              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
+              <el-button size="mini" type="text" @click="$refs[scope.row.jobId].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.jobId)">确定</el-button>
             </div>
             <el-button slot="reference" type="text" size="mini">删除</el-button>
           </el-popover>
@@ -128,21 +128,20 @@
 </template>
 
 <script>
-import crudJob from '@/api/system/timing'
+import crudJob from '@/views/system/timing/timing'
 import Log from './log'
 import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
-import DateRangePicker from '@/components/DateRangePicker'
 import Crontab from './components/crontab'
 
-const defaultForm = { id: null, jobName: null, subTask: null, beanName: null, methodName: null, params: null, cronExpression: null, pauseAfterFailure: true, isPause: false, personInCharge: null, email: null, description: null }
+const defaultForm = { jobId: null, beanName: null, cronExpression: null, isPause: false, jobName: null, methodName: null, params: null, description: null, personInCharge: null, email: null, subTask: null, pauseAfterFailure: true, createId: null, createName: null, createTime: null, updateId: null, updateName: null, updateTime: null }
 export default {
   name: 'Timing',
-  components: { Log, pagination, crudOperation, rrOperation, DateRangePicker, Crontab },
+  components: { Log, pagination, crudOperation, rrOperation, Crontab },
   cruds() {
-    return CRUD({ title: '定时任务', url: 'api/jobs', crudMethod: { ...crudJob }})
+    return CRUD({ title: '定时任务', idField: 'jobId', url: 'api/jobs', crudMethod: { ...crudJob }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   data() {
@@ -222,7 +221,7 @@ export default {
       this.$refs.log.doInit()
     },
     checkboxT(row, rowIndex) {
-      return row.id !== 1
+      return row.job_id !== 1
     },
     /** cron表达式按钮操作 */
     handleShowCron() {
diff --git a/lms/nladmin-ui/src/views/system/timing/log.vue b/lms/nladmin-ui/src/views/system/timing/log.vue
index b5e1f0af5..78c3b5f2b 100644
--- a/lms/nladmin-ui/src/views/system/timing/log.vue
+++ b/lms/nladmin-ui/src/views/system/timing/log.vue
@@ -5,7 +5,7 @@
       <el-input v-model="query.jobName" clearable size="mini" placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
       <date-range-picker v-model="query.createTime" class="date-item" />
       <el-select v-model="query.isSuccess" placeholder="日志状态" clearable size="mini" class="filter-item" style="width: 110px" @change="toQuery">
-        <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
+        <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.displayName" :value="item.key" />
       </el-select>
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
     </div>
@@ -16,13 +16,13 @@
       <el-table-column show-overflow-tooltip prop="methodName" label="执行方法" />
       <el-table-column show-overflow-tooltip prop="params" width="120px" label="参数" />
       <el-table-column show-overflow-tooltip prop="cronExpression" label="cron表达式" />
-      <el-table-column prop="createTime" label="异常详情" width="110px">
+      <el-table-column prop="create_time" label="异常详情" width="110px">
         <template slot-scope="scope">
           <el-button v-show="scope.row.exceptionDetail" size="mini" type="text" @click="info(scope.row.exceptionDetail)">查看详情</el-button>
         </template>
       </el-table-column>
       <el-table-column show-overflow-tooltip align="center" prop="time" width="100px" label="耗时(毫秒)" />
-      <el-table-column align="center" prop="isSuccess" width="80px" label="状态">
+      <el-table-column align="center" prop="is_success" width="80px" label="状态">
         <template slot-scope="scope">
           <el-tag :type="scope.row.isSuccess ? 'success' : 'danger'">{{ scope.row.isSuccess ? '成功' : '失败' }}</el-tag>
         </template>
@@ -39,7 +39,7 @@
     <!--分页组件-->
     <el-pagination
       :total="total"
-      :current-page="page + 1"
+      :current-page="page"
       :page-size="6"
       style="margin-top:8px;"
       layout="total, prev, pager, next"
@@ -60,8 +60,8 @@ export default {
       title: '任务日志',
       errorInfo: '', errorDialog: false,
       enabledTypeOptions: [
-        { key: 'true', display_name: '成功' },
-        { key: 'false', display_name: '失败' }
+        { key: '1', displayName: '成功' },
+        { key: '0', displayName: '失败' }
       ]
     }
   },
diff --git a/lms/nladmin-ui/src/views/system/timing/timing.js b/lms/nladmin-ui/src/views/system/timing/timing.js
new file mode 100644
index 000000000..613e15f49
--- /dev/null
+++ b/lms/nladmin-ui/src/views/system/timing/timing.js
@@ -0,0 +1,41 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/jobs',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/jobs',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/jobs',
+    method: 'put',
+    data
+  })
+}
+
+export function updateIsPause(id) {
+  return request({
+    url: 'api/jobs/' + id,
+    method: 'put'
+  })
+}
+
+export function execution(id) {
+  return request({
+    url: 'api/jobs/exec/' + id,
+    method: 'put'
+  })
+}
+
+export default { del, updateIsPause, execution, add, edit }
diff --git a/lms/nladmin-ui/src/views/system/user/center.vue b/lms/nladmin-ui/src/views/system/user/center.vue
index 029a5dcc3..d21100423 100644
--- a/lms/nladmin-ui/src/views/system/user/center.vue
+++ b/lms/nladmin-ui/src/views/system/user/center.vue
@@ -20,8 +20,15 @@
             </div>
             <ul class="user-info">
               <li><div style="height: 100%"><svg-icon icon-class="login" /> 登录账号<div class="user-right">{{ user.username }}</div></div></li>
-              <li><svg-icon icon-class="user1" /> 用户姓名 <div class="user-right">{{ user.nickName }}</div></li>
-              <li><svg-icon icon-class="dept" /> 所属部门 <div class="user-right"> {{ user.dept.name }}</div></li>
+              <li><svg-icon icon-class="user1" /> 用户姓名 <div class="user-right">{{ user.personName }}</div></li>
+              <li><svg-icon icon-class="dept" /> 所属部门
+                <el-tooltip effect="dark" placement="top">
+                  <div slot="content">
+                    <span v-for="item in depts">{{ item.name }} </span>
+                  </div>
+                  <span class="user-right" v-for="item in depts">{{ item.name }}<span v-if="depts.length>1">...</span></span>
+                </el-tooltip>
+              </li>
               <li><svg-icon icon-class="phone" /> 手机号码 <div class="user-right">{{ user.phone }}</div></li>
               <li><svg-icon icon-class="email" /> 用户邮箱 <div class="user-right">{{ user.email }}</div></li>
               <li>
@@ -41,8 +48,8 @@
           <el-tabs v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="用户资料" name="first">
               <el-form ref="form" :model="form" :rules="rules" style="margin-top: 10px;" size="mini" label-width="65px">
-                <el-form-item label="姓名" prop="nickName">
-                  <el-input v-model="form.nickName" style="width: 35%" />
+                <el-form-item label="姓名" prop="personName">
+                  <el-input v-model="form.personName" style="width: 35%" />
                   <span style="color: #C0C0C0;margin-left: 10px;">用户姓名不作为登录使用</span>
                 </el-form-item>
                 <el-form-item label="手机号" prop="phone">
@@ -116,7 +123,7 @@ import store from '@/store'
 import { isvalidPhone } from '@/utils/validate'
 import { parseTime } from '@/utils/index'
 import crud from '@/mixins/crud'
-import { editUser } from '@/api/system/user'
+import { editUser } from '@/views/system/user'
 import Avatar from '@/assets/images/avatar.png'
 export default {
   name: 'Center',
@@ -142,8 +149,9 @@ export default {
         'Authorization': getToken()
       },
       form: {},
+      deptsName: '',
       rules: {
-        nickName: [
+        personName: [
           { required: true, message: '请输入用户姓名', trigger: 'blur' },
           { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
         ],
@@ -156,12 +164,13 @@ export default {
   computed: {
     ...mapGetters([
       'user',
+      'depts',
       'updateAvatarApi',
       'baseApi'
     ])
   },
   created() {
-    this.form = { id: this.user.id, nickName: this.user.nickName, gender: this.user.gender, phone: this.user.phone }
+    this.form = { id: this.user.id, personName: this.user.personName, gender: this.user.gender, phone: this.user.phone }
     store.dispatch('GetInfo').then(() => {})
   },
   methods: {
diff --git a/lms/nladmin-ui/src/views/system/user/center/updateEmail.vue b/lms/nladmin-ui/src/views/system/user/center/updateEmail.vue
index d72b63a04..aa9836587 100644
--- a/lms/nladmin-ui/src/views/system/user/center/updateEmail.vue
+++ b/lms/nladmin-ui/src/views/system/user/center/updateEmail.vue
@@ -20,7 +20,7 @@
 <script>
 import store from '@/store'
 import { validEmail } from '@/utils/validate'
-import { updateEmail } from '@/api/system/user'
+import { updateEmail } from '@/views/system/user'
 import { resetEmail } from '@/api/system/code'
 export default {
   props: {
diff --git a/lms/nladmin-ui/src/views/system/user/center/updatePass.vue b/lms/nladmin-ui/src/views/system/user/center/updatePass.vue
index c6467543d..79f04ce2c 100644
--- a/lms/nladmin-ui/src/views/system/user/center/updatePass.vue
+++ b/lms/nladmin-ui/src/views/system/user/center/updatePass.vue
@@ -22,7 +22,7 @@
 
 <script>
 import store from '@/store'
-import { updatePass } from '@/api/system/user'
+import { updatePass } from '@/views/system/user'
 export default {
   data() {
     const confirmPass = (rule, value, callback) => {
diff --git a/lms/nladmin-ui/src/views/system/user/dialog/relevanceDeptDialog.vue b/lms/nladmin-ui/src/views/system/user/dialog/relevanceDeptDialog.vue
new file mode 100644
index 000000000..78380fc7e
--- /dev/null
+++ b/lms/nladmin-ui/src/views/system/user/dialog/relevanceDeptDialog.vue
@@ -0,0 +1,181 @@
+<template>
+  <el-dialog
+    title="关联用户"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="1000px"
+    @close="close"
+    @open="open"
+  >
+    <el-form
+      :inline="true"
+      class="demo-form-inline"
+      label-position="right"
+      label-width="80px"
+      label-suffix=":"
+    >
+      <el-form-item label="模糊搜索">
+        <el-input
+          v-model="query.name"
+          clearable
+          size="mini"
+          placeholder="输入部门名称搜索"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-form-item>
+      <rrOperation />
+    </el-form>
+
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      lazy
+      row-key="dept_id"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      :load="getDeptDatas"
+      default-expand-all
+      style="width: 100%;"
+      size="mini"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      @select="handleSelectionChange"
+      @current-change="clickChange"
+    >
+      <el-table-column v-if="!isSingle" type="selection" width="55" />
+      <el-table-column v-if="isSingle" label="选择" width="55">
+        <template slot-scope="scope">
+          <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
+        </template>
+      </el-table-column>
+      <el-table-column label="名称" prop="name" />
+      <el-table-column label="排序" prop="deptSort" />
+      <el-table-column prop="createTime" label="创建日期" />
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+import crudDept from '@/views/system/dept/dept'
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+
+export default {
+  name: 'RelevanceDeptDialog',
+  components: { rrOperation, pagination },
+  cruds() {
+    return CRUD({ title: '部门', idField: 'deptId', url: 'api/dept/vo', crudMethod: { ...crudDept }, query: { isUsed: '1' }})
+  },
+  mixins: [presenter(), header()],
+  dicts: ['product_series'],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    isSingle: {
+      type: Boolean,
+      default: true
+    },
+    depts: {
+      type: Array
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      classes: [],
+      tableRadio: null,
+      class_idStr: null,
+      checkrow: null,
+      rows: []
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    clickChange(item) {
+      this.tableRadio = item
+    },
+    open() {
+      // 回显
+      this.$nextTick(function() {
+        for (var k = 0; k < this.depts.length; k++) {
+          for (var i = 0; i < this.crud.data.length; i++) {
+            if (this.crud.data[i].deptId == this.depts[k].deptId) {
+              this.$refs.table.toggleRowSelection(this.crud.data[i], true)
+              break
+            }
+          }
+        }
+      })
+    },
+    handleSelectionChange(val, row) {
+      if (val.length > 1 && this.isSingle) {
+        this.$refs.table.clearSelection()
+        this.$refs.table.toggleRowSelection(val.pop())
+      } else {
+        this.checkrow = row
+      }
+    },
+    onSelectAll() {
+      this.$refs.table.clearSelection()
+    },
+    close() {
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+    },
+    submit() {
+      // 处理单选
+      if (this.isSingle && this.tableRadio) {
+        this.$emit('update:dialogShow', false)
+        this.$emit('selectDepts', this.tableRadio)
+        return
+      }
+      this.rows = this.$refs.table.selection
+      if (this.rows.length <= 0) {
+        this.$message('请先勾选用户')
+        return
+      }
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+      this.$emit('selectDepts', this.rows)
+      // console.log(this.rows)
+    },
+    getDeptDatas(tree, treeNode, resolve) {
+      const params = { pid: tree.deptId }
+      setTimeout(() => {
+        crudDept.getDeptvo(params).then(res => {
+          resolve(res.content)
+        })
+      }, 100)
+    },
+    [CRUD.HOOK.afterRefresh]() {
+      this.open()
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 0px;
+}
+</style>
+
diff --git a/lms/nladmin-ui/src/views/system/user/dialog/relevanceUserDialog.vue b/lms/nladmin-ui/src/views/system/user/dialog/relevanceUserDialog.vue
new file mode 100644
index 000000000..85e45c08c
--- /dev/null
+++ b/lms/nladmin-ui/src/views/system/user/dialog/relevanceUserDialog.vue
@@ -0,0 +1,175 @@
+<template>
+  <el-dialog
+    title="关联用户"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="1000px"
+    @close="close"
+    @open="open"
+  >
+    <el-form
+      :inline="true"
+      class="demo-form-inline"
+      label-position="right"
+      label-width="80px"
+      label-suffix=":"
+    >
+      <el-form-item label="模糊搜索">
+        <el-input
+          v-model="query.blurry"
+          clearable
+          size="mini"
+          placeholder="输入账号或者名称"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-form-item>
+      <rrOperation />
+    </el-form>
+
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;"
+      size="mini"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      @select="handleSelectionChange"
+      @current-change="clickChange"
+    >
+      <el-table-column v-if="!isSingle" type="selection" width="55" />
+      <el-table-column v-if="isSingle" label="选择" width="55">
+        <template slot-scope="scope">
+          <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
+        </template>
+      </el-table-column>
+      <el-table-column prop="username" label="用户名" :min-width="flexWidth('username',crud.data,'用户名')" />
+      <el-table-column
+        prop="personName"
+        label="姓名"
+        :min-width="flexWidth('personName',crud.data,'姓名')"
+      />
+      <el-table-column show-overflow-tooltip prop="deptnames" label="部门" />
+      <el-table-column label="状态" align="center" prop="enabled">
+        <template slot-scope="scope">
+          {{scope.row.isUsed==1?'启用':'禁用'}}
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+import crudUser from '../user'
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+
+export default {
+  name: 'RelevanceUserDialog',
+  components: { rrOperation, pagination },
+  cruds() {
+    return CRUD({ title: '用户', idField: 'userId', url: 'api/users', crudMethod: { ...crudUser }, query: {isUsed: '1'}})
+  },
+  mixins: [presenter(), header()],
+  dicts: ['product_series'],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    isSingle: {
+      type: Boolean,
+      default: true
+    },
+    users: {
+      type: Array
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      classes: [],
+      tableRadio: null,
+      class_idStr: null,
+      checkrow: null,
+      rows: []
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    clickChange(item) {
+      this.tableRadio = item
+    },
+    open() {
+      this.$nextTick(function() {
+        console.log(this.crud.data)
+        for (var k = 0; k < this.users.length; k++) {
+          for (var i = 0; i < this.crud.data.length; i++) {
+            if (this.crud.data[i].userId == this.users[k].userId) {
+              this.$refs.table.toggleRowSelection(this.crud.data[i], true)
+              break
+            }
+          }
+        }
+      })
+    },
+    handleSelectionChange(val, row) {
+      if (val.length > 1 && this.isSingle) {
+        this.$refs.table.clearSelection()
+        this.$refs.table.toggleRowSelection(val.pop())
+      } else {
+        this.checkrow = row
+      }
+    },
+    onSelectAll() {
+      this.$refs.table.clearSelection()
+    },
+    close() {
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+    },
+    submit() {
+      // 处理单选
+      if (this.isSingle && this.tableRadio) {
+        this.$emit('update:dialogShow', false)
+        this.$emit('selectUsers', this.tableRadio)
+        return
+      }
+      this.rows = this.$refs.table.selection
+      if (this.rows.length <= 0) {
+        this.$message('请先勾选用户')
+        return
+      }
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+      this.$emit('selectUsers', this.rows)
+      // console.log(this.rows)
+    },
+    [CRUD.HOOK.afterRefresh]() {
+      this.open()
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 0px;
+}
+</style>
+
diff --git a/lms/nladmin-ui/src/views/system/user/dialog/showDataPermissionDialog.vue b/lms/nladmin-ui/src/views/system/user/dialog/showDataPermissionDialog.vue
new file mode 100644
index 000000000..8e9822056
--- /dev/null
+++ b/lms/nladmin-ui/src/views/system/user/dialog/showDataPermissionDialog.vue
@@ -0,0 +1,96 @@
+<template>
+  <el-dialog
+    title="数据权限"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="1000px"
+    @close="close"
+    @open="open"
+  >
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;"
+      size="mini"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+    >
+      <el-table-column prop="permission_scope_type" label="权限类型" min-width="100" show-overflow-tooltip />
+      <el-table-column prop="permission_name" label="权限范围" min-width="100" show-overflow-tooltip />
+      <el-table-column prop="dept_name" label="部门名称" min-width="100" show-overflow-tooltip />
+      <el-table-column prop="person_name" label="用户名称" min-width="100" show-overflow-tooltip />
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+
+export default {
+  name: 'ShowDataPermissionDialog',
+  components: { rrOperation, pagination },
+  cruds() {
+    return CRUD({ title: '权限明细', idField: 'userId', url: 'api/dataPermission/dataDetail'})
+  },
+  mixins: [presenter(), header()],
+  dicts: ['product_series'],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    currentUserId: {
+      type: Number,
+      default: 0
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      classes: [],
+      tableRadio: null,
+      rows: []
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    clickChange(item) {
+      this.tableRadio = item
+    },
+    open() {
+      console.log(this.currentUserId)
+    },
+    close() {
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+    },
+    [CRUD.HOOK.afterRefresh]() {
+      this.open()
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 0px;
+}
+</style>
+
diff --git a/lms/nladmin-ui/src/views/system/user/index.vue b/lms/nladmin-ui/src/views/system/user/index.vue
index d1743d239..2aa010a82 100644
--- a/lms/nladmin-ui/src/views/system/user/index.vue
+++ b/lms/nladmin-ui/src/views/system/user/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-row :gutter="20">
       <!--侧边部门数据-->
-      <el-col :xs="9" :sm="6" :md="5" :lg="5" :xl="4">
+      <el-col :span="4">
         <div class="head-container">
           <el-input
             v-model="deptName"
@@ -16,15 +16,12 @@
         </div>
         <el-tree
           :data="deptDatas"
-          :load="getDeptDatas"
           :props="defaultProps"
-          :expand-on-click-node="false"
-          lazy
           @node-click="handleNodeClick"
         />
       </el-col>
       <!--用户数据-->
-      <el-col :xs="15" :sm="18" :md="19" :lg="19" :xl="20">
+      <el-col :span="20">
         <!--工具栏-->
         <div class="head-container">
           <div v-if="crud.props.searchToggle">
@@ -39,7 +36,7 @@
               @keyup.enter.native="crud.toQuery"
             />
             <el-select
-              v-model="query.enabled"
+              v-model="query.isUsed"
               clearable
               size="mini"
               placeholder="状态"
@@ -58,7 +55,7 @@
           </div>
           <crudOperation show="" :permission="permission" />
         </div>
-        <!--表单渲染-->
+        <!--新增跟修改表单渲染-->
         <el-dialog
           append-to-body
           :close-on-click-modal="false"
@@ -74,24 +71,28 @@
             <el-form-item label="电话" prop="phone">
               <el-input v-model.number="form.phone" style="width: 200px;" />
             </el-form-item>
-            <el-form-item label="姓名" prop="nickName">
-              <el-input v-model="form.nickName" style="width: 200px;" />
+            <el-form-item label="姓名" prop="preson_name">
+              <el-input v-model="form.personName" 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="dept.id" :rules="[{ required: true, message: '请选择部门', trigger: 'change' }]">
+            <br v-if="!crud.status.edit">
+            <el-form-item v-if="crud.status.add" label="部门" prop="depts" :rules="[{ required: true, message: '请选择部门', trigger: 'change' }]">
               <treeselect
-                v-model="form.dept.id"
-                :options="depts"
+                v-model="form.depts"
                 :load-options="loadDepts"
-                style="width: 200px"
-                placeholder="选择部门"
+                :options="deptDatas"
+                style="width: 370px;"
+                :multiple="true"
+                :flat="true"
+                :normalizer="normalizer"
+                placeholder="选择部门类目"
               />
             </el-form-item>
             <br v-if="!crud.status.add">
-            <el-form-item label="密码" prop="password" v-if="crud.status.add">
-              <el-input v-model="form.password" style="width: 200px;" show-password auto-complete="new-password"/>
+            <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">
@@ -99,31 +100,31 @@
                 <el-radio label="女">女</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.enabled" :disabled="form.id === user.id">
-                <el-radio
-                  v-for="item in dict.user_status"
-                  :key="item.id"
-                  :label="item.value"
-                >{{ item.label }}
-                </el-radio>
-              </el-radio-group>
+            <el-form-item label="状态" prop="isUesd">
+              <el-switch
+                v-model="form.isUsed"
+                active-color="#409EFF"
+                inactive-color="#F56C6C"
+              />
             </el-form-item>
-            <el-form-item style="margin-bottom: 0;" label="角色" prop="roles">
+            <br v-if="!crud.status.edit">
+            <el-form-item v-if="crud.status.add" 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.name"
-                  :disabled="level !== 1 && item.level <= level"
+                  :key="item.roleId"
                   :label="item.name"
-                  :value="item.id"
+                  :value="item.roleId"
                 />
               </el-select>
             </el-form-item>
@@ -142,55 +143,51 @@
           @selection-change="crud.selectionChangeHandler"
         >
           <el-table-column :selectable="checkboxT" type="selection" width="55" />
-          <el-table-column show-overflow-tooltip prop="username" label="用户名" />
-          <el-table-column show-overflow-tooltip prop="nickName" label="姓名" />
-          <el-table-column prop="gender" label="性别" />
-          <el-table-column show-overflow-tooltip prop="phone" width="100" label="电话" />
-          <el-table-column show-overflow-tooltip width="135" prop="email" label="邮箱" />
-          <el-table-column show-overflow-tooltip prop="dept" label="部门">
+          <el-table-column prop="username" label="用户名" :min-width="flexWidth('username',crud.data,'用户名')" />
+          <el-table-column
+            prop="personName"
+            label="姓名"
+            :min-width="flexWidth('personName',crud.data,'姓名')"
+          />
+          <el-table-column prop="gender" label="性别" :min-width="flexWidth('personName',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="depts" label="部门">
             <template slot-scope="scope">
-              <div>{{ scope.row.dept.name }}</div>
+              <span v-for=" item in scope.row.depts" :key="item.index">{{ item.name }}    </span>
             </template>
-          </el-table-column>
+          </el-table-column>>
           <el-table-column label="状态" align="center" prop="enabled">
             <template slot-scope="scope">
-              <el-switch
-                v-model="scope.row.enabled"
-                :disabled="user.id === scope.row.id"
-                active-color="#409EFF"
-                inactive-color="#F56C6C"
-                @change="changeEnabled(scope.row, scope.row.enabled)"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column show-overflow-tooltip prop="createTime" width="135" label="创建日期">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span :style="{'color': caseStatusColorFilter(scope.row.isUsed)}">{{ enabledTypeOptions.find(item => {return item.key == scope.row.isUsed}).display_name }}</span>
             </template>
           </el-table-column>
+          <el-table-column prop="createTime" label="创建日期" :min-width="flexWidth('createTime',crud.data,'创建日期')" />
           <el-table-column
-            v-permission="['admin','user:edit','user:del']"
             label="操作"
-            width="200"
-            align="center"
             fixed="right"
+            align="center"
+            width="200"
           >
             <template slot-scope="scope">
-              <udOperation
-                style="display: inline"
-                :data="scope.row"
-                :permission="permission"
-                :disabled-dle="scope.row.id === user.id"
-              />
-              <el-button
-                v-permission="permission.edit"
-                type="text"
-                slot="left"
-                icon="el-icon-refresh-left"
-                @click="resetPassword(scope.row)"
-              >
-                重置密码
-              </el-button>
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="crud.toEdit(scope.row)">修改</el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" @click="handdeleted(scope.row)">删除</el-button>
+              <el-dropdown v-hasPermi="['system:user:resetPwd', 'system:user:edit']" size="mini">
+                <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item icon="el-icon-refresh-right"><span @click="resetPassword(scope.row)">重置密码</span></el-dropdown-item>
+                  <el-dropdown-item icon="el-icon-key">
+                    <span @click="openDeptDrawer(scope.row)">部门权限</span>
+                  </el-dropdown-item>
+                  <el-dropdown-item icon="el-icon-key">
+                    <span @click="openDataDialog(scope.row)">数据权限</span>
+                  </el-dropdown-item>
+                  <el-dropdown-item icon="el-icon-lock"><span @click="changeEnabled(scope.row)">{{ enabledTypeOptions.find(item => {return item.key !== scope.row.isUsed}).display_name }}账号</span></el-dropdown-item>
+                  <el-dropdown-item icon="el-icon-circle-check">
+                    <span @click="openRoleDrawer(scope.row)">分配角色</span>
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
             </template>
           </el-table-column>
         </el-table>
@@ -198,70 +195,210 @@
         <pagination />
       </el-col>
     </el-row>
+    <el-drawer
+      :title="drawerTitle"
+      :visible.sync="syncDrawer"
+      direction="rtl"
+      :before-close="handleClose"
+      :wrapper-closable="false"
+      size="35%"
+      @close="clearCheck"
+    >
+      <div style="margin: 0 20px 0 20px; height: 100%">
+        <div style="height: 90%">
+          <el-tree
+            v-if="flag"
+            ref="deptUser"
+            show-checkbox
+            default-expand-all
+            :data="deptsDatas"
+            :default-checked-keys="depChecked"
+            :props="deptProps"
+            node-key="deptId"
+            highlight-current
+            check-strictly
+            @check="handCheck"
+            @check-change="checkChange"
+            @close="clearCheck"
+          />
+          <el-table
+            v-if="!flag"
+            ref="roleTable"
+            highlight-current-row
+            style="width: 100%;"
+            :data="rolesDatas"
+            @selection-change="crud.selectionChangeHandler"
+          >
+            <el-table-column type="selection" width="55" />
+            <el-table-column prop="name" label="角色名称" min-width="100" show-overflow-tooltip />
+          </el-table>
+        </div>
+        <div style="height: 10%">
+          <el-button @click="cancelForm">取 消</el-button>
+          <el-button type="primary" @click="saveChecked">保 存</el-button>
+        </div>
+      </div>
+    </el-drawer>
+    <el-dialog
+      :close-on-click-modal="true"
+      :visible.sync="dataPerm"
+      :title="dataPermissionTitle"
+      width="700px"
+    >
+      <el-form ref="form" :inline="true" :model="dataDialog" :rules="rules" size="mini" label-width="100px">
+        <el-form-item label="用户名" prop="username">
+          <el-input v-model="dataDialog.username" disabled style="width: 200px;" />
+        </el-form-item>
+        <el-form-item label="姓名" prop="presonName">
+          <el-input v-model="dataDialog.personName" disabled style="width: 200px;" />
+        </el-form-item>
+        <el-table
+          ref="dialogTable"
+          :data="dataDialog.dataScopeType"
+          style="width: 100%;"
+          @selection-change="getRows"
+        >
+          <el-table-column :selectable="checkboxT" type="selection" width="55" />
+          <el-table-column prop="label" label="权限范围" />
+          <el-table-column label="数据权限">
+            <template slot-scope="scope">
+              <el-select
+                v-model="scope.row.permissionId"
+                placeholder="请选择"
+                @change="openRelevance(scope.row, scope.$index)"
+              >
+                <el-option
+                  v-for="item in permissions"
+                  :key="item.permissionId"
+                  :label="item.name"
+                  :value="item.permissionId"
+                />
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            fixed="right"
+            align="center"
+            width="100"
+          >
+            <template slot-scope="scope">
+              <el-button type="text" @click="showDatas(scope.row)">查看明细</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancelDataPerm">取消</el-button>
+        <el-button type="primary" @click="savePermise()">确认</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog
+      :close-on-click-modal="true"
+      :visible.sync="showData"
+      :title="dataPermissionTitle"
+      width="700px"
+    >
+      <el-table
+        ref="dialogTable"
+        :data="dataPermissions"
+        style="width: 100%; max-height: 500px"
+      >
+        <el-table-column prop="permissionScopeType" label="权限类型" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="permissionName" label="权限范围" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="deptName" label="部门名称" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="personName" label="用户名称" min-width="100" show-overflow-tooltip />
+      </el-table>
+    </el-dialog>
+    <relevance-user-dialog :dialog-show.sync="relevanceUser" :is-single="false" :users="userIds" @selectUsers="selectUsers" />
+    <relevance-dept-dialog :dialog-show.sync="relevanceDept" :is-single="false" :depts="deptIds" @selectDepts="selectDepts" />
   </div>
 </template>
 
 <script>
-import crudUser from '@/api/system/user'
-import { getDepts, getDeptSuperior } from '@/api/system/dept'
-import { getAll, getLevel } from '@/api/system/role'
+import crudUser from '@/views/system/user/user'
+import crudDept from '@/views/system/dept/dept'
+import crudDataPermission from '@/views/system/dataPermission/dataPermission'
+import { getAll, getLevel } from '@/views/system/role/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 DateRangePicker from '@/components/DateRangePicker'
 import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
 import { mapGetters } from 'vuex'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import RelevanceUserDialog from '@/views/system/user/dialog/relevanceUserDialog'
+import RelevanceDeptDialog from '@/views/system/user/dialog/relevanceDeptDialog'
 
 let userRoles = []
 const defaultForm = {
-  id: null,
+  deptId: null,
+  depts: [],
   username: null,
-  nickName: null,
+  personName: null,
   gender: '男',
   email: null,
-  enabled: 'true',
+  isUsed: true,
   roles: [],
-  dept: { id: null },
   phone: null,
   password: null
 }
 export default {
   name: 'User',
-  components: { Treeselect, crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
+  components: { RelevanceDeptDialog, RelevanceUserDialog, Treeselect, crudOperation, rrOperation, udOperation, pagination },
   cruds() {
-    return CRUD({ title: '用户', url: 'api/users', crudMethod: { ...crudUser }})
+    return CRUD({ title: '用户', idField: 'userId', url: 'api/users', crudMethod: { ...crudUser }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   // 数据字典
-  dicts: ['user_status'],
+  dicts: ['user_status', 'permission_scope_type'],
   data() {
     return {
       height: document.documentElement.clientHeight - 180 + 'px;',
       deptName: '', depts: [], deptDatas: [], level: 3, roles: [],
       roleDatas: [], // 多选时使用
-      defaultProps: { children: 'children', label: 'name', isLeaf: 'leaf' },
+      defaultProps: { children: 'children', label: 'name' },
+      deptProps: { children: 'children', label: 'name' },
       permission: {
         add: ['admin', 'user:add'],
         edit: ['admin', 'user:edit'],
         del: ['admin', 'user:del']
       },
       enabledTypeOptions: [
-        { key: 'true', display_name: '激活' },
-        { key: 'false', display_name: '锁定' }
+        { key: true, display_name: '激活' },
+        { key: false, display_name: '锁定' }
       ],
       rules: {
         username: [
           { required: true, message: '请输入用户名', trigger: 'blur' },
           { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
         ],
-        nickName: [
+        personName: [
           { required: true, message: '请输入用户姓名', trigger: 'blur' },
           { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
         ]
-      }
+      },
+      syncDrawer: false,
+      depChecked: [],
+      depCheckedId: '',
+      deptsDatas: [],
+      rolesDatas: [],
+      drawerTitle: '',
+      flag: true,
+      dataPerm: false,
+      dataDialog: {},
+      permissions: [],
+      permissionId: '',
+      multipleSelection: [], // 选中
+      relevanceUser: false, // 关联用户
+      rowData: {}, // 当行数据
+      relevanceDept: false, // 关联部门
+      deptIds: [],
+      userIds: [],
+      showData: false,
+      dataPermissions: [],
+      dataPermissionTitle: '数据权限'
     }
   },
   computed: {
@@ -269,6 +406,9 @@ export default {
       'user'
     ])
   },
+  beforeMount() {
+    this.deptTree()
+  },
   created() {
     this.crud.msg.add = '新增成功'
   },
@@ -293,16 +433,33 @@ export default {
         }
       })
     },
+    caseStatusColorFilter(isUsed) {
+      if (isUsed === true) {
+        return '#378be2'
+      }
+      return '#F56C6C'
+    },
+    handdeleted(datas) {
+      this.$confirm(`确认删除选中的1条数据?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.crud.delAllLoading = true
+        this.crud.doDelete(datas)
+      }).catch(() => {
+      })
+    },
     // 新增与编辑前做的操作
     [CRUD.HOOK.afterToCU](crud, form) {
       this.getRoles()
-      if (form.id == null) {
-        this.getDepts()
+      if (form.deptId == null) {
+        crudDept.getDepts()
       } else {
-        this.getSupDepts(form.dept.id)
+        this.getSupDepts(form.deptId)
       }
-      this.getRoleLevel()
-      form.enabled = form.enabled.toString()
+      // this.getRoleLevel() 暂时不用
+      form.isUsed = form.enabled.toString()
     },
     // 新增前将多选的值设置为空
     [CRUD.HOOK.beforeToAdd]() {
@@ -311,18 +468,21 @@ export default {
     },
     // 初始化编辑时候的角色与岗位
     [CRUD.HOOK.beforeToEdit](crud, form) {
+      crud.status.edit
       this.roleDatas = []
       userRoles = []
       const _this = this
-      form.roles.forEach(function(role, index) {
-        _this.roleDatas.push(role.id)
-        const rol = { id: role.id }
-        userRoles.push(rol)
-      })
+      if (form.roles !== null && form.roles.length > 0) {
+        form.roles.forEach(function(role, index) {
+          _this.roleDatas.push(role)
+          const rol = { id: role }
+          userRoles.push(rol)
+        })
+      }
     },
     // 提交前做的操作
     [CRUD.HOOK.afterValidateCU](crud) {
-      if (!crud.form.dept.id) {
+      if (!crud.form.depts) {
         this.$message({
           message: '部门不能为空',
           type: 'warning'
@@ -335,25 +495,22 @@ export default {
         })
         return false
       }
-      crud.form.roles = userRoles
+      const roles = []
+      userRoles.forEach(function(data, index) {
+        roles.push(data.id)
+      })
+      crud.form.roles = roles
       return true
     },
     // 获取左侧部门数据
     getDeptDatas(node, resolve) {
-      console.log('node', node)
-      console.log('resolve', resolve)
-      const sort = 'id,desc'
-      const params = { sort: sort }
-      if (typeof node !== 'object') {
-        if (node) {
-          params['name'] = node
-        }
-      } else if (node.level !== 0) {
-        params['pid'] = node.data.id
-      }
-      console.log('params', params)
       setTimeout(() => {
-        getDepts(params).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)
@@ -363,10 +520,19 @@ export default {
         })
       }, 100)
     },
+
+    deptTree() {
+      setTimeout(() => {
+        crudDept.getDeptTree().then(res => {
+          this.deptDatas = res.content
+        })
+      }, 100)
+    },
     getDepts() {
       console.log('获取部门')
-      getDepts({ enabled: true }).then(res => {
+      crudDept.getDepts({ isUsed: true }).then(res => {
         console.log('获取的部门信息', res)
+
         this.depts = res.content.map(function(obj) {
           if (obj.hasChildren) {
             obj.children = null
@@ -376,7 +542,7 @@ export default {
       })
     },
     getSupDepts(deptId) {
-      getDeptSuperior(deptId).then(res => {
+      crudDept.getDeptSuperior(deptId).then(res => {
         console.log('父部门', res)
         const date = res.content
         this.buildDepts(date)
@@ -396,42 +562,44 @@ export default {
     // 获取弹窗内部门数据
     loadDepts({ action, parentNode, callback }) {
       if (action === LOAD_CHILDREN_OPTIONS) {
-        getDepts({ enabled: true, pid: parentNode.id }).then(res => {
+        crudDept.getDeptvo({ isUsed: true, pid: parentNode.dept_id }).then(res => {
           parentNode.children = res.content.map(function(obj) {
-            if (obj.hasChildren) {
-              obj.children = null
-            }
+            obj.children = null
             return obj
           })
           setTimeout(() => {
             callback()
-          }, 200)
+          }, 100)
         })
       }
     },
+    normalizer(node) {
+      return {
+        id: node.deptId,
+        label: node.name,
+        children: node.children
+      }
+    },
     // 切换部门
     handleNodeClick(data) {
-      if (data.pid === 0) {
-        this.query.deptId = null
-      } else {
-        this.query.deptId = data.id
-      }
+      this.query.deptId = data.deptId
+      this.query.needAll = true
       this.crud.toQuery()
+      this.query.deptId = null
     },
     // 改变状态
-    changeEnabled(data, val) {
-      this.$confirm('此操作将 "' + this.dict.label.user_status[val] + '" ' + data.username + ', 是否继续？', '提示', {
+    changeEnabled(row) {
+      const satus = this.enabledTypeOptions.find(item => { return item.key !== row.isUsed })
+      this.$confirm('此操作将' + satus.display_name + '账号：' + row.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
+        row.isUsed = satus.key
+        crudUser.edit(row).then(res => {
+          this.crud.toQuery()
+          this.crud.notify('账号' + row.username + '已' + satus.display_name)
         })
-      }).catch(() => {
-        data.enabled = !data.enabled
       })
     },
     // 获取弹窗内角色数据
@@ -449,29 +617,257 @@ export default {
       })
     },
     checkboxT(row, rowIndex) {
-      return row.id !== this.user.id
+      // return row.id !== this.user.id
+      return true
     },
     resetPassword(row) {
-      row.password = null
-      this.$prompt('', '重置密码', {
+      this.$confirm(`确认重置密码？`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        inputPlaceholder: '请输入新的密码',
-        inputPattern: /^[A-Z|a-z|0-9|(._~!@#$^&*)]{6,20}$/,
-        inputErrorMessage: '密码格式不正确,只能是6-20位密码',
-        closeOnClickModal: false
-      }).then(({ value }) => {
-        row.password = value
+        type: 'warning'
+      }).then(() => {
+        row.password = '123456'
         crudUser.edit(row).then(res => {
           this.crud.toQuery()
-          this.crud.notify('密码重置成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消输入'
+          this.crud.notify('密码重置成功，密码:123456', CRUD.NOTIFICATION_TYPE.SUCCESS)
         })
       })
+    },
+    // 部门权限
+    openDeptDrawer(row) {
+      crudDept.getDeptTree().then(res => {
+        this.deptsDatas = res.content
+      })
+      this.openDrawer()
+      this.drawerTitle = '分配部门权限'
+      this.flag = true
+      // 默认选中
+      const deptIds = []
+      for (var index in row.depts) {
+        deptIds.push(row.depts[index].deptId)
+      }
+      this.$nextTick(() => {
+        this.$refs.deptUser.setCheckedKeys(deptIds)
+      })
+      this.giveValue(row)
+    },
+    // 角色权限
+    openRoleDrawer(row) {
+      this.rolesDatas = []
+      getAll().then(res => {
+        this.rolesDatas = res
+        // 回显默认选中
+        this.$nextTick(function() {
+          for (let j = 0; j < row.roles.length; j++) {
+            for (let i = 0; i < this.rolesDatas.length; i++) {
+              if (this.rolesDatas[i].roleId == row.roles[j].roleId) {
+                this.$refs.roleTable.toggleRowSelection(this.rolesDatas[i], true)
+                break
+              }
+            }
+          }
+        })
+      })
+      this.openDrawer()
+      this.drawerTitle = '分配角色权限'
+      this.flag = false
+      this.giveValue(row)
+    },
+    openDataDialog(row) {
+      // 清空数据 应该需要初始化赋值
+      this.dataDialog = {}
+      this.multipleSelection = []
+      // 获取权限范围
+      crudDataPermission.getDataScopeType().then(res => {
+        this.dataDialog.dataScopeType = res
+        // permissions
+        crudDataPermission.getDataPermissionOption().then(res => {
+          // console.log(res)
+          this.permissions = res
+          this.dataDialog.personName = row.personName
+          this.dataDialog.username = row.username
+          this.dataDialog.userId = row.userId
+          this.dataPermissionTitle = '[' + row.personName + '] 数据权限'
+          this.dataPerm = true
+          // 回显数据
+          crudDataPermission.getDataShow(row.userId).then(res => {
+            this.$nextTick(function() {
+              for (var index = 0; index < res.length; index++) {
+                for (var i = 0; i < this.dataDialog.dataScopeType.length; i++) {
+                  if (this.dataDialog.dataScopeType[i].value == res[index].permissionScopeType) {
+                    this.dataDialog.dataScopeType[i].permissionId = res[index].permissionId
+                    if (res[index].users) this.dataDialog.dataScopeType[i].users = res[index].users
+                    if (res[index].depts) this.dataDialog.dataScopeType[i].depts = res[index].depts
+                    // 选中
+                    this.$refs.dialogTable.toggleRowSelection(this.dataDialog.dataScopeType[i], true)
+                    break
+                  }
+                }
+              }
+            })
+          })
+        })
+      })
+    },
+    getRows(val) { // 获取行数据
+      this.multipleSelection = val
+    },
+    openRelevance(row, index) {
+      for (var i = 0; i < this.permissions.length; i++) {
+        if (this.permissions[i].permissionId != undefined && this.permissions[i].permissionId && this.permissions[i].permissionId != row.permissionId) {
+          this.$delete(this.dataDialog.dataScopeType[index], this.permissions[i].permissionId.toString())
+        }
+      }
+      this.$set(this.dataDialog.dataScopeType[index], this.dataDialog.dataScopeType[index].permissionId, row.permissionId)
+      this.rowData = {}
+      this.deptIds = []
+      this.userIds = []
+      console.log(row)
+      if (row.permissionId == '1605129738328870912') { // 选择用户
+        this.userIds = this.dataDialog.dataScopeType[index].users
+        this.rowData = row
+        this.relevanceUser = true
+      } else if (row.permissionId == '1605129882164137984') { // 选择部门
+        this.deptIds = this.dataDialog.dataScopeType[index].depts
+        this.rowData = row
+        this.relevanceDept = true
+      } else if (row.permissionId == '1605128919449735168') { // 自身
+        const param = {
+          userId: this.dataDialog.userId
+        }
+        this.dataDialog.dataScopeType[index].users = []
+        this.dataDialog.dataScopeType[index].users.push(param)
+      } else { // 其他应该清空
+        this.dataDialog.dataScopeType[index].depts = []
+        this.dataDialog.dataScopeType[index].users = []
+      }
+    },
+    selectUsers(row) { // row对话框传来的数据
+      for (var i = 0; i < this.dataDialog.dataScopeType.length; i++) {
+        if (this.dataDialog.dataScopeType[i].dictId == this.rowData.dictId) {
+          if (this.dataDialog.dataScopeType[i].depts != undefined && this.dataDialog.dataScopeType[i].depts.length > 0) this.dataDialog.dataScopeType[i].depts = []
+          this.dataDialog.dataScopeType[i].users = row
+          break
+        }
+      }
+      this.rowData = {}
+    },
+    selectDepts(row) {
+      for (var i = 0; i < this.dataDialog.dataScopeType.length; i++) {
+        if (this.dataDialog.dataScopeType[i].dictId == this.rowData.dictId) {
+          if (this.dataDialog.dataScopeType[i].users != undefined && this.dataDialog.dataScopeType[i].users.length > 0) this.dataDialog.dataScopeType[i].users = []
+          this.dataDialog.dataScopeType[i].depts = row
+          break
+        }
+      }
+      this.rowData = {}
+    },
+    cancelDataPerm() {
+      this.dataPerm = false
+    },
+    savePermise() {
+      const param = {
+        userId: this.dataDialog.userId,
+        datas: this.multipleSelection
+      }
+      console.log('param', param)
+      crudDataPermission.saveDataPermission(param).then(res => {
+        this.dataPerm = false
+        this.crud.notify('添加数据权限成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
+      })
+    },
+    openDrawer() {
+      this.syncDrawer = true
+      this.depCheckedId = ''
+      this.depChecked = []
+    },
+    giveValue(row) {
+      this.depCheckedId = row.userId
+    },
+    clearCheck() { // 清空选中
+      if (this.flag) this.$refs.deptUser.setCheckedKeys([])
+    },
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          done()
+        })
+        .catch(_ => {})
+    },
+    cancelForm() { // 关闭
+      this.syncDrawer = false
+      if (this.flag) this.clearCheck()
+    },
+    saveChecked() {
+      const user = {
+        userId: this.depCheckedId
+      }
+      if (this.flag) {
+        user.deptIds = this.$refs.deptUser.getCheckedKeys()
+      } else {
+        user.rolesIds = this.crud.selections.map(item => (item.roleId))
+      }
+      crudUser.edit(user).then(res => {
+        this.cancelForm()
+        this.crud.notify('保存成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
+      })
+    },
+    // 覆盖原有勾选功能，父与子关联，子与父不关联
+    handCheck(data, node) {
+      this.hanleCheck(data, node, 'deptUser')
+    },
+    hanleCheck(data, node, treeName) {
+      const _this = this
+      // 获取当前节点是否被选中
+      const isChecked = _this.$refs[treeName].getNode(data).checked
+      // 如果当前节点被选中，则遍历下级子节点并选中，如果当前节点取消选中，则遍历下级节点并取消
+      if (isChecked) {
+        // 判断该节点是否有下级节点，如果有那么遍历设置下级节点为选中
+        data.children && data.children.length > 0 && setChildreChecked(data.children, true)
+      } else {
+        // 如果节点取消选中，则取消该节点下的子节点选中
+        data.children && data.children.length > 0 && setChildreChecked(data.children, false)
+      }
+      function setChildreChecked(node, isChecked) {
+        node.forEach(item => {
+          item.children && item.children.length > 0 && setChildreChecked(item.children, isChecked)
+          // 修改勾选状态
+          _this.$refs[treeName].setChecked(item.name, isChecked)
+        })
+      }
+    },
+    checkChange(data, checked, indeterminate) {
+      const _this = this
+      // console.log(data, checked, indeterminate);
+      // 选中全部子节点，父节点也默认选中，但是子节点再次取消勾选或者全部子节点取消勾选也不会影响父节点勾选状态
+      const checkNode = _this.$refs.deptUser.getNode(data)// 获取当前节点
+      // 勾选部分子节点，父节点变为半选状态
+      if (checkNode.parent && checkNode.parent.childNodes.some(ele => ele.checked)) {
+        checkNode.parent.indeterminate = true
+      }
+      // 勾选全部子节点，父节点变为全选状态
+      if (checkNode.parent && checkNode.parent.childNodes.every(ele => ele.checked)) {
+        checkNode.parent.checked = true
+        checkNode.parent.indeterminate = false
+      }
+      // 如果取消所有第二节点的勾选状态，则第一层父节点也取消勾选
+      if (checkNode.level == 2 && checkNode.parent.childNodes.every(ele => !ele.checked)) {
+        checkNode.parent.checked = false
+        checkNode.parent.indeterminate = false
+      }
+    },
+    showDatas(row) {
+      const param = {
+        userId: this.dataDialog.userId,
+        permissionScopeType: row.value
+      }
+      crudDataPermission.getDataDetail(param).then(res => {
+        console.log(res)
+        this.dataPermissions = res
+      })
+      this.showData = true
     }
   }
 }
diff --git a/lms/nladmin-ui/src/api/system/user.js b/lms/nladmin-ui/src/views/system/user/user.js
similarity index 100%
rename from lms/nladmin-ui/src/api/system/user.js
rename to lms/nladmin-ui/src/views/system/user/user.js
diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/stor/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/stor/index.vue
index f8b70ade7..b4cbebe95 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/st/stor/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/st/stor/index.vue
@@ -202,7 +202,7 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import { getDepts, getDeptSuperior } from '@/api/system/dept'
+import { getDepts, getDeptSuperior } from '@/views/system/dept/dept'
 import { isvalidPhone } from '@/utils/validate'
 import crudSectattr from '@/views/wms/basedata/st/sect/sectattr'
 
diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/userStor/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/userStor/index.vue
index c5ea879cf..6e136b643 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/st/userStor/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/st/userStor/index.vue
@@ -88,8 +88,8 @@
 
 <script>
 import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
-import { getDepts, getDeptSuperior } from '@/api/system/dept'
-import { getChild, getMenusTree } from '@/api/system/menu'
+import { getDepts, getDeptSuperior } from '@/views/system/dept/dept'
+import { getChild, getMenusTree } from '@/views/system/menu/menu'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
diff --git a/lms/nladmin-ui/vue.config.js b/lms/nladmin-ui/vue.config.js
index 0bac45180..9cea9e1b6 100644
--- a/lms/nladmin-ui/vue.config.js
+++ b/lms/nladmin-ui/vue.config.js
@@ -19,6 +19,8 @@ module.exports = {
   lintOnSave: process.env.NODE_ENV === 'development',
   productionSourceMap: false,
   devServer: {
+    disableHostCheck: true,
+    allowedHosts: ['all'],
     port: port,
     open: false,
     overlay: {