Skip to content

H
hls-xcmg-vue-app
Commit 53991467 authored by 786817560's avatar 786817560
Browse files
Options

'解决冲突'

parents 915ec2df c015a3a2
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 28 deletions
src/pages/contractSigning/contract-detail.vue
View file @ 53991467
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-10-22 17:22:03
* @LastEditTime: 2019-10-23 13:51:34
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -126,7 +126,7 @@
<img src="@/assets/constractSigning/read.png" alt="" class="read">
</div>
<div slot="content" class="in-all">
<div @click="entryInfo"><img src="@/assets/constractSigning/scan.png" alt=""></div>
<div v-show="confirm_status === 'SUBMIT'" @click="entryInfo"><img src="@/assets/constractSigning/scan.png" alt=""></div>
<div @click="goContractContent('农行代扣授权书')"><img src="@/assets/constractSigning/detail.png" alt=""></div>
</div>
......@@ -177,7 +177,7 @@ export default {
check2: Check2,
uncheck1: unCheck1,
uncheck2: unCheck2,
confirm_status: this.$route.params.confirm_status,
confirm_status: '',
}
},
computed: {},
......@@ -186,11 +186,15 @@ export default {
if (from.name === 'ContractSigning') {
next(vm => {
vm.project_id = vm.$route.params.project_id
vm.confirm_status = vm.$route.params.confirm_status
vm.conditionQuery()
})
}
next()
},
activated () {
// console.log('...........', this.$route.params.confirm_status)
},
methods: {
// 合同商务条件查询
conditionQuery () {
......@@ -230,6 +234,9 @@ export default {
entryInfo () {
this.$router.push({
name: 'EntryInfo',
params: {
project_id: this.project_id,
},
})
},
inSure () {
......
src/pages/contractSigning/contract-signing.vue
View file @ 53991467
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-10-22 16:43:01
* @LastEditTime: 2019-10-23 11:01:35
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -31,7 +31,7 @@
<p class="incoming-num">进件号</p>
<p class="code">{{ item.project_number }}</p>
</div>
<div class="details" @click="goDetails(item.project_id,item.confirm_status)">
<div class="details" @click="goDetails(item.project_id,item.con_confirm_status)">
<div class="option">
<p class="name">承租人</p>
<p class="full-name normal">{{ item.bp_name }}</p>
......@@ -56,7 +56,7 @@
<p class="incoming-num">进件号</p>
<p class="code">{{ item.project_number }}</p>
</div>
<div class="details" @click="goDetails(item.project_id)">
<div class="details" @click="goDetails(item.project_id,item.con_confirm_status)">
<div class="option">
<p class="name">承租人</p>
<p class="full-name normal">{{ item.bp_name }}</p>
......@@ -101,7 +101,7 @@ export default {
},
beforeRouteEnter (to, from, next) {
if (from.name === 'HomePage') {
if (from.name === 'MyInfo') {
next(vm => {
vm.contractList()
})
......@@ -118,8 +118,8 @@ export default {
vm.hlsHttp.post(url, param).then(function (res) {
console.log(res)
if (res.result === 'S') {
vm.submitLists = res.lists.filter(item => item.confirm_status === 'SUBMIT')
vm.approvedLists = res.lists.filter(item => item.confirm_status === 'APPROVED')
vm.submitLists = res.lists.filter(item => item.con_confirm_status === 'SUBMIT')
vm.approvedLists = res.lists.filter(item => item.con_confirm_status === 'APPROVED')
} else {
hlsPopup.showLongCenter(res.message)
}
......
src/pages/contractSigning/entry-info.vue
View file @ 53991467
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-10-22 20:03:19
* @LastEditTime: 2019-10-23 13:47:58
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: /c:\Users\slice\Desktop\xg\new-pro\hls-xcmg-vue-app\src\pages\contractSigning\entry-info.vue
-->
<template>
<h-view id="entry-info" class="public-style">
......@@ -19,29 +18,31 @@
<div class="info">
<div class="info-header">
<p>请上传银行卡照片</p>
<div class="bank-pic">
<img v-if="!bankImg" src="@/assets/constractSigning/bank.png" alt="" @click="ocrShow('bankCard', '')">
<img v-if="bankImg" :src="bankImg" alt="" @click="ocrShow('bankCard', '')">
<div v-if="!bankImg" class="bank-pic">
<img src="@/assets/constractSigning/bank.png" alt="" @click="ocrShow('bankCard', '')">
</div>
<div v-if="bankImg" class="bank-pic2">
<img :src="bankImg" alt="" @click="ocrShow('bankCard', '')">
</div>
</div>
<list-item :item-height="44" class="info-center">
<item>
<div slot="name" >银行卡卡号</div>
<input
slot="content" v-model="bank_lists.bank_account_num" type="text" placeholder="上传银行卡自动填充"
readonly>
slot="content" v-model="bank_lists[0].bank_account_num" type="text" placeholder="上传银行卡自动填充"
>
</item>
<item>
<div slot="name" >账户名称</div>
<input slot="content" type="text" placeholder="请输入账户名称">
<input slot="content" v-model="bank_lists[0].bank_account_name" type="text" placeholder="请输入账户名称">
</item>
<item>
<div slot="name" >银行名称</div>
<input slot="content" v-model="bank_lists.bank_full_name" type="text" placeholder="请输入银行名称">
<input slot="content" v-model="bank_lists[0].bank_full_name" type="text" placeholder="请输入银行名称">
</item>
<item>
<div slot="name" >支行名称</div>
<input slot="content" type="text" placeholder="请输入支行名称">
<input slot="content" v-model="bank_lists[0].bank_branch_name" type="text" placeholder="请输入支行名称">
</item>
</list-item>
......@@ -49,7 +50,7 @@
</h-content>
<bottom-tab>
<tab-button class="footer">
<tab-button class="footer" @click.native="cardAdd">
保存
</tab-button>
</bottom-tab>
......@@ -76,10 +77,20 @@ export default {
uncheck2: unCheck2,
res: '',
name: '',
bank_lists: {
bank_full_name: '', // 银行名称
bank_account_num: '', // 卡号
},
// bank_lists: {
// bank_full_name: '', // 银行名称
// bank_account_num: '', // 卡号
// 'bank_account_name': '',
// 'bank_branch_name': '',
// },
bank_lists: [
{
bank_full_name: '', // 银行名称
bank_account_num: '', // 卡号
bank_account_name: '',
bank_branch_name: '',
},
],
}
},
computed: {},
......@@ -156,11 +167,29 @@ export default {
hlsUtil.baiduOcr(fileUrl, url, function (res) {
hlsPopup.hideLoading()
let result = res.result.result
vm.bank_lists.bank_account_num = result.bank_card_number.replace(/\s*/g, '') // 卡号
vm.bank_lists.bank_full_name = result.bank_name // 银行名称
vm.bank_lists[0].bank_account_num = result.bank_card_number.replace(/\s*/g, '') // 卡号
vm.bank_lists[0].bank_full_name = result.bank_name // 银行名称
// vm.bank_lists.bank_card_type = result.bank_card_type
})
},
cardAdd () {
let vm = this
let url = $config.basePath + 'con_bank_save'
let param = {
master: {
project_id: vm.$route.params.project_id,
bank_lists: vm.bank_lists,
},
}
vm.hlsHttp.post(url, param).then(function (res) {
console.log('银行信息录入', res)
// if (res.result === 'S') {
// vm.conditionInfo = res.info
// } else {
// hlsPopup.showLongCenter(res.message)
// }
})
},
},
}
</script>
......@@ -205,6 +234,18 @@ export default {
margin: 14px auto 0;
line-height: 145px;
}
.bank-pic2 {
border: 1px dashed #DCDCDD;
border-radius: 2px;
width: 172px;
height: 120px;
// text-align: center;
// margin: 14px auto 0;
// line-height: 145px;
img {
width: 100%;
}
}
img{
height: 45px;
......
src/pages/userBind/org/enterprise.vue
View file @ 53991467
......@@ -2,7 +2,7 @@
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-09-19 09:31:19
* @LastEditTime: 2019-10-12 09:42:44
* @LastEditTime: 2019-10-23 14:04:33
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -959,7 +959,7 @@ export default {
this.showModalValue = false
},
getInfo (i, isClear) {
if(isClear){
if (isClear) {
this.bank_lists = {}
}
this.showModalValue = i
......
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