hz/ebiz-h5
1
0
Fork 0
mirror of http://112.124.100.131/GFRS/ebiz-h5.git synced 2025-12-20 04:56:45 +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-18 22:20:17 +08:00
parent dce25aee18 0e7de5550d
commit 10e13d08ac
1 changed files with 35 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,11 +26,9 @@
>
</div>
</div>
<!-- 审批人审批 -->
<div v-for="(item, index) in approveMapping" :key="index">
<div>
<div
:class="['h60', 'flex', 'relative', 'border-right', proces.approvalStatus == '01' && proces.ebizExamineApproveDtoList.length == 0 ? '' : 'active']"
v-if="index == 0"
>
<i
:class="[
@@ -43,31 +41,15 @@
]"
></i>
</div>
<div v-else :class="['h60', 'flex', 'relative', 'border-right', ebizExamineApproveDtoList[index - 1].examineApproveResult == '1' ? 'active' : '']">
<i
:class="[
'w10',
'h10',
'radius50',
'absolute',
'bottom0',
ebizExamineApproveDtoList[index - 1].examineApproveResult == '1' ? 'right-circle' : 'right-cir'
]"
></i>
</div>
<!-- 审批人审批 -->
<div v-for="(item, index) in approveMapping" :key="index">
<div class="flex nowrap align-items-c text-center relative pv5" style="left:50%">
<div class="relative">
<div>
{{ item.name }}
<van-tag
v-if="
(ebizExamineApproveDtoList[index].examineApproveStatus == '2' || ebizExamineApproveDtoList[index].examineApproveStatus == '1') &&
proces.approvalStatus != '02' &&
proces.approvalStatus != '03' &&
proces.approvalStatus != '21' &&
proces.approvalStatus != '04' &&
!(proces.approvalStatus == '01' && proces.ebizExamineApproveDtoList.length == 0)
"
v-if="ebizExamineApproveDtoList[index].examineApproveStatus == '2' || ebizExamineApproveDtoList[index].examineApproveStatus == '1'"
class="w60 absolute approval-vag"
:color="
ebizExamineApproveDtoList[index].examineApproveStatus == '1'
@@ -90,18 +72,16 @@
>
</div>
</div>
</div>
<!-- 人员管理岗审批 （销管审批）-->
<div>
<div
:class="[
'h50',
'h60',
'flex',
'relative',
'border-right',
proces.approvalStatus == '02' || proces.approvalStatus == '03' || proces.approvalStatus == '21' || proces.approvalStatus == '04' || approvalFlag
? 'active'
: ''
(proces.approvalStatus == '01' && proces.ebizExamineApproveDtoList.length == 0) ||
ebizExamineApproveDtoList[index + 1].examineApproveStatus == '0'
? ''
: 'active'
]"
>
<i
@@ -111,12 +91,16 @@
'radius50',
'absolute',
'bottom0',
proces.approvalStatus == '02' || proces.approvalStatus == '03' || proces.approvalStatus == '21' || proces.approvalStatus == '04' || approvalFlag
? 'right-circle'
: 'right-cir'
(proces.approvalStatus == '01' && proces.ebizExamineApproveDtoList.length == 0) ||
ebizExamineApproveDtoList[index + 1].examineApproveStatus == '0'
? 'right-cir'
: 'right-circle'
]"
></i>
</div>
</div>
<!-- 人员管理岗审批 （销管审批）-->
<div>
<div class="flex nowrap align-items-c text-center relative pv5">
<div class="relative">
<div>
@@ -147,7 +131,6 @@
></div>
</div>
<div>
<!-- <div :class="['h50','w100', 'border-right', proces.approvalStatus == '06'|| proces.approvalStatus == '07' ? 'active' : '']"></div> -->
<div class="text-center" style="width:400%;font-size:0">
<i
:class="[
@@ -261,37 +244,26 @@ export default {
that.proces = res.content
console.log(' that.proces', that.ebizExamineApproveDtoList.length)
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' })
}
}
// that.ebizExamineApproveDtoList.push({ examineApproveStatus: '0' })
if (that.approveMapping.length == that.ebizExamineApproveDtoList.length) {
that.approvalFlag = true
}
if (that.approveMapping.length == that.ebizExamineApproveDtoList.length + 1) {
if (that.ebizExamineApproveDtoList.length == 0) {
that.ebizExamineApproveDtoList.push({ examineApproveStatus: 1 })
} else if (that.ebizExamineApproveDtoList[that.ebizExamineApproveDtoList.length - 1].examineApproveResult == '0') {
//如果前一审批结果为拒绝审批
that.ebizExamineApproveDtoList.push({ examineApproveStatus: 0 })
} else {
that.ebizExamineApproveDtoList.push({ examineApproveStatus: 1 })
}
}
if (that.approveMapping.length > that.ebizExamineApproveDtoList.length + 1) {
if (that.ebizExamineApproveDtoList.length == 0) {
that.ebizExamineApproveDtoList.push({ examineApproveStatus: 1 })
} else if (that.ebizExamineApproveDtoList[that.ebizExamineApproveDtoList.length - 1].examineApproveResult == '0') {
//如果前一审批结果为拒绝审批
that.ebizExamineApproveDtoList.push({ examineApproveStatus: 0 })
} else {
that.ebizExamineApproveDtoList.push({ examineApproveStatus: 1 })
}
let arr = that.approveMapping.slice(that.ebizExamineApproveDtoList.length)
arr.forEach(val => {
that.ebizExamineApproveDtoList.push({ examineApproveStatus: 0 })
})
}
console.log('proces.ebizExamineApproveDtoList.length ==', this.proces.ebizExamineApproveDtoList.length)
} else {
this.$toast(res.resultMessage)
}
@@ -360,7 +332,7 @@ export default {
let text
if (examineApproveStatus == '1') {
text = '审批中'
} else {
} else if (examineApproveStatus == '2') {
text = examineApproveResult == '1' ? '审批通过' : '拒绝审批'
}
return text