hz/ebiz-h5
1
0
Fork 0
mirror of http://112.124.100.131/GFRS/ebiz-h5.git synced 2025-12-20 17:46:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

[FIX]解决dev合并代码冲突

Browse Source
This commit is contained in:
yuweiqi
2020-02-19 18:02:41 +08:00
parent 47e531a3ca
commit 494b6ecf65
1 changed files with 3 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,7 @@
<template>
<div class="entry-container pt60 bg-white" v-if="proces">
<div class="ml80 w200 text-center pv5">
入司申请<br />
<span class="grey">{{ proces.applyDate }}</span>
<div class="ml80 w200 text-center">
入司申请<br /><span class="grey">{{ proces.applyDate }}</span>
</div>
<div class="ml80 w100 flex path relative" style="flex-wrap: wrap">
<div class="left-path flex" style="flex-direction: column"></div>
@@ -14,7 +13,7 @@
<div class="flex align-items-c text-center">
<div>
<div>自助入司资料上传</div>
<span class="grey">{{ proces.approvalDate }}</span>
<span v-if="proces.approvalStatus == '03'" class="grey">{{ proces.approvalDate }}{{ proces.approvalTime }}</span>
</div>
<van-button
v-if="proces.approvalStatus == '01' && proces.ebizExamineApproveDtoList.length == 0"
@@ -177,11 +176,6 @@ export default {
},
created() {
this.processCheck()
document.body.style.backgroundColor = '#fff'
},
beforeRouteLeave(to, from, next) {
document.body.style.backgroundColor = ''
next()
},
methods: {
processCheck() {
@@ -201,46 +195,6 @@ export default {
processCheck(data).then(res => {
that.$toast.clear()
if (res.result == '0') {
if (res.content.trajectoryList != null) {
res.content.trajectoryList.map((item, index, array) => {
//02审批中 03成功 04拒绝
//要拒绝的
if (item.approvalStatus.indexOf('04') != -1) {
that.failArr.unshift(item)
// 要审批的
} else if (item.approvalStatus.indexOf('02') != -1) {
that.granting.push(item)
that.granting.map((item, index, array) => {
if (that.granting.length > 1) {
array.splice(index, array.length - 1)
}
})
// 成功的
} else if (item.approvalStatus.indexOf('03') != -1) {
that.successArr.push(item)
}
})
// if (that.successArr.length > 0) {
// res.trajectory_list = that.successArr.concat(that.failArr)
// } else {
// res.trajectory_list = that.granting.concat(that.failArr)
// }
if (res.content.approvalStatus == '01') {
res.content.trajectoryList = null
} else if (res.content.approvalStatus == '02' || res.content.approvalStatus == '21') {
res.content.trajectoryList = that.granting.concat(that.failArr)
} else if (res.content.approvalStatus == '04') {
res.content.trajectoryList = that.failArr
} else if (res.content.approvalStatus == '05' || res.content.approvalStatus == '06' || res.approvalStatus == '07' || res.approvalStatus == '08') {
res.content.trajectoryList = that.successArr.concat(that.failArr)
}
// console.log(' res.trajectory_list', res.trajectory_list)
if (res.content.approvalStatus != '01') {
res.content.trajectoryList.reverse()
}
}
that.proces = res.content
that.approveMapping = that.proces.approveMapping
if (that.proces.ebizExamineApproveDtoList.length > 0) {