Skip to content

H
hls-xcmg-vue-app
Commit 2690208b authored by linxin's avatar linxin
Browse files
Options

Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

parents 1d74aa25 6898df06
Hide whitespace changes
Inline Side-by-side
Showing with 229 additions and 122 deletions
src/main.js
View file @ 2690208b
......@@ -58,8 +58,8 @@ import Jpush from './scripts/jpushService'
import Jmessage from './scripts/jmessageService'
//if (process.env.CONFIG_ENV === 'uat') {
// const VConsole = require('vconsole')
// new VConsole() // eslint-disable-line
const VConsole = require('vconsole')
new VConsole() // eslint-disable-line
//}
Vue.use(componentInstall)
......
src/pages/contractSigning/contract-detail.vue
View file @ 2690208b
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-10-23 18:37:15
* @LastEditTime: 2019-10-24 14:51:39
* @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 v-show="confirm_status === 'SUBMIT'" @click="entryInfo"><img src="@/assets/constractSigning/scan.png" alt=""></div>
<div @click="entryInfo"><img src="@/assets/constractSigning/scan.png" alt=""></div>
<div @click="goContractContent('农行代扣授权书')"><img src="@/assets/constractSigning/detail.png" alt=""></div>
</div>
......@@ -172,6 +172,7 @@ export default {
isshow: false, // 提示框的显示与隐藏
num: 0,
project_id: '',
bank_flag: false,
confirm_id: '',
conditionInfo: {},
check1: Check1,
......@@ -196,12 +197,13 @@ export default {
next()
},
activated () {
this.bankCardQuery()
// console.log('...........', this.$route.params.confirm_status)
if (window.sessionStorage.getItem('add_status') === 'true') { // 根据add_status值改变entry_info_flag，传入银行卡录入页面，负责重置数据与否
this.entry_info_flag = true
} else {
this.entry_info_flag = false
}
// if (window.sessionStorage.getItem('add_status') === 'true') { // 根据add_status值改变entry_info_flag，传入银行卡录入页面，负责重置数据与否
// this.entry_info_flag = true
// } else {
// this.entry_info_flag = false
// }
},
methods: {
// 合同商务条件查询
......@@ -249,8 +251,8 @@ export default {
})
},
inSure () {
console.log(typeof window.sessionStorage.getItem('add_status'))
if (window.sessionStorage.getItem('add_status') === 'true') {
// console.log(typeof window.sessionStorage.getItem('add_status'))
if (this.bank_flag) {
// this.entry_info_flag = true
let vm = this
let url = $config.basePath + 'con_bp_confirm'
......@@ -273,6 +275,37 @@ export default {
// this.entry_info_flag = false
}
},
// 银行卡查询
bankCardQuery () {
let vm = this
let url = $config.basePath + 'con_bank_query'
let param = {
project_id: vm.project_id,
}
vm.hlsHttp.post(url, param).then(function (res) {
console.log('bankcardinfo。。。。。。。。。。。。', res)
if (res.result === 'S') {
if (!(JSON.stringify(res.info) === '{}')) {
// vm.bank_lists = [res.info]
// console.log(vm.bank_lists[0])
vm.bank_flag = true
} else {
vm.bank_flag = false
// this.bank_lists = [
// {
// bank_full_name: '', // 银行名称
// bank_account_num: '', // 卡号
// bank_account_name: '',
// bank_branch_name: '',
// },
// ]
}
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
},
}
</script>
......
src/pages/contractSigning/contract-signing.vue
View file @ 2690208b
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-10-23 18:36:01
* @LastEditTime: 2019-10-24 14:51:12
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -127,7 +127,7 @@ export default {
},
// val: project_id, status: confirm_status
goDetails (val, status, id) { // 银行卡录入页面keep alive为true，根据project_id和add_status重置页面
window.sessionStorage.setItem('add_status', false)
// window.sessionStorage.setItem('add_status', false)
this.$router.push({
name: 'ContractDetail',
params: {
......
src/pages/contractSigning/entry-info.vue
View file @ 2690208b
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-10-24 09:24:21
* @LastEditTime: 2019-10-24 14:52:02
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -29,7 +29,7 @@
<item>
<div slot="name" >银行卡卡号</div>
<input
slot="content" v-model="bank_lists[0].bank_account_num" type="text" placeholder="上传银行卡自动填充"
slot="content" v-model="bank_lists[0].bank_account_num" type="text" readonly placeholder="上传银行卡自动填充"
>
</item>
<item>
......@@ -38,7 +38,7 @@
</item>
<item>
<div slot="name" >银行名称</div>
<input slot="content" v-model="bank_lists[0].bank_full_name" type="text" placeholder="请输入银行名称">
<input slot="content" v-model="bank_lists[0].bank_full_name" readonly type="text" placeholder="请输入银行名称">
</item>
<item>
<div slot="name" >支行名称</div>
......@@ -99,8 +99,8 @@ export default {
watch: {},
activated () {
this.name = this.$route.params.name
this.bankCardQuery()
if (this.project_id !== this.$route.params.project_id || !this.$route.params.entry_info_flag) {
// || !this.$route.params.entry_info_flag
if (this.project_id !== this.$route.params.project_id) {
this.project_id = this.$route.params.project_id
this.bankImg = ''
this.bank_lists = [
......@@ -112,6 +112,7 @@ export default {
},
]
}
this.bankCardQuery()
},
methods: {
// ocr识别入口
......@@ -178,8 +179,11 @@ export default {
hlsUtil.baiduOcr(fileUrl, url, function (res) {
hlsPopup.hideLoading()
let result = res.result.result
alert('result' + result)
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.sort()
alert('数组'+ JSON.stringify(vm.bank_lists))
// vm.bank_lists.bank_card_type = result.bank_card_type
})
},
......@@ -211,7 +215,7 @@ export default {
console.log('银行信息录入', res)
if (res.result === 'S') {
vm.hlsPopup.showSuccess('保存成功')
window.sessionStorage.setItem('add_status', true)
// window.sessionStorage.setItem('add_status', true)
vm.$routeGo()
// vm.$router.push({
// name: 'ContractDetail',
......@@ -233,6 +237,23 @@ export default {
}
vm.hlsHttp.post(url, param).then(function (res) {
console.log('bankcardinfo。。。。。。。。。。。。', res)
if (res.result === 'S') {
if (!(JSON.stringify(res.info) === '{}')) {
vm.bank_lists = [res.info]
// console.log(vm.bank_lists[0])
} else {
this.bank_lists = [
{
bank_full_name: '', // 银行名称
bank_account_num: '', // 卡号
bank_account_name: '',
bank_branch_name: '',
},
]
}
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
},
......
src/pages/distributorSign/contract-details.vue
View file @ 2690208b
......@@ -2,7 +2,7 @@
* @Description: 合同详情
* @Author: your name
* @Date: 2019-09-25 15:38:21
* @LastEditTime: 2019-10-24 09:10:29
* @LastEditTime: 2019-10-24 15:53:19
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -63,9 +63,9 @@
</div>
<div class="center">
<p>业务经办：{{ baseInfo.bp_user_id_n }}</p>
<p>联系电话：{{ baseInfo.cell_phone }}</p>
<p>联系电话：{{ baseInfo.agent_phone }}</p>
</div>
<div class="right1" @click="callUp(baseInfo.phone)">
<div class="right1" @click="callUp(baseInfo.agent_phone)">
<img src="@/assets/distributorSign/calls.png" alt="">
</div>
</div>
......@@ -158,9 +158,9 @@
</div>
<div class="center">
<p>业务经办：{{ baseInfo.bp_user_id_n }}</p>
<p>联系电话：{{ baseInfo.phone }}</p>
<p>联系电话：{{ baseInfo.agent_phone }}</p>
</div>
<div class="right1" @click="callUp(baseInfo.phone)">
<div class="right1" @click="callUp(baseInfo.agent_phone)">
<img src="@/assets/distributorSign/calls.png" alt="">
</div>
</div>
......
src/pages/financingTrial/financing-trial.vue
View file @ 2690208b
......@@ -2,7 +2,7 @@
* @Descrip 融资试算
* @Author: your name
* @Date: 2019-09-29 17:09:49
* @LastEditTime: 2019-10-18 10:11:01
* @LastEditTime: 2019-10-24 10:52:13
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -70,6 +70,19 @@ export default {
}
next()
},
activated () {
// let vm = this
// let url = $config.basePath + 'con_bank_query'
// let param = {
// project_id: vm.$route.params.project_id,
// }
// vm.hlsHttp.post(url, param).then(function (res) {
// console.log('bankcardinfo。。。。。。。。。。。。', res)
// if (!(JSON.stringify(res.info) === '{}')) {
// vm.bank_lists[0] = res.info
// }
// })
},
created () {
},
......
src/pages/intoApproval/intoApproval/base.vue
View file @ 2690208b
......@@ -2,7 +2,7 @@
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-09-25 10:20:35
* @LastEditTime: 2019-10-09 21:49:42
* @LastEditTime: 2019-10-24 16:04:40
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -191,9 +191,9 @@
</div>
<div class="center">
<p>业务经办：{{ bp_user_id_n }}</p>
<p>联系电话：{{ cell_phone }}</p>
<p>联系电话：{{ personInfo.agent_phone }}</p>
</div>
<div class="right1" @click="callUp(cell_phone)">
<div class="right1" @click="callUp(personInfo.agent_phone)">
<img src="@/assets/distributorSign/calls.png" alt="">
</div>
</div>
......@@ -318,9 +318,9 @@
</div>
<div class="center">
<p>业务经办：{{ bp_user_id_n }}</p>
<p>联系电话：{{ cell_phone }}</p>
<p>联系电话：{{ companyInfo.agent_phone }}</p>
</div>
<div class="right1" @click="callUp(cell_phone)">
<div class="right1" @click="callUp(companyInfo.agent_phone)">
<img src="@/assets/distributorSign/calls.png" alt="">
</div>
</div>
......@@ -416,6 +416,7 @@ export default {
cell_phone: '',
marital_status: '',
bp_name: '',
agent_phone: '',
address_on_resident_booklit: '',
working_place_sp: '',
academic_background: '',
......@@ -428,6 +429,7 @@ export default {
registered_capital: '',
auth_person_name: '',
auth_flag: '',
agent_phone: '',
bp_name: '',
registered_place: '',
phone: '',
......
src/pages/myProductCollection/my-product-list.Vue
View file @ 2690208b
<!--
* @Author: your name
* @Date: 2019-10-22 20:26:28
* @LastEditTime: 2019-10-24 12:28:54
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \hls-xcmg-vue-app\src\pages\myProductCollection\my-product-list.Vue
-->
/**
* @Author Sean
* @Date 2019/10/22
*/
<template>
<h-view class="public-style" style="height: 100%">
<h-header :proportion="[5,1,1]" class="bar-custom">
<div slot="left" class="h-header-btn">
<img src="@/assets/userBind/arrow.png" @click="$routeGo()">
<span>我的收藏</span>
<h-view class="public-style" style="height: 100%">
<h-header :proportion="[5,1,1]" class="bar-custom">
<div slot="left" class="h-header-btn">
<img src="@/assets/userBind/arrow.png" @click="$routeGo()">
<span>我的收藏</span>
</div>
</h-header>
<h-content>
<div class="hinput">
<div class="search-box">
<input type="text" placeholder="请输入经销商/产品名称/参数项">
<img src="@/assets/distributorSign/search.png" alt="">
</div>
</h-header>
<h-content>
<div class="hinput">
<div class="search-box">
<input type="text" placeholder="请输入经销商/产品名称/参数项">
<img src="@/assets/distributorSign/search.png" alt="">
</div>
<list-item v-for="item in productList" :key="item.product_id">
<item :proportion="[1,4]" @click.native="goDetailed(item.product_id,item.collect_status)">
<div slot="name" class="item-pic">
<img src="@/assets/homePage/WechatIMG2 Copy@2x.png" alt="">
</div>
<div slot="content" class="item-content">
<div class="centers">
<p class="firsts1">经销商</p>
<p class="seconds1">{{ item.bp_name }}</p>
</div>
<div class="centers">
<p class="firsts1">参数项</p>
<p class="seconds1">{{ item.product_code }}</p>
</div>
<div class="centers">
<p class="firsts1">产品名称</p>
<p class="seconds1">{{ item.product_name }}</p>
</div>
</div>
<list-item v-for="item in productList" :key="item.product_id">
<item :proportion="[1,4]" @click.native="goDetailed(item.product_id,item.collect_status)">
<div slot="name" class="item-pic">
<img src="@/assets/homePage/WechatIMG2 Copy@2x.png" alt="">
</div>
<div slot="content" class="item-content">
<div class="centers">
<p class="firsts1">经销商</p>
<p class="seconds1">{{ item.bp_name }}</p>
</div>
<div class="centers">
<p class="firsts1">参数项</p>
<p class="seconds1">{{ item.product_code }}</p>
</div>
<div class="centers">
<p class="firsts1">产品名称</p>
<p class="seconds1">{{ item.product_name }}</p>
</div>
</div>
<div slot="right-icon">
<img class="arrow" src="@/assets/productQuery/getIn.png" alt="" >
</div>
</item>
</list-item>
</h-content>
</h-view>
<div slot="right-icon">
<img class="arrow" src="@/assets/productQuery/getIn.png" alt="" >
</div>
</item>
</list-item>
</h-content>
</h-view>
</template>
<script>
export default {
data() {
return {
productList: [],
}
},
created: function () {
},
mounted: function () {
},
updated: function () {
},
destroyed: function () {
},
beforeRouteEnter (to, from, next) {
next(vm => {
if (from.name === 'MyInfo') {
vm.getList()
}
})
},
methods: {
getList(){
let vm = this
let url = $config.basePath + 'my_collection_query'
let param = {
user_phone: window.localStorage.getItem('user_phone'),
}
vm.$post(url, param).then(function (res) {
if (res.result === 'S') {
vm.productList = res.lists
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
// val：产品id, status: 收藏状态
goDetailed (val, status) { // 进入产品查询功能明细页面
window.sessionStorage.setItem('collect_status', status)
this.$router.push({
name: 'ProDetailed',
params: {
product_id: val,
// collect_status: status,
},
})
},
}
export default {
data () {
return {
productList: [],
}
},
created: function () {
},
mounted: function () {
},
updated: function () {
},
destroyed: function () {
},
beforeRouteEnter (to, from, next) {
next(vm => {
if (from.name === 'MyInfo') {
vm.getList()
}
})
},
methods: {
getList () {
let vm = this
let url = $config.basePath + 'my_collection_query'
let param = {
user_phone: window.localStorage.getItem('user_phone'),
}
vm.$post(url, param).then(function (res) {
if (res.result === 'S') {
vm.productList = res.lists
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
// val：产品id, status: 收藏状态
goDetailed (val, status) { // 进入产品查询功能明细页面
window.sessionStorage.setItem('collect_status', status)
this.$router.push({
name: 'ProDetailed',
params: {
product_id: val,
// collect_status: status,
},
})
},
},
}
</script>
<style scoped lang="less" rel="stylesheet">
......
src/pages/userBind/np/naturePerson.vue
View file @ 2690208b
......@@ -291,7 +291,13 @@
style="height: 38%;"
@click="ocrShow('bankCard', '')"
>
<img v-if="!bankImg && isApproved" src="@/assets/userBind/addBack.png" class="addBack" >
<img
v-if="isClear && isApproved && !bankImg"
src="@/assets/userBind/addBack.png"
class="addBack"
@click="ocrShow('bankCard', '')"
>
<img v-if="!bankImg && isApproved && !isClear" src="@/assets/userBind/addBack.png" class="addBack" >
<list-item :item-height="44" class="card-Info">
<item>
<div slot="name">银行卡卡号</div>
......@@ -317,7 +323,7 @@
</list-item>
</div>
</h-view>
<bottom-tab v-if="!isApproved" class="add-box">
<bottom-tab v-if="!isApproved || (isClear && isApproved)" class="add-box">
<tab-button class="add-card" @click.native="addBankInfo">添加</tab-button>
</bottom-tab>
</h-modal>
......@@ -402,6 +408,7 @@ export default {
idCardCheck_id: '', // 身份证check_id
idCardImgList: [], // 存身份证图片列表
idCardEditFlag: false, // 身份证修改标识，为true则标识已修改，后续需要重新上传此照片
isClear: false,
}
},
watch: {
......@@ -1021,8 +1028,14 @@ export default {
this.showModalValue = false
},
getInfo (i, isClear) {
this.isClear = isClear
if (isClear) {
this.bank = {}
// this.bank = {}
this.bank.bank_account_num = ''
this.bank.bank_account_name = ''
this.bank.bank_card_type = ''
this.bank.bank_full_name = ''
this.bank.bank_branch_name = ''
}
this.showModalValue = i
},
......
src/pages/userBind/org/enterprise.vue
View file @ 2690208b
......@@ -2,7 +2,7 @@
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-09-19 09:31:19
* @LastEditTime: 2019-10-23 14:04:33
* @LastEditTime: 2019-10-24 10:00:33
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -371,7 +371,13 @@
@click="ocrShow('bankCard', '')"
>
<img
v-if="!bankImg && isApproved"
v-if="isClear && isApproved && !bankImg"
src="@/assets/userBind/addBack.png"
class="addBack"
@click="ocrShow('bankCard', '')"
>
<img
v-if="!bankImg && isApproved && !isClear"
src="@/assets/userBind/addBack.png"
class="addBack"
>
......@@ -405,7 +411,7 @@
</list-item>
</div>
</h-view>
<bottom-tab v-if="!isApproved" class="add-box">
<bottom-tab v-if="!isApproved || (isClear && isApproved)" class="add-box">
<tab-button class="add-card" @click.native="addBankInfo">添加</tab-button>
</bottom-tab>
</h-modal>
......@@ -513,6 +519,7 @@ export default {
idCardEditFlag: false, // 身份证修改标识，为true则标识已修改，后续需要重新上传此照片
licenseEditFlag: false, // 营业执照照片修改标识，为true则标识已修改，后续需要重新上传此照片
LaEditFlag: false, // 授权书图片修改标识，为true则标识已修改，后续需要重新上传此照片
isClear: false,
}
},
computed: {},
......@@ -781,6 +788,9 @@ export default {
case 'bp_type':
vm.hlsPopup.showLongCenter('客户类型未填写')
break
case 'agent_username':
vm.hlsPopup.showLongCenter('业务经办员工代码未填写')
break
case 'bp_name':
vm.hlsPopup.showLongCenter('公司名称未填写')
break
......@@ -959,8 +969,14 @@ export default {
this.showModalValue = false
},
getInfo (i, isClear) {
this.isClear = isClear
if (isClear) {
this.bank_lists = {}
// this.bank_lists = {}
this.bank_lists.bank_account_num = ''
this.bank_lists.bank_account_name = ''
this.bank_lists.bank_card_type = ''
this.bank_lists.bank_full_name = ''
this.bank_lists.bank_branch_name = ''
}
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