Merge remote-tracking branch 'origin/feature/GFRS-1198【待确定】自助入司改造(涉及销管)' into release/0811

# Conflicts:
#	src/assets/js/utils/data-dictionary.js
#	src/router/ebiz/agentEenter.js
#	src/views/ebiz/agentEenter/AgentEenterBasicImage.vue
#	src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
#	src/views/ebiz/agentEenter/Paction.vue
#	src/views/ebiz/agentEenter/SignContract.vue
This commit is contained in:
阳华祥
2020-08-11 13:41:33 +08:00
24 changed files with 742 additions and 152 deletions

View File

@@ -26,6 +26,9 @@ const ApproveInfo = () => import('@/views/ebiz/agentEenter/approve/ApproveInfo')
const SubmitSuccess = () => import('@/views/ebiz/agentEenter/approve/SubmitSuccess')
const ResultEnd = () => import('@/views/ebiz/agentEenter/ResultEnd')
const recordList = () => import('@/views/ebiz/agentEenter/approve/RecordList')
const recordDetail = () => import('@/views/ebiz/agentEenter/approve/RecordDetail')
const ResultEnd = () => import('@/views/ebiz/agentEenter/ResultEnd')
export default [
{
@@ -227,7 +230,7 @@ export default [
}
},
{
path: '/agentEenter/approve/BasicInfo/:baseId',
path: '/agentEenter/approve/BasicInfo/:baseId/:branchType/:approveName/:appntNode?',
name: 'BasicInfo',
component: BasicInfo,
meta: {
@@ -236,7 +239,7 @@ export default [
}
},
{
path: '/agentEenter/approve/ApproveInfo/:baseId',
path: '/agentEenter/approve/ApproveInfo/:baseId/:branchType/:approveName/:appntNode?',
name: 'ApproveInfo',
component: ApproveInfo,
meta: {
@@ -253,6 +256,33 @@ export default [
index: 1
}
},
{
path: '/agentEenter/approve/recordList',
name: 'recordList',
component: recordList,
meta: {
title: '审批记录',
index: 1
}
},
{
path: '/agentEenter/approve/recordDetail/:baseId',
name: 'recordDetail',
component: recordDetail,
meta: {
title: '审批详细信息',
index: 1
}
},
{
path: '/agentEenter/ResultEnd',
name: 'ResultEnd',
component: ResultEnd,
meta: {
title: '入司成功',
index: 1
}
},
{
path: '/agentEenter/ResultEnd',
name: 'ResultEnd',