diff --git a/src/api/base/site.js b/src/api/base/site.js
index 90f15fe..dc01d09 100644
--- a/src/api/base/site.js
+++ b/src/api/base/site.js
@@ -43,6 +43,7 @@ export const deleteBU = data => createAPI(`/base/deleteBU`,'post',data)
export const searchAccessBuList = data => createAPI(`/base/searchAccessBuList`,'post',data)
export const saveAccessBU = data => createAPI(`/base/saveAccessBU`,'post',data)
+export const saveAccessRole = data => createAPI(`/base/saveAccessRole`,'post',data)
export const searchAccessBuListForUser= data => createAPI(`/base/searchAccessBuListForUser`,'post',data)
export const saveAccessBuListForBu= data => createAPI(`/base/saveAccessBuListForBu`,'post',data)
export const searchAccessProjectForUser= data => createAPI(`/base/searchAccessProjectForUser`,'post',data)
@@ -57,6 +58,8 @@ export const getUserAccessSiteInfoList = data => createAPI(`/base/getUserAccessS
// 获取用户BU权限信息
export const getUserAccessBUInfoList = data => createAPI(`/base/getUserAccessBUInfoList`,'post',data)
+// 获取用户角色权限信息
+export const getUserAccessRoleInfoList = data => createAPI(`/base/getUserAccessRoleInfoList`,'post',data)
// 获取用户项目权限信息
export const getUserAccessProjectInfoList = data => createAPI(`/base/getUserAccessProjectInfoList`,'post',data)
@@ -65,3 +68,4 @@ export const getSiteList = data => createAPI(`/base/getSiteList`,'post',data)
export const getDepartmentList = data => createAPI(`/base/getDepartmentList`,'post',data)
export const getPostList = data => createAPI(`/base/getPostList`,'post',data)
+export const searchAccessRoleList = data => createAPI(`/base/searchAccessRoleList`,'post',data)
diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue
index b8da939..295aac5 100644
--- a/src/views/modules/sys/user.vue
+++ b/src/views/modules/sys/user.vue
@@ -30,6 +30,10 @@
@click="FieldListModel()"
> {{ buttons.fieldAuthorization || '字段授权' }}
+ {{ buttons.roleAuthorization || '角色授权' }}
+
@@ -291,6 +295,35 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -454,6 +487,26 @@
+
+
+
+
+
import {getUserAccessSiteList, saveUserAccessSiteList} from '@/api/factory/accessSite.js'
import {getSiteList} from '@/api/factory/site.js'
-import {searchAccessBuList,saveAccessBU,searchAccessProjectForUser,saveAccessProject, getUserAccessSiteInfoList, getUserAccessBUInfoList, getUserAccessProjectInfoList} from '@/api/base/site.js'
+import {searchAccessBuList,searchAccessRoleList,saveAccessBU,saveAccessRole,searchAccessProjectForUser,saveAccessProject, getUserAccessSiteInfoList, getUserAccessBUInfoList, getUserAccessRoleInfoList, getUserAccessProjectInfoList} from '@/api/base/site.js'
import {
searchFieldFunctionList,searchAccessFieldListByUser,saveAccessFieldListByUser,getUserAccessFieldFunctionInfoList
} from "@/api/base/field.js"
@@ -587,14 +640,18 @@ export default {
specialVisible: false,
siteVisible: false,
buVisible: false,
+ roleVisible: false,
currentData: {},
userId: this.$store.state.user.name,
transferData: [],
checked: [],
selectBUList: [],
buList: [],
+ selectRoleList: [],
+ roleList:[],
userSiteList: [],
userBUList:[],
+ userRoleList:[],
userProjectList:[],
userFieldList:[],
userData: [],
@@ -615,6 +672,8 @@ export default {
mobile: '',
buNo: '',
buDesc: '',
+ roleNo: '',
+ roleDesc: '',
departmentNo:'',
departmentName:'',
postNo:'',
@@ -691,6 +750,7 @@ export default {
specialCompetencies: '特殊权限',
factoryAuthorization: '工厂授权',
buAuthorization: 'BU授权',
+ roleAuthorization: '角色授权',
projectAuthorization: '项目授权',
createTime: '创建时间',
username: '用户账号',
@@ -776,6 +836,12 @@ export default {
if (this.activeTable === 'field_function_information'){
this.getUserAccessFieldFunctionInfoList()
}
+ if (this.activeTable === 'security_information'){
+ this.getUserSpecialSecurity()
+ }
+ if (this.activeTable === 'role_information'){
+ this.getUserAccessRoleInfoList()
+ }
},
// 特殊权限
specialAuthorize() {
@@ -823,6 +889,10 @@ export default {
this.searchBuList()
},
+ roleAuthorize() {
+ this.roleVisible = true
+ this.searchRoleList()
+ },
//授权项目start
projectModel(){
let inData={
@@ -955,6 +1025,29 @@ export default {
}
})
},
+ saveRoleAssessSite(){
+ if(this.selectRoleList.length==0){
+ this.$message.warning("请选择角色")
+ return false;
+ }
+ let inList=[];
+ for (let i = 0; i < this.selectRoleList.length; i++) {
+ let inData={
+ site:this.$store.state.user.site,
+ username:this.selectUser.username,
+ roleNo:this.selectRoleList[i]
+ }
+ inList.push(inData)
+ }
+ saveAccessRole(inList).then(({data}) => {
+ if (data && data.code === 0) {
+ this.$message.success( '操作成功')
+ this.roleVisible = false
+ } else {
+ this.$message.error(data.msg)
+ }
+ })
+ },
// 获取用户已授权的工厂列表
searchUserAccessSiteList() {
getUserAccessSiteList({userid: this.selectUser.username}).then(({data}) => {
@@ -979,6 +1072,14 @@ export default {
this.buList=data.buList
})
},
+ searchRoleList(){
+ searchAccessRoleList({site:this.$store.state.user.site,
+ username: this.selectUser.username,
+ active:'Y'}).then(({data}) => {
+ this.selectRoleList = data.selectRoleList
+ this.roleList=data.roleList
+ })
+ },
// 选中行
handleCurrentChange(val) {
this.selectUser = val
@@ -1118,6 +1219,18 @@ export default {
}
})
},
+ // 获取用户角色权限信息
+ getUserAccessRoleInfoList () {
+ getUserAccessRoleInfoList(this.userData).then(({data}) => {
+ if (data && data.code === 0) {
+ this.userRoleList = data.rows
+ } else {
+ this.$alert(data.msg, '错误', {
+ confirmButtonText: '确定'
+ })
+ }
+ })
+ },
// 获取用户项目权限信息
getUserAccessProjectInfoList () {
getUserAccessProjectInfoList(this.userData).then(({data}) => {
@@ -1220,6 +1333,7 @@ export default {
this.userFieldList=[];
this.siteList=[];
this.selectSitList=[];
+ this.userRoleList=[];
},
},
created() {