From 277e3ff3c9298b542342f0fbeecf0643949ebcaa Mon Sep 17 00:00:00 2001 From: T-95707 Date: Tue, 25 Aug 2020 09:26:53 +0800 Subject: [PATCH] =?UTF-8?q?20200825=20zjt=20=E7=BB=A9=E6=95=88=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/parBasicData.js | 47 +++ src/config/router.config.js | 8 + src/permission.js | 14 +- src/views/par/basicData/ParBasicData.vue | 507 +++++++++++++++++++++++ 4 files changed, 567 insertions(+), 9 deletions(-) create mode 100644 src/api/parBasicData.js create mode 100644 src/views/par/basicData/ParBasicData.vue diff --git a/src/api/parBasicData.js b/src/api/parBasicData.js new file mode 100644 index 0000000..2d4ff38 --- /dev/null +++ b/src/api/parBasicData.js @@ -0,0 +1,47 @@ +import { axios } from '@/utils/request' +const api = { + // 根据父节点查询基础数据树 + basicDataTree: '/par/basicData/tree', + // 绩效基础数据 + basicData: '/par/basicData' + +} +/** + * 获取树结构组织信息 + */ +export function getBasicDataTree (parameter) { + return axios({ + url: api.basicDataTree, + method: 'get', + params: parameter + }) +} +/** + * 新增绩效基础数据 + */ +export function addBasicData (parameter) { + return axios({ + url: api.basicData, + method: 'post', + data: parameter + }) +} +/** + * 修改绩效基础数据 + */ +export function updateBasicData (parameter) { + return axios({ + url: api.basicData, + method: 'put', + data: parameter + }) +} +/** + * 删除绩效基础数据 + */ +export function delBasicData (parameter) { + return axios({ + url: api.basicData + '/' + parameter, + method: 'delete' + }) +} diff --git a/src/config/router.config.js b/src/config/router.config.js index ca9fa6e..aa9e0e0 100644 --- a/src/config/router.config.js +++ b/src/config/router.config.js @@ -125,6 +125,14 @@ export const asyncRouterMap = [ meta: { title: '报销审批' } + }, + { + path: 'par-basic-data', + name: 'ParBasicData', + component: () => import(/* webpackChunkName: "parBasicData" */ '@/views/par/basicData/ParBasicData.vue'), + meta: { + title: '绩效基础数据' + } } ] }, diff --git a/src/permission.js b/src/permission.js index ee70f89..459b6a9 100644 --- a/src/permission.js +++ b/src/permission.js @@ -24,7 +24,6 @@ router.beforeEach((to, from, next) => { next({ path: '/workplace' }) NProgress.done() } else { - // console.log('role',store.getters) if (store.getters.roles.length === 0) { store .dispatch('GetInfo') @@ -32,7 +31,6 @@ router.beforeEach((to, from, next) => { store.dispatch('GenerateRoutes').then(() => { // 根据roles权限生成可访问的路由表 // 动态添加可访问路由表 - console.log('addRouters',store.getters.addRouters) router.addRoutes(store.getters.addRouters) const redirect = decodeURIComponent(from.query.redirect || to.path) // 重新登录时,不跳转到上一次访问的地址 @@ -71,9 +69,6 @@ router.beforeEach((to, from, next) => { staffInfo.roles = result.roles Vue.ls.set(WECHAT_INFO, staffInfo, 7 * 24 * 60 * 60 * 1000) store.commit('SET_INFO', staffInfo) - // alert('login2') - // alert(JSON.stringify(to)) - // alert(JSON.stringify(staffInfo)) next({ path: to.fullPath }) // eslint-disable-next-line handle-callback-err }).catch(error => { @@ -109,9 +104,6 @@ router.beforeEach((to, from, next) => { staffInfo.roles = result.roles Vue.ls.set(WECHAT_INFO, staffInfo, 7 * 24 * 60 * 60 * 1000) store.commit('SET_INFO', staffInfo) - // alert('login') - // alert(JSON.stringify(to)) - // alert(JSON.stringify(staffInfo)) next({ path: to.fullPath }) // eslint-disable-next-line handle-callback-err }).catch(error => { @@ -181,7 +173,11 @@ const action = Vue.directive('action', { }) } const actionName = binding.arg - getElemets(store.getters.roles.menus) + let menus = [] + store.getters.roles.forEach(item => { + menus = menus.concat(item.menus) + }) + getElemets(menus) const per = actions.some(item => { if (item.code === actionName && item.defaultCheck === true) { return true diff --git a/src/views/par/basicData/ParBasicData.vue b/src/views/par/basicData/ParBasicData.vue new file mode 100644 index 0000000..6736718 --- /dev/null +++ b/src/views/par/basicData/ParBasicData.vue @@ -0,0 +1,507 @@ + + + -- Gitee