diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js index 0d7887fd3..b0d93a022 100644 --- a/src/assets/js/utils/data-dictionary.js +++ b/src/assets/js/utils/data-dictionary.js @@ -1397,6 +1397,14 @@ export default { ], //入司文化程度 rsdegree: [ + { + id: 11, + text: '博士后' + }, + { + id: 10, + text: '博士' + }, { id: 2, text: '硕士' @@ -1413,41 +1421,29 @@ export default { id: 5, text: '高中' }, - { - id: 6, - text: '初中' - }, { id: 7, text: '中专' }, - { - id: 8, - text: '小学' - }, - { - id: 12, - text: '其他' - }, - { - id: 13, - text: '文盲' - }, { id: 14, text: '中技' }, + { + id: 6, + text: '初中' + }, + { + id: 8, + text: '小学' + }, + { + id: 13, + text: '文盲' + }, { id: 12, text: '其他' - }, - { - id: 10, - text: '博士' - }, - { - id: 11, - text: '博士后' } ], rsRankAgent: [ @@ -1466,7 +1462,7 @@ export default { ], relationType: [{ id: '0', text: '配偶' }, { id: '1', text: '子女' }, { id: '2', text: '父母' }, { id: '3', text: '无' }], guarantRelationType: [{ id: '0', text: '亲属' }, { id: '1', text: '朋友' }, { id: '2', text: '同事' }, { id: '3', text: '其他' }], - classification: [{ id: '0', text: '司内' }, { id: '1', text: '司外' }], + classification: [{ id: '1', text: '司外' }], //入司国籍/地区 rsnativeplace: [ { id: 'AGO', text: '安哥拉' }, diff --git a/src/router/ebiz/agentEenter.js b/src/router/ebiz/agentEenter.js index 54ba324c5..64d9c5d5e 100644 --- a/src/router/ebiz/agentEenter.js +++ b/src/router/ebiz/agentEenter.js @@ -26,6 +26,7 @@ const ApproveInfo = () => import('@/views/ebiz/agentEenter/approve/ApproveInfo') const SubmitSuccess = () => import('@/views/ebiz/agentEenter/approve/SubmitSuccess') 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 +228,7 @@ export default [ } }, { - path: '/agentEenter/approve/BasicInfo/:baseId', + path: '/agentEenter/approve/BasicInfo/:baseId/:branchType/:appntNode', name: 'BasicInfo', component: BasicInfo, meta: { @@ -236,7 +237,7 @@ export default [ } }, { - path: '/agentEenter/approve/ApproveInfo/:baseId', + path: '/agentEenter/approve/ApproveInfo/:baseId/:branchType/:appntNode', name: 'ApproveInfo', component: ApproveInfo, meta: { @@ -270,5 +271,14 @@ export default [ title: '审批详细信息', index: 1 } + }, + { + path: '/agentEenter/ResultEnd', + name: 'ResultEnd', + component: ResultEnd, + meta: { + title: '入司成功', + index: 1 + } } ] diff --git a/src/views/ebiz/agentEenter/AgentEenterBasicHealth.vue b/src/views/ebiz/agentEenter/AgentEenterBasicHealth.vue index d440fc425..dbe47f7c3 100644 --- a/src/views/ebiz/agentEenter/AgentEenterBasicHealth.vue +++ b/src/views/ebiz/agentEenter/AgentEenterBasicHealth.vue @@ -290,7 +290,7 @@ export default { }) } if (item.impartType == '03') { - item.impartId = item.impartCode + item.impartId = '8' if (item.itemDtoLst) { item.itemDtoLst.map(itm => { itm.impartId = item.impartCode diff --git a/src/views/ebiz/agentEenter/AgentEenterBasicImage.vue b/src/views/ebiz/agentEenter/AgentEenterBasicImage.vue index f75492e45..f432c7238 100644 --- a/src/views/ebiz/agentEenter/AgentEenterBasicImage.vue +++ b/src/views/ebiz/agentEenter/AgentEenterBasicImage.vue @@ -404,6 +404,14 @@ export default { return } let that = this + if (this.fileListBank01.length < 2) { + this.$toast('您需要同时上传本人身份证正面及反面图像,请上传') + return + } + if (this.fileListBank06.length < 2) { + this.$toast('您需要同时上传担保人身份证正面及反面图像,请上传') + return + } this.$toast.loading({ duration: 0, // 持续展示 toast forbidClick: true, // 禁用背景点击 diff --git a/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue b/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue index fded1ceab..d2f740d1a 100644 --- a/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue +++ b/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue @@ -218,14 +218,14 @@

推荐人信息

- + - + - + - - + +
下一步 @@ -558,7 +558,7 @@ export default { Number(this.userInfo.degree) == 8 || Number(this.userInfo.degree) == 6 ) { - return this.$toast('学历不符合入司条件') + return this.$toast('您的学历不符合入司要求,不允许入司。') } this.checkShow = true // } else { diff --git a/src/views/ebiz/agentEenter/Paction.vue b/src/views/ebiz/agentEenter/Paction.vue index d684e03e6..ef766b4c7 100644 --- a/src/views/ebiz/agentEenter/Paction.vue +++ b/src/views/ebiz/agentEenter/Paction.vue @@ -154,11 +154,10 @@ export default { name: localStorage.idName, //身份证号码id type: '1', - // keyword: '不属于公司招聘员工', keyword: '本合同履行期间,本人保证不从事与代', pageNo: '1', index: '2', - offset: '110', + offset: '220', pos: '2' }).then(data => { this.$toast.clear() diff --git a/src/views/ebiz/agentEenter/ResultEnd.vue b/src/views/ebiz/agentEenter/ResultEnd.vue new file mode 100644 index 000000000..acdb7c397 --- /dev/null +++ b/src/views/ebiz/agentEenter/ResultEnd.vue @@ -0,0 +1,79 @@ + + + + + + diff --git a/src/views/ebiz/agentEenter/ShowPDF.vue b/src/views/ebiz/agentEenter/ShowPDF.vue index 81181fb7d..3644d55ef 100644 --- a/src/views/ebiz/agentEenter/ShowPDF.vue +++ b/src/views/ebiz/agentEenter/ShowPDF.vue @@ -1,50 +1,71 @@ diff --git a/src/views/ebiz/agentEenter/SignContract.vue b/src/views/ebiz/agentEenter/SignContract.vue index a6ecd5c96..a5c4bee7c 100644 --- a/src/views/ebiz/agentEenter/SignContract.vue +++ b/src/views/ebiz/agentEenter/SignContract.vue @@ -17,7 +17,7 @@
{{ sign.name }}
- 重新签名
@@ -40,7 +40,7 @@
  • {{ sign.name }}
    - 重新签名
  • diff --git a/src/views/ebiz/agentEenter/approve/ApproveList.vue b/src/views/ebiz/agentEenter/approve/ApproveList.vue index 4d0b40f92..32f3a97b9 100644 --- a/src/views/ebiz/agentEenter/approve/ApproveList.vue +++ b/src/views/ebiz/agentEenter/approve/ApproveList.vue @@ -1,5 +1,12 @@