Commit 65887c9d authored by linxin's avatar linxin

修复

parent bb3f0260
...@@ -296,16 +296,16 @@ ...@@ -296,16 +296,16 @@
</div> </div>
</div> </div>
</div> </div>
<RentInfo v-show="tabNum==1" /> <RentInfo v-show="tabNum==1" :confirm_status="confirm_status"/>
<AccessoryInfo v-show="tabNum==2" @down="getDown" /> <AccessoryInfo v-show="tabNum==2" @down="getDown" />
</h-content> </h-content>
<bottom-tab v-if="confirm_status!=='APPROVED'" class="footer-button"> <bottom-tab v-if="confirm_status!=='APPROVED'&&this.$route.params.hasButtom" class="footer-button">
<tab-button class="approve" @click.native="showModalValue=true"> <tab-button class="approve" @click.native="showModalValue=true">
<img src="@/assets/intoApproval/approve.png" >审批 <img src="@/assets/intoApproval/approve.png" >审批
</tab-button> </tab-button>
</bottom-tab> </bottom-tab>
<h-modal <h-modal
v-if="confirm_status!=='APPROVED'" ref="modal" v-model="showModalValue" position="bottom" v-if="confirm_status!=='APPROVED'&&this.$route.params.hasButtom" ref="modal" v-model="showModalValue" position="bottom"
cus-class="sign-modal"> cus-class="sign-modal">
<h-view> <h-view>
<h-content class="approveContent"> <h-content class="approveContent">
...@@ -317,7 +317,7 @@ ...@@ -317,7 +317,7 @@
<textarea v-model="confirm_note" cols="8" rows="20" placeholder="请输入" /> <textarea v-model="confirm_note" cols="8" rows="20" placeholder="请输入" />
</div> </div>
</h-content> </h-content>
<bottom-tab v-if="confirm_status!=='APPROVED'"> <bottom-tab>
<tab-button class="reject" @click.native="showModalValue=true;confirm_status='REJECTED';charge('拒绝')"> <tab-button class="reject" @click.native="showModalValue=true;confirm_status='REJECTED';charge('拒绝')">
<img src="@/assets/intoApproval/reject.png" >拒绝 <img src="@/assets/intoApproval/reject.png" >拒绝
</tab-button> </tab-button>
...@@ -348,7 +348,6 @@ export default { ...@@ -348,7 +348,6 @@ export default {
ischecked: false, ischecked: false,
isConfirm: false, isConfirm: false,
baseInfo: {}, baseInfo: {},
confirm_status: '',
checkedImg: checkedImg, checkedImg: checkedImg,
isDown: false, isDown: false,
bp_class: window.sessionStorage.bp_class, bp_class: window.sessionStorage.bp_class,
......
...@@ -106,6 +106,7 @@ export default { ...@@ -106,6 +106,7 @@ export default {
}, },
data () { data () {
return { return {
confirm_status: this.$route.params.confirm_status,
info: { info: {
finance_amount: '', finance_amount: '',
lease_charge: '', lease_charge: '',
...@@ -123,10 +124,17 @@ export default { ...@@ -123,10 +124,17 @@ export default {
}, },
methods: { methods: {
goBase () { goBase () {
let confirmStatus
if (this.confirm_status !== 'APPROVED') {
confirmStatus = true
} else {
confirmStatus = false
}
this.$router.replace({ this.$router.replace({
name: 'Base', name: 'Base',
params: { params: {
isConfirm: true, isConfirm: true,
hasButtom: confirmStatus,
}, },
}) })
}, },
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</item> </item>
<item> <item>
<div slot="name">还款周期</div> <div slot="name">还款周期</div>
<input slot="content" v-model="rentInfo.annual_pay_times + rentInfo.annual_pay_times_n" readonly > <input slot="content" v-model="rentInfo.annual_pay_times_n" readonly >
</item> </item>
<item> <item>
<div slot="name">租赁期数</div> <div slot="name">租赁期数</div>
...@@ -117,6 +117,12 @@ export default { ...@@ -117,6 +117,12 @@ export default {
} }
}, },
}, },
props: {
confirm_status: {
type: String,
default: '',
},
},
data () { data () {
return { return {
rentInfo: { rentInfo: {
...@@ -149,6 +155,9 @@ export default { ...@@ -149,6 +155,9 @@ export default {
changeRefund () { changeRefund () {
this.$router.push({ this.$router.push({
name: 'Refund', name: 'Refund',
params: {
confirm_status: this.confirm_status,
},
}) })
}, },
getRent () { getRent () {
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</div> </div>
<div class="option"> <div class="option">
<p class="name">合同金额</p> <p class="name">合同金额</p>
<p class="normal money">{{ item.equip_price|NumFormat }}</p> <p class="normal money">{{ item.total_price|NumFormat }}</p>
<img src="@/assets/distributorSign/goDetails.png" alt=""> <img src="@/assets/distributorSign/goDetails.png" alt="">
</div> </div>
<div class="option"> <div class="option">
...@@ -214,6 +214,7 @@ export default { ...@@ -214,6 +214,7 @@ export default {
name: 'Base', name: 'Base',
params: { params: {
confirm_status: item.confirm_status, confirm_status: item.confirm_status,
hasButtom: true,
}, },
}) })
}, },
......
<template>
<div>
<div class="head">头像</div>
<button>用户绑定</button>
</div>
</template>
<script>
export default {
}
</script>
<style scoped>
.head{
width:100px;
height:100px;
border:1px solid #000;
}
button{
margin-top:80%;
width:150px;
height:50px;
border:1px solid #000;
}
</style>
...@@ -201,6 +201,26 @@ export default { ...@@ -201,6 +201,26 @@ export default {
}, },
methods: { methods: {
reSubmit () {
console.log(this.baseInfo.bp_id)
let url = $config.basePath + 'bp_bind_submit'
let param = {
master: {
bp_id: this.baseInfo.bp_id,
company_id: '2145',
},
}
let vm = this
this.hlsHttp.post(url, param).then(function (res) {
console.log('企业信息提交', res)
if (res.result === 'S') {
vm.hlsPopup.showSuccess('提交成功')
vm.$router.push({
name: 'Home',
})
}
})
},
basicInfoQuery () { basicInfoQuery () {
let vm = this let vm = this
let url = process.env.basePath + 'bp_np_info_query' let url = process.env.basePath + 'bp_np_info_query'
......
...@@ -45,7 +45,8 @@ import ContractSigning from '../pages/contractSigning/contract-signing' ...@@ -45,7 +45,8 @@ import ContractSigning from '../pages/contractSigning/contract-signing'
import ContractDetail from '@/pages/ContractSigning/contract-detail' import ContractDetail from '@/pages/ContractSigning/contract-detail'
import ContractContent from '@/pages/ContractSigning/contract-content' import ContractContent from '@/pages/ContractSigning/contract-content'
import EntryInfo from '@/pages/ContractSigning/entry-info' import EntryInfo from '@/pages/ContractSigning/entry-info'
// 个人中心
import PersonList from '@/pages/personalCenter/personList'
Vue.use(Router) Vue.use(Router)
export default new Router({ export default new Router({
...@@ -74,7 +75,7 @@ export default new Router({ ...@@ -74,7 +75,7 @@ export default new Router({
meta: {keepAlive: true}, meta: {keepAlive: true},
children: [ children: [
{path: '/tab/home', component: Home, name: 'Home', meta: {keepAlive: true}}, {path: '/tab/home', component: Home, name: 'Home', meta: {keepAlive: true}},
{path: '/tab/my-info', component: MyInfo, name: 'MyInfo', meta: {keepAlive: true}}, {path: '/tab/my-info', component: PersonList, name: 'PersonList', meta: {keepAlive: true}},
], ],
}, },
...@@ -128,6 +129,7 @@ export default new Router({ ...@@ -128,6 +129,7 @@ export default new Router({
{path: '/contract-detail', component: ContractDetail, name: 'ContractDetail', meta: {keepAlive: true}}, {path: '/contract-detail', component: ContractDetail, name: 'ContractDetail', meta: {keepAlive: true}},
{path: '/contract-content', component: ContractContent, name: 'ContractContent', meta: {keepAlive: true}}, {path: '/contract-content', component: ContractContent, name: 'ContractContent', meta: {keepAlive: true}},
{path: '/entry-info', component: EntryInfo, name: 'EntryInfo', meta: {keepAlive: true}}, {path: '/entry-info', component: EntryInfo, name: 'EntryInfo', meta: {keepAlive: true}},
// 个人中心
], ],
scrollBehavior (to, from, savedPosition) { scrollBehavior (to, from, savedPosition) {
if (to.hash) { if (to.hash) {
......
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