Commit 78a329e8 authored by linxin's avatar linxin

Merge branch 'liuin' into uat

parents 8e9aec87 8f31efdb
...@@ -205,6 +205,33 @@ ...@@ -205,6 +205,33 @@
<img src="@/assets/intoApproval/approve.png" >确认签约 <img src="@/assets/intoApproval/approve.png" >确认签约
</tab-button> </tab-button>
</bottom-tab> </bottom-tab>
<h-modal
v-if="confirm_status!=='APPROVED'"
ref="modal"
v-model="showModalValue"
position="bottom"
cus-class="sign-modal"
>
<h-view>
<h-content class="approveContent">
<div class="approveBottom">
<span>
审批意见
<img src="@/assets/intoApproval/close1.png" @click="showModalValue=false" >
</span>
<textarea v-model="confirm_note" cols="8" rows="20" placeholder="请输入" />
</div>
</h-content>
<bottom-tab>
<tab-button class="reject" @click.native="showModalValue=true;charge('拒绝','REJECTED')">
<img src="@/assets/intoApproval/reject.png" >拒绝
</tab-button>
<tab-button class="same" @click.native="showModalValue=true;charge('同意','APPROVED')">
<img src="@/assets/intoApproval/approve.png" >同意
</tab-button>
</bottom-tab>
</h-view>
</h-modal>
<!--活体检测--> <!--活体检测-->
<body-check ref="body" :check_id="$route.params.check_id" :confirm_id="confirm_id"/> <body-check ref="body" :check_id="$route.params.check_id" :confirm_id="confirm_id"/>
</h-view> </h-view>
...@@ -294,6 +321,19 @@ export default { ...@@ -294,6 +321,19 @@ export default {
}, },
created () {}, created () {},
methods: { methods: {
charge (val, status) {
let vm = this
this.hlsPopup.showConfirm({
title: '提示',
content: `您确认${val}吗?`,
onConfirm: data => {
if (data) {
// 需要先校验是否认证通过
vm.issure(status)
}
},
})
},
// 合同文本详情附件查询 // 合同文本详情附件查询
getAttachment () { getAttachment () {
let vm = this let vm = this
...@@ -367,15 +407,7 @@ export default { ...@@ -367,15 +407,7 @@ export default {
let vm = this let vm = this
let flag = await this.signCheck() let flag = await this.signCheck()
if (flag) { // 只有认证通过后方可进行签约操作 if (flag) { // 只有认证通过后方可进行签约操作
this.hlsPopup.showConfirm({ this.showModalValue = true // 审批内容框显示
title: '提示',
content: '您确认签约吗?',
onConfirm: (data) => {
if (data) {
vm.issure('APPROVED')
}
},
})
} }
}, },
async goContent (item, index) { async goContent (item, index) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment