用户角色模块初步修改

src/api/system/role.js

 import request from '@/utils/request'
 import Qs from 'qs'
+
+/**
+ * 1.查询角色列表
+ * 2.查询角色详细
+ * 3.新增角色
+ * 4.修改角色
+ * 5.角色数据权限
+ * 6.角色状态修改
+ * 7.删除角色
+ * 8.导出角色
+ * */
+
 // 查询角色列表
 export function listRole(query) {
   return request({
@@ -8,12 +20,6 @@ export function listRole(query) {
     params: query
   })
 }
-export function getlistRole() {
-  return request({
-    url: 'system/role/listAll',
-    method: 'get'
-  })
-}
 
 // 查询角色详细
 export function getRole(businessId) {
@@ -30,9 +36,7 @@ export function addRole(data) {
     url: '/system/role/add',
     method: 'post',
     data: data,
-    headers: {
-      'Content-Type': 'application/x-www-form-urlencoded'
-    }
+    headers: {}
   })
 }
 
@@ -44,9 +48,7 @@ export function updateRole(data) {
     url: '/system/role/update/' + businessId,
     method: 'put',
     data,
-    headers: {
-      'Content-Type': 'application/x-www-form-urlencoded'
-    }
+    headers: {}
   })
 }
 
@@ -57,9 +59,7 @@ export function dataScope(data) {
     url: '/system/role/dataScope',
     method: 'put',
     data,
-    headers: {
-      'Content-Type': 'application/x-www-form-urlencoded'
-    }
+    headers: {}
   })
 }
 

src/api/system/user.js

 import request from '@/utils/request'
 import { praseStrEmpty } from '@/utils/common'
 import Qs from 'qs'
+
+/**
+ * 1.查询用户列表
+ * 2.查询用户详细
+ * 3.新增用户
+ * 4.修改用户
+ * 5.删除用户
+ * 6.用户密码重置
+ * 7.用户状态修改
+ * 8.查询用户个人信息
+ * 9.修改用户个人信息
+ * 10.用户密码修改
+ * 11.导出用户
+ * 12.用户头像上传
+ * 13.下载用户导入模板
+ * 14.导入用户信息
+ * 15.下载错误文件
+ * */
+
 // 查询用户列表
 export function listUser(query) {
   return request({
@@ -9,14 +28,6 @@ export function listUser(query) {
     params: query
   })
 }
-// selectUserIdsListDept 新查询用户接-口
-export function selectUserIdsListDept(params) {
-  return request({
-    url: '/system/user/listByDept',
-    method: 'post',
-    params
-  })
-}
 // 查询用户详细
 export function getUser(userId) {
   return request({
@@ -32,9 +43,7 @@ export function addUser(data) {
     url: '/system/user/add',
     method: 'post',
     data,
-    headers: {
-      'Content-Type': 'application/x-www-form-urlencoded'
-    }
+    headers: {}
   })
 }
 
@@ -46,9 +55,7 @@ export function updateUser(data) {
     url: '/system/user/update',
     method: 'put',
     data: data,
-    headers: {
-      'Content-Type': 'application/x-www-form-urlencoded'
-    }
+    headers: {}
   })
 }
 
@@ -103,7 +110,7 @@ export function updateUserProfile(data) {
   })
 }
 
-// 用户密码重置
+// 用户密码修改
 export function updateUserPwd(data) {
   return request({
     url: '/system/user/updatePwd',
@@ -165,12 +172,3 @@ export function uploadFalseFile(params) {
     responseType: 'blob'
   })
 }
-
-// 控制用户能否登录
-export function userLoginManage(data) {
-  return request({
-    url: '/system/user/updateAllowLogin',
-    method: 'post',
-    data
-  })
-}

src/utils/commonField.js

+/** 公共字段*/
+const commonField = {
+  typeParent: 'text',
+  typePrimary: 'primary',
+  typeSuccess: 'success',
+  nameParent: '删除',
+  resetPassword: '重置密码',
+  resetName: '重置',
+  addName: '新增',
+  exportName: '导出',
+  updateName: '修改',
+  size: 'mini',
+  smallSize: 'small',
+  delIcon: 'el-icon-delete',
+  addIcon: 'el-icon-plus',
+  exportIcon: 'el-icon-download',
+  resetIcon: ''
+}
+
+export default commonField

src/views/system/role/index.vue

@@ -260,8 +260,8 @@ export default {
       addIcon: 'el-icon-plus',
       exportIcon: 'el-icon-download',
       resetIcon: '',
-      hasDelPerm: ['sys:user:delete'],
-      hasResetPerm: ['sys:user:resetPwd'],
+      hasDelPerm: ['sys:role:delete'],
+      hasResetPerm: ['sys:role:resetPwd'],
       hasUpdatePerm: ['sys:role:update'],
       hasAddPerm: ['sys:role:add'],
       hasExportPerm: ['sys:role:export'],

src/views/system/user/index.vue

@@ -33,14 +33,14 @@
           <el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
         </el-form-item>
         <el-form-item style="float: right">
-          <coolbutton :type="typePrimary" :name="addName" :size="smallSize" :icon="addIcon" :haspermi="hasAddPerm" @btn-click="handleAdd" />
+          <coolbutton :type="commonField.typePrimary" :name="commonField.addName" :size="commonField.smallSize" :icon="commonField.addIcon" :haspermi="hasAddPerm" @btn-click="handleAdd" />
           <el-button
             type="warning"
             icon="el-icon-upload"
             size="small"
             @click="handleImport"
           >导入</el-button>
-          <coolbutton :type="typeSuccess" :name="exportName" :size="smallSize" :icon="exportIcon" :haspermi="hasAddPerm" @btn-click="handleExport" />
+          <coolbutton :type="commonField.typeSuccess" :name="commonField.exportName" :size="commonField.smallSize" :icon="commonField.exportIcon" :haspermi="hasAddPerm" @btn-click="handleExport" />
         </el-form-item>
       </el-form>
     </div>
@@ -121,9 +121,9 @@
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope">
-              <coolbutton style="color: #49cec9" :type="typeParent" :name="updateName" :size="size" :haspermi="hasUpdatePerm" @btn-click="handleUpdate(scope.row)" />
-              <coolbutton :type="typeParent" :name="resetName" :size="size" :haspermi="hasResetPerm" @btn-click="handleResetPwd(scope.row)" />
-              <coolbutton v-if="scope.row.businessId !== 1" :type="typeParent" :name="nameParent" :size="size" :haspermi="hasDelPerm" @btn-click="handleDelete(scope.row)" />
+              <coolbutton style="color: #49cec9" :type="commonField.typeParent" :name="commonField.updateName" :size="commonField.size" :haspermi="hasUpdatePerm" @btn-click="handleUpdate(scope.row)" />
+              <coolbutton :type="commonField.typeParent" :name="commonField.resetPassword" :size="commonField.size" :haspermi="hasResetPerm" @btn-click="handleResetPwd(scope.row)" />
+              <coolbutton v-if="scope.row.businessId !== 1" :type="commonField.typeParent" :name="commonField.nameParent" :size="commonField.size" :haspermi="hasDelPerm" @btn-click="handleDelete(scope.row)" />
             </template>
           </el-table-column>
         </el-table>
@@ -341,6 +341,7 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import { getlistRole } from '@/api/system/role'
 import Coolbutton from '@/components/coolbutton'
 import { getDataCache, setDataCache } from '@/assets/js/filterData'
+import commonField from '@/utils/commonField'
 export default {
   name: 'User',
   components: { TreeSelect, Coolbutton },
@@ -363,20 +364,6 @@ export default {
         text: true,
         password: false
       },
-      typeParent: 'text',
-      typePrimary: 'primary',
-      typeSuccess: 'success',
-      nameParent: '删除',
-      resetName: '重置密码',
-      addName: '新增',
-      exportName: '导出',
-      updateName: '修改',
-      size: 'mini',
-      smallSize: 'small',
-      delIcon: 'el-icon-delete',
-      addIcon: 'el-icon-plus',
-      exportIcon: 'el-icon-download',
-      resetIcon: '',
       hasDelPerm: ['sys:user:delete'],
       hasResetPerm: ['sys:user:resetPwd'],
       hasUpdatePerm: ['sys:user:update'],
@@ -415,8 +402,6 @@ export default {
       // 默认密码
       initPassword: undefined,
       importLoading: false,
-      // // 时间范围
-      // dateRange: ['', ''],
       // 状态数据字典
       statusOptions: [
         {
@@ -433,10 +418,6 @@ export default {
         { label: '男', value: '0' },
         { label: '女', value: '1' }
       ],
-      // 岗位选项
-      postOptions: [],
-      // 角色选项
-      roleOptions: [],
       // 子部门信息
       deptChildren: [],
       // 表单参数
@@ -476,15 +457,7 @@ export default {
         page: 1,
         rows: 10,
         username: '',
-        email: '',
-        phone: '',
-        nickName: '',
-        idNumber: '',
-        userType: '',
-        allowLogin: '',
-        flag: '',
-        deptId: '',
-        name: ''
+        flag: ''
       },
       // 表单校验
       rules: {
@@ -543,6 +516,11 @@ export default {
       addLoading: false
     }
   },
+  computed: {
+    commonField() {
+      return commonField
+    }
+  },
   /** 路由离开前存储筛选条件*/
   beforeRouteLeave(to, from, next) {
     setDataCache(this.$route.path, this.queryParams)
@@ -681,7 +659,12 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm('queryForm')
+      this.queryParams = {
+        page: 1,
+        rows: 10,
+        username: '',
+        flag: ''
+      },
       this.handleQuery()
     },
     // 多选框选中数据