Commit 964585c3 by caoyanzhi

update: 去掉资源范围授权

parent 15aebdf6
...@@ -25,16 +25,6 @@ ...@@ -25,16 +25,6 @@
@change="onCheckedChange" @change="onCheckedChange"
@app-open-change="onAppOpenChange"></menu-tree> @app-open-change="onAppOpenChange"></menu-tree>
</el-form-item> </el-form-item>
<el-form-item label="资源范围" prop="resourceCode">
<div class="resource-list">
<div v-for="el in resourceList" :key="el.appId" class="resource-item">
<p class="app-name">{{ el.appName }}</p>
<el-radio-group v-model="roleData.resourceCode[el.appId]">
<el-radio v-for="item in el.resourceList" :key="item.resourceCode" :label="item.resourceCode">{{ item.resourceName }}</el-radio>
</el-radio-group>
</div>
</div>
</el-form-item>
<el-form-item label="门店导购范围"> <el-form-item label="门店导购范围">
<p class="type-title">当前门店</p> <p class="type-title">当前门店</p>
<div> <div>
...@@ -65,7 +55,7 @@ import navCrumb from '@/components/nav/nav.vue'; ...@@ -65,7 +55,7 @@ import navCrumb from '@/components/nav/nav.vue';
import MenuTree from './edit-role/menu-tree.vue'; import MenuTree from './edit-role/menu-tree.vue';
import api from '@/api/admin-list'; import api from '@/api/admin-list';
const { resourceList, menuList, editRole, roleDetail, findAppSetting, saveAppSetting, findStoreRange, saveStoreRange } = api; const { menuList, editRole, roleDetail, findAppSetting, saveAppSetting, findStoreRange, saveStoreRange } = api;
export default { export default {
name: 'EditStoreRole', name: 'EditStoreRole',
...@@ -88,14 +78,12 @@ export default { ...@@ -88,14 +78,12 @@ export default {
roleId: '', roleId: '',
roleName: '', roleName: '',
menuIds: [], // {appType:"",menuIds:,menuName:}选中的菜单id menuIds: [], // {appType:"",menuIds:,menuName:}选中的菜单id
resourceCode: {},
seeType: '1', // 0仅自己,1门店下全部导购 seeType: '1', // 0仅自己,1门店下全部导购
managerType: '1', // 0仅自己,1门店下全部导购 managerType: '1', // 0仅自己,1门店下全部导购
}, },
roleDataRule: { roleDataRule: {
roleName: [ { required: true } ], roleName: [ { required: true } ],
menuIds: [ { required: true, validator: valiMenuIds, trigger: 'change' } ], menuIds: [ { required: true, validator: valiMenuIds, trigger: 'change' } ]
resourceCode: [ { required: true, message: '', trigger: 'change' } ],
}, },
activeType: 3, activeType: 3,
// 权限菜单列表 // 权限菜单列表
...@@ -104,8 +92,6 @@ export default { ...@@ -104,8 +92,6 @@ export default {
{ label: '好办小程序', appType: 3, menuList: [], checkedId: {}, appIds: [] }, { label: '好办小程序', appType: 3, menuList: [], checkedId: {}, appIds: [] },
{ label: '小程序应用', appType: 4, menuList: [], checkedId: {}, appIds: [] }, { label: '小程序应用', appType: 4, menuList: [], checkedId: {}, appIds: [] },
], ],
// 资源范围
resourceList: [],
}; };
}, },
async created() { async created() {
...@@ -133,13 +119,6 @@ export default { ...@@ -133,13 +119,6 @@ export default {
}); });
})); }));
}); });
// 获取资源范围数据
prom.push(resourceList().then(res => {
this.resourceList = res.result || [];
this.resourceList.forEach(el => {
this.$set(this.roleData.resourceCode, el.appId, '');
});
}));
return Promise.all(prom); return Promise.all(prom);
}, },
...@@ -147,7 +126,7 @@ export default { ...@@ -147,7 +126,7 @@ export default {
getRoleDetail(roleId) { getRoleDetail(roleId) {
// 获取角色权限配置、资源范围等数据 // 获取角色权限配置、资源范围等数据
roleDetail({ roleId }).then(res => { roleDetail({ roleId }).then(res => {
let { roleId, roleName, menuIds, resourceCode } = res.result || {}; let { roleId, roleName, menuIds } = res.result || {};
menuIds = typeof menuIds == 'string' ? menuIds.split(',') : []; menuIds = typeof menuIds == 'string' ? menuIds.split(',') : [];
Object.assign(this.roleData, { roleId, roleName }); Object.assign(this.roleData, { roleId, roleName });
// 将menuIds分配到相应同的tab下的checkedId中 // 将menuIds分配到相应同的tab下的checkedId中
...@@ -159,17 +138,6 @@ export default { ...@@ -159,17 +138,6 @@ export default {
}); });
this.roleData.menuIds.push({ appType: el.appType, menuIds: checkedId }); this.roleData.menuIds.push({ appType: el.appType, menuIds: checkedId });
}); });
if (typeof resourceCode == 'string' && resourceCode.length > 0) {
resourceCode.split(',').forEach(el => {
this.resourceList.some(item => {
const flag = item.resourceList.some(resource => resource.resourceCode == el);
if (flag) {
this.roleData.resourceCode[item.appId] = el;
}
return flag;
});
});
}
}); });
// 获取门店导购范围数据 // 获取门店导购范围数据
findStoreRange({ roleId, wxEnterpriseId: this.wxEnterpriseId }).then(res => { findStoreRange({ roleId, wxEnterpriseId: this.wxEnterpriseId }).then(res => {
...@@ -291,18 +259,13 @@ export default { ...@@ -291,18 +259,13 @@ export default {
onSave() { onSave() {
this.$refs.roleData.validate(vali => { this.$refs.roleData.validate(vali => {
if (!vali) return; if (!vali) return;
const { roleId, roleName, menuIds, resourceCode, seeType, managerType } = this.roleData; const { roleId, roleName, menuIds, seeType, managerType } = this.roleData;
const params = { const params = {
roleId, roleId,
roleName, roleName,
menuIds: JSON.stringify(menuIds), menuIds: JSON.stringify(menuIds),
wxEnterpriseId: this.wxEnterpriseId, wxEnterpriseId: this.wxEnterpriseId
resourceCode: []
}; };
for(let key in resourceCode) {
params.resourceCode.push(resourceCode[key]);
}
params.resourceCode = params.resourceCode.join(',');
this.loading = true; this.loading = true;
// 保存权限和资源范围配置 // 保存权限和资源范围配置
editRole(params).then(succ.bind(this, roleId, '保存成功')).catch(() => this.loading = false); editRole(params).then(succ.bind(this, roleId, '保存成功')).catch(() => this.loading = false);
......
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