fix :修复部分bug

src/views/modules/sys/menu/index.vue

@@ -2,7 +2,12 @@
   <el-card class="mod-menu">
     <el-form :inline="true" :model="dataForm">
       <el-form-item>
-        <el-button v-if="isAuth('sys:menu:save')" type="primary" @click="handleAddOrUpdate()">新增</el-button>
+        <el-button
+          icon="el-icon-plus"
+          v-if="isAuth('sys:menu:save')"
+          type="primary"
+          @click="handleAddOrUpdate()"
+        >新增菜单</el-button>
       </el-form-item>
     </el-form>
     <el-table :data="dataList" row-key="menuId" border style="width: 100%;">

src/views/modules/sys/role/index.vue

@@ -6,7 +6,12 @@
       </el-form-item>
       <el-form-item>
         <el-button @click="handleGetTableList()">查询</el-button>
-        <el-button v-if="isAuth('sys:role:save')" type="primary" @click="handleAddOrUpdate()">新增</el-button>
+        <el-button
+          icon="el-icon-plus"
+          v-if="isAuth('sys:role:save')"
+          type="primary"
+          @click="handleAddOrUpdate()"
+        >新增角色</el-button>
         <el-button
           v-if="isAuth('sys:role:delete')"
           type="danger"
@@ -138,7 +143,7 @@ export default {
       let ids = id ? [id] : this.dataListSelections.map(item => {
         return item.roleId
       })
-      this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+      this.$confirm(`确定删除该角色吗？删除后该角色所有关联账号将无法使用相关权限。`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/views/modules/sys/role/role-add-or-update.vue

@@ -1,14 +1,33 @@
 <template>
   <el-dialog
-    :title="!dataForm.id ? '新增' : '编辑'"
+    :title="!dataForm.id ? '新增角色' : '编辑角色'"
     :close-on-click-modal="false"
-    :visible.sync="visible">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="handleConfirm()" label-width="80px">
+    :visible.sync="visible"
+  >
+    <el-form
+      :model="dataForm"
+      :rules="dataRule"
+      ref="dataForm"
+      @keyup.enter.native="handleConfirm()"
+      label-width="80px"
+    >
       <el-form-item label="角色名称" prop="roleName">
-        <el-input v-model="dataForm.roleName" placeholder="角色名称"></el-input>
+        <el-input
+          clearable
+          maxlength="20"
+          show-word-limit
+          v-model="dataForm.roleName"
+          placeholder="角色名称"
+        ></el-input>
       </el-form-item>
       <el-form-item label="备注" prop="remark">
-        <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+        <el-input
+          clearable
+          maxlength="30"
+          show-word-limit
+          v-model="dataForm.remark"
+          placeholder="备注"
+        ></el-input>
       </el-form-item>
       <el-form-item size="mini" label="授权">
         <el-tree
@@ -17,8 +36,8 @@
           node-key="menuId"
           ref="menuListTree"
           :default-expand-all="true"
-          show-checkbox>
-        </el-tree>
+          show-checkbox
+        ></el-tree>
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -61,6 +80,11 @@
         this.handleEdit()
         this.apiType = '/update'
       } else {
+        this.dataForm = {
+          id: 0,
+          roleName: '',
+          remark: ''
+        }
         this.apiType = '/save'
       }
     },
@@ -88,6 +112,7 @@
           this.dataDemo = res.role.menuIdList
           setTimeout(() => {
             this.$nextTick(() => {
+              console.log(' this.dataForm: ', this.dataForm)
               this.$refs.menuListTree.setCheckedKeys(res.role.menuIdList)
             })
           }, 50)

src/views/modules/sys/user/index.vue

@@ -2,11 +2,11 @@
   <el-card class="mod-user">
     <el-form :inline="true" :model="dataForm" @keyup.enter.native="handleGetTableList()">
       <el-form-item>
-        <el-input v-model="dataForm.userName" placeholder="用户名" clearable></el-input>
+        <el-input v-model="dataForm.userName" placeholder="员工姓名" clearable></el-input>
       </el-form-item>
       <el-form-item>
         <el-button @click="handleGetTableList()">查询</el-button>
-        <el-button v-if="isAuth('sys:user:save')" type="primary" @click="handleAddOrUpdate()">新增</el-button>
+        <el-button v-if="isAuth('sys:user:save')" type="primary" @click="handleAddOrUpdate()">新增账户</el-button>
         <el-button
           v-if="isAuth('sys:user:delete')"
           type="danger"
@@ -24,8 +24,8 @@
     >
       <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
       <el-table-column prop="userId" header-align="center" align="center" width="80" label="ID"></el-table-column>
-      <el-table-column prop="username" header-align="center" align="center" label="用户名"></el-table-column>
-      <el-table-column prop="email" header-align="center" align="center" label="邮箱"></el-table-column>
+      <el-table-column prop="username" header-align="center" align="center" label="员工姓名"></el-table-column>
+      <el-table-column prop="email" header-align="center" align="center" label="账号"></el-table-column>
       <el-table-column prop="mobile" header-align="center" align="center" label="手机号"></el-table-column>
       <el-table-column prop="status" header-align="center" align="center" label="状态">
         <template slot-scope="scope">
@@ -145,7 +145,7 @@ export default {
       let userIds = id ? [id] : this.dataListSelections.map(item => {
         return item.userId
       })
-      this.$confirm(`确定对[id=${userIds.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+      this.$confirm(`确定删除该账户吗？删除后该账户将无法使用`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/views/modules/sys/user/user-add-or-update.vue

@@ -2,9 +2,16 @@
   <el-dialog
     :title="!dataForm.id ? '新增' : '编辑'"
     :close-on-click-modal="false"
-    :visible.sync="visible">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="handleConfirm()" label-width="80px">
-      <el-form-item label="用户名" prop="username">
+    :visible.sync="visible"
+  >
+    <el-form
+      :model="dataForm"
+      :rules="dataRule"
+      ref="dataForm"
+      @keyup.enter.native="handleConfirm()"
+      label-width="80px"
+    >
+      <el-form-item label="员工姓名" prop="username">
         <el-input v-model="dataForm.username" placeholder="登录帐号"></el-input>
       </el-form-item>
       <el-form-item label="密码" prop="password" :class="{ 'is-required': !dataForm.id }">
@@ -21,7 +28,11 @@
       </el-form-item>
       <el-form-item label="角色" size="mini" prop="roleIdList">
         <el-checkbox-group v-model="dataForm.roleIdList">
-          <el-checkbox v-for="role in roleList" :key="role.roleId" :label="role.roleId">{{ role.roleName }}</el-checkbox>
+          <el-checkbox
+            v-for="role in roleList"
+            :key="role.roleId"
+            :label="role.roleId"
+          >{{ role.roleName }}</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
       <el-form-item label="状态" size="mini" prop="status">
@@ -89,7 +100,7 @@
         status: 1
       },
       dataRule: {
-          username: [{ required: true, message: '用户名不能为空', trigger: 'blur' }],
+        username: [{ required: true, message: '员工姓名不能为空', trigger: 'blur' }],
         password: [{ validator: validatePassword, trigger: 'blur' }],
         comfirmPassword: [{ validator: validateComfirmPassword, trigger: 'blur' }],
         email: [