mirror of
http://112.124.100.131/GFRS/ebiz-h5.git
synced 2025-12-13 04:56:44 +08:00
解决冲突
This commit is contained in:
liyuetong
@@ -1,149 +1,156 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="orderDetail-container bg-white">
|
<div class="orderDetail-container bg-white relative">
|
||||||
<van-collapse v-model="activeNames">
|
<div v-if="approvalApplyStatus == '4'" style="height: 100vh;">
|
||||||
<!-- 基本信息 开始 -->
|
<p class="fs16 gray text-center pt210">申请人已撤销申请</p>
|
||||||
<van-collapse-item class="main-title" name="baseInfo">
|
</div>
|
||||||
<template slot="title">
|
<div v-else>
|
||||||
<span>基本信息</span>
|
<img v-if="approveResult == '0'" class='mt40 w100 h100 absolute top10 right25' style="z-index: 9;" src='@/assets/images/allowance/icon_reject.png' />
|
||||||
</template>
|
<img v-else-if="approveResult == '1'" class='mt40 w100 h100 absolute top10 right25' style="z-index: 9;" src='@/assets/images/allowance/icon_pass.png' />
|
||||||
<van-cell title="申请人工号" :value="allowanceApplyDTO.agentCode" :border="border" />
|
<van-collapse v-model="activeNames">
|
||||||
<van-cell title="申请人姓名" :value="allowanceApplyDTO.name" :border="border" />
|
<!-- 基本信息 开始 -->
|
||||||
<van-cell title="申请人证件类型" :value="allowanceApplyDTO.idType | idToText('idType')" :border="border" />
|
<van-collapse-item class="main-title" name="baseInfo">
|
||||||
<van-cell title="申请人证件号码" :value="allowanceApplyDTO.idNo" :border="border" />
|
<template slot="title">
|
||||||
<van-cell title="享受人姓名" :value="allowanceEnjoyDTO.name" :border="border" />
|
<span>基本信息</span>
|
||||||
<select-radio
|
</template>
|
||||||
:required="false"
|
<van-cell title="申请人工号" :value="allowanceApplyDTO.agentCode" :border="border" />
|
||||||
:disabled="true"
|
<van-cell title="申请人姓名" :value="allowanceApplyDTO.name" :border="border" />
|
||||||
:color="colorButton"
|
<van-cell title="申请人证件类型" :value="allowanceApplyDTO.idType | idToText('idType')" :border="border" />
|
||||||
:type="typeButton"
|
<van-cell title="申请人证件号码" :value="allowanceApplyDTO.idNo" :border="border" />
|
||||||
:radios="relationshipArr"
|
<van-cell title="享受人姓名" :value="allowanceEnjoyDTO.name" :border="border" />
|
||||||
label="享受人角色"
|
<select-radio
|
||||||
name="享受人角色"
|
:required="false"
|
||||||
:value.sync="allowanceEnjoyDTO.relationship"
|
:disabled="true"
|
||||||
></select-radio>
|
:color="colorButton"
|
||||||
<van-cell title="享受人证件类型" :value="allowanceEnjoyDTO.idType | idToText('idType')" :border="border" />
|
:type="typeButton"
|
||||||
<van-cell title="享受人证件号码" :value="allowanceEnjoyDTO.idNo" :border="border" />
|
:radios="relationshipArr"
|
||||||
<select-radio
|
label="享受人角色"
|
||||||
:required="false"
|
name="享受人角色"
|
||||||
:disabled="true"
|
:value.sync="allowanceEnjoyDTO.relationship"
|
||||||
:color="colorButton"
|
></select-radio>
|
||||||
:type="typeButton"
|
<van-cell title="享受人证件类型" :value="allowanceEnjoyDTO.idType | idToText('idType')" :border="border" />
|
||||||
:radios="sexRadio"
|
<van-cell title="享受人证件号码" :value="allowanceEnjoyDTO.idNo" :border="border" />
|
||||||
label="性别"
|
<select-radio
|
||||||
name="性别"
|
:required="false"
|
||||||
:value.sync="allowanceEnjoyDTO.sex"
|
:disabled="true"
|
||||||
></select-radio>
|
:color="colorButton"
|
||||||
<van-cell title="出生日期" :value="allowanceEnjoyDTO.birthday" :border="border" />
|
:type="typeButton"
|
||||||
</van-collapse-item>
|
:radios="sexRadio"
|
||||||
<!-- 基本信息 结束 -->
|
label="性别"
|
||||||
<!-- 账户信息 开始 -->
|
name="性别"
|
||||||
<van-collapse-item title="账户信息" class="main-title" name="accountInfo">
|
:value.sync="allowanceEnjoyDTO.sex"
|
||||||
<van-cell title="开户银行省市" :value="areaStr" :border="border" />
|
></select-radio>
|
||||||
<van-cell title="开户银行" :value="allowanceBankDTO.bankName" :border="border" />
|
<van-cell title="出生日期" :value="allowanceEnjoyDTO.birthday" :border="border" />
|
||||||
<van-cell title="银行卡号" :value="allowanceBankDTO.bankCardNo" :border="border" />
|
</van-collapse-item>
|
||||||
<van-cell title="手机号码" :value="allowanceBankDTO.mobile" :border="border" />
|
<!-- 基本信息 结束 -->
|
||||||
</van-collapse-item>
|
<!-- 账户信息 开始 -->
|
||||||
<!-- 账户信息 结束 -->
|
<van-collapse-item title="账户信息" class="main-title" name="accountInfo">
|
||||||
<!-- 影像资料 开始 -->
|
<van-cell title="开户银行省市" :value="areaStr" :border="border" />
|
||||||
<!-- imageInfoType 1-居民身份证正面 2-居民身份证反面 3-银行卡正面 5-户口本正面 6-户口本反面 7-出生证正面 12-出生证反面
|
<van-cell title="开户银行" :value="allowanceBankDTO.bankName" :border="border" />
|
||||||
|
<van-cell title="银行卡号" :value="allowanceBankDTO.bankCardNo" :border="border" />
|
||||||
|
<van-cell title="手机号码" :value="allowanceBankDTO.mobile" :border="border" />
|
||||||
|
</van-collapse-item>
|
||||||
|
<!-- 账户信息 结束 -->
|
||||||
|
<!-- 影像资料 开始 -->
|
||||||
|
<!-- imageInfoType 1-居民身份证正面 2-居民身份证反面 3-银行卡正面 5-户口本正面 6-户口本反面 7-出生证正面 12-出生证反面
|
||||||
8-护照面 9-港澳居民来往内地通行证正面 13-港澳居民来往内地通行证反面 10-台湾居民来往大陆通行证正面 14-台湾居民来往大陆通行证反面
|
8-护照面 9-港澳居民来往内地通行证正面 13-港澳居民来往内地通行证反面 10-台湾居民来往大陆通行证正面 14-台湾居民来往大陆通行证反面
|
||||||
15-外国人永久居留身份证正面 16-外国人永久居留身份证反面 17-港澳台居民居住证正面 18-港澳台居民居住证反面
|
15-外国人永久居留身份证正面 16-外国人永久居留身份证反面 17-港澳台居民居住证正面 18-港澳台居民居住证反面
|
||||||
24-健康告知异常类资料 25-申请人执业证 26-享受人无银行卡证明 27-关系证明-->
|
24-健康告知异常类资料 25-申请人执业证 26-享受人无银行卡证明 27-关系证明-->
|
||||||
<!-- subBusinessType 0-申请人 1-享受人-->
|
<!-- subBusinessType 0-申请人 1-享受人-->
|
||||||
<van-collapse-item class="main-title bg-white" title="影像资料" name="MediaInfo">
|
<van-collapse-item class="main-title bg-white" title="影像资料" name="MediaInfo">
|
||||||
<div v-for="(item, i) in mediaDTOSList" :key="i">
|
<div v-for="(item, i) in mediaDTOSList" :key="i">
|
||||||
<template v-if="item.subBusinessType == '0'">
|
<template v-if="item.subBusinessType == '0'">
|
||||||
<div class="fs16 m-img">
|
<div class="fs16 m-img">
|
||||||
<p class="pv14">申请人{{ item.imageInfoType | idToText('imageInfoType') }}</p>
|
<p class="pv14">申请人{{ item.imageInfoType | idToText('imageInfoType') }}</p>
|
||||||
<img class="mt10" @click="prevImg(imgUrl + item.rgssUrl)" :src="imgUrl + item.rgssUrl" alt="" />
|
<img class="mt10" @click="prevImg(imgUrl + item.rgssUrl)" :src="imgUrl + item.rgssUrl" alt="" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</div>
|
</div>
|
||||||
<div v-for="(item, i) in mediaUploadDTOLst" :key="'info' + i">
|
<div v-for="(item, i) in mediaUploadDTOLst" :key="'info' + i">
|
||||||
<template v-if="item.imageInfoType == '25'">
|
<template v-if="item.imageInfoType == '25'">
|
||||||
<div class="fs16 m-img">
|
<div class="fs16 m-img">
|
||||||
<p class="pv14">申请人执业证</p>
|
<p class="pv14">申请人执业证</p>
|
||||||
<img class="mt10" @click="prevImg(imgUrl + item.rgssUrl)" :src="imgUrl + item.rgssUrl" alt="" />
|
<img class="mt10" @click="prevImg(imgUrl + item.rgssUrl)" :src="imgUrl + item.rgssUrl" alt="" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</div>
|
</div>
|
||||||
<div v-for="(item, i) in mediaDTOSList" :key="'info1' + i">
|
<div v-for="(item, i) in mediaDTOSList" :key="'info1' + i">
|
||||||
<template v-if="item.subBusinessType == '1'">
|
<template v-if="item.subBusinessType == '1'">
|
||||||
<div class="fs16 m-img">
|
<div class="fs16 m-img">
|
||||||
<p class="pv14">享受人{{ item.imageInfoType | idToText('imageInfoType') }}</p>
|
<p class="pv14">享受人{{ item.imageInfoType | idToText('imageInfoType') }}</p>
|
||||||
<img class="mt10" @click="prevImg(imgUrl + item.rgssUrl)" :src="imgUrl + item.rgssUrl" alt="" />
|
<img class="mt10" @click="prevImg(imgUrl + item.rgssUrl)" :src="imgUrl + item.rgssUrl" alt="" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-for="(item, i) in mediaUploadDTOLst" :key="'info2' + i">
|
<div v-for="(item, i) in mediaUploadDTOLst" :key="'info2' + i">
|
||||||
<div class="fs16 m-img" v-if="item.imageInfoType == 3">
|
<div class="fs16 m-img" v-if="item.imageInfoType == 3">
|
||||||
<p class="pv14">银行卡正面</p>
|
<p class="pv14">银行卡正面</p>
|
||||||
<img class="mt10" @click="prevImg(imgUrl + item.rgssUrl)" :src="imgUrl + item.rgssUrl" alt="" />
|
<img class="mt10" @click="prevImg(imgUrl + item.rgssUrl)" :src="imgUrl + item.rgssUrl" alt="" />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-if="mediaDTOSOther.length">
|
<div v-if="mediaDTOSOther.length">
|
||||||
<p class="pv14 fs16 pl20 pt20">关系证明</p>
|
<p class="pv14 fs16 pl20 pt20">关系证明</p>
|
||||||
<p class="red fs10 pl20 pr20">
|
<p class="red fs10 pl20 pr20">
|
||||||
温馨提示：申请人和享受人在同一户口本上需上传户主页、享受人页及本人页；如不在同一户口本上，请上传公安局或居委会开具的关系证明。
|
温馨提示：申请人和享受人在同一户口本上需上传户主页、享受人页及本人页；如不在同一户口本上，请上传公安局或居委会开具的关系证明。
|
||||||
</p>
|
</p>
|
||||||
<div v-for="(item, i) in mediaDTOSOther" :key="'info3' + i" @click="prevImgList(i)" class="fs16 m-img inline-b">
|
<div v-for="(item, i) in mediaDTOSOther" :key="'info3' + i" @click="prevImgList(i)" class="fs16 m-img inline-b">
|
||||||
<img class="mt10" :src="imgUrl + item.rgssUrl" alt="" />
|
<img class="mt10" :src="imgUrl + item.rgssUrl" alt="" />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div v-if="mediaDTOSNoBank.length">
|
||||||
<div v-if="mediaDTOSNoBank.length">
|
<p class="pv14 fs16 pl20 pt20">享受人无银行卡/手机号证明</p>
|
||||||
<p class="pv14 fs16 pl20 pt20">享受人无银行卡/手机号证明</p>
|
<div v-for="(item, i) in mediaDTOSNoBank" :key="'info4' + i" class="fs16 m-img">
|
||||||
<div v-for="(item, i) in mediaDTOSNoBank" :key="'info4' + i" class="fs16 m-img">
|
<img class="mt10" @click="prevImg(imgUrl + item.rgssUrl)" :src="imgUrl + item.rgssUrl" alt="" />
|
||||||
<img class="mt10" @click="prevImg(imgUrl + item.rgssUrl)" :src="imgUrl + item.rgssUrl" alt="" />
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</van-collapse-item>
|
||||||
</van-collapse-item>
|
<!-- 影像信息 结束 -->
|
||||||
<!-- 影像信息 结束 -->
|
<!-- 签名信息 开始 -->
|
||||||
<!-- 签名信息 开始 -->
|
<van-collapse-item class="main-title bg-white" name="signInfo">
|
||||||
<van-collapse-item class="main-title bg-white" name="signInfo">
|
<template slot="title">
|
||||||
<template slot="title">
|
<span>签名信息</span>
|
||||||
<span>签名信息</span>
|
</template>
|
||||||
</template>
|
<div class="pb30">
|
||||||
<div class="pb30">
|
<div class="ml15 mt10" v-for="(item, i) in allowanceSignDTOLst" :key="'info5' + i">
|
||||||
<div class="ml15 mt10" v-for="(item, i) in allowanceSignDTOLst" :key="'info5' + i">
|
<span v-if="item.type == 1">申请人签名</span>
|
||||||
<span v-if="item.type == 1">申请人签名</span>
|
<span v-else-if="item.type == 2">享受人签名</span>
|
||||||
<span v-else-if="item.type == 2">享受人签名</span>
|
<img v-if="item.signPath" class="w60 h40 ml15 v-middle" :src="imgUrl + item.signPath.replace(/\+/g, '%2B')" alt="" />
|
||||||
<img v-if="item.signPath" class="w60 h40 ml15 v-middle" :src="imgUrl + item.signPath.replace(/\+/g, '%2B')" alt="" />
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</van-collapse-item>
|
||||||
</van-collapse-item>
|
<!-- 签名信息 结束 -->
|
||||||
<!-- 签名信息 结束 -->
|
<!-- 审批结论 开始 -->
|
||||||
<!-- 审批结论 开始 -->
|
<van-collapse-item class="main-title bg-white" name="resultInfo" v-if="type == '1' || type == '2'">
|
||||||
<van-collapse-item class="main-title bg-white" name="resultInfo" v-if="type == '1' || type == '2'">
|
<template slot="title">
|
||||||
<template slot="title">
|
<span>审批结论</span>
|
||||||
<span>审批结论</span>
|
</template>
|
||||||
</template>
|
<div class="pb50">
|
||||||
<div class="pb50">
|
<div class="ml15 mt20 mb10">
|
||||||
<div class="ml15 mt20 mb10">
|
<van-radio-group v-model="approveResult" :disabled="type == '2' || (type == '1' && approvalStatus == '2')">
|
||||||
<van-radio-group v-model="approveResult" :disabled="type == '2' || (type == '1' && approvalStatus == '2')">
|
<van-radio class="mb10" name="1" checked-color="#2E4591">通过</van-radio>
|
||||||
<van-radio class="mb10" name="1" checked-color="#2E4591">通过</van-radio>
|
<van-radio name="0" checked-color="#2E4591">驳回</van-radio>
|
||||||
<van-radio name="0" checked-color="#2E4591">驳回</van-radio>
|
</van-radio-group>
|
||||||
</van-radio-group>
|
</div>
|
||||||
|
<van-field
|
||||||
|
class="m-textarea"
|
||||||
|
v-if="approveResult == '0'"
|
||||||
|
v-model="approveMsg"
|
||||||
|
rows="2"
|
||||||
|
:disabled="type == '2' || (type == '1' && approvalStatus == '2')"
|
||||||
|
autosize
|
||||||
|
label=""
|
||||||
|
type="textarea"
|
||||||
|
maxlength="200"
|
||||||
|
placeholder="请输入留言"
|
||||||
|
show-word-limit
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
<van-field
|
</van-collapse-item>
|
||||||
class="m-textarea"
|
<!-- 审批结论 结束 -->
|
||||||
v-if="approveResult == '0'"
|
</van-collapse>
|
||||||
v-model="approveMsg"
|
<van-button v-if="type == '1' && approvalStatus == '1'" type="danger" class="bottom-btn" @click="nextStep" v-no-more-click="1000">提交审批 </van-button>
|
||||||
rows="2"
|
</div>
|
||||||
:disabled="type == '2' || (type == '1' && approvalStatus == '2')"
|
|
||||||
autosize
|
|
||||||
label=""
|
|
||||||
type="textarea"
|
|
||||||
maxlength="200"
|
|
||||||
placeholder="请输入留言"
|
|
||||||
show-word-limit
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</van-collapse-item>
|
|
||||||
<!-- 审批结论 结束 -->
|
|
||||||
</van-collapse>
|
|
||||||
<van-button v-if="type == '1' && approvalStatus == '1'" type="danger" class="bottom-btn" @click="nextStep" v-no-more-click="1000">提交审批 </van-button>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
@@ -173,6 +180,7 @@ export default {
|
|||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
approvalApplyStatus: '', // 申请状态：0未提交, 1审批中 ,2 已同意, 3已驳回, 4已撤销
|
||||||
approvalStatus: '', //审批状态 (0-不可审批,1-可审批(审批中),2-已审批)
|
approvalStatus: '', //审批状态 (0-不可审批,1-可审批(审批中),2-已审批)
|
||||||
imgUrl: config.imgDomain + `/returnImageStream?a=b.jpg&imgPath=`,
|
imgUrl: config.imgDomain + `/returnImageStream?a=b.jpg&imgPath=`,
|
||||||
approveResult: '1', //审批结果 (0-审批拒绝,1-审批通过)
|
approveResult: '1', //审批结果 (0-审批拒绝,1-审批通过)
|
||||||
@@ -251,8 +259,9 @@ export default {
|
|||||||
if (res.result == '0') {
|
if (res.result == '0') {
|
||||||
let allowanceDTO = res.content.allowanceDTO
|
let allowanceDTO = res.content.allowanceDTO
|
||||||
if (allowanceDTO.approveNodeDTO) {
|
if (allowanceDTO.approveNodeDTO) {
|
||||||
this.approvalStatus = allowanceDTO.approveNodeDTO.approveStatus
|
this.approvalStatus = allowanceDTO.approveNodeDTO.approveStatus //审批状态
|
||||||
}
|
}
|
||||||
|
this.approvalApplyStatus = allowanceDTO.allowanceApplyDTO.approvalStatus //申请状态
|
||||||
this.allowanceApplyDTO = allowanceDTO.allowanceApplyDTO
|
this.allowanceApplyDTO = allowanceDTO.allowanceApplyDTO
|
||||||
this.allowanceEnjoyDTO = allowanceDTO.allowanceEnjoyDTO
|
this.allowanceEnjoyDTO = allowanceDTO.allowanceEnjoyDTO
|
||||||
this.mediaUploadDTOLst = allowanceDTO.mediaUploadDTOLst
|
this.mediaUploadDTOLst = allowanceDTO.mediaUploadDTOLst
|
||||||
|
|||||||
@@ -180,19 +180,33 @@ export default {
|
|||||||
* SIGN_ALLOWANCE 签名
|
* SIGN_ALLOWANCE 签名
|
||||||
*/
|
*/
|
||||||
let allowanceType = order.infoStatus //上一个节点页面
|
let allowanceType = order.infoStatus //上一个节点页面
|
||||||
|
let allowancePageFlag = ''
|
||||||
|
switch (allowanceType) {
|
||||||
|
case 'APPLY_ALLOWANCE': //账户信息
|
||||||
|
allowancePageFlag = '2'
|
||||||
|
break
|
||||||
|
case 'BANK_ALLOWANCE': //影像附件
|
||||||
|
allowancePageFlag = '3'
|
||||||
|
break
|
||||||
|
case 'MEDIA_ALLOWANCE': //签字页面
|
||||||
|
allowancePageFlag = '4'
|
||||||
|
break
|
||||||
|
default:
|
||||||
|
break
|
||||||
|
}
|
||||||
let url = ''
|
let url = ''
|
||||||
switch (allowanceType) {
|
switch (allowanceType) {
|
||||||
case 'APPLY_ALLOWANCE': //账户信息
|
case 'APPLY_ALLOWANCE': //账户信息
|
||||||
url = '/allowance/application/AccountInfo?allowanceNo=' + order.allowanceNo + '&type=edit&edit=1'
|
url = '/allowance/application/AccountInfo?allowanceNo=' + order.allowanceNo + '&allowancePageFlag='+allowancePageFlag+'&edit=1'
|
||||||
break
|
break
|
||||||
case 'BANK_ALLOWANCE': //影像附件
|
case 'BANK_ALLOWANCE': //影像附件
|
||||||
url = '/allowance/application/AttachmentManagement?allowanceNo=' + order.allowanceNo + '&type=edit&edit=1'
|
url = '/allowance/application/AttachmentManagement?allowanceNo=' + order.allowanceNo + '&allowancePageFlag='+allowancePageFlag+'&edit=1'
|
||||||
break
|
break
|
||||||
case 'MEDIA_ALLOWANCE': //签字页面
|
case 'MEDIA_ALLOWANCE': //签字页面
|
||||||
url = '/allowance/application/SignatureConfirmation?allowanceNo=' + order.allowanceNo + '&type=edit&edit=1'
|
url = '/allowance/application/SignatureConfirmation?allowanceNo=' + order.allowanceNo + '&allowancePageFlag='+allowancePageFlag+'&edit=1'
|
||||||
break
|
break
|
||||||
case 'SIGN_ALLOWANCE': //签字页面
|
case 'SIGN_ALLOWANCE': //签字页面
|
||||||
url = '/allowance/application/SignatureConfirmation?allowanceNo=' + order.allowanceNo + '&type=edit&edit=1'
|
url = '/allowance/application/SignatureConfirmation?allowanceNo=' + order.allowanceNo + '&allowancePageFlag='+allowancePageFlag+'&edit=1'
|
||||||
break
|
break
|
||||||
default:
|
default:
|
||||||
break
|
break
|
||||||
@@ -201,13 +215,15 @@ export default {
|
|||||||
flag: 'h5',
|
flag: 'h5',
|
||||||
extra: {
|
extra: {
|
||||||
forbidSwipeBack: '1',
|
forbidSwipeBack: '1',
|
||||||
|
pullRefresh: '0', //1:需要下拉刷新
|
||||||
url: location.origin + `/#${url}`
|
url: location.origin + `/#${url}`
|
||||||
},
|
},
|
||||||
routerInfo: {
|
routerInfo: {
|
||||||
path: url,
|
path: url,
|
||||||
query: {
|
query: {
|
||||||
allowanceNo: order.allowanceNo,
|
allowanceNo: order.allowanceNo,
|
||||||
type: 'edit'
|
edit: '1',
|
||||||
|
allowancePageFlag:allowancePageFlag
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -32,6 +32,7 @@
|
|||||||
<p v-if='!isWeixin' class='fw600 border-gb'>
|
<p v-if='!isWeixin' class='fw600 border-gb'>
|
||||||
<span>享受人</span><span class='ml60'>{{ allowanceEnjoyDTO.name }}</span>
|
<span>享受人</span><span class='ml60'>{{ allowanceEnjoyDTO.name }}</span>
|
||||||
</p>
|
</p>
|
||||||
|
<<<<<<< HEAD
|
||||||
<p v-if='!isWeixin'>点击【签名】按钮，进行享受人签名</p>
|
<p v-if='!isWeixin'>点击【签名】按钮，进行享受人签名</p>
|
||||||
<p class='border-gb'>
|
<p class='border-gb'>
|
||||||
<span v-if='!isWeixin'>享受人：</span>
|
<span v-if='!isWeixin'>享受人：</span>
|
||||||
@@ -42,6 +43,15 @@
|
|||||||
</van-button>
|
</van-button>
|
||||||
<img class='w60 h40 v-middle ml10' v-if='item.signPath' :src="imgUrl + item.signPath.replace(/\+/g, '%2B')"
|
<img class='w60 h40 v-middle ml10' v-if='item.signPath' :src="imgUrl + item.signPath.replace(/\+/g, '%2B')"
|
||||||
alt='' /><br />
|
alt='' /><br />
|
||||||
|
=======
|
||||||
|
<p v-if="!isWeixin">点击【签名】按钮，进行享受人签名</p>
|
||||||
|
<p class="border-gb">
|
||||||
|
<span>享受人：</span>
|
||||||
|
<van-button type="danger" color="#2E4591" class="ml5" size="small" @click="signFunc(item.type, item.id)" :disabled="isSure" v-no-more-click="1000">{{
|
||||||
|
item.signStatus == '0' ? '签名' : '已签名'
|
||||||
|
}}</van-button>
|
||||||
|
<img class="w60 h40 v-middle ml10" v-if="item.signPath" :src="imgUrl + item.signPath.replace(/\+/g, '%2B')" alt="" /><br />
|
||||||
|
>>>>>>> c7b1b0ed... 【金掌桂父母津贴】申请人已提交申请，且链接未失效，享受人点击了分享链接，要求：提示亲，当前申请已在审批流程中，请耐心等待~
|
||||||
<!-- 享受人有分享功能 -->
|
<!-- 享受人有分享功能 -->
|
||||||
<van-button
|
<van-button
|
||||||
type='danger'
|
type='danger'
|
||||||
@@ -563,6 +573,7 @@ export default {
|
|||||||
},
|
},
|
||||||
// 获取订单详情
|
// 获取订单详情
|
||||||
getAllowanceDetail() {
|
getAllowanceDetail() {
|
||||||
|
let that = this
|
||||||
let data = {
|
let data = {
|
||||||
allowanceNo: this.allowanceNo
|
allowanceNo: this.allowanceNo
|
||||||
}
|
}
|
||||||
@@ -584,7 +595,23 @@ export default {
|
|||||||
* 审批状态
|
* 审批状态
|
||||||
* 0未提交, 1审批中 ,2 已同意, 3已驳回, 4已撤销
|
* 0未提交, 1审批中 ,2 已同意, 3已驳回, 4已撤销
|
||||||
*/
|
*/
|
||||||
|
// "type" --1:申请人; 2:享受人
|
||||||
|
let isSignPathEnjoy = false
|
||||||
|
that.allowanceSignDTOLst.forEach(function (item) {
|
||||||
|
if (item.type == '2' && item.signPath) {
|
||||||
|
isSignPathEnjoy = true
|
||||||
|
}
|
||||||
|
})
|
||||||
if (this.isWeixin && this.allowanceApplyDTO.approvalStatus == '1') {
|
if (this.isWeixin && this.allowanceApplyDTO.approvalStatus == '1') {
|
||||||
|
Dialog.alert({
|
||||||
|
title: '提示',
|
||||||
|
confirmButtonText: '退出',
|
||||||
|
message: '亲，当前申请已在审批流程中，请耐心等待~'
|
||||||
|
}).then(() => {
|
||||||
|
window.close()
|
||||||
|
WeixinJSBridge.call('closeWindow')
|
||||||
|
})
|
||||||
|
}else if (this.isWeixin && isSignPathEnjoy){
|
||||||
Dialog.alert({
|
Dialog.alert({
|
||||||
title: '提示',
|
title: '提示',
|
||||||
confirmButtonText: '退出',
|
confirmButtonText: '退出',
|
||||||
|
|||||||
Reference in New Issue
Block a user