Commit d48e149e authored by linxin's avatar linxin

Merge branch 'liuin' into develop

parents d96a3ff1 fe7cd829
Pipeline #4818 canceled with stages
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<img src="@/assets/payment/first-pay.png" >保证金支付 <img src="@/assets/payment/first-pay.png" >保证金支付
</div> </div>
<div class="pay-input"> <div class="pay-input">
<span>保证金</span> <span>保证金</span>
<CurrencyInput v-model="money" placeholder="请输入支付金额" /> <CurrencyInput v-model="money" placeholder="请输入支付金额" />
<!-- <div @click="createOrder"> <!-- <div @click="createOrder">
<img src="@/assets/payment/into.png" > <img src="@/assets/payment/into.png" >
...@@ -36,10 +36,10 @@ ...@@ -36,10 +36,10 @@
<div class="pos"> <div class="pos">
<div class="pay-money"> <div class="pay-money">
<div class="pay-icon"> <div class="pay-icon">
<img src="@/assets/payment/first-pay.png" >保证金 <img src="@/assets/payment/first-pay.png" >缴纳保证金
</div> </div>
<div class="pay-input"> <div class="pay-input">
<span>保证金</span> <span>缴纳保证金</span>
<span style="text-align:right;display:inline-block;margin-right:5px;">{{ Paied|currency }}</span> <span style="text-align:right;display:inline-block;margin-right:5px;">{{ Paied|currency }}</span>
<!-- <div @click="createOrder"> <!-- <div @click="createOrder">
<img src="@/assets/payment/into.png" > <img src="@/assets/payment/into.png" >
...@@ -257,6 +257,7 @@ export default { ...@@ -257,6 +257,7 @@ export default {
flex: 3; flex: 3;
text-align: right; text-align: right;
padding-right: 5px; padding-right: 5px;
height:100%;
} }
div { div {
......
...@@ -7,14 +7,14 @@ ...@@ -7,14 +7,14 @@
<div v-show="showFlag" class="role-switch-wrap"> <div v-show="showFlag" class="role-switch-wrap">
<div class="role-switch-content"> <div class="role-switch-content">
<div class="content-header"> <div class="content-header">
<span>输入业务经办代码</span> <span>请输入业务经办代码</span>
<img src="@/assets/myInfo/modalClose.png" @click="roleCancle"> <img src="@/assets/myInfo/modalClose.png" @click="roleCancle">
</div> </div>
<div class="content-wrap"> <div class="content-wrap">
<div> <div class="input-text">
<span>{{ item.bp_type_n }}</span> <input v-model="business_num" type="text" placeholder="请输入业务经办代码">
</div> </div>
<div :class="{'content-btn-active':switchIndex !== ''}" class="content-btn" @click="roleConfirm"><span>确定</span></div> <div class="content-btn-active content-btn" @click="roleConfirm"><span>确定</span></div>
</div> </div>
</div> </div>
</div> </div>
...@@ -23,11 +23,10 @@ ...@@ -23,11 +23,10 @@
<script> <script>
export default { export default {
props: ['roleList'],
data () { data () {
return { return {
showFlag: false, showFlag: false,
switchIndex: '', business_num: '',
} }
}, },
created: function () { created: function () {
...@@ -37,20 +36,26 @@ export default { ...@@ -37,20 +36,26 @@ export default {
updated: function () { updated: function () {
}, },
methods: { methods: {
chooseRole (index) {
this.switchIndex = index
},
roleConfirm () { roleConfirm () {
if (this.switchIndex === '') { let vm = this
let url = process.env.basePath + 'bp_relation_insert'
let param = {
bp_id: window.localStorage.getItem('bp_id'),
business_num: vm.business_num,
}
vm.hlsPopup.showLoading('正在添加')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
vm.hlsPopup.showLongCenter('添加成功')
if (res.result === 'S') {
vm.showFlag = false
vm.$emit('roleConfirm', vm.business_num)
vm.business_num = ''
} else { } else {
this.showFlag = false hlsPopup.showError(res.message)
this.$emit('roleConfirm', this.roleList[this.switchIndex]) vm.business_num = ''
} }
}, })
show () {
this.switchIndex = ''
this.showFlag = true
}, },
roleCancle () { roleCancle () {
this.showFlag = false this.showFlag = false
...@@ -112,6 +117,16 @@ export default { ...@@ -112,6 +117,16 @@ export default {
padding: 10px 0; padding: 10px 0;
border-bottom-left-radius: 14px; border-bottom-left-radius: 14px;
border-bottom-right-radius: 14px; border-bottom-right-radius: 14px;
.input-text{
border: 1px solid @headerColor;
margin:30px auto;
height:40px;
line-height: 40px;
border-radius: 5px;
input{
text-indent: 5px;
}
}
.role-item { .role-item {
width: 90%; width: 90%;
height: 44px; height: 44px;
......
...@@ -391,9 +391,9 @@ export default { ...@@ -391,9 +391,9 @@ export default {
vm.bp_type = window.localStorage.bp_type vm.bp_type = window.localStorage.bp_type
setTimeout(() => { setTimeout(() => {
vm.loadItemList() vm.loadItemList()
vm.getCarInfo() // vm.getCarInfo()
vm.getHouseInfo() // vm.getHouseInfo()
vm.getEstateInfo() // vm.getEstateInfo()
}, 0) }, 0)
} else if (from.name === 'NPInvoiceInfo' && window.localStorage.from === 'false') { } else if (from.name === 'NPInvoiceInfo' && window.localStorage.from === 'false') {
vm.propertyInfo = { vm.propertyInfo = {
...@@ -502,37 +502,45 @@ export default { ...@@ -502,37 +502,45 @@ export default {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
}, },
getCarInfo () { async getCarInfo () {
let vm = this let vm = this
let url = process.env.basePath + 'bp_vehicleLicense_query' let url = process.env.basePath + 'bp_vehicleLicense_query'
let flag = await vm.getEstateInfo()
let param = { let param = {
bp_id: window.localStorage.getItem('bp_id'), bp_id: window.localStorage.getItem('bp_id'),
} }
hlsPopup.showLoading('请稍候') // hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) { if (flag) {
vm.hlsPopup.hideLoading() let res = await vm.$post(url, param)
// vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
Object.assign(vm.carInfo, res.info) Object.assign(vm.carInfo, res.info)
return true
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
return false
}
} }
})
}, },
getEstateInfo () { async getEstateInfo () {
let vm = this let vm = this
let url = process.env.basePath + 'bp_real_estate_query' let url = process.env.basePath + 'bp_real_estate_query'
let flag = await vm.getHouseInfo()
let param = { let param = {
bp_id: window.localStorage.getItem('bp_id'), bp_id: window.localStorage.getItem('bp_id'),
} }
hlsPopup.showLoading('请稍候') // hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) { if (flag) {
vm.hlsPopup.hideLoading() let res = await vm.$post(url, param)
// vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
Object.assign(vm.propertyInfo, res.info) Object.assign(vm.propertyInfo, res.info)
return true
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
return false
}
} }
})
}, },
async saveHouseInfo () { async saveHouseInfo () {
let vm = this let vm = this
...@@ -574,21 +582,22 @@ export default { ...@@ -574,21 +582,22 @@ export default {
} }
}) })
}, },
getHouseInfo () { async getHouseInfo () {
let vm = this let vm = this
let url = process.env.basePath + 'bp_house_info_query' let url = process.env.basePath + 'bp_house_info_query'
let param = { let param = {
bp_id: window.localStorage.getItem('bp_id'), bp_id: window.localStorage.getItem('bp_id'),
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) { let res = await vm.$post(url, param)
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
Object.assign(vm.hauseInfo, res.info) Object.assign(vm.hauseInfo, res.info)
return true
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
return false
} }
})
}, },
save () { save () {
let vm = this let vm = this
...@@ -951,10 +960,11 @@ export default { ...@@ -951,10 +960,11 @@ export default {
} }
}) })
}, },
loadItemList () { async loadItemList () {
let vm = this let vm = this
vm.dowload_list = [] vm.dowload_list = []
let bpId = window.localStorage.getItem('bp_id') let bpId = window.localStorage.getItem('bp_id')
let flag = await vm.getCarInfo()
if (bpId === 'undefined') { if (bpId === 'undefined') {
bpId = null bpId = null
} }
...@@ -967,8 +977,9 @@ export default { ...@@ -967,8 +977,9 @@ export default {
}, },
} }
// vm.hlsPopup.showLoading('请稍候') // vm.hlsPopup.showLoading('请稍候')
if (flag) {
vm.hlsHttp.post(url, param).then(function (res) { vm.hlsHttp.post(url, param).then(function (res) {
// vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
var listTemp = [...res.lists] var listTemp = [...res.lists]
listTemp.forEach(item => { listTemp.forEach(item => {
...@@ -995,6 +1006,7 @@ export default { ...@@ -995,6 +1006,7 @@ export default {
}) })
} }
}) })
}
}, },
delete_pic_to_ocr (attachment_id) { delete_pic_to_ocr (attachment_id) {
let vm = this let vm = this
......
...@@ -40,8 +40,9 @@ ...@@ -40,8 +40,9 @@
</item> </item>
<item v-if="(((isPaople&&from)||(isPaople&&isSelected)))||(multipleRole==='GUTA'||multipleRole==='TENANT')||searchPeople"> <item v-if="(((isPaople&&from)||(isPaople&&isSelected)))||(multipleRole==='GUTA'||multipleRole==='TENANT')||searchPeople">
<div slot="name" class="required">业务经办人</div> <div slot="name" class="required">业务经办人</div>
<input slot="content" v-model="baseInfo.agent_username" placeholder="请输入业务经办员工代码" > <!-- <input slot="content" v-model="baseInfo.agent_username" placeholder="请输入业务经办员工代码" > -->
<!-- <img src=""> --> <div slot="content" class="add-people"><input v-model="baseInfo.agent_username"><img src="@/assets/contractCreate/add.png" @click="inputNum=true"></div>
<!-- -->
</item> </item>
<item v-if="(((isLesons&&from)||(isLesons&&isSelected)))||multipleRole==='AGENT'||searchLecens"> <item v-if="(((isLesons&&from)||(isLesons&&isSelected)))||multipleRole==='AGENT'||searchLecens">
<div slot="name" class="required">营业执照</div> <div slot="name" class="required">营业执照</div>
...@@ -313,13 +314,12 @@ ...@@ -313,13 +314,12 @@
<bottom-tab class="footer-button"> <bottom-tab class="footer-button">
<tab-button class="save" @click.native="verified(false)">下一步</tab-button> <tab-button class="save" @click.native="verified(false)">下一步</tab-button>
</bottom-tab> </bottom-tab>
<!-- <InputNum <InputNum
v-show="inputNum" v-show="inputNum"
ref="inputtNum" ref="inputtNum"
:roleList="type" @roleCancle="roleCancle"
@roleConfirm="typeConfirm" @roleConfirm="roleConfirm"
@roleCancle="typeCancle" />
/> -->
</h-view> </h-view>
</template> </template>
<script> <script>
...@@ -351,6 +351,17 @@ export default { ...@@ -351,6 +351,17 @@ export default {
bp_type_n: '', bp_type_n: '',
bp_type: '', bp_type: '',
}, },
peopleList: [
{
agent_username: '1343dwsd',
},
{
agent_username: '1343dwsd',
},
{
agent_username: '1343dwsd',
},
],
cityList: [], cityList: [],
provinceList: [], provinceList: [],
upload_list: [], // 上传图片列表 upload_list: [], // 上传图片列表
...@@ -585,6 +596,14 @@ export default { ...@@ -585,6 +596,14 @@ export default {
roleCancle () { roleCancle () {
this.inputNum = false this.inputNum = false
}, },
roleConfirm (e) {
if (this.baseInfo.agent_username.indexOf(e) !== -1) {
hlsPopup.showLongCenter('您已添加了该业务经办')
} else {
this.baseInfo.agent_username = this.baseInfo.agent_username + `,${e}`
}
this.inputNum = false
},
timeFormat (str) { timeFormat (str) {
return `${str.substring(0, 4)}-${str.substring(4, 6)}-${str.substring(6)}` return `${str.substring(0, 4)}-${str.substring(4, 6)}-${str.substring(6)}`
}, },
...@@ -615,6 +634,8 @@ export default { ...@@ -615,6 +634,8 @@ export default {
vm.isAddNewType = false vm.isAddNewType = false
let item = vm.multiBpTypeSelectList.pop() let item = vm.multiBpTypeSelectList.pop()
vm.multiRoleList.push(item) vm.multiRoleList.push(item)
vm.searchLecens = true
vm.searchPeople = true
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
...@@ -876,34 +897,35 @@ export default { ...@@ -876,34 +897,35 @@ export default {
// 基本信息保存前校验 // 基本信息保存前校验
bindCheck () { bindCheck () {
let vm = this let vm = this
var business_num = '' // var business_num = ''
if (vm.baseInfo.bp_type === 'TENANT' || vm.baseInfo.bp_type === 'GUTA') { // // if (vm.baseInfo.bp_type === 'TENANT' || vm.baseInfo.bp_type === 'GUTA') {
business_num = vm.baseInfo.agent_username // // business_num = vm.baseInfo.agent_username
} else if (vm.baseInfo.bp_type === 'AGENT' || vm.baseInfo.bp_type === 'FACTORY') { // // } else
business_num = vm.baseInfo.business_license_num // if (vm.baseInfo.bp_type === 'AGENT' || vm.baseInfo.bp_type === 'FACTORY') {
} else if (vm.baseInfo.bp_type === 'OFFICE') { // business_num = vm.baseInfo.business_license_num
business_num = vm.baseInfo.business_license_num // } else if (vm.baseInfo.bp_type === 'OFFICE') {
} // business_num = vm.baseInfo.business_license_num
window.localStorage.setItem('business_num', business_num) // }
let url = process.env.basePath + 'bp_bind_check' // window.localStorage.setItem('business_num', business_num)
let param = { // let url = process.env.basePath + 'bp_bind_check'
'master': { // let param = {
bp_class: 'NP', // 'master': {
bp_type: vm.baseInfo.bp_type, // bp_class: 'NP',
business_num: business_num, // bp_type: vm.baseInfo.bp_type,
}, // business_num: business_num,
} // },
vm.hlsPopup.showLoading('正在校验数据有效性') // }
vm.hlsHttp.post(url, param).then(function (res) { // vm.hlsPopup.showLoading('正在校验数据有效性')
vm.hlsPopup.hideLoading() // vm.hlsHttp.post(url, param).then(function (res) {
if (res.result === 'S') { // vm.hlsPopup.hideLoading()
// if (res.result === 'S') {
vm.$router.push({ vm.$router.push({
name: 'NPInvoiceInfo', name: 'NPInvoiceInfo',
}) })
} else { // } else {
hlsPopup.showError(res.message) // hlsPopup.showError(res.message)
} // }
}) // })
}, },
async saveProtocol () { async saveProtocol () {
let vm = this let vm = this
...@@ -1616,6 +1638,14 @@ export default { ...@@ -1616,6 +1638,14 @@ export default {
text-align: right; text-align: right;
color: #666; color: #666;
} }
.add-people{
display: flex;
justify-content: start;
img{
width:20px;
margin-left:10px;
}
}
.type-save{ .type-save{
color: #fff; color: #fff;
width:80px; width:80px;
......
...@@ -46,13 +46,19 @@ ...@@ -46,13 +46,19 @@
</div> </div>
</item> </item>
<item v-if="bp_type_flag"> <item v-if="bp_type_flag">
<div slot="name" class="required">业务经办人</div>
<!-- <input slot="content" v-model="baseInfo.agent_username" placeholder="请输入业务经办员工代码" > -->
<div slot="content" class="add-people"><input v-model="baseInfo.agent_username"><img src="@/assets/contractCreate/add.png" @click="inputNum=true"></div>
<!-- -->
</item>
<!-- <item v-if="bp_type_flag">
<div slot="name" class="required">{{ typeName }}</div> <div slot="name" class="required">{{ typeName }}</div>
<input <input
v-if="bpClass_flag" v-if="bpClass_flag"
slot="content" slot="content"
:placeholder="type" :placeholder="type"
v-model="baseInfo.agent_username" v-model="baseInfo.agent_username"
> > -->
<!-- <input v-if="!bpClass_flag" slot="content" :placeholder="type" v-model="baseInfo.business_license_num" > --> <!-- <input v-if="!bpClass_flag" slot="content" :placeholder="type" v-model="baseInfo.business_license_num" > -->
</item> </item>
<button v-if="isAddNewType" class="type-save" @click="addNewRole">新增角色</button> <button v-if="isAddNewType" class="type-save" @click="addNewRole">新增角色</button>
...@@ -418,20 +424,32 @@ ...@@ -418,20 +424,32 @@
<!-- <tab-button class="put" @click.native="handSubmit">提交</tab-button> --> <!-- <tab-button class="put" @click.native="handSubmit">提交</tab-button> -->
<tab-button class="save" @click.native="verified(false)">下一步</tab-button> <tab-button class="save" @click.native="verified(false)">下一步</tab-button>
</bottom-tab> </bottom-tab>
<InputNum
v-show="inputNum"
ref="inputtNum"
@roleCancle="roleCancle"
@roleConfirm="roleConfirm"
/>
</h-view> </h-view>
</template> </template>
<script> <script>
import InputNum from '../input-num'
export default { export default {
name: 'Enterprise', name: 'Enterprise',
components: {
InputNum,
},
data () { data () {
return { return {
bp_id: '', bp_id: '',
flag: true, // 显示未授权框 flag: true, // 显示未授权框
bpClass: '', bpClass: '',
from: false, from: false,
inputNum: false, // 填写业务经办
isApproved: false, // 审批通过为true isApproved: false, // 审批通过为true
isAddNewType: false, isAddNewType: false,
hasPeople: false, // 是否有第二角色
isAGENT: this.$route.params.isAGENT, // 是否为经销商 isAGENT: this.$route.params.isAGENT, // 是否为经销商
isMultiRole: this.$route.params.isMultiRole, // 担保人/承租人为true isMultiRole: this.$route.params.isMultiRole, // 担保人/承租人为true
img_url: {}, img_url: {},
...@@ -556,7 +574,7 @@ export default { ...@@ -556,7 +574,7 @@ export default {
// 监听客户类型 // 监听客户类型
'baseInfo.bp_type_n' () { 'baseInfo.bp_type_n' () {
let vm = this let vm = this
if (vm.baseInfo.bp_type === 'TENANT' || vm.baseInfo.bp_type === 'GUTA') { if (vm.baseInfo.bp_type === 'TENANT' || vm.baseInfo.bp_type === 'GUTA' || vm.hasPeople) {
vm.type = '请输入业务经办员工代码' vm.type = '请输入业务经办员工代码'
vm.typeName = '业务经办人' vm.typeName = '业务经办人'
vm.bp_type_flag = true vm.bp_type_flag = true
...@@ -593,6 +611,7 @@ export default { ...@@ -593,6 +611,7 @@ export default {
id_card_date_from: '', // 法定代表人身份证有效期从 id_card_date_from: '', // 法定代表人身份证有效期从
id_card_date_to: '', // 法定代表人身份证有效期到 id_card_date_to: '', // 法定代表人身份证有效期到
} }
vm.hasPeople = false
if (vm.$route.params.status === 'APPROVED') { if (vm.$route.params.status === 'APPROVED') {
vm.isApproved = true vm.isApproved = true
window.localStorage.setItem('isApproved', vm.isApproved) window.localStorage.setItem('isApproved', vm.isApproved)
...@@ -689,6 +708,7 @@ export default { ...@@ -689,6 +708,7 @@ export default {
vm.upload_list = [] // 上传图片列表 vm.upload_list = [] // 上传图片列表
vm.dowload_list = [] // 下载图片列表 vm.dowload_list = [] // 下载图片列表
vm.hasPeople = false
vm.idCardFrontEditFlag = false // 身份证正面修改标识,为true则标识已修改,后续需要重新上传此照片 vm.idCardFrontEditFlag = false // 身份证正面修改标识,为true则标识已修改,后续需要重新上传此照片
vm.idCardBackEditFlag = false // 身份证正面修改标识,为true则标识已修改,后续需要重新上传此照片 vm.idCardBackEditFlag = false // 身份证正面修改标识,为true则标识已修改,后续需要重新上传此照片
vm.authidCardFrontEditFlag = false // 授权人身份证正面修改标识,为true则标识已修改,后续需要重新上传此照片 vm.authidCardFrontEditFlag = false // 授权人身份证正面修改标识,为true则标识已修改,后续需要重新上传此照片
...@@ -752,6 +772,17 @@ export default { ...@@ -752,6 +772,17 @@ export default {
next() next()
}, */ }, */
methods: { methods: {
roleCancle () {
this.inputNum = false
},
roleConfirm (e) {
if (this.baseInfo.agent_username.indexOf(e) !== -1) {
hlsPopup.showLongCenter('您已添加了该业务经办')
} else {
this.baseInfo.agent_username = this.baseInfo.agent_username + `,${e}`
}
this.inputNum = false
},
async getMultipleRole () { async getMultipleRole () {
let vm = this let vm = this
let url = process.env.basePath + 'bp_role_query' let url = process.env.basePath + 'bp_role_query'
...@@ -788,7 +819,7 @@ export default { ...@@ -788,7 +819,7 @@ export default {
} }
let res = await vm.hlsHttp.post(url, param) let res = await vm.hlsHttp.post(url, param)
if (res.result === 'S') { if (res.result === 'S') {
// vm.hasMultiRole = true vm.hasPeople = true
return true return true
} else { } else {
vm.hasMultiRole = false vm.hasMultiRole = false
...@@ -902,23 +933,23 @@ export default { ...@@ -902,23 +933,23 @@ export default {
// 基本信息保存前校验 // 基本信息保存前校验
bindCheck () { bindCheck () {
let vm = this let vm = this
var business_num = '' // var business_num = ''
if (vm.baseInfo.bp_type === 'TENANT' || vm.baseInfo.bp_type === 'GUTA') { // if (vm.baseInfo.bp_type === 'TENANT' || vm.baseInfo.bp_type === 'GUTA') {
business_num = vm.baseInfo.agent_username // business_num = vm.baseInfo.agent_username
} // }
window.localStorage.setItem('business_num', business_num) // window.localStorage.setItem('business_num', business_num)
let url = process.env.basePath + 'bp_bind_check' // let url = process.env.basePath + 'bp_bind_check'
let param = { // let param = {
'master': { // 'master': {
bp_class: 'ORG', // bp_class: 'ORG',
bp_type: vm.baseInfo.bp_type, // bp_type: vm.baseInfo.bp_type,
business_num: business_num, // business_num: business_num,
}, // },
} // }
vm.hlsPopup.showLoading('正在校验数据有效性') // vm.hlsPopup.showLoading('正在校验数据有效性')
vm.hlsHttp.post(url, param).then(function (res) { // vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading() // vm.hlsPopup.hideLoading()
if (res.result === 'S') { // if (res.result === 'S') {
vm.$router.push({ vm.$router.push({
name: 'Invoice', name: 'Invoice',
params: { params: {
...@@ -927,10 +958,10 @@ export default { ...@@ -927,10 +958,10 @@ export default {
from: vm.from, from: vm.from,
bp_name: vm.baseInfo.bp_name, bp_name: vm.baseInfo.bp_name,
}, },
}) // })
} else { // } else {
hlsPopup.showError(res.message) // hlsPopup.showError(res.message)
} // }
}) })
}, },
// 校验手机号 // 校验手机号
...@@ -1948,7 +1979,14 @@ export default { ...@@ -1948,7 +1979,14 @@ export default {
color: #666; color: #666;
// padding-top:16px; // padding-top:16px;
} }
.add-people{
display: flex;
justify-content: start;
img{
width:20px;
margin-left:10px;
}
}
.type-save { .type-save {
color: #fff; color: #fff;
width: 80px; width: 80px;
......
...@@ -473,9 +473,9 @@ export default { ...@@ -473,9 +473,9 @@ export default {
vm.isApproved = window.localStorage.isApproved vm.isApproved = window.localStorage.isApproved
vm.bp_id = vm.$route.params.bp_id vm.bp_id = vm.$route.params.bp_id
vm.loadItemList() vm.loadItemList()
vm.houseQuery() // vm.houseQuery()
vm.carQuery() // vm.carQuery()
vm.propertyQuery() // 不动产权证查询 // vm.propertyQuery() // 不动产权证查询
} else if (from.name === 'Invoice' && window.localStorage.from === 'false') { } else if (from.name === 'Invoice' && window.localStorage.from === 'false') {
vm.carFlag = false, // 行驶证查看标识,为false则用查询出来的,为true则用拍照出来的 vm.carFlag = false, // 行驶证查看标识,为false则用查询出来的,为true则用拍照出来的
vm.houseFlag = false, // 房产证查看标识,为false则用查询出来的,为true则用拍照出来的 vm.houseFlag = false, // 房产证查看标识,为false则用查询出来的,为true则用拍照出来的
...@@ -573,60 +573,69 @@ export default { ...@@ -573,60 +573,69 @@ export default {
} }
}, },
// 房产证信息查询 // 房产证信息查询
houseQuery () { async houseQuery () {
let vm = this let vm = this
let url = process.env.basePath + 'bp_house_info_query' let url = process.env.basePath + 'bp_house_info_query'
let flag = await vm.carQuery()
let param = { let param = {
bp_id: vm.bp_id, bp_id: vm.bp_id,
} }
hlsPopup.showLoading('请稍候') if (flag) {
vm.$post(url, param).then(function (res) { // hlsPopup.showLoading('请稍候')
vm.hlsPopup.hideLoading() let res = await vm.$post(url, param)
// vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
Object.assign(vm.hauseInfo, res.info) Object.assign(vm.hauseInfo, res.info)
// vm.hauseInfo = res.info // vm.hauseInfo = res.info
return true
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
return false
}
} }
})
}, },
// 行驶证信息查询 // 行驶证信息查询
carQuery () { async carQuery () {
let vm = this let vm = this
let url = process.env.basePath + 'bp_vehicleLicense_query' let url = process.env.basePath + 'bp_vehicleLicense_query'
let flag = await vm.propertyQuery()
let param = { let param = {
bp_id: vm.bp_id, bp_id: vm.bp_id,
} }
hlsPopup.showLoading('请稍候') // hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) { if (flag) {
vm.hlsPopup.hideLoading() let res = await vm.$post(url, param)
// vm.hlsPopup.hideLoading()
console.log('行驶证信息查询', res) console.log('行驶证信息查询', res)
if (res.result === 'S') { if (res.result === 'S') {
Object.assign(vm.carInfo, res.info) Object.assign(vm.carInfo, res.info)
// vm.carInfo = res.info // vm.carInfo = res.info
return true
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
return false
}
} }
})
}, },
// 不动产权证查询 // 不动产权证查询
propertyQuery () { async propertyQuery () {
let vm = this let vm = this
let url = process.env.basePath + 'bp_real_estate_query' let url = process.env.basePath + 'bp_real_estate_query'
let param = { let param = {
bp_id: vm.bp_id, bp_id: vm.bp_id,
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) { let res = await vm.$post(url, param)
vm.hlsPopup.hideLoading() // vm.hlsPopup.hideLoading()
console.log('不动产权证查询', res) console.log('不动产权证查询', res)
if (res.result === 'S') { if (res.result === 'S') {
Object.assign(vm.propertyInfo, res.info) Object.assign(vm.propertyInfo, res.info)
return true
// vm.propertyInfo = res.info // vm.propertyInfo = res.info
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
return false
} }
})
}, },
// 行驶证信息保存 // 行驶证信息保存
async saveCarInfo () { async saveCarInfo () {
...@@ -910,9 +919,10 @@ export default { ...@@ -910,9 +919,10 @@ export default {
vm.propertyInfo.right_others = result.right_others.word vm.propertyInfo.right_others = result.right_others.word
}) })
}, },
loadItemList () { async loadItemList () {
let vm = this let vm = this
let url = process.env.basePath + 'prj_cdd_check_list' let url = process.env.basePath + 'prj_cdd_check_list'
let flag = await vm.houseQuery()
let bpId = vm.bp_id let bpId = vm.bp_id
if (bpId === 'undefined') { if (bpId === 'undefined') {
bpId = null bpId = null
...@@ -924,7 +934,9 @@ export default { ...@@ -924,7 +934,9 @@ export default {
'tab_group': window.localStorage.authFlag ? 'HLS_ORG_NAUTH' : 'HLS_ORG_AUTH', 'tab_group': window.localStorage.authFlag ? 'HLS_ORG_NAUTH' : 'HLS_ORG_AUTH',
}, },
} }
if (flag) {
vm.hlsHttp.post(url, param).then(function (res) { vm.hlsHttp.post(url, param).then(function (res) {
hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
vm.cddItemList = [] vm.cddItemList = []
var listTemp = [...res.lists] var listTemp = [...res.lists]
...@@ -951,6 +963,7 @@ export default { ...@@ -951,6 +963,7 @@ export default {
}) })
} }
}) })
}
}, },
load_picture (check_id, index, cdd_item) { load_picture (check_id, index, cdd_item) {
......
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