Commit 1030f522 authored by 李晓兵's avatar 李晓兵

'1.3uat'

parent 9c1ca516
Pipeline #4468 canceled with stages
...@@ -11,5 +11,5 @@ module.exports = { ...@@ -11,5 +11,5 @@ module.exports = {
ocrPath:'"http://180.104.121.66:8088/r/api"', ocrPath:'"http://180.104.121.66:8088/r/api"',
fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_DEV&apiName="', fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_DEV&apiName="',
appId: '"com.xcmg.app.dev"', appId: '"com.xcmg.app.dev"',
currentVersion: '"1.3.3"' currentVersion: '"1.3.4"'
} }
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<br >证件号 <br >证件号
</div> </div>
<div slot="content"> <div slot="content">
<input v-model="item.bp_name" placeholder="暂无信息" readonly > <input v-model="item.bp_guta_name" placeholder="暂无信息" readonly >
<input v-model="item.id_card_no" placeholder="暂无信息" readonly > <input v-model="item.id_card_no" placeholder="暂无信息" readonly >
</div> </div>
</item> </item>
......
...@@ -26,23 +26,23 @@ ...@@ -26,23 +26,23 @@
<div class="userInfo">租赁产品</div> <div class="userInfo">租赁产品</div>
<list-item :item-height="44"> <list-item :item-height="44">
<item v-if="!isReadOnly" :showArrow="true" @click.native="selectProductLine"> <item v-if="!isReadOnly" :showArrow="true" @click.native="selectProductLine">
<div slot="name">产品线</div> <div slot="name" class="required">产品线</div>
<input slot="content" v-model="saveInfo.division_n" readonly placeholder="请选择"> <input slot="content" v-model="saveInfo.division_n" readonly placeholder="请选择">
</item> </item>
<item v-if="isReadOnly"> <item v-if="isReadOnly">
<div slot="name">产品线</div> <div slot="name" class="required">产品线</div>
<input slot="content" v-model="saveInfo.division_n" readonly> <input slot="content" v-model="saveInfo.division_n" readonly>
</item> </item>
<item v-if="!isReadOnly" :showArrow="true" @click.native="getProduct"> <item v-if="!isReadOnly" :showArrow="true" @click.native="getProduct">
<div slot="name">产品型号</div> <div slot="name" class="required">产品型号</div>
<input slot="content" v-model="saveInfo.product_id_n" readonly placeholder="请选择"> <input slot="content" v-model="saveInfo.product_id_n" readonly placeholder="请选择">
</item> </item>
<item v-if="isReadOnly"> <item v-if="isReadOnly">
<div slot="name">产品型号</div> <div slot="name" class="required">产品型号</div>
<input slot="content" v-model="saveInfo.product_id_n" readonly> <input slot="content" v-model="saveInfo.product_id_n" readonly>
</item> </item>
<item> <item>
<div slot="name">产品数量</div> <div slot="name" class="required">产品数量</div>
<input slot="content" v-model="saveInfo.product_num" :readonly="isReadOnly" placeholder="请输入产品数量"> <input slot="content" v-model="saveInfo.product_num" :readonly="isReadOnly" placeholder="请输入产品数量">
</item> </item>
</list-item> </list-item>
...@@ -52,97 +52,97 @@ ...@@ -52,97 +52,97 @@
</div> </div>
<list-item :item-height="44"> <list-item :item-height="44">
<item v-if="!isReadOnly" :showArrow="true" @click.native="getBusinessPolicy();showModalBusiness=true"> <item v-if="!isReadOnly" :showArrow="true" @click.native="getBusinessPolicy();showModalBusiness=true">
<div slot="name">商务政策</div> <div slot="name" class="required">商务政策</div>
<input slot="content" v-model="saveInfo.product_plan_name" readonly placeholder="请选择"> <input slot="content" v-model="saveInfo.product_plan_name" readonly placeholder="请选择">
</item> </item>
<item v-if="isReadOnly"> <item v-if="isReadOnly">
<div slot="name">商务政策</div> <div slot="name" class="required">商务政策</div>
<input slot="content" v-model="saveInfo.product_plan_name" readonly placeholder="请选择"> <input slot="content" v-model="saveInfo.product_plan_name" readonly placeholder="请选择">
</item> </item>
<item> <item>
<div slot="name">设备单价</div> <div slot="name" class="required">设备单价</div>
<CurrencyInput slot="content" v-model="saveInfo.equip_price" :readonly="isReadOnly" placeholder="请输入设备单价"/> <CurrencyInput slot="content" v-model="saveInfo.equip_price" :readonly="isReadOnly" placeholder="请输入设备单价"/>
</item> </item>
<item> <item>
<div slot="name">融资金额</div> <div slot="name" class="required">融资金额</div>
<CurrencyInput slot="content" v-model="finance_amount" :readonly="isReadOnly" placeholder="请输入融资信息"/> <CurrencyInput slot="content" v-model="finance_amount" :readonly="isReadOnly" placeholder="请输入融资信息"/>
</item> </item>
<item> <item>
<div slot="name">首付比例</div> <div slot="name" class="required">首付比例</div>
<input slot="content" v-model="saveInfo.down_payment_ratio_n" :readonly="isReadOnly" placeholder="%"> <input slot="content" v-model="saveInfo.down_payment_ratio_n" :readonly="isReadOnly" placeholder="%">
</item> </item>
<item> <item>
<div slot="name">首付款</div> <div slot="name" class="required">首付款</div>
<CurrencyInput <CurrencyInput
slot="content" v-model="saveInfo.down_payment" :readonly="isReadOnly" placeholder="请输入首付款" slot="content" v-model="saveInfo.down_payment" :readonly="isReadOnly" placeholder="请输入首付款"
@input="changeRatio"/> @input="changeRatio"/>
</item> </item>
<item> <item>
<div slot="name">保证金比例</div> <div slot="name" class="required">保证金比例</div>
<input slot="content" v-model="saveInfo.deposit_ratio_n" :readonly="isReadOnly" placeholder="%"> <input slot="content" v-model="saveInfo.deposit_ratio_n" :readonly="isReadOnly" placeholder="%">
</item> </item>
<item> <item>
<div slot="name">保证金</div> <div slot="name" class="required">保证金</div>
<CurrencyInput <CurrencyInput
slot="content" v-model="saveInfo.deposit" :readonly="isReadOnly" placeholder="请输入保证金" slot="content" v-model="saveInfo.deposit" :readonly="isReadOnly" placeholder="请输入保证金"
@input="changeDeposit"/> @input="changeDeposit"/>
</item> </item>
<item> <item>
<div slot="name">手续费比例</div> <div slot="name" class="required">手续费比例</div>
<input slot="content" v-model="saveInfo.lease_charge_ratio_n" :readonly="isReadOnly" placeholder="%"> <input slot="content" v-model="saveInfo.lease_charge_ratio_n" :readonly="isReadOnly" placeholder="%">
</item> </item>
<item> <item>
<div slot="name">手续费</div> <div slot="name" class="required">手续费</div>
<CurrencyInput <CurrencyInput
slot="content" v-model="saveInfo.lease_charge" :readonly="isReadOnly" placeholder="请输入手续费" slot="content" v-model="saveInfo.lease_charge" :readonly="isReadOnly" placeholder="请输入手续费"
@input="changeLeaseCharge"/> @input="changeLeaseCharge"/>
</item> </item>
<item> <item>
<div slot="name">GPS费用</div> <div slot="name" class="required">GPS费用</div>
<CurrencyInput slot="content" v-model="saveInfo.gps_fee" :readonly="isReadOnly" placeholder="请输入GPS费用"/> <CurrencyInput slot="content" v-model="saveInfo.gps_fee" :readonly="isReadOnly" placeholder="请输入GPS费用"/>
</item> </item>
<item> <item>
<div slot="name">保险押金</div> <div slot="name" class="required">保险押金</div>
<CurrencyInput slot="content" v-model="saveInfo.insurance_fee" :readonly="isReadOnly" placeholder="请输入保险押金"/> <CurrencyInput slot="content" v-model="saveInfo.insurance_fee" :readonly="isReadOnly" placeholder="请输入保险押金"/>
</item> </item>
<item v-if="!isReadOnly" class="date-check" @click.native="showTime('YYYY-MM-DD')"> <item v-if="!isReadOnly" class="date-check" @click.native="showTime('YYYY-MM-DD')">
<div slot="name">预计付款日</div> <div slot="name" class="required">预计付款日</div>
<input slot="content" v-model="saveInfo.lease_start_date" readonly placeholder="请选择日期 "> <input slot="content" v-model="saveInfo.lease_start_date" readonly placeholder="请选择日期 ">
</item> </item>
<item v-if="isReadOnly" class="date-check"> <item v-if="isReadOnly" class="date-check">
<div slot="name">预计付款日</div> <div slot="name" class="required">预计付款日</div>
<input slot="content" v-model="saveInfo.lease_start_date" readonly> <input slot="content" v-model="saveInfo.lease_start_date" readonly>
</item> </item>
<item v-if="!isReadOnly" :showArrow="true" @click.native="periodPull"> <item v-if="!isReadOnly" :showArrow="true" @click.native="periodPull">
<div slot="name">还款周期</div> <div slot="name" class="required">还款周期</div>
<input slot="content" v-model="saveInfo.annual_pay_times_n" readonly placeholder="请选择"> <input slot="content" v-model="saveInfo.annual_pay_times_n" readonly placeholder="请选择">
</item> </item>
<item v-if="isReadOnly"> <item v-if="isReadOnly">
<div slot="name">还款周期</div> <div slot="name" class="required">还款周期</div>
<input slot="content" v-model="saveInfo.annual_pay_times_n" readonly placeholder="请选择"> <input slot="content" v-model="saveInfo.annual_pay_times_n" readonly placeholder="请选择">
</item> </item>
<item> <item>
<div slot="name">租赁期数</div> <div slot="name" class="required">租赁期数</div>
<input slot="content" v-model="saveInfo.lease_times" :readonly="isReadOnly" placeholder="请输入租赁期数"> <input slot="content" v-model="saveInfo.lease_times" :readonly="isReadOnly" placeholder="请输入租赁期数">
</item> </item>
<item> <item>
<div slot="name">年利率</div> <div slot="name" class="required">年利率</div>
<input slot="content" v-model="saveInfo.int_rate_n" readonly placeholder="%"> <input slot="content" v-model="saveInfo.int_rate_n" readonly placeholder="%">
</item> </item>
<item v-if="!isReadOnly" :showArrow="true" @click.native="selectPayWay"> <item v-if="!isReadOnly" :showArrow="true" @click.native="selectPayWay">
<div slot="name">支付方式</div> <div slot="name" class="required">支付方式</div>
<input slot="content" v-model="saveInfo.pay_type_n" readonly placeholder="请选择"> <input slot="content" v-model="saveInfo.pay_type_n" readonly placeholder="请选择">
</item> </item>
<item v-if="isReadOnly"> <item v-if="isReadOnly">
<div slot="name">支付方式</div> <div slot="name" class="required">支付方式</div>
<input slot="content" v-model="saveInfo.pay_type_n" readonly placeholder="请选择"> <input slot="content" v-model="saveInfo.pay_type_n" readonly placeholder="请选择">
</item> </item>
<item> <item>
<div slot="name">逾期日利率</div> <div slot="name" class="required">逾期日利率</div>
<input slot="content" v-model="saveInfo.penalty_rate_n" readonly placeholder="%"> <input slot="content" v-model="saveInfo.penalty_rate_n" readonly placeholder="%">
</item> </item>
<item> <item>
<div slot="name">留购价</div> <div slot="name" class="required">留购价</div>
<CurrencyInput slot="content" v-model="saveInfo.residual_value" :readonly="isReadOnly" placeholder="请输入留购价"/> <CurrencyInput slot="content" v-model="saveInfo.residual_value" :readonly="isReadOnly" placeholder="请输入留购价"/>
</item> </item>
<item :showArrow="true" @click.native="goPlan"> <item :showArrow="true" @click.native="goPlan">
...@@ -154,6 +154,7 @@ ...@@ -154,6 +154,7 @@
<bottom-tab class="add-box"> <bottom-tab class="add-box">
<tab-button v-if="!isReadOnly && !calculeFlag" class="before" @click.native="save">计算</tab-button> <tab-button v-if="!isReadOnly && !calculeFlag" class="before" @click.native="save">计算</tab-button>
<tab-button v-if="!isReadOnly && calculeFlag" class="before" @click.native="save">重新计算</tab-button> <tab-button v-if="!isReadOnly && calculeFlag" class="before" @click.native="save">重新计算</tab-button>
<tab-button v-if="isReadOnly" class="before" @click.native="$routeGo()">上一步</tab-button>
<tab-button class="next" @click.native="next">下一步</tab-button> <tab-button class="next" @click.native="next">下一步</tab-button>
</bottom-tab> </bottom-tab>
<h-modal ref="modal" v-model="showModalValue" class="flow" position="bottom"> <h-modal ref="modal" v-model="showModalValue" class="flow" position="bottom">
...@@ -262,6 +263,7 @@ export default { ...@@ -262,6 +263,7 @@ export default {
fromPage: window.localStorage.fromPage, fromPage: window.localStorage.fromPage,
keyWordProduct: '', keyWordProduct: '',
policyKeyWord: '', policyKeyWord: '',
isReadOnly: false, // 是否只读
fromPutted: false, fromPutted: false,
fromList: false, // 判断是否从列表过来 fromList: false, // 判断是否从列表过来
pagenum: 1, // 产品型号页码 pagenum: 1, // 产品型号页码
...@@ -319,13 +321,15 @@ export default { ...@@ -319,13 +321,15 @@ export default {
'finance_amount' () { // 融资金额 'finance_amount' () { // 融资金额
return parseFloat(this.saveInfo.equip_price - this.saveInfo.equip_price * this.saveInfo.down_payment_ratio_n.replace('%', '') / 100).toFixed(2) return parseFloat(this.saveInfo.equip_price - this.saveInfo.equip_price * this.saveInfo.down_payment_ratio_n.replace('%', '') / 100).toFixed(2)
}, },
isReadOnly () { // isReadOnly () {
if (window.localStorage.contractReadonly === 'true' && this.fromPage === 'list') { // if (window.localStorage.contractReadonly === 'true' && this.fromPage === 'list') {
return true // debugger
} else { // return true
return false // } else {
} // debugger
}, // return false
// }
// },
}, },
watch: { watch: {
policyKeyWord (newVal, oldVal) { policyKeyWord (newVal, oldVal) {
...@@ -345,6 +349,9 @@ export default { ...@@ -345,6 +349,9 @@ export default {
'saveInfo.down_payment_ratio_n' (newVal, oldVal) { 'saveInfo.down_payment_ratio_n' (newVal, oldVal) {
this.saveInfo.down_payment = (this.saveInfo.equip_price * newVal.replace('%', '') / 100).toFixed(2) this.saveInfo.down_payment = (this.saveInfo.equip_price * newVal.replace('%', '') / 100).toFixed(2)
}, },
// 'saveInfo.down_payment' (newVal, oldVal) {
// this.saveInfo.down_payment_ratio_n = `${(newVal / this.saveInfo.equip_price * 100).toFixed(2)}%`
// },
'saveInfo.lease_charge_ratio_n' (newVal, oldVal) { 'saveInfo.lease_charge_ratio_n' (newVal, oldVal) {
this.saveInfo.lease_charge = parseFloat((this.saveInfo.equip_price - this.saveInfo.equip_price * this.saveInfo.down_payment_ratio_n.replace('%', '') / 100) * (this.saveInfo.lease_charge_ratio_n.replace('%', '') / 100)).toFixed(2) this.saveInfo.lease_charge = parseFloat((this.saveInfo.equip_price - this.saveInfo.equip_price * this.saveInfo.down_payment_ratio_n.replace('%', '') / 100) * (this.saveInfo.lease_charge_ratio_n.replace('%', '') / 100)).toFixed(2)
}, },
...@@ -372,7 +379,13 @@ export default { ...@@ -372,7 +379,13 @@ export default {
vm.saveTed = false vm.saveTed = false
if (vm.fromPage === 'sale') { if (vm.fromPage === 'sale') {
vm.fromList = false vm.fromList = false
vm.isReadOnly = false
} else if (vm.fromPage === 'list') { } else if (vm.fromPage === 'list') {
if (window.localStorage.contractReadonly === 'true') {
vm.isReadOnly = true
} else {
vm.isReadOnly = false
}
vm.fromList = true vm.fromList = true
vm.rentInfoQuery() vm.rentInfoQuery()
} }
...@@ -435,11 +448,9 @@ export default { ...@@ -435,11 +448,9 @@ export default {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
Object.assign(vm.saveInfo, res.info) Object.assign(vm.saveInfo, res.info)
/* vm.productInfo.product_num = res.info.product_num
vm.productInfo.product_id = res.info.product_id
vm.productInfo.product_id_n = res.info.product_id_n */
vm.saveInfo.product_plan_name = res.info.product_plan_id_n vm.saveInfo.product_plan_name = res.info.product_plan_id_n
vm.saveInfo.division_n = res.info.product_name vm.saveInfo.division_n = res.info.product_name
vm.saveInfo.down_payment = res.info.down_payment
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
...@@ -566,8 +577,27 @@ export default { ...@@ -566,8 +577,27 @@ export default {
} }
}) })
}, },
next () { async isComputedCheck () {
let vm = this
let url = process.env.basePath + 'prj_product_cal_status'
let param = {
project_id: vm.saveInfo.project_id,
}
// hlsPopup.showLoading('请稍候')
let res = await vm.$post(url, param)
if (res.result === 'S') {
if (res.info.success_flag === 'Y') {
return true
} else {
return false
}
} else {
hlsPopup.showLongCenter(res.message)
}
},
async next () {
let vm = this let vm = this
vm.isComputed = await vm.isComputedCheck()
if (vm.isReadOnly) { if (vm.isReadOnly) {
vm.$router.push({ vm.$router.push({
name: 'CreateEnclosureInfo', name: 'CreateEnclosureInfo',
...@@ -884,7 +914,7 @@ export default { ...@@ -884,7 +914,7 @@ export default {
let randomString = Math.floor(Math.random() * 21) let randomString = Math.floor(Math.random() * 21)
let url = let url =
process.env.basePath + process.env.basePath +
'prd_product_list' + 'prj_product_list' +
'&index' + '&index' +
`'${randomString}'` `'${randomString}'`
let param = { let param = {
......
...@@ -81,71 +81,87 @@ ...@@ -81,71 +81,87 @@
</div> </div>
<list-item :item-height="44"> <list-item :item-height="44">
<item v-if="!fromPutted" :showArrow="true"> <item v-if="!fromPutted" :showArrow="true">
<div slot="name">行业情况</div> <div slot="name" class="required">行业情况</div>
<input <input
slot="content" v-model="saveInfo.np_industry_exp_n" readonly placeholder="请选择" slot="content"
@click="selectBussinessSituation" > v-model="saveInfo.np_industry_exp_n"
readonly
placeholder="请选择"
@click="selectBussinessSituation"
>
</item> </item>
<item v-if="fromPutted"> <item v-if="fromPutted">
<div slot="name">行业情况</div> <div slot="name" class="required">行业情况</div>
<span slot="content">{{ saveInfo.np_industry_exp_n }}</span> <span slot="content">{{ saveInfo.np_industry_exp_n }}</span>
</item> </item>
<item v-if="!fromPutted" :showArrow="true" > <item v-if="!fromPutted" :showArrow="true">
<div slot="name">职业情况</div> <div slot="name" class="required">职业情况</div>
<input <input
slot="content" v-model="saveInfo.np_occupation_n" readonly placeholder="请选择" slot="content"
@click="selectJobSituation" > v-model="saveInfo.np_occupation_n"
readonly
placeholder="请选择"
@click="selectJobSituation"
>
</item> </item>
<item v-if="fromPutted"> <item v-if="fromPutted">
<div slot="name">职业情况</div> <div slot="name" class="required">职业情况</div>
<span slot="content">{{ saveInfo.np_occupation_n }}</span> <span slot="content">{{ saveInfo.np_occupation_n }}</span>
</item> </item>
<item v-if="!fromPutted" :showArrow="true"> <item v-if="!fromPutted" :showArrow="true">
<div slot="name">房产信息</div> <div slot="name" class="required">房产信息</div>
<input <input
slot="content" v-model="saveInfo.house_type_n" readonly placeholder="请选择" slot="content"
@click="selectHouseInfo"> v-model="saveInfo.house_type_n"
readonly
placeholder="请选择"
@click="selectHouseInfo"
>
</item> </item>
<item v-if="fromPutted"> <item v-if="fromPutted">
<div slot="name">房产信息</div> <div slot="name" class="required">房产信息</div>
<span slot="content">{{ saveInfo.house_type_n }}</span> <span slot="content">{{ saveInfo.house_type_n }}</span>
</item> </item>
<item v-if="!fromPutted" :showArrow="true"> <item v-if="!fromPutted" :showArrow="true">
<div slot="name">设备价值</div> <div slot="name" class="required">设备价值</div>
<input <input
slot="content" v-model="saveInfo.equip_value" placeholder="请选择" readonly slot="content"
@click="selectEquipInfo"> v-model="saveInfo.equip_value"
placeholder="请选择"
readonly
@click="selectEquipInfo"
>
</item> </item>
<item v-if="fromPutted"> <item v-if="fromPutted">
<div slot="name">设备价值</div> <div slot="name" class="required">设备价值</div>
<span slot="content">{{ saveInfo.equip_value }}</span> <span slot="content">{{ saveInfo.equip_value }}</span>
</item> </item>
<item v-if="!fromPutted" class="check" @click.native="checked=!checked"> <item v-if="!fromPutted" class="check" @click.native="checked=!checked">
<div slot="name">农行代扣</div> <div slot="name" class="required">农行代扣</div>
<img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" > <img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" >
<span v-if="!checked" slot="content" /> <span v-if="!checked" slot="content" />
</item> </item>
<item v-if="fromPutted" class="check"> <item v-if="fromPutted" class="check">
<div slot="name">农行代扣</div> <div slot="name" class="required">农行代扣</div>
<img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" > <img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" >
<span v-if="!checked" slot="content" /> <span v-if="!checked" slot="content" />
</item> </item>
<item v-if="!fromPutted" class="check" @click.native="checkedApproved=!checkedApproved"> <item v-if="!fromPutted" class="check" @click.native="checkedApproved=!checkedApproved">
<div slot="name">是否特批</div> <div slot="name" class="required">是否特批</div>
<img v-if="checkedApproved" slot="content" src="@/assets/contractCreate/selected.png" > <img v-if="checkedApproved" slot="content" src="@/assets/contractCreate/selected.png" >
<span v-if="!checkedApproved" slot="content" /> <span v-if="!checkedApproved" slot="content" />
</item> </item>
<item v-if="fromPutted" class="check"> <item v-if="fromPutted" class="check">
<div slot="name">是否特批</div> <div slot="name" class="required">是否特批</div>
<img v-if="checkedApproved" slot="content" src="@/assets/contractCreate/selected.png" > <img v-if="checkedApproved" slot="content" src="@/assets/contractCreate/selected.png" >
<span v-if="!checkedApproved" slot="content" /> <span v-if="!checkedApproved" slot="content" />
</item> </item>
<item v-if="checkedApproved&&!fromPutted"> <item v-if="checkedApproved&&!fromPutted">
<div slot="name">特批事项</div> <div slot="name" class="required">特批事项</div>
<input slot="content" v-model="saveInfo.special_matter" placeholder="暂无信息"> <input slot="content" v-model="saveInfo.special_matter" placeholder="暂无信息" >
</item> </item>
<item v-if="checkedApproved&&fromPutted"> <item v-if="checkedApproved&&fromPutted">
<div slot="name">特批事项</div> <div slot="name" class="required">特批事项</div>
<span slot="content">{{ saveInfo.special_matter }}</span> <span slot="content">{{ saveInfo.special_matter }}</span>
</item> </item>
</list-item> </list-item>
...@@ -159,15 +175,30 @@ ...@@ -159,15 +175,30 @@
</item> </item>
<item> <item>
<div slot="name">企业类型</div> <div slot="name">企业类型</div>
<input slot="content" v-model="ORGBaseInfo.enterprise_type" readonly placeholder="暂无信息" > <input
slot="content"
v-model="ORGBaseInfo.enterprise_type"
readonly
placeholder="暂无信息"
>
</item> </item>
<item> <item>
<div slot="name">营业执照号</div> <div slot="name">营业执照号</div>
<input slot="content" v-model="ORGBaseInfo.organization_code" readonly placeholder="暂无信息" > <input
slot="content"
v-model="ORGBaseInfo.organization_code"
readonly
placeholder="暂无信息"
>
</item> </item>
<item> <item>
<div slot="name">注册资本</div> <div slot="name">注册资本</div>
<input slot="content" v-model="ORGBaseInfo.registered_capital" placeholder="暂无信息" readonly > <input
slot="content"
v-model="ORGBaseInfo.registered_capital"
placeholder="暂无信息"
readonly
>
</item> </item>
<item> <item>
<div slot="name">注册地址</div> <div slot="name">注册地址</div>
...@@ -198,7 +229,12 @@ ...@@ -198,7 +229,12 @@
</item> </item>
<item> <item>
<div slot="name">联系地址</div> <div slot="name">联系地址</div>
<input slot="content" v-model="ORGBaseInfo.living_address" placeholder="暂无信息" readonly > <input
slot="content"
v-model="ORGBaseInfo.living_address"
placeholder="暂无信息"
readonly
>
</item> </item>
</list-item> </list-item>
<div class="another-info"> <div class="another-info">
...@@ -206,77 +242,83 @@ ...@@ -206,77 +242,83 @@
</div> </div>
<list-item :item-height="44"> <list-item :item-height="44">
<item v-if="!fromPutted" :showArrow="true" @click.native="selectORGEquipInfo"> <item v-if="!fromPutted" :showArrow="true" @click.native="selectORGEquipInfo">
<div slot="name">设备保有量</div> <div slot="name" class="required">设备保有量</div>
<input slot="content" v-model="saveInfo.equip_num_n" readonly placeholder="请选择" > <input slot="content" v-model="saveInfo.equip_num_n" readonly placeholder="请选择" >
</item> </item>
<item v-if="fromPutted" :showArrow="true"> <item v-if="fromPutted" :showArrow="true">
<div slot="name">设备保有量</div> <div slot="name" class="required">设备保有量</div>
<input slot="content" v-model="saveInfo.equip_num_n" readonly placeholder="请选择" > <input slot="content" v-model="saveInfo.equip_num_n" readonly placeholder="请选择" >
</item> </item>
<item v-if="!fromPutted" :showArrow="true" @click.native="selectORGEnge"> <item v-if="!fromPutted" :showArrow="true" @click.native="selectORGEnge">
<div slot="name">工程合同</div> <div slot="name" class="required">工程合同</div>
<input slot="content" v-model="saveInfo.engineer_con_n" readonly placeholder="请选择" > <input slot="content" v-model="saveInfo.engineer_con_n" readonly placeholder="请选择" >
</item> </item>
<item v-if="fromPutted" :showArrow="true"> <item v-if="fromPutted" :showArrow="true">
<div slot="name">工程合同</div> <div slot="name" class="required">工程合同</div>
<input slot="content" v-model="saveInfo.engineer_con_n" readonly placeholder="请选择" > <input slot="content" v-model="saveInfo.engineer_con_n" readonly placeholder="请选择" >
</item> </item>
<item v-if="!fromPutted" :showArrow="true" @click.native="selectORGnative"> <item v-if="!fromPutted" :showArrow="true" @click.native="selectORGnative">
<div slot="name">企业性质</div> <div slot="name" class="required">企业性质</div>
<input slot="content" v-model="saveInfo.enterpriese_nature_n" readonly placeholder="请选择" >
</item>
<item v-if="fromPutted" :showArrow="true">
<div slot="name">企业性质</div>
<input slot="content" v-model="saveInfo.enterpriese_nature_n" readonly placeholder="请选择" >
</item>
<item v-if="!fromPutted" :showArrow="true" @click.native="selectEquipInfo">
<div slot="name">设备价值</div>
<input <input
slot="content" v-model="saveInfo.equip_value" placeholder="请选择" readonly slot="content"
v-model="saveInfo.enterpriese_nature_n"
readonly
placeholder="请选择"
> >
</item> </item>
<item v-if="fromPutted" :showArrow="true"> <item v-if="fromPutted" :showArrow="true">
<div slot="name">设备价值</div> <div slot="name" class="required">企业性质</div>
<input <input
slot="content" v-model="saveInfo.equip_value" placeholder="请选择" readonly slot="content"
v-model="saveInfo.enterpriese_nature_n"
readonly
placeholder="请选择"
> >
</item> </item>
<item v-if="!fromPutted" :showArrow="true" @click.native="selectEquipInfo">
<div slot="name" class="required">设备价值</div>
<input slot="content" v-model="saveInfo.equip_value" placeholder="请选择" readonly >
</item>
<item v-if="fromPutted" :showArrow="true">
<div slot="name" class="required">设备价值</div>
<input slot="content" v-model="saveInfo.equip_value" placeholder="请选择" readonly >
</item>
<item v-if="!fromPutted" class="check" @click.native="checked=!checked"> <item v-if="!fromPutted" class="check" @click.native="checked=!checked">
<div slot="name">农行代扣</div> <div slot="name">农行代扣</div>
<img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" > <img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" >
<span v-if="!checked" slot="content" /> <span v-if="!checked" slot="content" />
</item> </item>
<item v-if="fromPutted" class="check"> <item v-if="fromPutted" class="check">
<div slot="name">农行代扣</div> <div slot="name" class="required">农行代扣</div>
<img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" > <img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" >
<span v-if="!checked" slot="content" /> <span v-if="!checked" slot="content" />
</item> </item>
<item v-if="!fromPutted" class="check" @click.native="checkedApproved=!checkedApproved"> <item v-if="!fromPutted" class="check" @click.native="checkedApproved=!checkedApproved">
<div slot="name">是否特批</div> <div slot="name" class="required">是否特批</div>
<img v-if="checkedApproved" slot="content" src="@/assets/contractCreate/selected.png" > <img v-if="checkedApproved" slot="content" src="@/assets/contractCreate/selected.png" >
<span v-if="!checkedApproved" slot="content" /> <span v-if="!checkedApproved" slot="content" />
</item> </item>
<item v-if="fromPutted" class="check"> <item v-if="fromPutted" class="check">
<div slot="name">是否特批</div> <div slot="name" class="required">是否特批</div>
<img v-if="checkedApproved" slot="content" src="@/assets/contractCreate/selected.png" > <img v-if="checkedApproved" slot="content" src="@/assets/contractCreate/selected.png" >
<span v-if="!checkedApproved" slot="content" /> <span v-if="!checkedApproved" slot="content" />
</item> </item>
<item v-if="checkedApproved&&!fromPutted"> <item v-if="checkedApproved&&!fromPutted">
<div slot="name">特批事项</div> <div slot="name" class="required">特批事项</div>
<input slot="content" v-model="saveInfo.special_matter" placeholder="暂无信息"> <input slot="content" v-model="saveInfo.special_matter" placeholder="暂无信息" >
</item> </item>
<item v-if="checkedApproved&&fromPutted"> <item v-if="checkedApproved&&fromPutted">
<div slot="name">特批事项</div> <div slot="name" class="required">特批事项</div>
<input slot="content" v-model="saveInfo.special_matter" readonly placeholder="暂无信息"> <input slot="content" v-model="saveInfo.special_matter" readonly placeholder="暂无信息" >
</item> </item>
</list-item> </list-item>
</div> </div>
<div class="another-info"> <div class="another-info">
<img src="@/assets/contractCreate/undertake.png" >担保人信息 <img src="@/assets/contractCreate/undertake.png" >担保人信息
<img v-if="!fromPutted" src="@/assets/contractCreate/add.png" @click="addPerson"> <img v-if="!fromPutted" src="@/assets/contractCreate/add.png" @click="addPerson" >
</div> </div>
</div> </div>
<div v-if="!fromPutted" > <div v-if="!fromPutted">
<item-option v-for="(item,index) in selectUdertake" :key="index" class="mySlider"> <item-option v-for="(item,index) in selectUdertake" :key="index" class="mySlider">
<list-item :item-height="68"> <list-item :item-height="68">
<item> <item>
...@@ -314,7 +356,7 @@ ...@@ -314,7 +356,7 @@
<tab-button class="before" @click.native="$routeGo()">上一步</tab-button> <tab-button class="before" @click.native="$routeGo()">上一步</tab-button>
<tab-button class="next" @click.native="save">下一步</tab-button> <tab-button class="next" @click.native="save">下一步</tab-button>
</bottom-tab> </bottom-tab>
<AddUnderTake ref="addperson" :bp_agent_id="bp_agent_id" @addUnder="addUnder"/> <AddUnderTake ref="addperson" :bp_agent_id="bp_agent_id" @addUnder="addUnder" />
</h-view> </h-view>
</template> </template>
<script> <script>
...@@ -346,7 +388,8 @@ export default { ...@@ -346,7 +388,8 @@ export default {
selectUdertake: [], // 已选择的担保人列表 selectUdertake: [], // 已选择的担保人列表
NPBaseInfo: {}, // 自然人基本信息 NPBaseInfo: {}, // 自然人基本信息
ORGBaseInfo: {}, // 企业基本信息 ORGBaseInfo: {}, // 企业基本信息
saveInfo: {// 需要保存的信息 saveInfo: {
// 需要保存的信息
project_id: window.localStorage.project_id, project_id: window.localStorage.project_id,
bp_id: '', bp_id: '',
bp_class: window.localStorage.bp_class_tenant, bp_class: window.localStorage.bp_class_tenant,
...@@ -370,7 +413,7 @@ export default { ...@@ -370,7 +413,7 @@ export default {
} }
}, },
watch: { watch: {
'checked': { checked: {
handler (newVal, oldVal) { handler (newVal, oldVal) {
if (newVal === false) { if (newVal === false) {
this.saveInfo.abc_deduction_flag = 'N' this.saveInfo.abc_deduction_flag = 'N'
...@@ -400,7 +443,7 @@ export default { ...@@ -400,7 +443,7 @@ export default {
}, },
immediate: true, immediate: true,
}, },
'checkedApproved': { checkedApproved: {
handler (newVal, oldVal) { handler (newVal, oldVal) {
if (newVal === false) { if (newVal === false) {
this.saveInfo.special_flag = 'N' this.saveInfo.special_flag = 'N'
...@@ -431,14 +474,20 @@ export default { ...@@ -431,14 +474,20 @@ export default {
vm.checked = false // 农行代扣 vm.checked = false // 农行代扣
vm.checkedApproved = false // 是否特批 vm.checkedApproved = false // 是否特批
Object.keys(vm.saveInfo).forEach(i => { Object.keys(vm.saveInfo).forEach(i => {
if (i !== 'project_id' && i !== 'bp_id' && i !== 'bp_class' && i !== 'abc_deduction_flag' && i !== 'special_flag') { if (
i !== 'project_id' &&
i !== 'bp_id' &&
i !== 'bp_class' &&
i !== 'abc_deduction_flag' &&
i !== 'special_flag'
) {
vm.saveInfo[i] = '' vm.saveInfo[i] = ''
} else if (i === 'abc_deduction_flag' || i === 'special_flag') { } else if (i === 'abc_deduction_flag' || i === 'special_flag') {
vm.saveInfo[i] = 'N' vm.saveInfo[i] = 'N'
} else if (i === 'bp_id') { } else if (i === 'bp_id') {
vm.saveInfo[i] = window.localStorage.bp_id_tenant vm.saveInfo[i] = window.localStorage.bp_id_tenant
} }
// vm.saveInfo['project_id'] = window.localStorage.project_id // 重新赋值,防止缓存 // vm.saveInfo['project_id'] = window.localStorage.project_id // 重新赋值,防止缓存
}) })
vm.selectUdertake = [] vm.selectUdertake = []
setTimeout(() => { setTimeout(() => {
...@@ -464,8 +513,7 @@ export default { ...@@ -464,8 +513,7 @@ export default {
} }
}) })
}, },
mounted () { mounted () {},
},
methods: { methods: {
// 自定义返回逻辑:第一次新建时返回判断是否保存数据,未保存提示保存 // 自定义返回逻辑:第一次新建时返回判断是否保存数据,未保存提示保存
routeGoCustom () { routeGoCustom () {
...@@ -486,6 +534,26 @@ export default { ...@@ -486,6 +534,26 @@ export default {
vm.$routeGo() vm.$routeGo()
} }
}, },
deleteGuta (e) {
let vm = this
let url = process.env.basePath + 'prj_bp_guta_delete'
let param = {
master: {
project_id: window.localStorage.project_id,
bp_guta_id: e.bp_guta_id,
},
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
Object.assign(vm.saveInfo, res.info)
vm.selectUdertake = res.lists
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
getSaveInfo () { getSaveInfo () {
let vm = this let vm = this
let url = process.env.basePath + 'prj_base_info_query' let url = process.env.basePath + 'prj_base_info_query'
...@@ -505,7 +573,7 @@ export default { ...@@ -505,7 +573,7 @@ export default {
}, },
addUnder (e) { addUnder (e) {
let index = this.selectUdertake.findIndex(item => { let index = this.selectUdertake.findIndex(item => {
if (item.bp_name === e.bp_name) { if (item.bp_guta_name === e.bp_guta_name) {
return true return true
} }
}) })
...@@ -549,7 +617,7 @@ export default { ...@@ -549,7 +617,7 @@ export default {
let vm = this let vm = this
let url = process.env.basePath + 'prj_base_info_save' let url = process.env.basePath + 'prj_base_info_save'
let param = { let param = {
master: {...vm.saveInfo, ...vm.makeData()}, master: { ...vm.saveInfo, ...vm.makeData() },
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
...@@ -604,7 +672,7 @@ export default { ...@@ -604,7 +672,7 @@ export default {
let url = process.env.basePath + 'prj_base_info_save' let url = process.env.basePath + 'prj_base_info_save'
let isEmpty = vm.hasEmpty() let isEmpty = vm.hasEmpty()
let param = { let param = {
master: {...vm.saveInfo, ...vm.makeData()}, master: { ...vm.saveInfo, ...vm.makeData() },
} }
if (isEmpty) { if (isEmpty) {
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
...@@ -882,11 +950,12 @@ export default { ...@@ -882,11 +950,12 @@ export default {
deleteFun (e) { deleteFun (e) {
let deleteIndex let deleteIndex
this.selectUdertake.forEach((i, index, arr) => { this.selectUdertake.forEach((i, index, arr) => {
if (arr[index].bp_name.indexOf(e.bp_guta_name) !== -1) { if (arr[index].bp_guta_name.indexOf(e.bp_guta_name) !== -1) {
deleteIndex = index deleteIndex = index
} }
}) })
this.selectUdertake.splice(deleteIndex, 1) this.selectUdertake.splice(deleteIndex, 1)
this.deleteGuta(e)
}, },
}, },
} }
...@@ -899,8 +968,8 @@ export default { ...@@ -899,8 +968,8 @@ export default {
no-repeat; no-repeat;
background-size: 20px 20px; background-size: 20px 20px;
} }
.mySlider{ .mySlider {
height:68px; height: 68px;
} }
.hls-list-item { .hls-list-item {
margin-bottom: 0px !important; margin-bottom: 0px !important;
...@@ -990,14 +1059,14 @@ export default { ...@@ -990,14 +1059,14 @@ export default {
color: @headerColor; color: @headerColor;
display: flex; display: flex;
align-items: center; align-items: center;
img:nth-of-type(1){ img:nth-of-type(1) {
margin-left: 16px; margin-left: 16px;
width: 19px; width: 19px;
margin-right: 10px; margin-right: 10px;
} }
img:nth-of-type(2){ img:nth-of-type(2) {
margin-left:58%; margin-left: 58%;
width:19px; width: 19px;
} }
} }
.userInfo:first-of-type { .userInfo:first-of-type {
......
...@@ -522,11 +522,11 @@ export default { ...@@ -522,11 +522,11 @@ export default {
} }
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.hlsPopup.showSuccess('提交成功') vm.hlsPopup.showSuccess('提交成功')
vm.$router.push({ vm.$router.push({
name: 'ContractCreateList', name: 'MyInfo',
}) })
} else { } else {
vm.hlsPopup.showLongCenter(res.message) vm.hlsPopup.showLongCenter(res.message)
......
...@@ -37,7 +37,7 @@ export default { ...@@ -37,7 +37,7 @@ export default {
vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
vm.notice_detail = res.info.notice_detail vm.notice_detail = res.info.notice_body
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
...@@ -73,6 +73,8 @@ export default { ...@@ -73,6 +73,8 @@ export default {
line-height: 20px; line-height: 20px;
p{ p{
text-indent: 35px; text-indent: 35px;
color: #666666;
font-size: 14px;
} }
} }
} }
......
/**
* @Author Sean
* @Date 2019/11/27
*/
<template>
<transition name="role">
<div v-show="showFlag" class="role-switch-wrap">
<div class="role-switch-content">
<div class="content-header">
<span>请选择要切换的角色</span>
<img src="@/assets/myInfo/modalClose.png" @click="roleCancle">
</div>
<div class="content-wrap">
<div v-for="(item,index) in roleList" :key="index" :class="{'item-active':index === switchIndex}" class="role-item" @click="chooseRole(index)">
<span>{{ item.bp_type_desc }}</span>
</div>
<div :class="{'content-btn-active':switchIndex !== ''}" class="content-btn"><span @click="roleConfirm">确定</span></div>
</div>
</div>
</div>
</transition>
</template>
<script>
export default {
props: ['roleList'],
data () {
return {
showFlag: false,
switchIndex: '',
}
},
created: function () {
},
mounted: function () {
},
updated: function () {
},
methods: {
chooseRole(index){
this.switchIndex = index
},
roleConfirm () {
if(this.switchIndex === ''){
}else {
this.showFlag = false
this.$emit('roleConfirm',this.roleList[this.switchIndex])
}
},
show () {
this.switchIndex = ''
this.showFlag = true
},
roleCancle () {
this.showFlag = false
this.$emit('roleCancle')
},
},
}
</script>
<style scoped lang="less">
.role-enter-active, .role-leave-active {
transition: opacity .5s;
}
.role-enter, .role-leave-to /* .fade-leave-active below version 2.1.8 */ {
opacity: 0;
}
.role-switch-wrap {
width: 100%;
height: 100%;
position: absolute;
top: 0;
z-index: 999;
background: rgba(56, 63, 69, 0.30);
display: flex;
justify-content: center;
align-items: center;
.role-switch-content {
width: 80%;
margin: 0 auto;
.content-header {
width: 100%;
height: 44px;
background-color: @headerColor;
font-family: PingFangSC-Semibold;
font-size: 16px;
color: #FFFFFF;
letter-spacing: 0;
text-align: center;
line-height: 44px;
border-top-left-radius: 14px;
border-top-right-radius: 14px;
img {
width: 26px;
float: right;
}
}
.content-wrap {
width: 100%;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
background-color: #FFF;
padding: 10px 0;
border-bottom-left-radius: 14px;
border-bottom-right-radius: 14px;
.role-item {
width: 90%;
height: 44px;
background: #FFFFFF;
border: 1px solid #CFCFCF;
border-radius: 4px;
display: flex;
justify-content: center;
align-items: center;
margin: 4px 0;
span {
font-family: PingFangSC-Regular;
font-size: 14px;
color: #656464;
letter-spacing: 0;
line-height: 18px;
}
}
.item-active{
background: rgba(29,63,255,0.10);
border: 1px solid #1D3FFF;
border-radius: 4px;
}
}
.content-btn {
margin-top: 10px;
width: 84%;
height: 40px;
background: rgba(56, 63, 69, 0.50);
border-radius: 4px;
display: flex;
justify-content: center;
align-items: center;
span {
font-family: PingFangSC-Semibold;
font-size: 15px;
color: #FAFAFA;
line-height: 20px;
}
}
.content-btn-active{
background: #1D3FFF;
border-radius: 4px;
}
}
}
</style>
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
</div> </div>
</div> </div>
</div> </div>
<section class="pay-content"> <section class="pay-content">
<div class="pos"> <div class="pos">
<div class="pay-money"> <div class="pay-money">
...@@ -34,6 +33,20 @@ ...@@ -34,6 +33,20 @@
</div> </div>
</div> </div>
</div> </div>
<div class="pos">
<div class="pay-money">
<div class="pay-icon">
<img src="@/assets/payment/first-pay.png" >已还保证金
</div>
<div class="pay-input">
<span>已还保证金</span>
<span style="text-align:right;display:inline-block;margin-right:5px;">{{ Paied|currency }}</span>
<!-- <div @click="createOrder">
<img src="@/assets/payment/into.png" >
</div>-->
</div>
</div>
</div>
<div class="write"> <div class="write">
<div class="box"> <div class="box">
<span>备注</span> <span>备注</span>
...@@ -67,17 +80,38 @@ export default { ...@@ -67,17 +80,38 @@ export default {
}, },
data () { data () {
return { return {
money: 0, money: null,
Paied: 0, // 已缴纳金额
default: 0, default: 0,
pay_note: '', // 备注 pay_note: '', // 备注
} }
}, },
beforeRouteEnter (to, from, next) { beforeRouteEnter (to, from, next) {
next(vm => {}) next(vm => {
vm.getPaied()
})
}, },
computed: {}, computed: {},
watch: {}, watch: {},
methods: { methods: {
getPaied () {
let vm = this
let url = process.env.basePath + 'bp_agent_query'
let param = {
info: {
phone: window.localStorage.user_phone,
},
}
vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.Paied = res.info.paid_deposit
} else {
vm.hlsPopup.showLongCenter(res.message)
}
})
},
putOrder (money) { putOrder (money) {
let vm = this let vm = this
let url = process.env.basePath + 'create_order_agent_amt' let url = process.env.basePath + 'create_order_agent_amt'
......
...@@ -451,15 +451,34 @@ export default { ...@@ -451,15 +451,34 @@ export default {
vm.$post(url, param).then(function (res) { vm.$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: 'NPBankInfo', name: 'NPBankInfo',
}) })*/
vm.attachmentCheck()
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
}) })
} }
}, },
attachmentCheck(){
let vm = this
let url = process.env.basePath + 'bp_attachment_check'
let param = {
bp_id: window.localStorage.getItem('bp_id'),
}
vm.hlsPopup.showLoading('正在校验数据')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.$router.push({
name: 'NPBankInfo',
})
} else {
hlsPopup.showError(res.message)
}
})
},
getHouseInfo () { 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'
......
...@@ -529,7 +529,7 @@ export default { ...@@ -529,7 +529,7 @@ export default {
vm.idCardFrontSpEditFlag = false // 配偶身份证正面修改标识,为true则标识已修改,后续需要重新上传此照片 vm.idCardFrontSpEditFlag = false // 配偶身份证正面修改标识,为true则标识已修改,后续需要重新上传此照片
vm.idCardBackSpEditFlag = false // 配偶身份证反面修改标识,为true则标识已修改,后续需要重新上传此照片 vm.idCardBackSpEditFlag = false // 配偶身份证反面修改标识,为true则标识已修改,后续需要重新上传此照片
vm.isClear = false vm.isClear = false
//vm.baseInfo.bp_class = vm.$route.params.bp_class // vm.baseInfo.bp_class = vm.$route.params.bp_class
} }
}) })
}, },
...@@ -762,6 +762,35 @@ export default { ...@@ -762,6 +762,35 @@ export default {
} }
}) })
}, },
// 基本信息保存前校验
bindCheck () {
let vm = this
var business_num = ''
if (vm.baseInfo.bp_type === 'TENANT' || vm.baseInfo.bp_type === 'GUTA') {
business_num = vm.baseInfo.agent_username
} else if (vm.baseInfo.bp_type === 'AGENT' || vm.baseInfo.bp_type === 'FACTORY') {
business_num = vm.baseInfo.business_license_num
} else if (vm.baseInfo.bp_type === 'OFFICE') {
business_num = vm.baseInfo.business_license_num
}
let url = process.env.basePath + 'bp_bind_check'
let param = {
bp_class: 'NP',
bp_type: vm.baseInfo.bp_type,
business_num: business_num,
}
vm.hlsPopup.showLoading('正在校验数据有效性')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.$router.push({
name: 'NPInvoiceInfo',
})
} else {
hlsPopup.showError(res.message)
}
})
},
async saveProtocol () { async saveProtocol () {
let vm = this let vm = this
let url = process.env.basePath + 'bp_np_bind_save' let url = process.env.basePath + 'bp_np_bind_save'
...@@ -779,7 +808,8 @@ export default { ...@@ -779,7 +808,8 @@ export default {
window.localStorage.setItem('bp_name', vm.baseInfo.bp_name) window.localStorage.setItem('bp_name', vm.baseInfo.bp_name)
window.localStorage.setItem('bp_type', vm.baseInfo.bp_type) window.localStorage.setItem('bp_type', vm.baseInfo.bp_type)
window.localStorage.setItem('from', vm.from) window.localStorage.setItem('from', vm.from)
vm.$router.push({ // vm.bindCheck()
vm.$router.push({
name: 'NPInvoiceInfo', name: 'NPInvoiceInfo',
}) })
return res.bp_id return res.bp_id
...@@ -789,7 +819,6 @@ export default { ...@@ -789,7 +819,6 @@ export default {
}, },
async saveWord () { async saveWord () {
let vm = this let vm = this
debugger
if (!vm.baseInfo.bp_type) { if (!vm.baseInfo.bp_type) {
vm.hlsPopup.showLongCenter('客户类型不能为空!') vm.hlsPopup.showLongCenter('客户类型不能为空!')
} else if (vm.isPaople && !vm.baseInfo.agent_username) { } else if (vm.isPaople && !vm.baseInfo.agent_username) {
......
...@@ -304,32 +304,6 @@ export default { ...@@ -304,32 +304,6 @@ export default {
} }
}, },
}) })
// this.hlsPopup.showConfirm({
// title: '提示',
// content: '您确认提交吗?',
// onConfirm: data => {
// if (data) {
// let url = $config.basePath + 'bp_bind_submit'
// let param = {
// master: {
// bp_id: this.$route.params.bp_id,
// company_id: '2145',
// },
// }
// let vm = this
// vm.hlsPopup.showLoading('请稍候')
// this.hlsHttp.post(url, param).then(function (res) {
// vm.hlsPopup.hideLoading()
// if (res.result === 'S') {
// vm.hlsPopup.showSuccess('提交成功')
// vm.$router.push({
// name: 'MyInfo',
// })
// }
// })
// }
// },
// })
}, },
// 获取个人认证url // 获取个人认证url
getNpCertificationUrl () { getNpCertificationUrl () {
......
...@@ -395,7 +395,7 @@ ...@@ -395,7 +395,7 @@
</div> </div>
</div> </div>
</div> </div>
<!--
<div v-if="from&&isApproved&&isAGENT" class="tax" @click="changeUndertake"> <div v-if="from&&isApproved&&isAGENT" class="tax" @click="changeUndertake">
<img src="@/assets/userBind/tax.png" class="left-img"> <img src="@/assets/userBind/tax.png" class="left-img">
<div> <div>
...@@ -404,8 +404,8 @@ ...@@ -404,8 +404,8 @@
</div> </div>
<img src="@/assets/userBind/arrow-right.png" class="right-img"> <img src="@/assets/userBind/arrow-right.png" class="right-img">
</div> </div>
</div> </div> -->
</h-content> </div></h-content>
<bottom-tab class="footer-button"> <bottom-tab class="footer-button">
<!-- <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">下一步</tab-button> <tab-button class="save" @click.native="verified">下一步</tab-button>
...@@ -752,16 +752,16 @@ export default { ...@@ -752,16 +752,16 @@ export default {
}, },
}) })
}, },
changeUndertake () { // changeUndertake () {
this.$router.push({ // this.$router.push({
name: 'MarginFirstPay', // name: 'MarginFirstPay',
params: { // params: {
bp_id: this.$route.params.bp_id, // bp_id: this.$route.params.bp_id,
status: this.$route.params.status, // status: this.$route.params.status,
isAGENT: this.isAGENT, // isAGENT: this.isAGENT,
}, // },
}) // })
}, // },
addRows (e) { addRows (e) {
let addNum = parseInt(e.length / 16) let addNum = parseInt(e.length / 16)
if (addNum === 0) { if (addNum === 0) {
......
...@@ -414,6 +414,9 @@ export default { ...@@ -414,6 +414,9 @@ export default {
beforeRouteEnter (to, from, next) { beforeRouteEnter (to, from, next) {
next(vm => { next(vm => {
if (from.name === 'Invoice') { if (from.name === 'Invoice') {
vm.carImg = '',
vm.houseImg = '',
vm.propertyImg = '', // 不动产识别图片
vm.propertyInfo = { // 不动产证 vm.propertyInfo = { // 不动产证
bp_id: vm.$route.params.bp_id, bp_id: vm.$route.params.bp_id,
right_person: '', right_person: '',
...@@ -515,8 +518,8 @@ export default { ...@@ -515,8 +518,8 @@ export default {
vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
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)
//vm.hauseInfo = res.info // vm.hauseInfo = res.info
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
...@@ -534,8 +537,8 @@ export default { ...@@ -534,8 +537,8 @@ export default {
vm.hlsPopup.hideLoading() 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
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
...@@ -553,72 +556,86 @@ export default { ...@@ -553,72 +556,86 @@ export default {
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)
// vm.propertyInfo = res.info // vm.propertyInfo = res.info
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
}) })
}, },
// 行驶证信息保存 // 行驶证信息保存
saveCarInfo () { async saveCarInfo () {
let vm = this let vm = this
let url = process.env.basePath + 'bp_vehicleLicense_save' let url = process.env.basePath + 'bp_vehicleLicense_save'
let param = { let param = {
master: vm.carInfo, master: vm.carInfo,
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) { let res = await vm.$post(url, param)
if (res.result === 'S') {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { return true
vm.$router.push({ } else {
name: 'BankInfo', hlsPopup.showLongCenter(res.message)
params: { }
bp_id: vm.bp_id,
},
})
} else {
hlsPopup.showLongCenter(res.message)
}
})
}, },
// 不动产信息保存 // 不动产信息保存
savePropertyInfo () { async savePropertyInfo () {
let vm = this let vm = this
let url = process.env.basePath + 'bp_real_estate_save' let url = process.env.basePath + 'bp_real_estate_save'
let param = { let param = {
master: vm.propertyInfo, master: vm.propertyInfo,
} }
// hlsPopup.showLoading('请稍候') let res = await vm.$post(url, param)
if (res.result === 'S') {
return true
} else {
hlsPopup.showLongCenter(res.message)
}
},
// 房产证信息保存
async saveHouseInfo () {
let vm = this
let url = process.env.basePath + 'bp_house_info_save'
let isSaveCar = await vm.saveCarInfo()
let isSaveEstate = await vm.savePropertyInfo()
let param = {
master: vm.hauseInfo,
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
// vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
/* vm.$router.push({
name: 'BankInfo',
params: {
bp_id: vm.bp_id,
},
})*/
vm.attachmentCheck()
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
}) })
}, },
// 房产证信息保存 attachmentCheck () {
saveHouseInfo () {
let vm = this let vm = this
let url = process.env.basePath + 'bp_house_info_save' let url = process.env.basePath + 'bp_attachment_check'
// vm.hauseInfo.regist_date.substr(0, 10)
console.log('regist_date', vm.hauseInfo.regist_date)
let param = { let param = {
/*master: { bp_id: vm.bp_id,
...vm.hauseInfo,
regist_date: vm.hauseInfo.regist_date.substr(0, 10),
},*/
master: vm.hauseInfo,
} }
// hlsPopup.showLoading('请稍候') vm.hlsPopup.showLoading('正在校验数据')
vm.$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.saveCarInfo() vm.$router.push({
name: 'BankInfo',
params: {
bp_id: vm.bp_id,
},
})
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showError(res.message)
} }
}) })
}, },
...@@ -678,7 +695,7 @@ export default { ...@@ -678,7 +695,7 @@ export default {
vm.save_picture(list) vm.save_picture(list)
vm.isUploadProperty = false // 置为false,防止再次保存重复上传,只有重新识别才会重新上传 vm.isUploadProperty = false // 置为false,防止再次保存重复上传,只有重新识别才会重新上传
} }
vm.savePropertyInfo() // vm.savePropertyInfo()
vm.saveHouseInfo() vm.saveHouseInfo()
}, },
// 房产证/车辆证识别 // 房产证/车辆证识别
......
...@@ -35,11 +35,14 @@ axios.interceptors.response.use(response => { ...@@ -35,11 +35,14 @@ axios.interceptors.response.use(response => {
err.message = response.data.message err.message = response.data.message
hlsPopup.showError(err.message) hlsPopup.showError(err.message)
return Promise.resolve(err) return Promise.resolve(err)
} else if (response.code === '404') {
hlsPopup.showError('未找到资源文件')
} else { } else {
return response.data return response.data
} }
}, err => { }, err => {
if (err && err.response) { if (err && err.response) {
debugger
switch (err.response.status) { switch (err.response.status) {
case 400: case 400:
err.message = '错误请求' err.message = '错误请求'
......
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