Skip to content

O
office-web
Commit c023c45c by xiaohai
Options

Merge branch 'dev' of http://115.159.76.241/office/office-web into dev

parents f451fb0f b3282806
Showing with 118 additions and 89 deletions
src/components/set/staff-detail-field.vue
...@@ -58,83 +58,83 @@ ...@@ -58,83 +58,83 @@
fixDataStore: ['clerkName','clerkPhone','groupName','positionName','clerkCode'], fixDataStore: ['clerkName','clerkPhone','groupName','positionName','clerkCode'],
// 复选框数据 // 复选框数据
customData: [ customData: [
{ // {
fieldCode: 1, // fieldCode: 1,
fieldName: "基本信息", // fieldName: "基本信息",
checkList: [], // checkList: [],
children: [ // children: [
{ // {
fieldCode: 'name', // fieldCode: 'name',
fieldName: '姓名' // fieldName: '姓名'
}, // },
{ // {
fieldCode: 'depart', // fieldCode: 'depart',
fieldName: '部门' // fieldName: '部门'
}, // },
{ // {
fieldCode: 'phone', // fieldCode: 'phone',
fieldName: '手机号' // fieldName: '手机号'
}, // },
{ // {
fieldCode: 'email', // fieldCode: 'email',
fieldName: '邮箱' // fieldName: '邮箱'
}, // },
{ // {
fieldCode: 'profession', // fieldCode: 'profession',
fieldName: '职业' // fieldName: '职业'
}, // },
{ // {
fieldCode: 'hiredate', // fieldCode: 'hiredate',
fieldName: '入职时间' // fieldName: '入职时间'
}, // },
] // ]
}, // },
{ // {
fieldCode: 2, // fieldCode: 2,
fieldName: "工作信息", // fieldName: "工作信息",
checkList: [], // checkList: [],
children: [ // children: [
{ // {
fieldCode: 'name', // fieldCode: 'name',
fieldName: '姓名' // fieldName: '姓名'
}, // },
{ // {
fieldCode: 'depart', // fieldCode: 'depart',
fieldName: '部门' // fieldName: '部门'
} // }
] // ]
}, // },
{ // {
fieldCode: 3, // fieldCode: 3,
fieldName: "个人信息", // fieldName: "个人信息",
checkList: [], // checkList: [],
children: [ // children: [
{ // {
fieldCode: 'name', // fieldCode: 'name',
fieldName: '姓名' // fieldName: '姓名'
}, // },
{ // {
fieldCode: 'depart', // fieldCode: 'depart',
fieldName: '部门' // fieldName: '部门'
}, // },
] // ]
}, // },
{ // {
fieldCode: 4, // fieldCode: 4,
fieldName: "学历信息", // fieldName: "学历信息",
checkList: [], // checkList: [],
children: [ // children: [
{ // {
fieldCode: 'name', // fieldCode: 'name',
fieldName: '姓名' // fieldName: '姓名'
}, // },
{ // {
fieldCode: 'depart', // fieldCode: 'depart',
fieldName: '部门' // fieldName: '部门'
}, // },
] // ]
}, // },
], ],
checkList: [], //已选数据 checkList: [], //已选数据
......
src/router/index.js
...@@ -113,7 +113,7 @@ export const constantRouterMap = [ ...@@ -113,7 +113,7 @@ export const constantRouterMap = [
{ {
// 设置模块 // 设置模块
path: '/setCenter', path: '/setCenter',
name: '审核中心', name: '设置',
component: _import('setting','index'), component: _import('setting','index'),
children: [ children: [
{ {
...@@ -153,7 +153,7 @@ export const constantRouterMap = [ ...@@ -153,7 +153,7 @@ export const constantRouterMap = [
}, },
{ {
path: '/addAdminRole', path: '/addAdminRole',
name: '添加管理员', name: '添加管理员角色',
component: _import('setting','addAdminRole') component: _import('setting','addAdminRole')
} }
] ]
......
src/views/setting/addAdminRole.vue
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
@left-check-change="rightChange"> @left-check-change="rightChange">
</el-transfer> </el-transfer>
</el-form-item> </el-form-item>
<el-form-item label="应用权限" prop="" class=""> <!-- <el-form-item label="应用权限" prop="" class="">
<el-transfer <el-transfer
:titles="['一级权限', '二级权限']" :titles="['一级权限', '二级权限']"
:left-default-checked="ruleForm.leftCheckedApp" :left-default-checked="ruleForm.leftCheckedApp"
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
:data="ruleForm.rightApp" :data="ruleForm.rightApp"
@left-check-change="rightChangeApp"> @left-check-change="rightChangeApp">
</el-transfer> </el-transfer>
</el-form-item> </el-form-item> -->
<el-form-item> <el-form-item>
<el-button type="primary" @click="submitForm('ruleForm')">保存</el-button> <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
</el-form-item> </el-form-item>
...@@ -220,6 +220,32 @@ export default { ...@@ -220,6 +220,32 @@ export default {
}, },
/** /**
* 简单数组-->父子数组对象
*/
treeData(data){
let tree = data.filter((father)=>{ //循环所有项
let branchArr = data.filter((child)=>{
return father.haobanMenuRightId == child.parentRightId; //返回每一项的子级数组
});
if(branchArr.length>0){
father.children = branchArr; //如果存在子级，则给父级添加一个children属性，并赋值
}
return father.parentRightId == -1; //返回第一层
});
// 排序
// tree.sort(function(a,b){
// return a.sort - b.sort;
// })
// tree.forEach(function(ele,index){
// ele.children.sort(function(a,b){
// return a.sort - b.sort;
// })
// })
return tree;
},
/**
* 获取角色详情 * 获取角色详情
*/ */
getRoleDetail(roleId) { getRoleDetail(roleId) {
...@@ -231,13 +257,15 @@ export default { ...@@ -231,13 +257,15 @@ export default {
postRequest('/haoban-manage-web/role-detail',para) postRequest('/haoban-manage-web/role-detail',para)
.then((res) => { .then((res) => {
// console.log(res,res.data,res.data.errorCode) // console.log(res,res.data,res.data.errorCode)
var resData = res.data var resData = res.data.haobanResponse
if (resData.errorCode == 1) { if (resData.errorCode == 1) {
// showMsg.showmsg('操作成功','success') // showMsg.showmsg('操作成功','success')
that.ruleForm.roleId = resData.data.role.roleId; that.ruleForm.roleId = resData.result.role.roleId;
that.ruleForm.roleName = resData.data.role.roleName; that.ruleForm.roleName = resData.result.role.roleName;
that.ruleForm.roleCode = resData.data.role.roleCode; that.ruleForm.roleCode = resData.result.role.roleCode;
that.ruleForm.remark = resData.data.role.remark; that.ruleForm.remark = resData.result.role.remark;
console.log(resData.result.menuRightList,that.treeData(resData.result.menuRightList))
return; return;
} }
...@@ -284,9 +312,10 @@ export default { ...@@ -284,9 +312,10 @@ export default {
}, },
mounted() { mounted() {
const that = this const that = this
console.log(that.$router.query) console.log(that.$route.query)
if (that.$router.query.roleId) { if (!!that.$route.query.hasOwnProperty('roleId')) {
that.ruleForm.roleId = that.$router.query.roleId; that.ruleForm.roleId = that.$route.query.roleId;
that.getRoleDetail(that.ruleForm.roleId)
} }
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment