代码更新

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

@@ -173,14 +173,14 @@
               <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-key"><span @click="resetPassword(scope.row)">重置密码</span></el-dropdown-item>
+                  <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-key"><span @click="changeEnabled(scope.row)">{{ enabledTypeOptions.find(item => {return item.key !== scope.row.is_used}).display_name }}账号</span></el-dropdown-item>
+                  <el-dropdown-item icon="el-icon-lock"><span @click="changeEnabled(scope.row)">{{ enabledTypeOptions.find(item => {return item.key !== scope.row.is_used}).display_name }}账号</span></el-dropdown-item>
                   <el-dropdown-item icon="el-icon-circle-check">
                     <span @click="openRoleDrawer(scope.row)">分配角色</span>
                   </el-dropdown-item>
@@ -240,7 +240,7 @@
     <el-dialog
       :close-on-click-modal="true"
       :visible.sync="dataPerm"
-      title="数据权限"
+      :title="dataPermissionTitle"
       width="700px"
     >
       <el-form ref="form" :inline="true" :model="dataDialog" :rules="rules" size="mini" label-width="100px">
@@ -263,7 +263,8 @@
               <el-select
                 v-model="scope.row.permission_id"
                 placeholder="请选择"
-                @change="openRelevance(scope.row, scope.$index)">
+                @change="openRelevance(scope.row, scope.$index)"
+              >
                 <el-option
                   v-for="item in permissions"
                   :key="item.permission_id"
@@ -293,7 +294,7 @@
     <el-dialog
       :close-on-click-modal="true"
       :visible.sync="showData"
-      title="数据权限"
+      :title="dataPermissionTitle"
       width="700px"
     >
       <el-table
@@ -301,7 +302,7 @@
         :data="dataPermissions"
         style="width: 100%; max-height: 500px"
       >
-        <el-table-column prop="permission_scope_type" label="权限类型" min-width="100" show-overflow-tooltip >
+        <el-table-column prop="permission_scope_type" label="权限类型" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ dict.label.permission_scope_type[scope.row.permission_scope_type] }}
           </template>
@@ -399,7 +400,8 @@ export default {
       deptIds: [],
       userIds: [],
       showData: false,
-      dataPermissions: []
+      dataPermissions: [],
+      dataPermissionTitle: '数据权限'
     }
   },
   computed: {
@@ -632,7 +634,6 @@ export default {
       crudDept.getDeptTree().then(res => {
         this.deptsDatas = res.content
       })
-      console.log(row)
       this.nodeKey = 'dept_id'
       this.openDrawer()
       this.drawerTitle = '分配部门权限'
@@ -646,8 +647,6 @@ export default {
       getAll().then(res => {
         this.rolesDatas = res
         // 回显默认选中
-        // console.log(res)
-        // console.log(row)
         this.$nextTick(function() {
           for (let i = 0; i < this.rolesDatas.length; i++) {
             for (let j = 0; j < row.roles.length; j++) {
@@ -676,11 +675,10 @@ export default {
           this.dataDialog.person_name = row.person_name
           this.dataDialog.username = row.username
           this.dataDialog.user_id = row.user_id
+          this.dataPermissionTitle = '[' + row.person_name + '] 数据权限'
           this.dataPerm = true
-          // console.log(res)
           // 回显数据
           crudDataPermission.getDataShow(row.user_id).then(res => {
-            console.log('回显数据', res)
             this.$nextTick(function() {
               for (var index = 0; index < res.length; index++) {
                 for (var i = 0; i < this.dataDialog.dataScopeType.length; i++) {
@@ -695,14 +693,12 @@ export default {
                 }
               }
             })
-            console.log(this.dataDialog.dataScopeType)
           })
         })
       })
     },
     getRows(val) { // 获取行数据
       this.multipleSelection = val
-      console.log('选中', val)
     },
     openRelevance(row, index) {
       for (var i = 0; i < this.permissions.length; i++) {
@@ -726,10 +722,8 @@ export default {
         const param = {
           user_id: this.dataDialog.user_id
         }
-        console.log(param)
         this.dataDialog.dataScopeType[index].users = []
         this.dataDialog.dataScopeType[index].users.push(param)
-        console.log(this.dataDialog.dataScopeType[index])
       } else { // 其他应该清空
         this.dataDialog.dataScopeType[index].depts = []
         this.dataDialog.dataScopeType[index].users = []
@@ -763,7 +757,6 @@ export default {
         user_id: this.dataDialog.user_id,
         datas: this.multipleSelection
       }
-      console.log(this.dataDialog)
       crudDataPermission.saveDataPermission(param).then(res => {
         this.dataPerm = false
         this.crud.notify('添加数据权限成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
@@ -852,13 +845,11 @@ export default {
       }
     },
     showDatas(row) {
-      console.log(row)
       const param = {
         user_id: this.dataDialog.user_id,
         permission_scope_type: row.value
       }
       crudDataPermission.getDataDetail(param).then(res => {
-        // console.log('权限信息', res)
         this.dataPermissions = res
       })
       this.showData = true