Commit f449a5e1 authored by linxin's avatar linxin

fixed

parent 35d60547
......@@ -5,7 +5,7 @@
<template>
<input
:value="formatValue" :readonly="disable" type="text"
@input="onInput($event.target.value)" @focus="onFocus" @blur="onBlur">
@focus="onFocus" @blur="onBlur" @click="keyboradShow">
</template>
<script>
......@@ -13,7 +13,7 @@ export default {
name: 'CurrencyInput',
props: {
value: {
default: 0,
default: '',
},
disable: {
type: Boolean,
......@@ -28,19 +28,20 @@ export default {
data () {
return {
focused: false,
newVal: '',
}
},
filter: {
uncurrency (val) {
if (!val) return null
return (Number((val).replace(/,/gi, ''))) === 0 ? null : Number((val).replace(/,/gi, ''))
return (Number((val).replace(/,/gi, ''))) === 0 ? 0 : Number((val).replace(/,/gi, ''))
},
},
computed: {
formatValue () {
let currency = this.$options.filters['currency']
if (!this.focused) {
if (this.value !== '0.00' && this.value !== '' && this.value !== null) {
if (this.value !== '' && this.value !== null) {
return `¥${currency(this.value)}`
}
} else {
......@@ -49,12 +50,33 @@ export default {
},
},
methods: {
onInput: function (value) {
keyboradShow () {
let vm = this
hlsPopup.showNumberKeyborad({
title: '数字键盘',
keyDown: (text) => {
vm.onInput(text)
},
keyDelete: () => {
vm.onDelete()
},
})
},
onInput (value) {
if (this.disable) return
let uncurrency = this.$options.filter['uncurrency']
this.currencyValue = uncurrency(value)
this.$emit('input', this.currencyValue)
this.newVal = this.value
this.newVal += ('' + value)
this.$emit('input', this.newVal)
},
onDelete () {
this.value = ''
},
// onInput: function (value) {
// if (this.disable) return
// let uncurrency = this.$options.filter['uncurrency']
// this.currencyValue = uncurrency(value)
// this.$emit('input', this.currencyValue)
// },
onFocus (event) {
if (this.disable) return
this.focused = true
......
......@@ -11,7 +11,7 @@
<div class="down-content">
<span>请上传照片</span>
<div class="photo">
<img :src="vehicleImg">
<img :src="vehicleImg" @click="showBigPicture(vehicleImg)">
</div>
<list-item :item-height="44">
<item>
......@@ -355,6 +355,14 @@ export default {
},
})
},
// 查看大图
showBigPicture (pic) {
let vm = this
vm.hlsPopup.showBigPicture({
imgUrl: pic,
width: '100%',
})
},
// 打开相机自拍
takePhontoOpenCamera () {
let vm = this
......
......@@ -59,10 +59,10 @@
</item>
<item>
<div slot="name" class="font-color">保险押金</div>
<CurrencyInput slot="content" v-model="insurance_fee" placeholder="请输入保险押金"/></currencyinput></item>
<CurrencyInput slot="content" v-model="insurance_fee" placeholder="请输入保险押金"/></item>
<item>
<div slot="name" class="font-color">GPS费用</div>
<CurrencyInput slot="content" v-model="gps_fee" placeholder="请输入GPS费用"/></currencyinput></item>
<CurrencyInput slot="content" v-model="gps_fee" placeholder="请输入GPS费用"/></item>
<item>
<div slot="name" class="font-color">首次付款合计</div>
<span v-if="!equip_price" slot="content" class="autoColor">首次付款合计金额自动填充</span>
......
......@@ -12,11 +12,11 @@
</h-header>
<scroll ref="scroll" :updateData="[invoiceList]" :pullUp="true" @pullingUp="loadMore">
<section class="invoice-wrap">
<list-item v-for="(list,index) in [0,1,2]" :key="index">
<list-item v-for="(list,index) in invoiceList" :key="index">
<div class="invoice-number">
<img src="@/assets/invoice/myInvoice.png">
<div class="invoice-number-content">
<span class="number-left">发票号码 23456</span>
<span class="number-left">发票号码 {{ list.invoice_no }}</span>
<div class="number-right">
<img src="@/assets/invoice/download.png">
<span class="invoice-download">发票下载</span>
......@@ -26,15 +26,15 @@
<div class="invoice-content">
<div class="invoice-content-item">
<span class="item-text">开票金额</span>
<span class="item-value">120090000</span>
<span class="item-value">{{ list.amount }}</span>
</div>
<div class="invoice-content-item">
<span class="item-text">开票日期</span>
<span class="item-value">2019-12-24</span>
<span class="item-value">{{ list.invoicedate }}</span>
</div>
<div class="invoice-content-item">
<span class="item-text">发票代码</span>
<span class="item-value">14354</span>
<span class="item-value">{{ list.equip_model }}</span>
</div>
</div>
</list-item>
......@@ -62,10 +62,37 @@ export default {
},
methods: {
loadMore () {
this.getList()
},
getList () {
let vm = this
let url = process.env.basePath + 'user_invoice_query'
let param = {
bp_id: window.localStorage.bp_id,
}
vm.hlsPopup.showLoading('请稍后!')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
let returnData = []
returnData = res.lists
if (returnData.length === 0) {
vm.$refs.scroll.update(true)
} else if (returnData.length > 0 && returnData.length < 10) {
vum.forEach(returnData, function (data, index, array) {
vm.invoiceList.push(array[index])
})
vm.$refs.scroll.update(true)
} else if (returnData.length === 10) {
vum.forEach(returnData, function (data, index, array) {
vm.invoiceList.push(array[index])
})
vm.$refs.scroll.update(false)
}
} else {
vm.hlsPopup.showLongCenter(res.info.msg)
}
})
},
},
}
......@@ -150,6 +177,18 @@ export default {
}
}
}
}
.content {
position: absolute;
top: 0;
}
.scrollContent {
padding-top: 0.8rem;
padding-bottom: 20px;
}
.tab-style {
width: 100%;
position: absolute;
}
}
.platform-ios {
......
......@@ -334,7 +334,7 @@ export default {
},
beforeRouteEnter (to, from, next) {
next(vm => {
if (from.name === 'NPInvoiceInfo' && window.localStorage.from) {
if (from.name === 'NPInvoiceInfo' && window.localStorage.from === 'true') {
vm.propertyInfo = {bp_id: window.localStorage.getItem('bp_id')}
vm.hauseInfo = {bp_id: window.localStorage.getItem('bp_id')}
vm.carInfo = {bp_id: window.localStorage.getItem('bp_id')}
......@@ -354,6 +354,20 @@ export default {
vm.getHouseInfo()
vm.getEstateInfo()
}, 0)
} else if (from.name === 'NPInvoiceInfo' && window.localStorage.from === 'false') {
vm.propertyInfo = {bp_id: window.localStorage.getItem('bp_id')}
vm.hauseInfo = {bp_id: window.localStorage.getItem('bp_id')}
vm.carInfo = {bp_id: window.localStorage.getItem('bp_id')}
vm.houseImg = ''
vm.carImg = ''
vm.estateImg = ''
vm.houseFlag = false, // 房产证查看标识,为false则用查询出来的,为true则用拍照出来的
vm.carFlag = false, // 行驶证查看标识,为false则用查询出来的,为true则用拍照出来的
vm.estateFlag = false, // 不动产权证查看标识,为false则用查询出来的,为true则用拍照出来的
vm.isUploadHouse = false, // 房产证修改标识
vm.isUploadCar = false, // 行驶证修改标识
vm.isUploadEstate = false, // 不动产权证修改标识
vm.bp_type = window.localStorage.bp_type
}
})
},
......
......@@ -441,13 +441,16 @@ export default {
this.getEducationBackground()
this.getMarital()
this.getProvince()
if (this.$route.params.status === 'APPROVED') {
this.isApproved = true
}
},
beforeRouteEnter (to, from, next) {
// 绑定查询入口
next(vm => {
if (vm.$route.params.status === 'APPROVED') {
vm.isApproved = true
} else {
vm.isApproved = false
}
vm.isMultiRole = vm.$route.params.isMultiRole
if (from.fullPath === '/tab/my-info') {
vm.list = {}
vm.multiBpType = {}
......@@ -478,11 +481,14 @@ export default {
vm.idCardBackSpEditFlag = false // 配偶身份证反面修改标识,为true则标识已修改,后续需要重新上传此照片
vm.isClear = false
vm.from = true
window.localStorage.setItem('from', true)
vm.basicInfoQuery()
vm.loadItemList() // 附件查询
vm.checkHasmultiple()// 查询是否有新角色
} else if (from.name === 'UserBind') {
vm.list = {}
window.localStorage.setItem('from', false)
vm.from = false
vm.multiBpType = {
bp_type_n: '',
bp_type: '',
......@@ -845,7 +851,6 @@ export default {
window.localStorage.setItem('bp_id', res.bp_id)
window.localStorage.setItem('bp_name', vm.baseInfo.bp_name)
window.localStorage.setItem('bp_type', vm.baseInfo.bp_type)
window.localStorage.setItem('from', vm.from)
// vm.bindCheck()
vm.$router.push({
name: 'NPInvoiceInfo',
......
......@@ -195,7 +195,7 @@
<div slot="name" class="font-color required">固定电话</div>
<input
slot="content" v-model="baseInfo.phone" placeholder="请输入固定电话"
@blur="fixedPhoneCheck(baseInfo.phone)">
>
</item>
</list-item>
<!-- 法定代表人信息-->
......@@ -587,6 +587,7 @@ export default {
}
if (from.fullPath === '/tab/my-info') { /* || from.fullPath === '/margin-first-pay' */
vm.legal_personMsg = {}
window.localStorage.setItem('from', true)
vm.baseInfo = {}
vm.authMsg = {}
vm.bp_id = vm.$route.params.bp_id
......@@ -616,6 +617,7 @@ export default {
vm.laImgUrlFlag = false // 授权书图片,为false则用查询出来的,为true则用拍照出来的
vm.getbaseInfo()
} else if (from.name === 'UserBind') {
window.localStorage.setItem('from', false)
vm.multiBpType = {
bp_type_n: '',
bp_type: '',
......@@ -923,7 +925,7 @@ export default {
delete this.lastInfo.business_license_num
delete this.lastInfo.id_card_name
for (var key in vm.lastInfo) {
if (!vm.lastInfo[key]) {
if (!vm.lastInfo[key] && key !== 'phone') {
switch (key) {
case 'province_id':
vm.hlsPopup.showLongCenter('请选择省份')
......@@ -1017,9 +1019,8 @@ export default {
delete this.lastInfo.agent_username
delete this.lastInfo.id_card_name
for (var key1 in vm.lastInfo) {
if (!vm.lastInfo[key1]) {
if (!vm.lastInfo[key1] && key1 !== 'phone') {
console.log('key', key1)
// debugger
switch (key1) {
case 'bp_type':
vm.hlsPopup.showLongCenter('客户类型未填写')
......
......@@ -413,7 +413,7 @@ export default {
watch: {},
beforeRouteEnter (to, from, next) {
next(vm => {
if (from.name === 'Invoice') {
if (from.name === 'Invoice' && window.localStorage.from === 'true') {
vm.carFlag = false, // 行驶证查看标识,为false则用查询出来的,为true则用拍照出来的
vm.houseFlag = false, // 房产证查看标识,为false则用查询出来的,为true则用拍照出来的
vm.propertyFlag = false, // 不动产证查看标识,为false则用查询出来的,为true则用拍照出来的
......@@ -476,6 +476,65 @@ export default {
vm.houseQuery()
vm.carQuery()
vm.propertyQuery() // 不动产权证查询
} else if (from.name === 'Invoice' && window.localStorage.from === 'false') {
vm.carFlag = false, // 行驶证查看标识,为false则用查询出来的,为true则用拍照出来的
vm.houseFlag = false, // 房产证查看标识,为false则用查询出来的,为true则用拍照出来的
vm.propertyFlag = false, // 不动产证查看标识,为false则用查询出来的,为true则用拍照出来的
vm.isUploadCar = false,
vm.isUploadHouse = false,
vm.isUploadProperty = false,
vm.carImg = '',
vm.houseImg = '',
vm.propertyImg = '', // 不动产识别图片
vm.propertyInfo = { // 不动产证
bp_id: vm.$route.params.bp_id,
right_person: '',
public_situation: '',
house_located: '',
real_unit_number: '',
right_type: '',
right_property: '',
house_purpose: '',
house_area: '',
land_use_limit: '',
right_others: '',
}
vm.hauseInfo = { // 房产证
bp_id: vm.$route.params.bp_id,
house_owner: '',
public_situation: '',
house_located: '',
regist_date: '',
house_property: '',
plan_purpose: '',
house_layers: '',
built_area: '',
built_in_area: '',
others: '',
land_number: '',
land_get_method: '',
land_use_limit: '',
}
vm.carInfo = { // 行驶证
bp_id: vm.$route.params.bp_id,
vehicle_identify_num: '',
address: '',
brand_model_number: '',
start_date: '',
vehicle_type: '',
owner: '',
use_nature: '',
engine_number: '',
plate_number: '',
regist_date: '',
words_result_num: '',
success: '',
}
vm.upload_list = [] // 上传图片列表
vm.dowload_list = []
vm.cddItemList = []
vm.isApproved = window.localStorage.isApproved
vm.bp_id = vm.$route.params.bp_id
}
})
},
......
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