diff --git a/anrui-base/anrui-base-ui/src/api/jichuxinxi/baseaffiliatcompany.js b/anrui-base/anrui-base-ui/src/api/jichuxinxi/baseaffiliatcompany.js index 3562819ca3..788e7f8e94 100644 --- a/anrui-base/anrui-base-ui/src/api/jichuxinxi/baseaffiliatcompany.js +++ b/anrui-base/anrui-base-ui/src/api/jichuxinxi/baseaffiliatcompany.js @@ -50,14 +50,6 @@ export function details(data) { }) } -// 数据字典 已改 -export function typeValues(data) { - return request({ - url: '/portal/v1/dictcommons/typeValues', - method: 'get', - params: data - }) -} // 经销商下拉选 已改 export function getOneLevelList(data) { return request({ @@ -129,3 +121,66 @@ export function downloadUrl(data) { headers: { 'Content-Type': 'application/json' } }) } + +// 提交 +export function submit(data) { + return request({ + url: '/base/v1/basedistributor/submit', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) +} + +// 流程审批(同意) +export function complete (params) { + return request({ + url: '/base/v1/basedistributor/complete', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) +} +// 流程审批(驳回) +export function reject (params) { + return request({ + url: '/base/v1/basedistributor/reject', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) +} +// 流程审批(终止) +export function breakProcess (params) { + return request({ + url: '/base/v1/basedistributor/breakProcess', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) +} +// 流程审批(撤回) +export function revokeProcess (params) { + return request({ + url: '/base/v1/basedistributor/revokeProcess', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) +} +// 审批流程(同意)获取下一环节 +export function getNextNodesForSubmit (data) { + return request({ + url: '/base/v1/basedistributor/getNextNodesForSubmit', + method: 'get', + params: data + }) +} +// 审批流程(驳回)获取上一环节 +export function getPreviousNodesForReject (data) { + return request({ + url: '/base/v1/basedistributor/getPreviousNodesForReject', + method: 'get', + params: data + }) +} diff --git a/anrui-base/anrui-base-ui/src/api/jichuxinxi/dictcommons.js b/anrui-base/anrui-base-ui/src/api/jichuxinxi/dictcommons.js index 03ff05434f..f6f5336265 100644 --- a/anrui-base/anrui-base-ui/src/api/jichuxinxi/dictcommons.js +++ b/anrui-base/anrui-base-ui/src/api/jichuxinxi/dictcommons.js @@ -52,6 +52,14 @@ export function getOrgSidByPath(data) { }) } +// 根据分公司sid查询分公司名称 +export function fetchBySid(sid) { + return request({ + url: 'portal/v1/sysorganization/fetchBySid/' + sid, + method: 'get' + }) +} + // 当前用户创建申请时判断该用户是否有该菜单的操作权限 export function selectHaveMessage(data) { return request({ diff --git a/anrui-base/anrui-base-ui/src/router/index.js b/anrui-base/anrui-base-ui/src/router/index.js index 8878f65604..81cf3c6163 100644 --- a/anrui-base/anrui-base-ui/src/router/index.js +++ b/anrui-base/anrui-base-ui/src/router/index.js @@ -53,7 +53,7 @@ export const constantRoutes = [ component: Layout, redirect: '/changshang', meta: { - title: '厂商管理', + title: '厂商管理' }, children: [ { @@ -63,9 +63,9 @@ export const constantRoutes = [ name: 'changshangguanli', meta: { title: '厂商管理', - noCache: true, + noCache: true } - }, + } ] }, // 2品牌管理 @@ -84,39 +84,7 @@ export const constantRoutes = [ name: 'pinpaiguanli', meta: { title: '品牌管理', - noCache: true, - } - }, - { - path: '/pinpai/pinpaiAdd/:id', - component: () => - import('@/views/pinpai/pinpaiguanli/pinpaiAdd.vue'), - name: 'pinpaiAdd', - hidden: true, - meta: { - title: '品牌管理', - noCache: true, - } - }, - { - path: '/pinpai/pinpaiInfo', - component: () => - import('@/views/pinpai/pinpaiguanli/pinpaiInfo.vue'), - name: 'pinpaiInfo', - hidden: true, - meta: { - title: '品牌详情', - noCache: true, - } - }, - { - path: '/pinpai/pinpaiDaoru', - component: () => - import('@/views/pinpai/pinpaidaoru/pinpaiDaoru.vue'), - name: 'pinpaiDaoru', - hidden: true, - meta: { - title: '导入品牌' + noCache: true } } ] @@ -137,54 +105,9 @@ export const constantRoutes = [ name: 'jingxiaoshangguanli', meta: { title: '经销商管理', - noCache: true, - } - }, - { - path: '/jingxiaoshang/jingxiaoshangAdd', - component: () => - import('@/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangAdd.vue'), - name: 'jingxiaoshangAdd', - hidden: true, - meta: { - title: '经销商添加', - noCache: true, - } - }, - { - path: '/jingxiaoshang/jingxiaoshangEdit/:id', - component: () => - import('@/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangEdit.vue'), - name: 'jingxiaoshangEdit', - hidden: true, - meta: { - title: '经销商修改', - noCache: true, - } - }, - { - path: '/jingxiaoshang/jingxiaoshangInfo/:sid', - component: () => - import('@/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangInfo.vue'), - name: 'jingxiaoshangInfo', - hidden: true, - meta: { - title: '经销商详情', - noCache: true, + noCache: true } } - // { - // path: '/jingxiaoshang/addcomponents/beianzhanghaoForm', - // component: () => - // import('@/views/jingxiaoshang/addcomponents/beianzhanghaoForm.vue'), - // name: 'beianzhanghaoForm', - // hidden: true, - // meta: { - // title: '备案账号添加' - // } - // } - // - ] }, // 5挂靠公司 现已改为经销商 @@ -203,47 +126,7 @@ export const constantRoutes = [ name: 'guakaogongsiguanli', meta: { title: '经销商', - noCache: true, - } - }, - // { - // path: '/guakaogongsi/guakaogongsiAdd/:id', - // component: () => - // import('@/views/guakaogongsi/guakaogongsiguanli/guakaogongsiAdd.vue'), - // name: 'guakaogongsiAdd', - // hidden: true, - // meta: { - // title: '挂靠公司添加' - // } - // }, - // { - // path: '/guakaogongsi/guakaogongsiInfo', - // component: () => - // import('@/views/guakaogongsi/guakaogongsiguanli/guakaogongsiInfo.vue'), - // name: 'guakaogongsiInfo', - // hidden: true, - // meta: { - // title: '挂靠公司详情' - // } - // }, - { - path: '/guakaogongsi/renwu', - component: () => - import('@/views/guakaogongsi/renwu/renwu.vue'), - name: 'renwu', - hidden: true, - meta: { - title: '任务' - } - }, - { - path: '/guakaogongsi/renwuchuli', - component: () => - import('@/views/guakaogongsi/renwu/renwuchuli.vue'), - name: 'renwuchuli', - hidden: true, - meta: { - title: '任务处理' + noCache: true } } ] @@ -264,29 +147,7 @@ export const constantRoutes = [ name: 'zifangguanli', meta: { title: '资方信息管理', - noCache: true, - } - }, - { - path: '/zifang/zifangguanliAdd/:id', - component: () => - import('@/views/zifang/zifangguanli/zifangguanliAdd.vue'), - name: 'zifangguanliAdd', - hidden: true, - meta: { - title: '资方信息添加', - noCache: true, - } - }, - { - path: '/zifang/zifangguanliInfo', - component: () => - import('@/views/zifang/zifangguanli/zifangguanliInfo.vue'), - name: 'zifangguanliInfo', - hidden: true, - meta: { - title: '资方信息详细信息', - noCache: true, + noCache: true } }, { @@ -296,32 +157,9 @@ export const constantRoutes = [ name: 'zifangzhengce', meta: { title: '资方政策管理', - noCache: true, - } - }, - { - path: '/zifang/zifangzhengceAdd/:id', - component: () => - import('@/views/zifang/zifangzhengce/zifangzhengceAdd.vue'), - name: 'zifangzhengceAdd', - hidden: true, - meta: { - title: '资方政策添加', - noCache: true, - } - }, - { - path: '/zifang/zifangzhengceInfo', - component: () => - import('@/views/zifang/zifangzhengce/zifangzhengceInfo.vue'), - name: 'zifangzhengceInfo', - hidden: true, - meta: { - title: '资方政策详细信息', - noCache: true, + noCache: true } } - ] }, // 7、中介人员 @@ -330,7 +168,7 @@ export const constantRoutes = [ component: Layout, redirect: '/zhongjie', meta: { - title: '中介人员', + title: '中介人员' }, children: [ { @@ -340,9 +178,9 @@ export const constantRoutes = [ name: 'zhongjierenyuan', meta: { title: '中介人员', - noCache: true, + noCache: true } - }, + } ] }, // 资料清单 @@ -357,7 +195,7 @@ export const constantRoutes = [ path: '/fileList/index', component: () => import('@/views/fileList/fileList.vue'), name: 'fileList', - meta: { title: '资料清单',noCache: true, } + meta: { title: '资料清单', noCache: true } }] }, // 8、采购系统 @@ -375,6 +213,28 @@ export const constantRoutes = [ meta: { title: '采购系统', noCache: true } } ] + }, + // 流程审批 + // 经销商备案--编辑 + { + path: '/jingxiaoshangFlow/jingxiaoshangEdit', + component: () => + import('@/views/workFlow/jingxiaoshangFlow/jingxiaoshangEdit.vue'), + name: 'JingXiaoShangEdit' + }, + // 经销商备案--待办 + { + path: '/jingxiaoshangFlow/jingxiaoshangDaiBan', + component: () => + import('@/views/workFlow/jingxiaoshangFlow/jingxiaoshangDaiBan.vue'), + name: 'JingXiaoShangDaiBan' + }, + // 经销商备案--已办 + { + path: '/jingxiaoshangFlow/jingxiaoshangYiBan', + component: () => + import('@/views/workFlow/jingxiaoshangFlow/jingxiaoshangYiBan.vue'), + name: 'JingXiaoShangYiBan' }, { path: '/404', diff --git a/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiAdd.vue b/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiAdd.vue index 111e83846f..82ce6aa7e1 100644 --- a/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiAdd.vue +++ b/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiAdd.vue @@ -3,9 +3,9 @@