Skip to content

H
haoban-3
Commit 24a63fcd by caoyanzhi
Options

Merge branch 'feature/4月-菜单和权限' into dev

parents 8f68f668 d9d7e339
Showing with 59 additions and 171 deletions
menu-data/button-code.js
......@@ -24,25 +24,18 @@ module.exports = {
delShowRules: ['删除', 1, 1]
},
memberGroupSet: {
// 按钮名称、是否受权限控制0否1是、是否增删改0：跳转 1：增删改 2：其他、按钮跳转路径
memberGroupList: ['客户分组列表', 0, 0, 'memberGroupList'],
memberGroupSetList: ['分组展示设置', 0, 0, 'memberGroupSetList']
},
memberGroupList: {
// 1.会员分组失效后不展示（按钮）
groupExpire: ['分组失效后不展示', 1, 2],
groupExpire: ['客户分组列表-分组失效后不展示', 1, 2],
// 2.立即同步（按钮）
syncGroup: ['立即同步', 1, 2]
},
memberGroupSetList: {
syncGroup: ['客户分组列表-立即同步', 1, 2],
// 1.新建模板 （按钮，控制“客户分组设置”新建页面内所有操作权限）
addGroupTemp: ['新建模板', 1, 0, 'addGroupTemplate'],
addGroupTemp: ['分组展示设置-新建模板', 1, 0, 'addGroupTemplate'],
// 2.编辑 （按钮，控制“客户分组设置”修改页面内所有操作权限）
editGroupTemp: ['编辑', 1, 0, 'editGroupTemplate'],
editGroupTemp: ['分组展示设置-编辑', 1, 0, 'editGroupTemplate'],
// 3.门店范围设置 （按钮，控制“门店范围设置”页面内所有操作权限）
setStoreArea: ['门店范围设置', 1, 0, 'storeRangeSet'],
setStoreArea: ['分组展示设置-门店范围设置', 1, 0, 'storeRangeSet'],
// 4.删除（按钮）
delGroupTemp: ['删除', 1, 1]
delGroupTemp: ['分组展示设置-删除', 1, 1]
},
memberSearchSet: {
// 1.保存（按钮）
......@@ -165,26 +158,20 @@ module.exports = {
// 1.保存（按钮）
saveTaskSet: ['保存', 1, 1]
},
'daily-setting': {
systemReport: ['系统报表', 0, 0, 'systemReport'],
customReport: ['自定义报表', 0, 0, 'customReport'],
},
// 云日报设置-系统报表
systemReport: {
'daily-setting': {
// 1.模板设置（按钮，控制“模板设置”弹窗内所有操作权限）；
settingSystemReport: ['模板设置', 1, 2],
settingSystemReport: ['系统报表-模板设置', 1, 2],
// 2.保存并启用（按钮）
saveSystemReport: ['保存并启用', 1, 2],
},
customReport: {
saveSystemReport: ['系统报表-保存并启用', 1, 2],
// 1.新建模板（按钮，控制“新建模板”页面内所有操作权限）；
addCustomReport: ['新建模板', 1, 0, 'customReportSet'],
addCustomReport: ['自定义报表-新建模板', 1, 0, 'customReportSet'],
// 2.复制（按钮，控制“新建模板”页面内所有操作权限）；
copyCustomReport: ['复制', 1, 0, 'customReportCopy'],
copyCustomReport: ['自定义报表-复制', 1, 0, 'customReportCopy'],
// 3.编辑（按钮，控制“编辑模板”页面内所有操作权限）；
editCustomReport: ['编辑', 1, 0, 'customReportEdit'],
editCustomReport: ['自定义报表-编辑', 1, 0, 'customReportEdit'],
// 4.删除（按钮）
delCustomReport: ['删除', 1, 1]
delCustomReport: ['自定义报表-删除', 1, 1]
},
monthList: {
// 1.门店月指标 （按钮，控制“门店月指标”页面内所有操作权限）；
......@@ -301,14 +288,8 @@ module.exports = {
// 导购设置-导购操作权限设置
// 保存（按钮）
'guide-setting': {
guideAuthSetting: ['导购操作权限设置', 0, 0, 'guide-auth-setting'],
appVisibleSetting: ['应用可见权限设置', 0, 0, 'app-visible-setting']
},
'guide-auth-setting': {
saveGuideSetting: ['保存', 1, 1],
},
'app-visible-setting': {
saveAppsVisible: ['保存', 1, 1],
saveGuideSetting: ['导购操作权限设置-保存', 1, 1],
saveAppsVisible: ['应用可见权限设置-保存', 1, 1],
},
enterpriseSet: {
// 1.同步刷新（按钮）
......
menu-data/button-code.json
{"multipleAssign":"multipleAssign","assign":"assign","willSyncTag":"willSyncTag","breakSyncTag":"breakSyncTag","addShowRules":"addShowRules","editShowRules":"editShowRules","delShowRules":"delShowRules","memberGroupList":"memberGroupList","memberGroupSetList":"memberGroupSetList","groupExpire":"groupExpire","syncGroup":"syncGroup","addGroupTemp":"addGroupTemp","editGroupTemp":"editGroupTemp","setStoreArea":"setStoreArea","delGroupTemp":"delGroupTemp","searchSetSave":"searchSetSave","saveTrafficTaskSet":"saveTrafficTaskSet","addCard":"addCard","editCard":"editCard","delCard":"delCard","sendCardLog":"sendCardLog","getCardLog":"getCardLog","saveEvaluateSet":"saveEvaluateSet","addMaterialGroup":"addMaterialGroup","editMaterialGroup":"editMaterialGroup","delMaterialGroup":"delMaterialGroup","multipleDelAssets":"multipleDelAssets","multipleMoveAssets":"multipleMoveAssets","addText":"addText","editText":"editText","delText":"delText","textAssignStore":"textAssignStore","addImage":"addImage","editImage":"editImage","delImage":"delImage","imageAssignStore":"imageAssignStore","addWeb":"addWeb","editWeb":"editWeb","delWeb":"delWeb","webAssignStore":"webAssignStore","addVideo":"addVideo","editVideo":"editVideo","delVideo":"delVideo","videoAssignStore":"videoAssignStore","addFile":"addFile","editFile":"editFile","delFile":"delFile","fileAssignStore":"fileAssignStore","addApps":"addApps","editApps":"editApps","delApps":"delApps","appsAssignStore":"appsAssignStore","saveGoodsSet":"saveGoodsSet","exportActiveUser":"exportActiveUser","exportLoginUser":"exportLoginUser","exportAreaLoginUser":"exportAreaLoginUser","multipleDelReport":"multipleDelReport","exportReport":"exportReport","reportDetail":"reportDetail","multipleDelReportDetail":"multipleDelReportDetail","delReportDetail":"delReportDetail","showReportDetail":"showReportDetail","multipleExportReport":"multipleExportReport","saveTaskSet":"saveTaskSet","systemReport":"systemReport","customReport":"customReport","settingSystemReport":"settingSystemReport","saveSystemReport":"saveSystemReport","addCustomReport":"addCustomReport","copyCustomReport":"copyCustomReport","editCustomReport":"editCustomReport","delCustomReport":"delCustomReport","monthTarget":"monthTarget","dayTarget":"dayTarget","exportMonthTask":"exportMonthTask","checkMonthTask":"checkMonthTask","multipleDelTask":"multipleDelTask","delTask":"delTask","exportStoreList":"exportStoreList","checkStoreList":"checkStoreList","exportStoreDetail":"exportStoreDetail","checkStoreDetail":"checkStoreDetail","exportStoreDetailPop":"exportStoreDetailPop","previewStoreDetail":"previewStoreDetail","exportGrTaskList":"exportGrTaskList","checkGrTaskList":"checkGrTaskList","exportTaskRecord":"exportTaskRecord","multipleDelTaskRecord":"multipleDelTaskRecord","checkTaskRecord":"checkTaskRecord","exportTaskDetail":"exportTaskDetail","multipleDelTaskDetail":"multipleDelTaskDetail","delTaskDetail":"delTaskDetail","resolveTaskDetail":"resolveTaskDetail","previewTaskDetail":"previewTaskDetail","exportTaskView":"exportTaskView","multipleDelTaskView":"multipleDelTaskView","checkTaskView":"checkTaskView","exportTaskViewDetail":"exportTaskViewDetail","multipleDelTaskViewDetail":"multipleDelTaskViewDetail","checkTaskDetail":"checkTaskDetail","addSalutatory":"addSalutatory","editSalutatory":"editSalutatory","delSalutatory":"delSalutatory","multipleResolve":"multipleResolve","singleResolve":"singleResolve","singleReject":"singleReject","saveApplySetting":"saveApplySetting","refreshStoreMember":"refreshStoreMember","exportContact":"exportContact","checkContactDetail":"checkContactDetail","checkContactMemberDetail":"checkContactMemberDetail","checkLog":"checkLog","guideAuthSetting":"guideAuthSetting","appVisibleSetting":"appVisibleSetting","saveGuideSetting":"saveGuideSetting","saveAppsVisible":"saveAppsVisible","refreshStoreInfo":"refreshStoreInfo","saveMemberSecret":"saveMemberSecret","addMemberAppsSecret":"addMemberAppsSecret","editMemberAppsSecret":"editMemberAppsSecret","delMemberAppsSecret":"delMemberAppsSecret","addAppsSecret":"addAppsSecret","getAppsSecret":"getAppsSecret","editAppsSecret":"editAppsSecret","delAppsSecret":"delAppsSecret","checkAuth":"checkAuth","bindStoreList":"bindStoreList","refreshStore":"refreshStore","refreshAdminList":"refreshAdminList"}
\ No newline at end of file
{"multipleAssign":"multipleAssign","assign":"assign","willSyncTag":"willSyncTag","breakSyncTag":"breakSyncTag","addShowRules":"addShowRules","editShowRules":"editShowRules","delShowRules":"delShowRules","groupExpire":"groupExpire","syncGroup":"syncGroup","addGroupTemp":"addGroupTemp","editGroupTemp":"editGroupTemp","setStoreArea":"setStoreArea","delGroupTemp":"delGroupTemp","searchSetSave":"searchSetSave","saveTrafficTaskSet":"saveTrafficTaskSet","addCard":"addCard","editCard":"editCard","delCard":"delCard","sendCardLog":"sendCardLog","getCardLog":"getCardLog","saveEvaluateSet":"saveEvaluateSet","addMaterialGroup":"addMaterialGroup","editMaterialGroup":"editMaterialGroup","delMaterialGroup":"delMaterialGroup","multipleDelAssets":"multipleDelAssets","multipleMoveAssets":"multipleMoveAssets","addText":"addText","editText":"editText","delText":"delText","textAssignStore":"textAssignStore","addImage":"addImage","editImage":"editImage","delImage":"delImage","imageAssignStore":"imageAssignStore","addWeb":"addWeb","editWeb":"editWeb","delWeb":"delWeb","webAssignStore":"webAssignStore","addVideo":"addVideo","editVideo":"editVideo","delVideo":"delVideo","videoAssignStore":"videoAssignStore","addFile":"addFile","editFile":"editFile","delFile":"delFile","fileAssignStore":"fileAssignStore","addApps":"addApps","editApps":"editApps","delApps":"delApps","appsAssignStore":"appsAssignStore","saveGoodsSet":"saveGoodsSet","exportActiveUser":"exportActiveUser","exportLoginUser":"exportLoginUser","exportAreaLoginUser":"exportAreaLoginUser","multipleDelReport":"multipleDelReport","exportReport":"exportReport","reportDetail":"reportDetail","multipleDelReportDetail":"multipleDelReportDetail","delReportDetail":"delReportDetail","showReportDetail":"showReportDetail","multipleExportReport":"multipleExportReport","saveTaskSet":"saveTaskSet","settingSystemReport":"settingSystemReport","saveSystemReport":"saveSystemReport","addCustomReport":"addCustomReport","copyCustomReport":"copyCustomReport","editCustomReport":"editCustomReport","delCustomReport":"delCustomReport","monthTarget":"monthTarget","dayTarget":"dayTarget","exportMonthTask":"exportMonthTask","checkMonthTask":"checkMonthTask","multipleDelTask":"multipleDelTask","delTask":"delTask","exportStoreList":"exportStoreList","checkStoreList":"checkStoreList","exportStoreDetail":"exportStoreDetail","checkStoreDetail":"checkStoreDetail","exportStoreDetailPop":"exportStoreDetailPop","previewStoreDetail":"previewStoreDetail","exportGrTaskList":"exportGrTaskList","checkGrTaskList":"checkGrTaskList","exportTaskRecord":"exportTaskRecord","multipleDelTaskRecord":"multipleDelTaskRecord","checkTaskRecord":"checkTaskRecord","exportTaskDetail":"exportTaskDetail","multipleDelTaskDetail":"multipleDelTaskDetail","delTaskDetail":"delTaskDetail","resolveTaskDetail":"resolveTaskDetail","previewTaskDetail":"previewTaskDetail","exportTaskView":"exportTaskView","multipleDelTaskView":"multipleDelTaskView","checkTaskView":"checkTaskView","exportTaskViewDetail":"exportTaskViewDetail","multipleDelTaskViewDetail":"multipleDelTaskViewDetail","checkTaskDetail":"checkTaskDetail","addSalutatory":"addSalutatory","editSalutatory":"editSalutatory","delSalutatory":"delSalutatory","multipleResolve":"multipleResolve","singleResolve":"singleResolve","singleReject":"singleReject","saveApplySetting":"saveApplySetting","refreshStoreMember":"refreshStoreMember","exportContact":"exportContact","checkContactDetail":"checkContactDetail","checkContactMemberDetail":"checkContactMemberDetail","checkLog":"checkLog","saveGuideSetting":"saveGuideSetting","saveAppsVisible":"saveAppsVisible","refreshStoreInfo":"refreshStoreInfo","saveMemberSecret":"saveMemberSecret","addMemberAppsSecret":"addMemberAppsSecret","editMemberAppsSecret":"editMemberAppsSecret","delMemberAppsSecret":"delMemberAppsSecret","addAppsSecret":"addAppsSecret","getAppsSecret":"getAppsSecret","editAppsSecret":"editAppsSecret","delAppsSecret":"delAppsSecret","checkAuth":"checkAuth","bindStoreList":"bindStoreList","refreshStore":"refreshStore","refreshAdminList":"refreshAdminList"}
\ No newline at end of file
menu-data/menu-data.js
......@@ -30,15 +30,9 @@ module.exports = [
{
menu: ['客户分组设置', 'memberGroupSet', 1],
children: [
{ menu: ['客户分组列表', 'memberGroupList', 1] },
{
menu: ['分组展示设置', 'memberGroupSetList', 1],
children: [
{ menu: ['新建模板', 'addGroupTemplate', 1] },
{ menu: ['编辑模板', 'editGroupTemplate', 1] },
{ menu: ['门店范围设置', 'storeRangeSet', 1] },
]
},
{ menu: ['新建模板', 'addGroupTemplate', 1] },
{ menu: ['编辑模板', 'editGroupTemplate', 1] },
{ menu: ['门店范围设置', 'storeRangeSet', 1] }
]
},
{ menu: ['客户管理设置', 'memberSearchSet', 1] },
......@@ -156,15 +150,9 @@ module.exports = [
{
menu: ['云日报设置', 'daily-setting', 1],
children: [
{ menu: ['系统报表', 'systemReport', 1] },
{
menu: ['自定义报表', 'customReport', 1],
children: [
{ menu: ['新建模板', 'customReportSet', 1]},
{ menu: ['复制模板', 'customReportCopy', 1]},
{ menu: ['编辑模板', 'customReportEdit', 1]}
]
},
{ menu: ['新建模板', 'customReportSet', 1]},
{ menu: ['复制模板', 'customReportCopy', 1]},
{ menu: ['编辑模板', 'customReportEdit', 1]}
]
},
]
......@@ -227,13 +215,7 @@ module.exports = [
{
menu: ['导购设置', '', 1, 'icondaogoushezhi'],
children: [
{
menu: ['导购设置', 'guide-setting', 1],
children: [
{ menu: ['导购操作权限设置', 'guide-auth-setting', 1] },
{ menu: ['应用可见权限设置', 'app-visible-setting', 1] }
],
}
{menu: ['导购设置', 'guide-setting', 1]}
]
},
{
......
menu-data/result.xlsx
No preview for this file type
src/router/index.js
......@@ -114,19 +114,7 @@ export const constantRouterMap = [
{
path: '/guide-setting',
name: '导购设置',
component: _import('enterprise', 'guide-setting'),
children: [
{
path: '/guide-auth-setting',
name: '导购操作权限设置',
component: _import('enterprise', 'guide-auth-setting')
},
{
path: '/app-visible-setting',
name: '应用可见权限设置',
component: _import('enterprise', 'app-visible-setting')
}
]
component: _import('enterprise', 'guide-setting')
},
{
path: '/setting',
......@@ -246,19 +234,7 @@ export const constantRouterMap = [
{
path: '/memberGroupSet',
name: '客户分组设置',
component: _import('apps/customerApp', 'memberGroupSet'),
children: [
{
path: '/memberGroupList',
name: '客户分组列表',
component: _import('apps/customerApp', 'memberGroupList'),
},
{
path: '/memberGroupSetList',
name: '客户分组列表',
component: _import('apps/customerApp', 'memberGroupSetList'),
},
]
component: _import('apps/customerApp', 'memberGroupSet')
},
{
path: '/memberSearchSet',
......@@ -325,18 +301,6 @@ export const constantRouterMap = [
path: '/daily-setting',
name: '系统报表',
component: _import('apps/cloudDaily', 'daily-setting'),
children: [
{
path: '/systemReport',
name: '系统报表',
component: _import('apps/cloudDaily', 'systemReport')
},
{
path: '/customReport',
name: '自定义报表',
component: _import('apps/cloudDaily', 'customReport')
},
]
},
{
path: '/customReportSet',
......
src/views/apps/cloudDaily/daily-setting.vue
<template>
<div>
<el-tabs class="daily-setting" v-model="activeName" @tab-click="handleClick">
<el-tab-pane v-if="$getButtonLimit($buttonCode.systemReport)" :limit-code="$buttonCode.systemReport" label="系统报表" name="/systemReport"></el-tab-pane>
<el-tab-pane v-if="$getButtonLimit($buttonCode.customReport)" :limit-code="$buttonCode.customReport" label="自定义报表" name="/customReport"></el-tab-pane>
<el-tabs class="daily-setting" v-model="activeName">
<el-tab-pane label="系统报表" name="first">
<system-report :brand-id="brandId"></system-report>
</el-tab-pane>
<el-tab-pane label="自定义报表" name="second">
<custom-report :brand-id="brandId"></custom-report>
</el-tab-pane>
</el-tabs>
<router-view :brand-id="brandId"></router-view>
</div>
</template>
<script>
import SystemReport from './systemReport.vue';
import CustomReport from './customReport.vue';
export default {
name: 'DailySetting',
props: {
......@@ -17,29 +22,11 @@ export default {
default: ''
}
},
components: { SystemReport, CustomReport },
data() {
return {
activeName: ''
activeName: 'first'
};
},
methods: {
handleClick() {
this.$router.replace(this.activeName);
}
},
created() {
if (this.$route.path == '/daily-setting') {
if (this.$getButtonLimit(this.$buttonCode.systemReport)) {
this.activeName = '/systemReport';
} else if (this.$getButtonLimit(this.$buttonCode.customReport)) {
this.activeName = '/customReport';
}
if (this.activeName) {
this.handleClick();
}
} else {
this.activeName = this.$route.path;
}
}
};
</script>
......
src/views/apps/customerApp/memberGroupSet.vue
......@@ -13,16 +13,22 @@
-->
<template>
<div class="app-detail-wrap">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane v-if="$getButtonLimit($buttonCode.memberGroupList)" :limit-code="$buttonCode.memberGroupList" label="客户分组列表" name="/memberGroupList"></el-tab-pane>
<el-tab-pane v-if="$getButtonLimit($buttonCode.memberGroupSetList)" :limit-code="$buttonCodememberGroupSetList" label="分组展示设置" name="/memberGroupSetList"></el-tab-pane>
<el-tabs v-model="activeName">
<el-tab-pane label="客户分组列表" name="first">
<member-group-list :brand-id="brandId"></member-group-list>
</el-tab-pane>
<el-tab-pane label="分组展示设置" name="second">
<member-group-set-list :brand-id="brandId"></member-group-set-list>
</el-tab-pane>
</el-tabs>
<router-view :brandId="brandId"></router-view>
</div>
</template>
<script>
import MemberGroupList from './memberGroupList.vue';
import MemberGroupSetList from './memberGroupSetList.vue';
export default {
name: 'app-detail',
components: { MemberGroupList, MemberGroupSetList },
props: {
brandId: {
type: String,
......@@ -31,27 +37,8 @@ export default {
},
data() {
return {
activeName: ''
activeName: 'first'
};
},
methods: {
handleClick() {
this.$router.replace(this.activeName);
}
},
created() {
if (this.$route.path == '/memberGroupSet') {
if (this.$getButtonLimit(this.$buttonCode.memberGroupList)) {
this.activeName = '/memberGroupList';
} else if (this.$getButtonLimit(this.$buttonCode.memberGroupSetList)) {
this.activeName = '/memberGroupSetList';
}
if (this.activeName) {
this.handleClick();
}
} else {
this.activeName = this.$route.path;
}
}
};
</script>
......
src/views/enterprise/guide-setting.vue
<template>
<div>
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane v-if="$getButtonLimit($buttonCode.guideAuthSetting)" :limit-code="$buttonCode.guideAuthSetting" label="导购操作权限设置" name="/guide-auth-setting"> </el-tab-pane>
<el-tab-pane v-if="$getButtonLimit($buttonCode.appVisibleSetting)" :limit-code="$buttonCode.appVisibleSetting" label="应用可见权限设置" name="/app-visible-setting"> </el-tab-pane>
<el-tabs v-model="activeName">
<el-tab-pane label="导购操作权限设置" name="first">
<guide-auth-setting></guide-auth-setting>
</el-tab-pane>
<el-tab-pane label="应用可见权限设置" name="second">
<app-visible-setting></app-visible-setting>
</el-tab-pane>
</el-tabs>
<router-view></router-view>
</div>
</template>
<script>
import GuideAuthSetting from './guide-auth-setting.vue';
import AppVisibleSetting from './app-visible-setting.vue';
export default {
name: 'GuideSetting',
components: { GuideAuthSetting, AppVisibleSetting },
data() {
return {
activeName: ''
activeName: 'first'
};
},
methods: {
handleClick() {
this.$router.replace(this.activeName);
}
},
created() {
if (this.$route.path == '/guide-setting') {
if (this.$getButtonLimit(this.$buttonCode.guideAuthSetting)) {
this.activeName = '/guide-auth-setting';
} else if (this.$getButtonLimit(this.$buttonCode.appVisibleSetting)) {
this.activeName = '/app-visible-setting';
}
if (this.activeName) {
this.handleClick();
}
} else {
this.activeName = this.$route.path;
}
}
};
</script>
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