Skip to content

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

Merge branch 'liuxin' into develop

parents 5105903a aa208f42
Hide whitespace changes
Inline Side-by-side
Showing with 211 additions and 63 deletions
src/pages/intoApproval/intoApproval/base.vue
View file @ a681e2aa
......@@ -162,7 +162,10 @@
<h-view>
<h-content class="approveContent">
<div class="approveBottom">
<span>审批意见<img src="@/assets/intoApproval/close1.png" @click="showModalValue=false"></span>
<span>
审批意见
<img src="@/assets/intoApproval/close1.png" @click="showModalValue=false" >
</span>
<textarea cols="8" rows="20" placeholder="请输入" />
</div>
</h-content>
......@@ -263,7 +266,7 @@ export default {
}
}
.content {
height: 77%;
height: 79%;
.userInfo {
height: 45px;
line-height: 45px;
......@@ -272,7 +275,7 @@ export default {
font-size: 15px;
margin-left: 16px;
position: relative;
top:5px;
top: 5px;
}
.userInfo::before {
content: "";
......@@ -561,8 +564,8 @@ export default {
height: 21px;
line-height: 21px;
margin: 16px 0;
img{
float:right;
img {
float: right;
}
}
textarea {
......@@ -590,9 +593,9 @@ export default {
border-radius: 4px;
font-family: PingFangSC-Semibold;
font-size: 15px;
img{
width:13px;
height:13px;
img {
width: 13px;
height: 13px;
}
}
.reject {
......
src/pages/intoApproval/intoApproval/rentInfo.vue
View file @ a681e2aa
......@@ -51,7 +51,7 @@
</item>
</list-item>
<div class="top-userInfo">查看还款计划</div>
<div class="userInfo">担保人信息</div>
<div class="userInfo">设备清单</div>
<list-item>
<item>
<div slot="name">参数项</div>
......@@ -119,7 +119,7 @@ export default {
top: 12px;
}
.alert {
height: 93px;
height: 113px;
width: 100%;
background: rgba(252, 200, 0, 0.16);
}
......
src/pages/userBind/np/naturePerson.vue
View file @ a681e2aa
......@@ -13,7 +13,7 @@
<span>用户绑定</span>
</div>
</h-header>
<Tab :tabNum="tabNum" @getTabNum="getTabNum"/>
<Tab :tabNum="tabNum" @getTabNum="getTabNum" />
<h-content class="content">
<div v-show="tabNum==0">
<list-item :item-height="44">
......@@ -42,7 +42,7 @@
<div class="upload-id-card">
<span>身份证照片上传</span>
<div class="upload-box">
<div>
<div @click="show()">
<img src="@/assets/userBind/front.png" >
<p>正面</p>
</div>
......@@ -105,25 +105,27 @@
>
</item>
</list-item>
<div class="userInfo">配偶信息</div>
<list-item :item-height="44">
<item>
<div slot="name" class="required">姓名</div>
<input slot="content" v-model="baseInfo.bp_name_sp" placeholder="请输入姓名" >
</item>
<item>
<div slot="name" class="required">手机号码</div>
<input slot="content" v-model="baseInfo.spouse_phone" placeholder="请输入手机号码" >
</item>
<item>
<div slot="name" class="required">工作单位</div>
<input slot="content" v-model="baseInfo.working_place_sp" placeholder="请输入工作单位" >
</item>
<item>
<div slot="name" class="required">居住地址</div>
<input slot="content" v-model="baseInfo.address_sp" placeholder="请输入居住地址" >
</item>
</list-item>
<div v-if="hasSP">
<div class="userInfo">配偶信息</div>
<list-item :item-height="44">
<item>
<div slot="name" class="required">姓名</div>
<input slot="content" v-model="baseInfo.bp_name_sp" placeholder="请输入姓名" >
</item>
<item>
<div slot="name" class="required">手机号码</div>
<input slot="content" v-model="baseInfo.spouse_phone" placeholder="请输入手机号码" >
</item>
<item>
<div slot="name" class="required">工作单位</div>
<input slot="content" v-model="baseInfo.working_place_sp" placeholder="请输入工作单位" >
</item>
<item>
<div slot="name" class="required">居住地址</div>
<input slot="content" v-model="baseInfo.address_sp" placeholder="请输入居住地址" >
</item>
</list-item>
</div>
<div class="userInfo">资产信息</div>
<div class="card">
<span>房产证件</span>
......@@ -162,13 +164,13 @@
<h-content class="modal-content">
<notify v-model="show1" content="请输入本人的银行卡" type="warning" class="notice" />
<notify v-model="show2" content="请输入完整字段" type="warning" class="notice" />
<notify v-model="show3" content="添加成功，记得保存哦" type="success" class="notice" />
<notify v-model="show3" content="添加成功" type="success" class="notice" />
<div class="modal-content-add-top">
<span>添加银行卡</span>
<img src="@/assets/userBind/close.png" @click="hideModal" >
</div>
<img src="@/assets/userBind/addBack.png" class="addBack" >
<list-item :item-height="44" class="card-Info" >
<list-item :item-height="44" class="card-Info">
<item>
<div slot="name">银行卡卡号</div>
<input slot="content" v-model="bank.bank_account_num" placeholder="银行卡卡号自动填充" >
......@@ -207,14 +209,17 @@ export default {
data () {
return {
list: {},
hasSP: false,
isPaople: false,
isEnter: false,
show1: false,
show2: false,
show3: false,
showModalValue: false,
isSave: false,
isSelected: false,
tabNum: 0,
upload_list: [],
bp_type_n: '',
academic_bg_n: '',
marital_status_n: '',
......@@ -268,12 +273,33 @@ export default {
vm.isPaople = false
}
},
'tabNum': function (newVal, oldVal) {
if ((newVal === 1 && !window.sessionStorage.user_id) || (newVal === 2 && !window.sessionStorage.user_id)) {
tabNum: function (newVal, oldVal) {
// if (
// (newVal === 1 && !window.sessionStorage.user_id) ||
// (newVal === 2 && !window.sessionStorage.user_id)
// ) {
// this.hlsPopup.showError('清先保存基本信息')
// this.tabNum = oldVal
// }
if (
(newVal === 1 && !this.isSave) ||
(newVal === 2 && !this.isSave)
) {
this.hlsPopup.showError('清先保存基本信息')
this.tabNum = oldVal
}
},
marital_status_n: function (newVal, oldVal) {
if (newVal === '已婚') {
this.hasSP = true
} else {
this.hasSP = false
this.baseInfo.bp_name_sp = ''
this.baseInfo.spouse_phone = ''
this.baseInfo.working_place_sp = ''
this.baseInfo.address_sp = ''
}
},
},
created () {
this.getBpType()
......@@ -286,35 +312,148 @@ export default {
},
methods: {
verified () {
this.saveWord()
},
saveProtocol () {
let vm = this
if (!vm.baseInfo.bp_type || !vm.baseInfo.bp_name || !vm.baseInfo.id_card_no || !vm.baseInfo.phone || !vm.baseInfo.living_address ||
!vm.baseInfo.address_on_resident_booklit || !vm.baseInfo.marital_status || !vm.baseInfo.academic_background || !vm.baseInfo.bp_name_sp || !vm.baseInfo.spouse_phone ||
!vm.baseInfo.working_place_sp || !vm.baseInfo.address_sp
) {
vm.hlsPopup.showLongCenter('必输字端不能为空！')
return
}
if (!vm.hlsUtil.phoneNumber(vm.baseInfo.phone)) {
vm.hlsPopup.showLongCenter('手机号码有误!')
return
}
let url = process.env.basePath + 'bp_np_bind_save'
let param = {
'master': this.baseInfo,
master: this.baseInfo,
}
vm.hlsPopup.showLoading('保存中!')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.hlsPopup.showSuccess('保存成功')
vm.isSave = true
window.localStorage.setItem('user_id', res.bp_id)
window.sessionStorage.setItem('user_id', res.bp_id)
window.sessionStorage.setItem('bp_name', vm.baseInfo.bp_name)
window.localStorage.setItem('bp_name', vm.baseInfo.bp_name)
console.log('dbnxuweijhcdieuc', window.localStorage.getItem('bp_name'))
}
})
},
saveWord () {
let vm = this
if (!vm.baseInfo.bp_type) {
vm.hlsPopup.showLongCenter('客户类型不能为空！')
} else if (vm.isSelected && vm.isPaople && !vm.baseInfo.agent_username) {
vm.hlsPopup.showLongCenter('业务经办员工代码不能为空！')
} else if (vm.isSelected && !vm.isPaople && !vm.baseInfo.business_license_num) {
vm.hlsPopup.showLongCenter('营业执照号不能为空！')
} else if (!vm.baseInfo.bp_name) {
vm.hlsPopup.showLongCenter('客户姓名不能为空！')
} else if (!vm.baseInfo.id_card_no) {
vm.hlsPopup.showLongCenter('身份证号不能为空！')
} else if (!vm.baseInfo.phone) {
vm.hlsPopup.showLongCenter('手机号不能为空！')
} else if (!vm.baseInfo.living_address) {
vm.hlsPopup.showLongCenter('居住地址不能为空！')
} else if (!vm.baseInfo.address_on_resident_booklit) {
vm.hlsPopup.showLongCenter('户籍地址不能为空！')
} else if (!vm.baseInfo.academic_background) {
vm.hlsPopup.showLongCenter('学历不能为空！')
} else if (!vm.baseInfo.marital_status) {
vm.hlsPopup.showLongCenter('婚姻状况不能为空！')
} else if ((vm.marital_status_n == '已婚') && !vm.baseInfo.bp_name_sp) {
vm.hlsPopup.showLongCenter('配偶姓名不能为空！')
} else if ((vm.marital_status_n == '已婚') && !vm.baseInfo.spouse_phone) {
vm.hlsPopup.showLongCenter('配偶手机号不能为空！')
} else if ((vm.marital_status_n == '已婚') && !vm.baseInfo.working_place_sp) {
vm.hlsPopup.showLongCenter('配偶工作单位不能为空！')
} else if ((vm.marital_status_n == '已婚') && !vm.baseInfo.address_sp) {
vm.hlsPopup.showLongCenter('配偶居住地址不能为空！')
} else if (!vm.hlsUtil.phoneNumber(vm.baseInfo.phone)) {
vm.hlsPopup.showLongCenter('手机号码有误!')
} else {
vm.saveProtocol()
}
},
uploadIdCardFront () {
let vm = this
let url = process.env.basePath + 'attachment_upload'
let param = {
file_path: this.upload_list[0].filePath,
source_type: '',
pkvalue: window.localStorage.getItem('user_id'),
user_id: window.localStorage.getItem('user_id'),
}
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
console.log(res.response.attachment_id)
}
})
},
show () {
let vm = this
hlsPopup.showActionSheet({
titleText: '请选择照片',
buttonArray: ['拍照', '从相册取'],
callback: index => {
if (index === 0) {
vm.openCamera()
} else {
vm.takePicture()
}
},
})
},
openCamera () {
let vm = this
let obj = {
// 'table_pk_value': check_id,
table_name: 'PRJ_CDD_ITEM_CHECK',
// 'check_id': check_id,
picture: '',
filePath: '',
attachment_id: '',
timestamp: new Date().getTime(),
}
let cameraoptions = {
quality: 100,
}
let success = function (imgdata) {
obj.picture = imgdata
obj.filePath = imgdata
vm.upload_list.push(obj)
}
let error = function () {
console.log('出现错误')
}
hlsUtil.openCamera(cameraoptions, success, error)
},
takePicture () {
let vm = this
let cameraoptions = {
quality: 100,
}
let success = function (imgUrl) {
// for (let i = 0; i < imgUrl.length; i++) {
let obj = {
// 'table_pk_value': check_id,
table_name: 'PRJ_CDD_ITEM_CHECK',
// 'check_id': check_id,
picture: '',
filePath: '',
attachment_id: '',
timestamp: new Date().getTime(),
sequence: '',
}
obj.picture = imgUrl
obj.filePath = imgUrl
// obj.picture = imgUrl[i]
// obj.filePath = imgUrl[i]
// obj.sequence = i + 1
// push到上传列表中 通知前台数据发生改变
vm.upload_list.push(obj)
}
// }
let error = function () {
console.log('出现错误')
}
vm.hlsUtil.takePicture(cameraoptions, success, error)
},
showNotifyAtTop () {
if (this.show1) return
this.show1 = true
......@@ -337,7 +476,12 @@ export default {
},
addBankInfo () {
let bpName = window.localStorage.getItem('bp_name')
if (this.bank.bank_account_num === '' || this.bank.bank_account_name === '' || this.bank.bank_full_name === '' || this.bank.bank_branch_name === '') {
if (
this.bank.bank_account_num === '' ||
this.bank.bank_account_name === '' ||
this.bank.bank_full_name === '' ||
this.bank.bank_branch_name === ''
) {
this.showNotifyAtTop1()
} else if (this.hlsUtil.isBankAccount(this.bank.bank_account_num)) {
this.hlsPopup.showLongCenter('银行卡号有误')
......@@ -350,9 +494,9 @@ export default {
let vm = this
let url = process.env.basePath + 'bp_bank_save'
let param = {
'master': {
'bp_id': window.localStorage.getItem('user_id'),
'bank_lists': this.bankList,
master: {
bp_id: window.localStorage.getItem('user_id'),
bank_lists: this.bankList,
},
}
vm.hlsPopup.showLoading('请稍候')
......@@ -360,9 +504,7 @@ export default {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.showNotifyAtTopSuccess()
setTimeout(
vm.successCall
, 2000)
setTimeout(vm.successCall, 2000)
}
})
}
......@@ -371,16 +513,19 @@ export default {
let vm = this
let url = process.env.basePath + 'bp_bind_submit'
let param = {
'master': {
'bp_id': window.localStorage.getItem('user_id'),
'company_id': '2145',
master: {
bp_id: window.localStorage.getItem('user_id'),
company_id: '2145',
},
}
vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
console.log(res)
vm.hlsPopup.showSuccess('提交成功')
vm.$router.push({
name: 'Home',
})
}
})
},
......@@ -411,7 +556,7 @@ export default {
let bpId = window.localStorage.getItem('user_id')
let url = process.env.basePath + 'bp_bank_query'
let param = {
'bp_id': bpId,
bp_id: bpId,
}
vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) {
......@@ -535,7 +680,7 @@ export default {
margin-left: 4px;
}
span {
color:#fff;
color: #fff;
font-family: PingFangSC-Semibold;
margin-left: 16px;
font-size: 17px;
......@@ -678,7 +823,7 @@ export default {
position: absolute;
top: 25%;
background-color: #fff;
overflow-y:scroll;
overflow-y: scroll;
.modal-content-add-top {
width: 320px;
height: 34px;
......
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