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

@@ -85,3 +85,11 @@ export function agentAddApproval(data) {
data
})
}
//入司增员审批
export function revoke(data) {
return request({
url: getUrl('/agent/enter/revoke', 1),
method: 'post',
data
})
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@@ -1134,10 +1134,10 @@ export default {
id: '28',
text: '景颇族'
},
{
id: '代码',
text: '民族'
},
// {
// id: '代码',
// text: '民族'
// },
{
id: '29',
text: '柯尔克孜族'
@@ -1308,6 +1308,7 @@ export default {
],
//入司政治面貌
rspoliticsStatus: [
{ id: '13', text: '群众' },
{ id: '01', text: '中共党员' },
{ id: '02', text: '中共预备党员' },
{ id: '04', text: '民革党员' },
@@ -1319,7 +1320,6 @@ export default {
{ id: '10', text: '九三学社社员' },
{ id: '11', text: '台盟盟员' },
{ id: '12', text: '无党派人士' },
{ id: '13', text: '群众' },
{ id: '15', text: '工商' },
{ id: '99', text: '其他党派' }
],
@@ -1332,7 +1332,14 @@ export default {
id: 2,
text: '户口本'
},
{
id: 3,
text: '出生证'
},
{
id: 4,
text: '外国人护照'
},
{
id: 5,
text: '港澳居民来往内地通行证'
@@ -1342,12 +1349,12 @@ export default {
text: '台湾居民来往大陆通行证'
},
{
id: 8,
text: '外国人永久居留身份证'
id: 7,
text: '其他'
},
{
id: 9,
text: '港澳台居民居住证'
id: 8,
text: '外国人永久居留身份证'
}
],
// 健康状况
@@ -1464,18 +1471,8 @@ export default {
{ id: 'EAM', text: '资深部经理' },
{ id: 'AD', text: '营业总监' }
],
relationType: [
{ id: '0', text: '配偶' },
{ id: '1', text: '子女' },
{ id: '2', text: '父母' }
],
// 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: '其他' }
],
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: '1', text: '司外' }],
//入司国籍/地区
rsnativeplace: [

View File

@@ -42,7 +42,8 @@ let agentEnter = [
'/agent/enter/getImpart',
'/agent/agreement/query',
'/agent/agreement/signAgreement',
'/agent/enter/query'
'/agent/enter/query',
'/agent/examineApprove/dispose' //入司增员审批
] //入司
let claims = [
`/claim/claimApply/progress`,

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',

View File

@@ -3,6 +3,10 @@ const rate = () => import('@/views/example/Rate')
const test1 = () => import('@/views/example/Test1')
const test2 = () => import('@/views/example/Test2')
const formValidate = () => import('@/views/example/FormValidate')
const AgentTest1 = () => import('@/views/example/AgentTest1')
const AgentTest2 = () => import('@/views/example/AgentTest2')
const AgentTest3 = () => import('@/views/example/AgentTest3')
const AgentTest4 = () => import('@/views/example/AgentTest4')
export default [
{
@@ -41,5 +45,41 @@ export default [
title: '测试2',
index: 1
}
},
{
path: '/example/agentTest1',
name: 'AgentTest1',
component: AgentTest1,
meta: {
title: '自助入司测试1',
index: 1
}
},
{
path: '/example/agentTest2',
name: 'AgentTest2',
component: AgentTest2,
meta: {
title: '自助入司测试2',
index: 1
}
},
{
path: '/example/agentTest3',
name: 'AgentTest3',
component: AgentTest3,
meta: {
title: '自助入司测试3',
index: 1
}
},
{
path: '/example/agentTest4',
name: 'AgentTest4',
component: AgentTest4,
meta: {
title: '自助入司测试4',
index: 1
}
}
]

View File

@@ -22,7 +22,7 @@
<van-field label="姓名" type="text" name="姓名" placeholder="请输入" v-validate="'required|name'" clearable v-model="item.name" required />
<select-radio :radios="sexRadio" label="性别" name="性别" v-validate="'required'" required :value.sync="item.sex"></select-radio>
<van-field
:value="item.idType | idToText('idType')"
:value="item.idType | idToText('rsIdType')"
v-validate="'required'"
readonly
label="证件类型"
@@ -209,7 +209,7 @@ export default {
this.columns = DataDictionary.relationType
}
if (pickerType == '2') {
this.columns = DataDictionary.idType
this.columns = DataDictionary.rsIdType
}
},
onConfirm(value) {

View File

@@ -117,7 +117,7 @@
</van-field>
<van-field v-model="userInfo.address" label="联系地址" name="联系地址" placeholder="请输入" v-validate="'required'" required clearable />
<!-- <van-field v-model="userInfo.zip" label="邮政编码" name="邮政编码" placeholder="请输入" v-validate="'required|zipCode'" required clearable /> -->
<van-field v-model="userInfo.zip" label="邮政编码" name="邮政编码" placeholder="请输入" clearable />
<van-field v-model="userInfo.zip" label="邮政编码" name="邮政编码" placeholder="请输入" v-validate="'zipCode'" clearable />
<van-field :value="userInfo.bankName" label="开户银行" name="开户银行" v-validate="'required'" required readonly />
<!-- @click="focus"
right-icon="arrow"
@@ -140,6 +140,17 @@
>
<van-button slot="button" size="small" type="danger" round @click="cardScanning('0')">银行卡扫描</van-button>
</van-field>
<van-field
v-model="bankCode"
maxlength="19"
label="确认银行卡号"
name="银行卡号"
placeholder="请再次输入银行卡号"
required
clearable
v-validate="'required|bankCard'"
>
</van-field>
<van-field
v-model="userInfo.perationPeriod"
type="digit"
@@ -259,10 +270,10 @@
</van-list>
</van-popup>
<!-- 二次输入银行卡号校验弹出 -->
<van-dialog v-model="checkShow" show-cancel-button @confirm="bankCodeConfirm(bankCode)">
<van-dialog id="card" v-model="checkShow" show-cancel-button @confirm="bankCodeConfirm(bankCode)">
<p class="p10 fs16 text-center green mt5">请再次输入银行卡号</p>
<van-cell-group class="flex align-items-c pr5 mb15">
<van-field label="银行卡号:" name="银行卡号" maxlength="19" v-model="bankCode" clearable />
<van-field label="银行卡号:" name="银行卡号" maxlength="19" v-model="bankCode" clearable placeholder="请输入银行卡号" required />
</van-cell-group>
<p class="fs14 mt5 ml5">是否确认提交一旦提交在人管审批之前无法再次进行修改</p>
</van-dialog>
@@ -277,7 +288,7 @@ import CustomerPicker from '@/components/ebiz/customer/CustomerPicker'
import BankCardScan from '@/components/ebiz/sale/BankCardScan'
import areaList from '@/assets/js/utils/area'
import idNoCheck from '@/assets/js/utils/idNoCheck'
import DataDictionary from '@/assets/js/utils/data-dictionary'
// import DataDictionary from '@/assets/js/utils/data-dictionary'
import IdentityCardScan from '@/components/ebiz/sale/IdentityCardScan'
import beforeDate from '@/assets/js/utils/getBeforeDate.js'
import { getBankList } from '@/api/ebiz/sale/sale'
@@ -286,7 +297,7 @@ import { saveOrUpdateInfo, agentAll } from '@/api/ebiz/agentEenter/agentEenter.j
import { idToData } from '@/views/ebiz/customer/js/verification'
import {
selectComp,
appCallBack,
// appCallBack,
chooseOccupation,
toSelect,
onConfirm,
@@ -480,7 +491,7 @@ export default {
// 选择银行卡
clickList(item, bankCode) {
console.log('英航卡', item, bankCode)
let that = this
// let that = this
// that.userInfo.bankName = item
// // that.userInfo.bankCode = bankCode
// that.show = false
@@ -520,6 +531,9 @@ export default {
},
// 点击下一步
nextStep() {
if (this.userInfo.bankCode.trim() && this.bankCode.trim() && this.userInfo.bankCode !== this.bankCode) {
return this.$toast('两次输入的银行卡号不一致!')
}
this.$validator.validate().then(valid => {
if (valid == true) {
if (this.userInfo.idType == '1') {
@@ -560,7 +574,7 @@ export default {
) {
return this.$toast('您的学历不符合入司要求,不允许入司。')
}
this.checkShow = true //
this.bankCodeConfirm()
} else {
this.$toast(this.errors.all()[0])
}
@@ -595,7 +609,7 @@ export default {
sureArea(this, area, type)
},
//设为联系地址
setAddress(val) {
setAddress() {
//上面是0下面是1
if (this.homeDefault) {
this.userInfo.addressStatus = 1
@@ -681,13 +695,8 @@ export default {
})
this.isScan = false
},
bankCodeConfirm(val) {
if (val == this.userInfo.bankCode) {
bankCodeConfirm() {
this.save()
} else {
this.$toast('两次输入的银行卡号不一致,请重新输入!')
this.bankCode = ''
}
}
},
beforeDestroy() {
@@ -712,6 +721,11 @@ export default {
width: 120px;
}
}
#card {
/deep/.van-cell__value {
border-bottom: 2px solid #e9332e;
}
}
}
/deep/ .van-field__label {
display: flex;

View File

@@ -16,7 +16,7 @@
@click="toSelect('1')"
required
/>
<van-field
<!-- <van-field
:value="userInfo.type | idToText('classification')"
v-validate="'required'"
readonly
@@ -26,7 +26,8 @@
placeholder="请选择"
@click="toSelect('2')"
required
/>
/> -->
<van-field :value="userInfo.type | idToText('classification')" v-validate="'required'" readonly label="类别" name="类别" disabled />
<van-field label="姓名" type="text" name="姓名" placeholder="请输入" v-validate="'required|name'" clearable v-model="userInfo.name" required />
<select-radio :radios="sexRadio" label="性别" name="性别" v-validate="'required'" required :value.sync="userInfo.sex"></select-radio>
<van-field
@@ -67,7 +68,7 @@
</div>
</template>
<script>
import { Field, CellGroup, Button, col, popup, picker, Dialog } from 'vant'
import { Field, CellGroup, Button, col, popup, picker, Dialog, Cell } from 'vant'
import FieldDatePicter from '@/components/ebiz/FieldDatePicter'
import SelectRadio from '@/components/ebiz/SelectRadio'
import DataDictionary from '@/assets/js/utils/data-dictionary'
@@ -81,6 +82,7 @@ export default {
[FieldDatePicter.name]: FieldDatePicter,
[Field.name]: Field,
[CellGroup.name]: CellGroup,
[Cell.name]: Cell,
[Button.name]: Button,
[col.name]: col,
[popup.name]: popup,
@@ -95,7 +97,7 @@ export default {
columns: [],
userInfo: {
relation: '',
type: '',
type: '0',
name: '',
sex: '0',
idNo: '',
@@ -164,6 +166,12 @@ export default {
} else {
this.userInfo.sex = String(res.content.ebizGuarantorDto.sex) //性别
}
//担保人类别
if (res.content.ebizGuarantorDto.type == null) {
this.userInfo.type = '1'
} else {
this.userInfo.type = String(res.content.ebizGuarantorDto.type) //性别
}
}
})
},
@@ -248,10 +256,11 @@ export default {
</script>
<style lang="scss" scoped>
.guarant-info-container {
.referrerW {
/deep/.van-cell__title {
width: 110px;
/deep/ .van-cell__value {
text-align: left;
}
/deep/ .van-cell__title {
width: 20%;
}
.add-btn {
width: 80%;

View File

@@ -246,10 +246,10 @@ export default {
this.$jump({
flag: 'h5',
extra: {
url: location.origin + `/#/agentEenter/seeCause`
url: location.origin + `/#/agentEenter/seeCause?basicId=${this.ebizExamineApproveDtoList[0].baseId}`
},
routerInfo: {
path: `/agentEenter/seeCause`
path: `/agentEenter/seeCause?basicId=${this.ebizExamineApproveDtoList[0].baseId}`
}
})
},

View File

@@ -146,6 +146,7 @@ export default {
loadingType: 'spinner',
message: '加载中……'
})
// eslint-disable-next-line no-undef
EWebBridge.webCallAppInJs('ca_sign', {
//身份证号码
number: localStorage.idNo,
@@ -157,6 +158,8 @@ export default {
pageNo: '1',
index: '2',
offset: '220',
pos: '2'
offset: '220',
pos: '2',
signatureWidth: this.$utils.signParams().signatureWidth,
signatureHeight: this.$utils.signParams().signatureHeight

View File

@@ -16,14 +16,16 @@
<span>{{ refusalCause }}</span>
</div>
</div>
<van-button @click="goBaseInfo" plain type="danger" class="w200 mt50" round>去修改</van-button>
<van-button @click="goBaseInfo" plain type="danger" class="w150 mt50 mr20" round>去修改</van-button>
<van-button @click="revoke()" plain type="danger" class="w150 mt50" round>撤销申请</van-button>
</div>
</div>
</template>
<script>
import { Field, Icon, Button, Checkbox, CheckboxGroup } from 'vant'
import { processCheck } from '@/api/ebiz/agentEenter/agentEenter'
import { processCheck, revoke } from '@/api/ebiz/agentEenter/agentEenter'
export default {
data() {
return {
@@ -59,6 +61,24 @@ export default {
}
})
},
//撤销申请
revoke() {
//调后端撤销申请接口
let data = {
ebizEnterCustomerDto: {
id: this.$route.query.basicId
}
}
revoke(data).then(res => {
if (res.result == 0) {
this.$toast('撤销成功')
// eslint-disable-next-line no-undef
EWebBridge.webCallAppInJs('login')
} else {
this.$toast(res.resultMessage)
}
})
},
processCheck() {
let that = this
that.$toast.loading({

View File

@@ -17,15 +17,7 @@
<div class="w240 blue">{{ sign.name }}</div>
<div class="pt5 pb5">
<van-icon v-if="sign.signState === '1'" color="green" name="checked" />
<van-button
v-if="sign.signState === '1' && agentInfo.audit == '04'"
@click="changeSign(sign, '0')"
v-no-more-click="1000"
plain
type="danger"
round
size="small"
class="ml5"
<van-button v-if="sign.signState === '1' && agentInfo.audit == '04' " @click="changeSign(sign, '0')" v-no-more-click="1000" plain type="danger" round size="small" class="ml5"
>重新签名</van-button
>
</div>
@@ -48,15 +40,7 @@
<li class="flex" v-for="(sign, index) in guaranteeSignList" :key="index">
<div class="w240 blue">{{ sign.name }}</div>
<van-icon v-if="sign.signState === '1'" color="green" name="checked" />
<van-button
v-if="sign.signState === '1' && agentInfo.audit == '04'"
@click="changeSign(sign, '1')"
v-no-more-click="1000"
plain
type="danger"
round
size="small"
class="ml5"
<van-button v-if="sign.signState === '1' && agentInfo.audit == '04' " @click="changeSign(sign, '1')" v-no-more-click="1000" plain type="danger" round size="small" class="ml5"
>重新签名</van-button
>
</li>

View File

@@ -2,11 +2,12 @@
<div class="detail-container">
<p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">审批信息</p>
<van-cell-group v-for="item in approvalInfo" :key="item.examineApproveName" class="fs15">
<van-cell title="审批人" :value="item.examineApproveName" />
<van-cell title="职级" :value="item.examineApproveTitle" />
<van-cell title="所属团队" :value="item.team" />
<van-cell title="审批结论" :value="item.examineApproveResult == '0' ? '拒绝审批' : '审批通过'" />
<van-cell title="退回原因" :value="item.examineApproveMsg" />
<van-cell title="审批人" :value="approveName" />
<van-cell title="职级" :value="applGradeToText(item.examineApproveTitle, 'applGrade')" />
<van-cell title="所属团队" :value="item.examineApproveTeam" />
<!-- <van-cell title="审批结论" value="审批拒绝" /> -->
<van-cell title="审批结论" :value="item.exampleApproveStatus == '1' ? '审批拒绝' : '审批通过'" />
<van-cell title="退回原因" v-if="item.exampleApproveStatus == '1'" :value="item.examineApproveMsg" />
</van-cell-group>
<van-cell-group class="pt10 pb80 fs15">
<van-radio-group v-model="approvalResult" v-validate="approvalResult === '' ? 'required' : ''" name="审批结论" class="pl15">
@@ -62,9 +63,20 @@ export default {
data() {
return {
// approvalInfo: [], //审批信息
approveName: decodeURI(this.$route.params.approveName), //当前审批人姓名
approvalInfo: [], //审批信息
approvalResult: '', //该审批人填写的审批结果
approvalMsg: '' //该审批人填写的退回原因
approvalMsg: '', //该审批人填写的退回原因
ebizEnterCustomerDto: {} //申请人信息
}
},
computed: {
applGradeToText() {
return (title, type) => {
const rs = this.$options.filters['idToText'](title, type)
if (rs) return rs
return ''
}
}
},
mounted() {
@@ -75,7 +87,7 @@ export default {
//获取审批信息
getOrderList() {
let params = {
types: ['04'],
types: ['02', '04'],
ebizEnterCustomerDto: {
id: this.$route.params.baseId
}
@@ -84,6 +96,7 @@ export default {
if (res.result == '0') {
if (res.content) {
this.approvalInfo = res.content.ebizHisExamineApproveDtoList
this.ebizEnterCustomerDto = res.content.ebizEnterCustomerDto
}
}
})
@@ -110,16 +123,35 @@ export default {
this.$validator.validate().then(valid => {
if (true === valid) {
let baseId = this.$route.params.baseId // 代理人id
let appntNode
switch (this.$route.params.appntNode) {
case '1':
appntNode = '1'
break
case '3':
appntNode = '2'
break
case '5':
appntNode = '3'
break
default:
appntNode = null
break
}
let params = {
types: ['00'],
ebizEnterCustomerDto: {
id: baseId // 代理人id
id: baseId, // 代理人id
idNo: this.ebizEnterCustomerDto.idNo,
idType: this.ebizEnterCustomerDto.idType,
name: this.ebizEnterCustomerDto.name
},
// userModel: {
// id: 'A864501000001', // 审批人工号
// name: '审批人一号', // 审批人姓名
// agentGrade: 'A201' // 审批人职级
// },
appntNode: this.$route.params.branchType == '1' ? appntNode : null,
result: this.approvalResult, //审批结果 0-拒绝审批 1-通过
msg: this.approvalMsg //审批原因
}

View File

@@ -1,5 +1,13 @@
<template>
<div class="sale-list-container pb50">
<!--<van-sticky>
<van-tabs v-model="appntNode" v-if="branchType === '1'" @change="change">
<van-tab title="营业区经理" name="1"> </van-tab>
<van-tab title="三级机构负责人" name="3"> </van-tab>
<van-tab title="人员管理岗" name="5"> </van-tab>
</van-tabs>
</van-sticky>-->
<van-list v-model="loading" :immediate-check="false" :finished="finished" :finished-text="finishedText" @load="loadMore">
<div v-if="isSuccess">
<div v-if="approveList.length > 0">
<div v-for="(item, index) in approveList" :key="index">
@@ -37,17 +45,18 @@
</div>
</div>
</div>
<div v-else class="text-center">
<img class="mt40" src="@/assets/images/pic_page-non.png" />
<div class="fs17 mt40">暂无审批信息</div>
</div>
</van-list>
</div>
</template>
<script>
import { List, Tag, Sticky, Toast, Dialog } from 'vant'
import { List, Tag, Tab, Sticky, Tabs } from 'vant'
import { agentAddApproval } from '@/api/ebiz/agentEenter/agentEenter.js'
import { getAgentInfo } from '@/api/ebiz/my/my.js'
export default {
name: 'approveList',
@@ -55,46 +64,86 @@ export default {
[List.name]: List,
[Tag.name]: Tag,
[Sticky.name]: Sticky,
[Dialog.name]: Dialog
[Tab.name]: Tab,
[Tabs.name]: Tabs
},
data() {
return {
approveList: [], //审批列表信息
branchType: '', //是否是内勤审批 0-不是内勤审批 1-是内勤审批
approveName: '', //当前审批人姓名
appntNode: '', //审批级别 1区经理审批 3、三级机构审批 5、人员管理岗
loading: false,
finished: false,
currentPage: 1, //当前页数
finishedText: '',
isSuccess: false
}
},
mounted() {
this.getOrderList()
async mounted() {
// 获取代理人信息
const res = await getAgentInfo({})
if (res.result == 0) {
this.branchType = /^N{1}/.test(res.branchType) ? '1' : '0' //res.branchType 以N打头的是内勤 其他是外勤
this.approveName = encodeURI(res.name)
if(this.branchType == '0'){
this.getOrderList({
pageNum: this.currentPage
})
}
} else {
return this.$toast(res.resultMessage)
}
},
methods: {
change(tab) {
this.currentPage = 1
this.approveList = []
this.finished = false
this.loading = true
this.finishedText = ''
this.getOrderList(
{
pageNum: this.currentPage
},
tab
)
},
loadMore() {
let pageInfo = {
pageNum: this.currentPage
// pageSize: this.pageSize
}
console.log('pageInfo==', pageInfo)
this.getOrderList(pageInfo, this.appntNode)
},
//初始化审批列表
getOrderList() {
this.$toast.loading({
duration: 0, // 持续展示 toast
forbidClick: true, // 禁用背景点击
loadingType: 'spinner',
message: '加载中……'
})
getOrderList(pageInfo, appntNode = '1') {
let data = {
types: ['01']
...pageInfo,
types: ['01'],
appntNode: this.branchType === '1' ? appntNode : null
}
agentAddApproval(data).then(res => {
this.$toast.clear()
if (res.result == '0') {
let resData = res.content.ebizExamineApproveDtoList
let obj = {}
if (resData.length > 0) {
this.currentPage++
let resData = res.content.approveWaitPageInfo
if (resData.list.length > 0) {
this.isSuccess = true
resData.forEach(ele => {
obj = {}
obj.name = ele.name //申请人姓名
obj.referName = ele.referName //推荐人姓名
obj.team = ele.team //所属团队
obj.createdDate = ele.createdDate //申请时间
obj.baseId = ele.baseId //代理人id
this.approveList.push(obj)
resData.list.map(ele => {
this.approveList.push(ele)
})
if (resData.pageNum == resData.pages) {
this.finished = true
this.finishedText = '没有更多了'
}
this.loading = false
}
} else {
this.finished = true
this.loading = false
this.finishedText = res.resultMessage
}
})
},
@@ -105,12 +154,26 @@ export default {
this.$jump({
flag: 'h5',
extra: {
url: location.origin + `/#/agentEenter/approve/BasicInfo/${baseId}`,
url: location.origin + `/#/agentEenter/approve/BasicInfo/${baseId}/${this.branchType}/${this.approveName}/${this.appntNode}`,
pullRefresh: '1' //1:需要开启下拉刷新
},
routerInfo: { path: `/agentEenter/approve/BasicInfo/${baseId}` }
routerInfo: { path: `/agentEenter/approve/BasicInfo/${baseId}/${this.branchType}/${this.approveName}/${this.appntNode}` }
})
}
},
watch: {
//审批级别变化时触发
// appntNode(val) {
// this.currentPage = 1
// this.finished = false
// this.loading = false
// let pageInfo = {
// pageNum: this.currentPage
// }
// this.approveList = []
// // this.getOrderList(pageInfo, val)
// this.loadMore()
// }
}
}
</script>

View File

@@ -30,7 +30,7 @@
<van-cell title="是否同业" :value="BasicInfoDTO.sameTrade | idToText('rshealthCondition')" />
<van-cell title="国籍/地区" :value="BasicInfoDTO.nationality | idToText('rsnativeplace')" />
<van-cell title="是否境外人员" :value="BasicInfoDTO.foreigners | idToText('rshealthCondition')" />
<van-cell title="职级" :value="BasicInfoDTO.applGrade" />
<van-cell title="职级" :value="BasicInfoDTO.applGrade | idToText('applGrade')" />
</van-cell-group>
<p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">推荐人信息</p>
<van-cell-group>
@@ -52,7 +52,6 @@
<script>
import { agentAddApproval } from '@/api/ebiz/agentEenter/agentEenter.js'
import { Cell, CellGroup, Button } from 'vant'
import DataDictionary from '@/assets/js/utils/data-dictionary'
export default {
name: 'approveInfo',
@@ -76,6 +75,7 @@ export default {
getOrderList() {
let BasicParams = {
types: ['02', '03'],
appntNode: this.$route.params.branchType == '1' ? this.$route.params.appntNode : null,
ebizEnterCustomerDto: {
id: this.$route.params.baseId
}
@@ -85,6 +85,9 @@ export default {
if (res.result == '0') {
if (res.content) {
this.BasicInfoDTO = res.content.ebizEnterCustomerDto
if (this.BasicInfoDTO.bankName == '102') {
this.BasicInfoDTO.bankName = '工商银行'
}
this.referrerInfoDTO = res.content.ebizReferrerDto
}
}
@@ -96,9 +99,13 @@ export default {
this.$jump({
flag: 'h5',
extra: {
url: location.origin + `/#/agentEenter/approve/ApproveInfo/${baseId}`
url:
location.origin +
`/#/agentEenter/approve/ApproveInfo/${baseId}/${this.$route.params.branchType}/${this.$route.params.approveName}/${this.$route.params.appntNode}`
},
routerInfo: { path: `/agentEenter/approve/ApproveInfo/${baseId}` }
routerInfo: {
path: `/agentEenter/approve/ApproveInfo/${baseId}/${this.$route.params.branchType}/${this.$route.params.approveName}/${this.$route.params.appntNode}`
}
})
}
}

View File

@@ -0,0 +1,137 @@
<template>
<div class="record-detail-container">
<p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">基本信息</p>
<div class="pb80">
<van-cell-group>
<van-cell title="姓名" :value="basicInfoDTO.name" />
<van-cell title="性别" :value="basicInfoDTO.sex == 0 ? '男' : '女'" />
<van-cell title="出生日期" :value="basicInfoDTO.birthday" />
<van-cell title="籍贯" :value="basicInfoDTO.nativePlace | idToText('rsnativePlace')" />
<van-cell title="民族" :value="basicInfoDTO.ethnic | idToText('nationType')" />
<van-cell title="户口所在地" :value="basicInfoDTO.rgtAddress | idToText('rsnativePlace')" />
<van-cell title="职称" :value="basicInfoDTO.title" />
<van-cell title="婚姻状况" :value="basicInfoDTO.marriage | idToText('rsmarriage')" />
<van-cell title="政治面貌" :value="basicInfoDTO.political | idToText('rspoliticsStatus')" />
<van-cell title="学历" :value="basicInfoDTO.degree | idToText('rsdegree')" />
<van-cell title="毕业院校" :value="basicInfoDTO.school" />
<van-cell title="所学专业" :value="basicInfoDTO.discipline" />
<van-cell title="手机" :value="basicInfoDTO.mobile" />
<van-cell title="证件类型" :value="basicInfoDTO.idType | idToText('idType')" />
<van-cell title="证件号码" :value="basicInfoDTO.idNo" />
<van-cell title="联系地址" :value="basicInfoDTO.address" />
<van-cell title="邮政编码" :value="basicInfoDTO.zip" />
<van-cell title="开户银行" :value="basicInfoDTO.bankName" />
<van-cell title="开户地" :value="basicInfoDTO.bankAddress" />
<van-cell title="开户姓名" :value="basicInfoDTO.accountName" />
<van-cell title="银行卡号" :value="basicInfoDTO.bankCode" />
<van-cell title="从业年限" :value="basicInfoDTO.perationPeriod" />
<van-cell title="原工作单位" :value="basicInfoDTO.oldCompany" />
<van-cell title="原职业" :value="basicInfoDTO.oldOccupation | idToText('oldOccupation')" />
<van-cell title="是否同业" :value="basicInfoDTO.sameTrade | idToText('rshealthCondition')" />
<van-cell title="国籍/地区" :value="basicInfoDTO.nationality | idToText('rsnativeplace')" />
<van-cell title="是否境外人员" :value="basicInfoDTO.foreigners | idToText('rshealthCondition')" />
<van-cell title="职级" :value="basicInfoDTO.applGrade | idToText('applGrade')" />
</van-cell-group>
<p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">推荐人信息</p>
<van-cell-group>
<van-cell title=" 推荐人代码" :value="referrerInfoDTO.referCode" />
<van-cell title="推荐人姓名" :value="referrerInfoDTO.referName" />
<van-cell title="营业组主管代码" :value="referrerInfoDTO.teamManger" />
<van-cell title="营业组主管姓名" :value="referrerInfoDTO.teamMangerName" />
<van-cell title="营业部经理代码" :value="referrerInfoDTO.officeManger" />
<van-cell title="营业部经理姓名" :value="referrerInfoDTO.officeMangerNam" />
<van-cell title="业务总监经理代码" :value="referrerInfoDTO.areaManger" />
<van-cell title="业务总监经理姓名" :value="referrerInfoDTO.areaMangerName" />
</van-cell-group>
<p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">审批信息</p>
<van-cell-group v-for="item in approvalInfo" :key="item.examineApproveName" class="fs15">
<van-cell title="审批时间" :value="item.modifiedDate" />
<van-cell title="审批结论" :value="item.exampleApproveStatus == '1' ? '审批拒绝' : '审批通过'" />
<van-cell v-if="item.exampleApproveStatus == '1'" title="退回原因" :value="item.examineApproveMsg" />
</van-cell-group>
</div>
</div>
</template>
<script>
import { agentAddApproval } from '@/api/ebiz/agentEenter/agentEenter.js'
import { Cell, CellGroup, Button } from 'vant'
export default {
name: 'recordDetail',
components: {
[Cell.name]: Cell,
[CellGroup.name]: CellGroup,
[Button.name]: Button
},
data() {
return {
basicInfoDTO: {}, //基本信息
referrerInfoDTO: {}, //推荐人信息
approvalInfo: [] //审批信息
}
},
async mounted() {
let basicParams = {
types: ['02', '03'],
ebizEnterCustomerDto: {
id: this.$route.params.baseId
}
}
//获取列表信息
await this.getOrderList(basicParams, '1')
let { idNo, idType, name } = this.basicInfoDTO
let param = {
types: ['04'],
ebizEnterCustomerDto: {
id: this.$route.params.baseId,
idNo,
idType,
name
}
}
await this.getOrderList(param, '2')
},
methods: {
//获取列表信息
getOrderList(params, code) {
return new Promise((resolve, reject) => {
//获取代理人信息、推荐人信息
agentAddApproval(params).then(res => {
if (res.result == '0') {
if (res.content) {
if (code == '1') {
this.basicInfoDTO = res.content.ebizEnterCustomerDto
this.referrerInfoDTO = res.content.ebizReferrerDto
if (this.basicInfoDTO.bankName == '102') {
this.basicInfoDTO.bankName = '工商银行'
}
}
// 需要新的接口文档
if (code == '2') {
this.approvalInfo = res.content.ebizHisExamineApproveDtoList
}
}
resolve()
} else {
this.$toast.resultMessage
}
})
})
}
}
}
</script>
<style lang="scss" scoped>
.detail-container {
.van-hairline--top-bottom::after {
border: none;
}
/deep/ .van-cell__title {
min-width: 40%;
}
/deep/ .van-cell__value {
text-align: left !important;
min-width: 60%;
}
}
</style>

View File

@@ -0,0 +1,148 @@
<template>
<div class="record-list-container pb50">
<van-list v-model="loading" :immediate-check="false" :finished="finished" :finished-text="finishedText" @load="loadMore">
<div v-if="isSuccess">
<div v-if="approveList.length > 0">
<div v-for="(item, index) in approveList" :key="index">
<div class="bg-white pv15 pr15 pl10 record-list">
<div class="flex justify-content-s align-items-c">
<div class="mb10">
<div class="inline-b" style="margin-right:13px">
<van-tag plain color="#5CA7DE">申请人</van-tag>
</div>
<span class="fs14 c-gray-dark ml20">{{ item.name }}</span>
</div>
</div>
<div class="mb10">
<div class="inline-b" style="margin-right:13px">
<van-tag plain color="#5CA7DE">推荐人</van-tag>
</div>
<span class="fs14 c-gray-dark ml20">{{ item.referName }}</span>
</div>
<div class="mb10">
<div class="inline-b">
<van-tag plain color="#5CA7DE">所属团队</van-tag>
</div>
<span class="fs14 c-gray-dark ml20">{{ item.team }}</span>
</div>
<div class="mb10">
<div class="inline-b">
<van-tag plain color="#5CA7DE">审批时间</van-tag>
</div>
<span class="fs14 c-gray-dark ml20">{{ item.createdDate }}</span>
</div>
<div class="mt10 pt10 flex justify-content-fe">
<van-button round size="small" class="mr10" type="danger" @click="goDetail(item.baseId)">查看</van-button>
</div>
</div>
</div>
</div>
</div>
<div v-else class="text-center">
<img class="mt40" src="@/assets/images/pic_page-non.png" />
<div class="fs17 mt40">暂无审批记录</div>
</div>
</van-list>
</div>
</template>
<script>
import { List, Tag, Sticky, Toast, Dialog } from 'vant'
import { agentAddApproval } from '@/api/ebiz/agentEenter/agentEenter.js'
import { getAgentInfo } from '@/api/ebiz/my/my.js'
export default {
name: 'approveList',
components: {
[List.name]: List,
[Tag.name]: Tag,
[Sticky.name]: Sticky,
[Dialog.name]: Dialog
},
data() {
return {
approveList: [], //审批列表信息
loading: false,
finished: false,
currentPage: 1, //当前页数
finishedText: '',
// pageSize: 15, //每页数据条数
isSuccess: false,
branchType: '1'
}
},
async mounted() {
document.getElementsByTagName('body')[0].classList.add('bg-white')
const res = await getAgentInfo({})
if (res.result == 0) {
this.branchType = /^N{1}/.test(res.branchType) ? '1' : '0' //res.branchType 以N打头的是内勤 其他是外勤
if(this.branchType == '0'){
this.loadMore()
}
} else {
return this.$toast(res.resultMessage)
}
},
destroyed() {
document.getElementsByTagName('body')[0].classList.remove('bg-white')
},
methods: {
loadMore() {
let pageInfo = {
pageNum: this.currentPage
// pageSize: this.pageSize
}
this.getOrderList(pageInfo)
},
//初始化审批记录列表
getOrderList(pageInfo) {
let data = {
...pageInfo,
types: ['05']
}
agentAddApproval(data).then(res => {
this.$toast.clear()
if (res.result == '0') {
let resData = res.content.approveDonePageInfo
if (resData.list.length > 0) {
this.isSuccess = true
resData.list.map(ele => {
this.approveList.push(ele)
})
if (resData.pageNum == resData.pages) {
this.finished = true
this.finishedText = '没有更多了'
}
this.loading = false
}
} else {
this.finished = true
this.loading = false
this.finishedText = res.resultMessage
}
})
},
//查看详情
goDetail(baseId) {
this.$jump({
flag: 'h5',
extra: {
url: location.origin + `/#/agentEenter/approve/recordDetail/${baseId}`
},
routerInfo: { path: `/agentEenter/approve/recordDetail/${baseId}` }
})
}
}
}
</script>
<style lang="scss" scoped>
.record-list {
border-bottom: 1px solid #ebedf0;
border-top: 1px solid #ebedf0;
margin: 15px 0;
.justify-content-fe {
border-top: 1px solid #ebedf0;
}
}
</style>

View File

@@ -144,17 +144,6 @@ export default {
this.getData()
},
methods: {
// yuansheng() {
// EWebBridge.webCallAppInJs('bridge', {
// flag: 'share',
// extra: {
// title: '鼎诚人寿欢迎你!',
// content: '正在招聘代理人,工作地点北京市朝阳区,有意向请戳我…',
// url: location.origin + '/#/agentEenter/ShareInfo?token=' + this.token,
// img: this.$assetsUrl + 'images/logo.png'
// }
// })
// },
getData: function() {
let self = this
self.$toast.loading({

View File

@@ -10,7 +10,7 @@
<script>
import UserInfoHeader from '@/components/ebiz/manpower/UserInfoHeader'
import NavItem from '@/components/ebiz/manpower/NavItem'
import record from '@/assets/images/u73803.png'
import { CellGroup } from 'vant'
import { getTokenForUserModel } from '@/api/ebiz/manpower/manpower'
@@ -37,6 +37,11 @@ export default {
title: '增员审批',
icon: 'comment-o',
path: '/agentEenter/approve/ApproveList'
},
{
title: '审批记录',
src: record,
path: '/agentEenter/approve/recordList'
}
]
}

View File

@@ -0,0 +1,27 @@
<template>
<div class="agent-test1-container">
<h1>我是自助入司测试1</h1>
<button @click="go">点击进入 测试2</button>
</div>
</template>
<script>
export default {
methods: {
go() {
this.$jump({
flag: 'h5',
extra: {
url: location.origin + '/#/example/agentTest2'
},
routerInfo: {
path: '/example/agentTest2'
}
})
}
}
}
</script>
<style>
</style>

View File

@@ -0,0 +1,27 @@
<template>
<div class="agent-test2-container">
<h1>我是自助入司测试2</h1>
<button @click="go">点击进入 测试3</button>
</div>
</template>
<script>
export default {
methods: {
go() {
this.$jump({
flag: 'h5',
extra: {
url: location.origin + '/#/example/agentTest3'
},
routerInfo: {
path: '/example/agentTest3'
}
})
}
}
}
</script>
<style>
</style>

View File

@@ -0,0 +1,28 @@
<template>
<div class="agent-test2-container">
<h1>我是自助入司测试3</h1>
<button @click="go">点击进入 测试4</button>
</div>
</template>
<script>
export default {
methods: {
go() {
this.$jump({
flag: 'h5',
extra: {
url: location.origin + '/#/example/agentTest4',
backToFirst: '1'
},
routerInfo: {
path: '/example/agentTest4'
}
})
}
}
}
</script>
<style>
</style>

View File

@@ -0,0 +1,21 @@
<template>
<div class="agent-test2-container">
<h1>我是自助入司测试4</h1>
<button @click="go">点击进入 返回入口第一页</button>
</div>
</template>
<script>
export default {
methods: {
go() {
this.$jump({
flag: 'goBack'
})
}
}
}
</script>
<style>
</style>