diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index f36bdd5..d05eb37 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -17,6 +17,8 @@
         :expand-on-click-node="false"
         :filter-node-method="filterNode"
         :default-expand-all="false"
+        :default-expanded-keys="defaultExpandedKeys"
+        node-key="id"
         highlight-current
         accordion
         @node-click="onClickNode"
@@ -81,6 +83,10 @@
         label: 'areaName',
         children: 'children'
       })
+    },
+    defaultExpandedKeys: {
+      type: Array,
+      default: () => []
     }
   },
   data() {

diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index f36bdd5..d05eb37 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -17,6 +17,8 @@
         :expand-on-click-node="false"
         :filter-node-method="filterNode"
         :default-expand-all="false"
+        :default-expanded-keys="defaultExpandedKeys"
+        node-key="id"
         highlight-current
         accordion
         @node-click="onClickNode"
@@ -81,6 +83,10 @@
         label: 'areaName',
         children: 'children'
       })
+    },
+    defaultExpandedKeys: {
+      type: Array,
+      default: () => []
     }
   },
   data() {
diff --git a/src/store/modules/dict.js b/src/store/modules/dict.js
new file mode 100644
index 0000000..8f5de49
--- /dev/null
+++ b/src/store/modules/dict.js
@@ -0,0 +1,17 @@
+const state = {
+  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }]
+}
+
+const mutations = {
+}
+
+const actions = {
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}
+

diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index f36bdd5..d05eb37 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -17,6 +17,8 @@
         :expand-on-click-node="false"
         :filter-node-method="filterNode"
         :default-expand-all="false"
+        :default-expanded-keys="defaultExpandedKeys"
+        node-key="id"
         highlight-current
         accordion
         @node-click="onClickNode"
@@ -81,6 +83,10 @@
         label: 'areaName',
         children: 'children'
       })
+    },
+    defaultExpandedKeys: {
+      type: Array,
+      default: () => []
     }
   },
   data() {
diff --git a/src/store/modules/dict.js b/src/store/modules/dict.js
new file mode 100644
index 0000000..8f5de49
--- /dev/null
+++ b/src/store/modules/dict.js
@@ -0,0 +1,17 @@
+const state = {
+  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }]
+}
+
+const mutations = {
+}
+
+const actions = {
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}
+
diff --git a/src/utils/structure.js b/src/utils/structure.js
index 4c65ee7..13bfb99 100644
--- a/src/utils/structure.js
+++ b/src/utils/structure.js
@@ -27,7 +27,7 @@
  * @param isSelect 是否是下拉需要顶级的树
  * @returns {*}
  */
-export function toTreeList(plainList, id = '0', isSelect = false) {
+export function toTreeList(plainList, rootId = '0', isSelect = false) {
   const pid = findPid(plainList)
   if (pid.length > 1) {
     return plainList

diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index f36bdd5..d05eb37 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -17,6 +17,8 @@
         :expand-on-click-node="false"
         :filter-node-method="filterNode"
         :default-expand-all="false"
+        :default-expanded-keys="defaultExpandedKeys"
+        node-key="id"
         highlight-current
         accordion
         @node-click="onClickNode"
@@ -81,6 +83,10 @@
         label: 'areaName',
         children: 'children'
       })
+    },
+    defaultExpandedKeys: {
+      type: Array,
+      default: () => []
     }
   },
   data() {
diff --git a/src/store/modules/dict.js b/src/store/modules/dict.js
new file mode 100644
index 0000000..8f5de49
--- /dev/null
+++ b/src/store/modules/dict.js
@@ -0,0 +1,17 @@
+const state = {
+  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }]
+}
+
+const mutations = {
+}
+
+const actions = {
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}
+
diff --git a/src/utils/structure.js b/src/utils/structure.js
index 4c65ee7..13bfb99 100644
--- a/src/utils/structure.js
+++ b/src/utils/structure.js
@@ -27,7 +27,7 @@
  * @param isSelect 是否是下拉需要顶级的树
  * @returns {*}
  */
-export function toTreeList(plainList, id = '0', isSelect = false) {
+export function toTreeList(plainList, rootId = '0', isSelect = false) {
   const pid = findPid(plainList)
   if (pid.length > 1) {
     return plainList
diff --git a/src/utils/validate.js b/src/utils/validate.js
index dbecf7a..223c280 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -88,3 +88,11 @@
     return false
   }
 }
+
+/**
+ * 常用正则表达式
+ */
+export const regularReg = {
+  password: '', // 密码
+  mobile: /^1[34578]\d{9}$/ // 手机号码
+}

diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index f36bdd5..d05eb37 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -17,6 +17,8 @@
         :expand-on-click-node="false"
         :filter-node-method="filterNode"
         :default-expand-all="false"
+        :default-expanded-keys="defaultExpandedKeys"
+        node-key="id"
         highlight-current
         accordion
         @node-click="onClickNode"
@@ -81,6 +83,10 @@
         label: 'areaName',
         children: 'children'
       })
+    },
+    defaultExpandedKeys: {
+      type: Array,
+      default: () => []
     }
   },
   data() {
diff --git a/src/store/modules/dict.js b/src/store/modules/dict.js
new file mode 100644
index 0000000..8f5de49
--- /dev/null
+++ b/src/store/modules/dict.js
@@ -0,0 +1,17 @@
+const state = {
+  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }]
+}
+
+const mutations = {
+}
+
+const actions = {
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}
+
diff --git a/src/utils/structure.js b/src/utils/structure.js
index 4c65ee7..13bfb99 100644
--- a/src/utils/structure.js
+++ b/src/utils/structure.js
@@ -27,7 +27,7 @@
  * @param isSelect 是否是下拉需要顶级的树
  * @returns {*}
  */
-export function toTreeList(plainList, id = '0', isSelect = false) {
+export function toTreeList(plainList, rootId = '0', isSelect = false) {
   const pid = findPid(plainList)
   if (pid.length > 1) {
     return plainList
diff --git a/src/utils/validate.js b/src/utils/validate.js
index dbecf7a..223c280 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -88,3 +88,11 @@
     return false
   }
 }
+
+/**
+ * 常用正则表达式
+ */
+export const regularReg = {
+  password: '', // 密码
+  mobile: /^1[34578]\d{9}$/ // 手机号码
+}
diff --git a/src/views/system/user/editUser.vue b/src/views/system/user/editUser.vue
index d22cd09..c9eb42f 100644
--- a/src/views/system/user/editUser.vue
+++ b/src/views/system/user/editUser.vue
@@ -1,10 +1,10 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="700" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="userForm" label-position="right" label-width="80px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="账号" prop="account">
-            <el-input v-model.trim="userForm.account" :disabled="ifdisabled" type="text" placeholder="必填" />
+            <el-input v-model.trim="userForm.account" :disabled="dialogStatus=='update'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -52,17 +52,16 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item v-if="!ifdisabled" label="角色" prop="roleid">
-            <select-tree v-model="userForm.roleid" :options="roleTreeList" :props="roleProps" />
+          <el-form-item v-if="dialogStatus=='create'" label="角色" prop="roleid">
+            <select-tree v-model="userForm.roleid" :default-expanded-keys="[userForm.roleid]" :options="roleTreeList" :props="roleProps" />
           </el-form-item>
           <el-form-item v-else label="角色">
-            <el-input v-model="roleName" :disabled="ifdisabled" type="text" placeholder="无" />
+            <el-input v-model="roleName" :disabled="dialogStatus=='update'" type="text" placeholder="无" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="组织机构" prop="deptId">
-            <dept-select v-model="userForm.deptId" :dept-show="deptShow" placeholder="请选择组织机构" />
-            <!--<select-tree v-model="userForm.deptId" :options="deptTreeList" :props="deptProps" />-->
+            <dept-select v-model="userForm.deptId" :dept-show="true" :default-expanded-keys="[userForm.roleid]" placeholder="请选择组织机构" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -94,17 +93,16 @@
 import { toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
 import DeptSelect from '@/components/DeptSelect'
-// import { getDeptTreeList } from '@/api/system/dept'
+import { regularReg } from '@/utils/validate'
 import { getRoleTreeList } from '@/api/system/role'
 import { addUser, updateUser } from '@/api/system/user'
-import { RSAencrypt } from '../../../utils/security'
+import { RSAencrypt } from '@/utils/security'
 
 export default {
   name: 'EditUser',
   components: { SelectTree, DeptSelect },
   data() {
     const validatePass = (rule, value, callback) => {
-      console.log('验证密码')
       if (value === '') {
         callback(new Error('密码不能为空'))
       } else {
@@ -115,7 +113,6 @@
       }
     }
     const validatePass2 = (rule, value, callback) => {
-      console.log('验证重复密码')
       if (value === '') {
         callback(new Error('重复密码不能为空'))
       } else if (value !== this.userForm.password) {
@@ -139,35 +136,14 @@
         rePassword: '', // 重复密码
         birthday: ''
       }, // 表单
-      deptProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
-      },
-      roleProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
-      },
-      deptTreeList: null, // 组织树列表数据
+      deptProps: { parent: 'pid', value: 'id', label: 'name', children: 'children' },
+      roleProps: { parent: 'pid', value: 'id', label: 'name', children: 'children' },
       roleTreeList: null, // 角色树列表数据
-      sexList: [
-        {
-          label: '男',
-          value: '0'
-        },
-        {
-          label: '女',
-          value: '1'
-        }
-      ],
+      sexList: this.$store.getters.sexList, // 性别选项
       textMap: {
-        update: '编辑',
-        create: '新增'
+        update: '编辑用户',
+        create: '新增用户'
       }, // 表头显示标题
-      ifdisabled: true, // 是否可修改
       rules: {
         account: [{ required: true, message: '账号不能为空', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: '姓名不能为空', trigger: ['blur', 'change'] }],
@@ -175,34 +151,14 @@
         rePassword: [{ required: true, validator: validatePass2, trigger: ['blur', 'change'] }],
         deptId: [{ required: true, message: '组织机构必选', trigger: ['blur', 'change'] }],
         roleid: [{ required: true, message: '角色必选', trigger: ['blur', 'change'] }],
-        email: [{
-          required: false, // 是否必填
-          message: '请输入邮箱地址', // 错误提示信息
-          trigger: 'blur'// 检验方式（blur为鼠标点击其他地方，）
-        },
-        {
-          type: 'email', // 要检验的类型（number，email，date等）
-          message: '请输入正确的邮箱地址',
-          trigger: ['blur', 'change'] }],
-        phone: [{
-          required: false,
-          pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦
-          message: '请输入正确的手机号',
-          trigger: ['blur', 'change'] }]
+        email: [{ required: false, message: '请输入邮箱地址', trigger: 'blur' }, { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
+        phone: [{ required: false, pattern: regularReg.mobile, message: '请输入正确的手机号', trigger: ['blur', 'change'] }]
       }, // 前端校验规则
-      roleName: '',
-      deptShow: true,
+      roleName: '', // 角色名，展示用
       btnLoading: false // 保存按钮的加载中状态
     }
   },
-  computed: {
-    userTree: function() {
-      const tree = toTreeList(this.userTreeList)
-      console.log(tree)
-      return tree
-    }
-  },
-  mounted: function() {
+  created() {
     this.fetchRoleTree()
   },
   methods: {
@@ -211,15 +167,12 @@
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = true
       this.btnLoading = false
-      this.fetchRoleTree()
       if (dialogStatus === 'create') { // 如果是新增，清除验证
-        this.ifdisabled = false
         this.resetForm()
         this.$nextTick(() => {
           this.$refs['dataForm'].clearValidate()
         })
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
-        this.ifdisabled = true
         this.userForm = {
           id: row.id, // 编号
           account: row.account, // 账号
@@ -239,11 +192,9 @@
     // 加载角色树形下拉菜单
     fetchRoleTree: function() {
       getRoleTreeList(this.listQuery).then(response => {
-        console.log('fetchRoleTree:')
         console.log(response.data)
-        if (response.data.list) {
+        if (response.data.list) { // 将列表转树结构
           this.roleTreeList = toTreeList(response.data.list, '0', true)
-          console.log(this.roleTreeList)
         }
       })
     },
@@ -327,10 +278,6 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-
-  .el-dialog{
-    width:700px
-  }
   .el-select{
     width: 100%;
   }

diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index f36bdd5..d05eb37 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -17,6 +17,8 @@
         :expand-on-click-node="false"
         :filter-node-method="filterNode"
         :default-expand-all="false"
+        :default-expanded-keys="defaultExpandedKeys"
+        node-key="id"
         highlight-current
         accordion
         @node-click="onClickNode"
@@ -81,6 +83,10 @@
         label: 'areaName',
         children: 'children'
       })
+    },
+    defaultExpandedKeys: {
+      type: Array,
+      default: () => []
     }
   },
   data() {
diff --git a/src/store/modules/dict.js b/src/store/modules/dict.js
new file mode 100644
index 0000000..8f5de49
--- /dev/null
+++ b/src/store/modules/dict.js
@@ -0,0 +1,17 @@
+const state = {
+  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }]
+}
+
+const mutations = {
+}
+
+const actions = {
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}
+
diff --git a/src/utils/structure.js b/src/utils/structure.js
index 4c65ee7..13bfb99 100644
--- a/src/utils/structure.js
+++ b/src/utils/structure.js
@@ -27,7 +27,7 @@
  * @param isSelect 是否是下拉需要顶级的树
  * @returns {*}
  */
-export function toTreeList(plainList, id = '0', isSelect = false) {
+export function toTreeList(plainList, rootId = '0', isSelect = false) {
   const pid = findPid(plainList)
   if (pid.length > 1) {
     return plainList
diff --git a/src/utils/validate.js b/src/utils/validate.js
index dbecf7a..223c280 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -88,3 +88,11 @@
     return false
   }
 }
+
+/**
+ * 常用正则表达式
+ */
+export const regularReg = {
+  password: '', // 密码
+  mobile: /^1[34578]\d{9}$/ // 手机号码
+}
diff --git a/src/views/system/user/editUser.vue b/src/views/system/user/editUser.vue
index d22cd09..c9eb42f 100644
--- a/src/views/system/user/editUser.vue
+++ b/src/views/system/user/editUser.vue
@@ -1,10 +1,10 @@
 <template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="700" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="userForm" label-position="right" label-width="80px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="账号" prop="account">
-            <el-input v-model.trim="userForm.account" :disabled="ifdisabled" type="text" placeholder="必填" />
+            <el-input v-model.trim="userForm.account" :disabled="dialogStatus=='update'" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -52,17 +52,16 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item v-if="!ifdisabled" label="角色" prop="roleid">
-            <select-tree v-model="userForm.roleid" :options="roleTreeList" :props="roleProps" />
+          <el-form-item v-if="dialogStatus=='create'" label="角色" prop="roleid">
+            <select-tree v-model="userForm.roleid" :default-expanded-keys="[userForm.roleid]" :options="roleTreeList" :props="roleProps" />
           </el-form-item>
           <el-form-item v-else label="角色">
-            <el-input v-model="roleName" :disabled="ifdisabled" type="text" placeholder="无" />
+            <el-input v-model="roleName" :disabled="dialogStatus=='update'" type="text" placeholder="无" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="组织机构" prop="deptId">
-            <dept-select v-model="userForm.deptId" :dept-show="deptShow" placeholder="请选择组织机构" />
-            <!--<select-tree v-model="userForm.deptId" :options="deptTreeList" :props="deptProps" />-->
+            <dept-select v-model="userForm.deptId" :dept-show="true" :default-expanded-keys="[userForm.roleid]" placeholder="请选择组织机构" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -94,17 +93,16 @@
 import { toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
 import DeptSelect from '@/components/DeptSelect'
-// import { getDeptTreeList } from '@/api/system/dept'
+import { regularReg } from '@/utils/validate'
 import { getRoleTreeList } from '@/api/system/role'
 import { addUser, updateUser } from '@/api/system/user'
-import { RSAencrypt } from '../../../utils/security'
+import { RSAencrypt } from '@/utils/security'
 
 export default {
   name: 'EditUser',
   components: { SelectTree, DeptSelect },
   data() {
     const validatePass = (rule, value, callback) => {
-      console.log('验证密码')
       if (value === '') {
         callback(new Error('密码不能为空'))
       } else {
@@ -115,7 +113,6 @@
       }
     }
     const validatePass2 = (rule, value, callback) => {
-      console.log('验证重复密码')
       if (value === '') {
         callback(new Error('重复密码不能为空'))
       } else if (value !== this.userForm.password) {
@@ -139,35 +136,14 @@
         rePassword: '', // 重复密码
         birthday: ''
       }, // 表单
-      deptProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
-      },
-      roleProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
-      },
-      deptTreeList: null, // 组织树列表数据
+      deptProps: { parent: 'pid', value: 'id', label: 'name', children: 'children' },
+      roleProps: { parent: 'pid', value: 'id', label: 'name', children: 'children' },
       roleTreeList: null, // 角色树列表数据
-      sexList: [
-        {
-          label: '男',
-          value: '0'
-        },
-        {
-          label: '女',
-          value: '1'
-        }
-      ],
+      sexList: this.$store.getters.sexList, // 性别选项
       textMap: {
-        update: '编辑',
-        create: '新增'
+        update: '编辑用户',
+        create: '新增用户'
       }, // 表头显示标题
-      ifdisabled: true, // 是否可修改
       rules: {
         account: [{ required: true, message: '账号不能为空', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: '姓名不能为空', trigger: ['blur', 'change'] }],
@@ -175,34 +151,14 @@
         rePassword: [{ required: true, validator: validatePass2, trigger: ['blur', 'change'] }],
         deptId: [{ required: true, message: '组织机构必选', trigger: ['blur', 'change'] }],
         roleid: [{ required: true, message: '角色必选', trigger: ['blur', 'change'] }],
-        email: [{
-          required: false, // 是否必填
-          message: '请输入邮箱地址', // 错误提示信息
-          trigger: 'blur'// 检验方式（blur为鼠标点击其他地方，）
-        },
-        {
-          type: 'email', // 要检验的类型（number，email，date等）
-          message: '请输入正确的邮箱地址',
-          trigger: ['blur', 'change'] }],
-        phone: [{
-          required: false,
-          pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦
-          message: '请输入正确的手机号',
-          trigger: ['blur', 'change'] }]
+        email: [{ required: false, message: '请输入邮箱地址', trigger: 'blur' }, { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
+        phone: [{ required: false, pattern: regularReg.mobile, message: '请输入正确的手机号', trigger: ['blur', 'change'] }]
       }, // 前端校验规则
-      roleName: '',
-      deptShow: true,
+      roleName: '', // 角色名，展示用
       btnLoading: false // 保存按钮的加载中状态
     }
   },
-  computed: {
-    userTree: function() {
-      const tree = toTreeList(this.userTreeList)
-      console.log(tree)
-      return tree
-    }
-  },
-  mounted: function() {
+  created() {
     this.fetchRoleTree()
   },
   methods: {
@@ -211,15 +167,12 @@
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = true
       this.btnLoading = false
-      this.fetchRoleTree()
       if (dialogStatus === 'create') { // 如果是新增，清除验证
-        this.ifdisabled = false
         this.resetForm()
         this.$nextTick(() => {
           this.$refs['dataForm'].clearValidate()
         })
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
-        this.ifdisabled = true
         this.userForm = {
           id: row.id, // 编号
           account: row.account, // 账号
@@ -239,11 +192,9 @@
     // 加载角色树形下拉菜单
     fetchRoleTree: function() {
       getRoleTreeList(this.listQuery).then(response => {
-        console.log('fetchRoleTree:')
         console.log(response.data)
-        if (response.data.list) {
+        if (response.data.list) { // 将列表转树结构
           this.roleTreeList = toTreeList(response.data.list, '0', true)
-          console.log(this.roleTreeList)
         }
       })
     },
@@ -327,10 +278,6 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-
-  .el-dialog{
-    width:700px
-  }
   .el-select{
     width: 100%;
   }
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index 0e1eb07..c289af6 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -66,9 +66,9 @@
         <normal-table ref="normalTable" :style="{'min-height':(bodyHeight-118)+'px'}" class="table" :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" size="small" @change="changePage">
           <template slot="preColumns">
             <el-table-column label="选择" width="55" header-align="center" align="center">
-              <template slot-scope="scope">
+              <template v-slot="scope">
                 <el-radio v-model="radio" :label="scope.$index" class="radio">
-                  &nbsp;
+&nbsp
                 </el-radio>
               </template>
             </el-table-column>
@@ -76,7 +76,7 @@
           <template slot="columns">
             <!--冻结状态-->
             <el-table-column label="状态" width="80" align="center">
-              <template slot-scope="scope">
+              <template v-slot="scope">
                 <el-tag :type="tagNames[scope.row.statusName]" size="medium">
                   {{ scope.row.statusName }}
                 </el-tag>
@@ -129,25 +129,16 @@
         sort: 'id'
       },
       registerTime: [], // 注册时间范围
-      tagNames: {
-        '已冻结': 'danger',
-        '启用': 'success'
-      },
-      btnNames: {
-        '已冻结': '解冻',
-        '启用': '冻结'
-      },
-      btnStatus: {
-        '已冻结': '',
-        '启用': 'primary'
-      },
+      tagNames: { '已冻结': 'danger', '启用': 'success' },
+      btnNames: { '已冻结': '解冻', '启用': '冻结' },
+      btnStatus: { '已冻结': '', '启用': 'primary' },
       columns: [
         { text: '账号', value: 'account' },
         { text: '所在组织机构', value: 'deptName', width: 150 },
         { text: '真实姓名', value: 'name' },
         { text: '角色', value: 'roleName' },
         { text: '手机号', value: 'phone' },
-        { text: '注册日期', value: 'createtime' }
+        { text: '注册时间', value: 'createtime' }
       ],
       list: [],
       total: 0,
@@ -158,7 +149,6 @@
       },
       treeLoading: false,
       listLoading: false,
-      dialogStatus: '',
       editShow: false, // 编辑组件是否显示
       roleAssignShow: false, // 角色分配组件是否显示
       expandAllNode: true,
@@ -186,17 +176,15 @@
   methods: {
     // 打开新增对话框
     add() {
-      this.dialogStatus = 'create'
       this.editShow = true
-      this.$refs.edituser.initDialog(this.dialogStatus)
+      this.$refs.edituser.initDialog('create')
     },
     // 打开修改对话框
     edit() {
       if (this.singleCheck()) {
-        this.dialogStatus = 'update'
         this.editShow = true
         const row = this.list[this.radio]
-        this.$refs.edituser.initDialog(this.dialogStatus, row)
+        this.$refs.edituser.initDialog('update', row)
       } else {
         this.$message.error('必须选中一项')
       }