hz/ebiz-h5
1
0
Fork 0
mirror of http://112.124.100.131/GFRS/ebiz-h5.git synced 2025-12-24 18:23:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/GFRS-221_入司审批' into dev

Browse Source
This commit is contained in:
yuweiqi
2020-02-19 17:49:34 +08:00
parent 44eb02352c 37ea1e1dbb
commit f39662bd63
2 changed files with 14 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/views/ebiz/agentEenter/EntryProcess.vue
View File

@@ -164,67 +164,6 @@ import { processCheck } from '@/api/ebiz/agentEenter/agentEenter'
export default {
data() {
return {
/*proces: {
approveMapping: [
{
code: 'A101',
name: '客户专员'
},
{
code: 'A201',
name: '业务主任'
},
{
code: 'A301',
name: '营业部经理'
}
],
ebizExamineApproveDtoList: [
{
baseId: 23559,
createdDate: '2020-02-18 19:32:32',
createdUser: '王六',
examineApproveCode: 'A864501000266',
examineApproveName: '杨玉珍',
examineApproveStatus: 2,
examineApproveResult: 1,
examineApproveTeam: '龙世梅组',
examineApproveTitle: 'A101',
name: '王六',
referCode: 'A864501000266',
referName: '杨玉珍',
team: '龙世梅组'
},
{
baseId: 23559,
createdDate: '2020-02-18 19:32:32',
createdUser: '王六',
examineApproveCode: 'A864501000015',
examineApproveName: '龙世梅',
examineApproveStatus: 2,
examineApproveTeam: '龙世梅组',
examineApproveTitle: 'A201',
name: '王六',
referCode: 'A864501000266',
referName: '杨玉珍',
team: '龙世梅组'
},
{
baseId: 23559,
createdDate: '2020-02-18 19:32:32',
createdUser: '王六',
examineApproveCode: 'A864501000072',
examineApproveName: '韦辉',
examineApproveStatus: 0,
examineApproveTeam: '韦辉组',
examineApproveTitle: 'A301',
name: '王六',
referCode: 'A864501000266',
referName: '杨玉珍',
team: '龙世梅组'
}
]
},*/
proces: null,
approvalFlag: false, //人员管理岗审批标志
approveMapping: [], //审批流程链
@@ -259,28 +198,6 @@ export default {
loadingType: 'spinner',
message: '加载中……'
})
/*
that.approveMapping = that.proces.approveMapping
if (that.proces.ebizExamineApproveDtoList.length > 0) {
that.proces.ebizExamineApproveDtoList.map(item => {
that.ebizExamineApproveDtoList.push(item)
})
} else {
that.approveMapping.forEach(val => {
that.ebizExamineApproveDtoList.push({ examineApproveStatus: '0' })
})
}
if (that.proces.ebizExamineApproveDtoList.length > 0) {
if (that.proces.ebizExamineApproveDtoList[that.proces.ebizExamineApproveDtoList.length - 1].examineApproveResult == '1') {
that.ebizExamineApproveDtoList.push({ examineApproveStatus: '1' })
} else {
that.ebizExamineApproveDtoList.push({ examineApproveStatus: '0' })
}
}
if (that.approveMapping.length == that.ebizExamineApproveDtoList.length) {
that.approvalFlag = true
}
that.$toast.clear()*/
processCheck(data).then(res => {
that.$toast.clear()
if (res.result == '0') {

26
src/views/ebiz/agentEenter/approve/BasicInfo.vue
View File

@@ -3,19 +3,19 @@
<p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">基本信息</p>
<van-cell-group>
<van-cell title="姓名" :value="BasicInfoDTO.name" />
<van-cell title="性别" :value="BasicInfoDTO.sex" />
<van-cell title="性别" :value="BasicInfoDTO.sex == 0 ? '男' : '女'" />
<van-cell title="出生日期" :value="BasicInfoDTO.birthday" />
<van-cell title="籍贯" :value="BasicInfoDTO.nativePlace" />
<van-cell title="民族" :value="BasicInfoDTO.ethnic" />
<van-cell title="户口所在地" :value="BasicInfoDTO.rgtAddress" />
<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" />
<van-cell title="政治面貌" :value="BasicInfoDTO.political" />
<van-cell title="学历" :value="BasicInfoDTO.degree" />
<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" />
<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" />
@@ -25,10 +25,10 @@
<van-cell title="银行卡号" :value="BasicInfoDTO.bankCode" />
<van-cell title="从业年限" :value="BasicInfoDTO.perationPeriod" />
<van-cell title="原工作单位" :value="BasicInfoDTO.oldCompany" />
<van-cell title="原职业" :value="BasicInfoDTO.oldOccupation" />
<van-cell title="是否同业" :value="BasicInfoDTO.sameTrade" />
<van-cell title="国籍/地区" :value="BasicInfoDTO.nationality" />
<van-cell title="是否境外人员" :value="BasicInfoDTO.foreigners" />
<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" />
</van-cell-group>
<p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">推荐人信息</p>
@@ -50,6 +50,8 @@
<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',
components: {