Skip to content

H
hls-xcmg-vue-app
Commit fff8cd22 authored by 786817560's avatar 786817560
Browse files
Options

'修改经销商keepalive为true'

parent 53399ecc
Hide whitespace changes
Inline Side-by-side
Showing with 168 additions and 122 deletions
src/pages/distributorSign/contract-details.vue
View file @ fff8cd22
......@@ -2,7 +2,7 @@
* @Description: 合同详情
* @Author: your name
* @Date: 2019-09-25 15:38:21
* @LastEditTime: 2019-11-15 17:38:34
* @LastEditTime: 2019-11-26 17:23:14
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -13,7 +13,7 @@
<span>签约详情</span>
</div>
</h-header>
<Tab @getTabNum="getTabNum" />
<Tab :tabNums="tabNum" @getTabNum="getTabNum" />
<!-- 基本信息 -->
<h-content v-if="tabNum === 0">
......@@ -40,22 +40,6 @@
</item>
</list-item>
<!-- <list-item v-if="guarantorInfo.length && guarantorInfo[0].bp_class === 'ORG'" :item-height="76">
<item v-for="(item,index) in guarantorInfo" :key="index">
<div slot="name">
<span class="name-box">{{ index+1 }}</span>
<span class="name">担保人{{ index+1 }}姓名</span>
<span class="card-num">证件号</span>
</div>
<div slot="content" class="right">
<img src="@/assets/intoApproval/introduce.png" >
<span :title="item.bp_name">{{ item.bp_name }}</span>
<br >
<span>{{ item.organization_code }}</span>
</div>
</item>
</list-item> -->
<!-- 联系人 -->
<div class="bottom-call-wrap">
<div class="bottom-call">
......@@ -171,15 +155,6 @@
</div>
</h-content>
<h-content v-if="tabNum === 2">
<!-- <list-item :item-height="56">
<item :proportion="[4,1]">
<div slot="name" class="aguremrnt-list">
<img src="@/assets/distributorSign/agreement.png" alt="" class="pic">
<p class="second first">经销商担保协议</p>
</div>
<img slot="content" src="@/assets/distributorSign/into.png" alt="">
</item>
</list-item> -->
<list-item :item-height="56">
<item :proportion="[4,1]">
<div slot="name" class="aguremrnt-list">
......@@ -214,16 +189,17 @@ export default {
data () {
return {
showModalValue: false,
info: {},
info: {}, // 租赁信息
tabNum: 0,
baseInfo: {},
baseInfo: {}, // 基本信息
project_id: '',
bp_flag: false,
guarantorInfo: [],
bp_class: window.localStorage.getItem('bp_class'),
confirm_status: '',
guarantorInfo: [], // 担保人信息
bp_class: '', // 商业伙伴类型
confirm_status: '', // 签约状态
faceListUpload: [], // 自拍照上传
confirm_note: '',
confirm_id: window.localStorage.getItem('confirm_id'),
confirm_note: '', // 审批意见
confirm_id: '',
agentPic: '', // 经销商担保协议图片
readed: require('@/assets/constractSigning/read.png'), // 已读
unRead: require('@/assets/constractSigning/unread.png'), // 未读
......@@ -239,36 +215,39 @@ export default {
this.bp_flag = true
}
},
tabNum () {
if (this.tabNum === 1) {
}
},
},
beforeRouteEnter (to, from, next) {
next(vm => {
if (from.name === 'ContractContent') {
if (from.name === 'ContractList') {
vm.tabNum = 0
vm.baseInfo = {}
vm.info = {}
vm.bp_flag = false
vm.guarantorInfo = []
vm.faceListUpload = []
vm.confirm_note = ''
vm.bp_class = vm.$route.params.item.bp_class
vm.project_id = vm.$route.params.item.project_id
vm.confirm_id = vm.$route.params.item.confirm_id
vm.confirm_status = vm.$route.params.item.confirm_status
vm.agentPic = vm.unRead
if (vm.bp_class === 'NP') {
vm.bp_flag = false
vm.getBseMsg()
vm.getGuarantor()
} else {
vm.bp_flag = true
vm.getBseMsg()
vm.getGuarantor()
}
vm.getLease()
} else if (from.name === 'ContractContent') {
vm.tabNum = 2
vm.agentPic = vm.readed
}
})
},
created () {
this.agentPic = this.unRead
this.confirm_status = window.localStorage.getItem('confirm_status')
if (this.bp_class === 'NP') {
this.bp_flag = false
this.getBseMsg()
this.getGuarantor()
} else {
this.bp_flag = true
this.getBseMsg()
this.getGuarantor()
}
this.getLease()
},
created () {},
methods:
{
// 签约确认
......@@ -402,6 +381,9 @@ export default {
vm.hlsPopup.showSuccess('签约成功')
vm.$router.push({
name: 'ContractList',
params: {
backFlag: true,
},
})
} else {
vm.hlsPopup.showSuccess(res.message)
......@@ -456,7 +438,7 @@ export default {
let url2 = $config.basePath + 'prj_org_info_query'
vm.bp_class === 'NP' ? url = url1 : url = url2
let param = {
project_id: window.localStorage.getItem('project_id'),
project_id: vm.project_id,
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
......@@ -476,7 +458,7 @@ export default {
let vm = this
let url = $config.basePath + 'prj_guarantor_list_query'
let param = {
project_id: window.localStorage.getItem('project_id'),
project_id: vm.project_id,
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
......@@ -490,7 +472,7 @@ export default {
let vm = this
let url = $config.basePath + 'prj_lease_query'
let param = {
project_id: window.localStorage.getItem('project_id'),
project_id: vm.project_id,
}
// 租赁信息
vm.hlsPopup.showLoading('数据加载中')
......@@ -512,9 +494,6 @@ export default {
},
// 跳转合同详情
goContractContent (name) {
// if (name === '经销商担保协议') {
// setTimeout(() => { this.agentPic = this.readed }, 1000)
// }
this.$router.push({
name: 'ContractContent',
params: {
......@@ -526,8 +505,7 @@ export default {
this.$router.push({
name: 'FinancDetails',
params: {
project_id: window.localStorage.getItem('project_id'),
// confirm_status: this.confirm_status,
project_id: this.project_id,
product_num: this.info.product_num,
},
})
......
src/pages/distributorSign/contract-list.vue
View file @ fff8cd22
......@@ -12,13 +12,16 @@
<span>经销商签约</span>
</div>
</h-header>
<Tab @getTabNum="getTabNum"/>
<div class="tab-style has-header">
<div :class="{'done':num === 1,'undone':num !== 1}" @click="num = 1;"><img :src="num === 1?check1:uncheck1"><span>待签约</span></div>
<div :class="{'done':num === 2,'undone':num !== 2}" @click="num = 2;"><img :src="num === 2?check2:uncheck2"><span>已签约</span></div>
</div>
<!-- 搜索 -->
<div class="search">
<input v-model="searchInput" type="text" placeholder="请输入合同号/承租人名称">
</div>
<scroll
v-show="tabNum === 0"
v-show="num === 1"
ref="scroll"
:updateData="[submitLists]"
:pullUp="true"
......@@ -43,7 +46,7 @@
</div>
</scroll>
<scroll
v-show="tabNum === 1"
v-show="num === 2"
ref="scrolls"
:updateData="[approvedLists]"
:pullUp="true"
......@@ -71,35 +74,32 @@
</template>
<script>
import Tab from '@/pages/distributorSign/tab'
import Check1 from '@/assets/constractSigning/no-done.png'
import Check2 from '@/assets/constractSigning/yes-done.png'
import unCheck1 from '@/assets/constractSigning/no-undone.png'
import unCheck2 from '@/assets/constractSigning/yes-undone.png'
export default {
name: 'ContractList',
components: {
Tab,
},
data () {
return {
tabNum: null,
pagenum: 1,
submitPagenum: 1,
approvedPagenum: 1,
searchInput: '',
num: 1,
submitPagenum: 1, // 待签约页码
approvedPagenum: 1, // 已签约页码
searchInput: '', // 搜索内容
check1: Check1,
check2: Check2,
uncheck1: unCheck1,
uncheck2: unCheck2,
lists: [],
showLists: [],
submitLists: [],
approvedLists: [],
submitFlag: false,
submitLists: [], // 待签约列表
approvedLists: [], // 已签约列表
approvedFlag: false,
}
},
watch: {
'tabNum': {
'num': {
handler (newVal, oldVal) {
if (newVal === 0) {
if (!this.submitFlag) {
this.getLists()
}
} else if (newVal === 1) {
if (newVal === 2) {
if (!this.approvedFlag) {
this.getLists()
}
......@@ -118,14 +118,35 @@ export default {
},
},
created () {
this.tabNum = 0
// this.getLists()
},
beforeRouteEnter (to, from, next) {
next(vm => {
if (from.name === 'MyInfo') {
vm.num = 1
vm.submitPagenum = 1
vm.approvedPagenum = 1
vm.searchInput = ''
vm.approvedFlag = false
vm.submitLists = []
vm.approvedLists = []
vm.getLists()
} else if (from.name === 'ContractDetails') {
if (vm.$route.params.backFlag) {
vm.searchInput = ''
vm.submitPagenum = 1
vm.approvedPagenum = 1
vm.approvedFlag = false
vm.getLists()
}
}
})
},
methods: {
// 查询签约列表
getLists () {
let vm = this
if (vm.tabNum === 0) {
if (vm.num === 1) {
let url = $config.basePath + 'prj_confirm_list_query'
let param = {
pagesize: 10,
......@@ -140,7 +161,6 @@ export default {
if (res.result === 'S') {
console.log(res.lists)
vm.submitLists = res.lists
vm.submitFlag = true
// vm.showLists = vm.submitLists
if (res.lists.length > 0 && res.lists.length < 10) {
vm.$refs.scroll.update(true)
......@@ -151,7 +171,7 @@ export default {
hlsPopup.showLongCenter(res.message)
}
})
} else if (vm.tabNum === 1) {
} else if (vm.num === 2) {
let url = $config.basePath + 'prj_confirm_list_query'
let param = {
pagesize: 10,
......@@ -180,7 +200,7 @@ export default {
},
loadMore () {
let vm = this
if (vm.tabNum === 0) {
if (vm.num === 1) {
vm.submitPagenum++
let url = $config.basePath + 'prj_confirm_list_query'
let param = {
......@@ -213,7 +233,7 @@ export default {
hlsPopup.showLongCenter(res.message)
}
})
} else if (vm.tabNum === 1) {
} else if (vm.num === 2) {
vm.approvedPagenum++
let url = $config.basePath + 'prj_confirm_list_query'
let param = {
......@@ -259,9 +279,9 @@ export default {
confirm_status: 'SUBMIT',
searchInput: vm.searchInput,
}
// vm.hlsPopup.showLoading('数据加载中')
vm.hlsPopup.showLoading('请稍后')
vm.hlsHttp.post(url, param).then(function (res) {
// vm.hlsPopup.hideLoading()
vm.hlsPopup.hideLoading()
// console.log(res.lists)
vm.submitLists = res.lists
if (res.lists.length >= 0 && res.lists.length < 10) {
......@@ -282,9 +302,9 @@ export default {
confirm_status: 'APPROVED',
searchInput: vm.searchInput,
}
vm.hlsPopup.showLoading('数据加载中')
// vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
// vm.hlsPopup.hideLoading()
// console.log(res.lists)
vm.approvedLists = res.lists
if (res.lists.length >= 0 && res.lists.length < 10) {
......@@ -299,20 +319,13 @@ export default {
setTimeout(this.approvedearch, 1000)
},
goDetails (item) {
window.localStorage.setItem('confirm_id', item.confirm_id)
window.localStorage.setItem('bp_class', item.bp_class)
window.localStorage.setItem('project_id', item.project_id)
window.localStorage.setItem('confirm_status', item.confirm_status)
this.$router.push({
name: 'ContractDetails',
params: {
confirm_id: item.confirm_id,
item: item,
},
})
},
getTabNum (i) {
this.tabNum = i
},
dateConverse (date) {
return date.replace(/\//g, '-')
},
......@@ -321,7 +334,51 @@ export default {
</script>
<style lang="less">
#distribute-sign {
.tab-style{
display:flex;
width: 100%;
justify-content: center;
padding-top:12px;
padding-bottom: 8px;
align-items: center;
background-color: #fff;
box-shadow:0 2px 3px 0 rgba(220,220,221,0.50);
position: absolute;
z-index: 999;
div{
position: relative;
height: 32px;
width: 172px;
border-radius:16px;
border-radius: 16px;
font-family: PingFangSC-Semibold;
font-size: 14px;
letter-spacing: 0.43px;
margin: 0 4px;
line-height: 32px;
}
.undone{
background: rgba(220,220,221,0.26);
color: #383F45;
}
.done{
background: rgba(0,70,156,0.10);
color: #00469C;
}
img{
height: 20px;
display: block;
float: left;
margin: 6px 0 0 43px;
}
span{
position: absolute;
left:70px;
}
}
.search {
background-color: #fff;
padding: 8px 12px;
......@@ -329,11 +386,8 @@ export default {
width: 100%;
z-index: 100;
margin-bottom: 8px;
top: 94px;
margin-top: 52px;
input {
background: url("../../assets/contractStart/search1.png") 320px no-repeat;
background-size: 16px 16px;
background-color: rgba(239, 239, 239, 0.55);
padding-left: 12px;
border-radius: 4px;
height: 36px;
......@@ -342,6 +396,9 @@ export default {
font-size: 14px;
color: #888C8F;
line-height: 36px;
background: url("../../assets/contractStart/search1.png") 320px no-repeat;
background-size: 16px 16px;
background-color: rgba(239, 239, 239, 0.55);
}
input::placeholder {
......
src/pages/distributorSign/details-tab.vue
View file @ fff8cd22
......@@ -16,6 +16,12 @@ import unbase from '@/assets/distributorSign/unbase.png'
import unsigned from '@/assets/distributorSign/unsigned.png'
import untrial from '@/assets/distributorSign/untrial.png'
export default {
props: {
tabNums: {
type: Number,
default: 0,
},
},
data () {
return {
tabNum: 0,
......@@ -27,6 +33,11 @@ export default {
untrial: untrial,
}
},
watch: {
tabNums () {
this.tabNum = this.tabNums
},
},
methods: {
sendTabNum () {
this.$emit('getTabNum', this.tabNum)
......
src/pages/distributorSign/legal-person.vue
View file @ fff8cd22
......@@ -2,7 +2,7 @@
* @Description: 法人信息
* @Author: your name
* @Date: 2019-09-26 15:09:24
* @LastEditTime: 2019-11-25 17:35:06
* @LastEditTime: 2019-11-26 17:20:26
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -33,7 +33,7 @@
</item>
<item>
<div slot="name" class="font-color">注册地址</div>
<input slot="content" v-model="baseInfo.registered_place" readonly>
<span slot="content">{{ baseInfo.registered_place }}</span>
</item>
<item>
<div slot="name" class="font-color">经营地址</div>
......
src/pages/distributorSign/personal.vue
View file @ fff8cd22
......@@ -2,7 +2,7 @@
* @Descrip：个人信息
* @Author: your name
* @Date: 2019-09-26 15:47:45
* @LastEditTime: 2019-11-13 09:21:48
* @LastEditTime: 2019-11-26 17:19:19
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -37,7 +37,7 @@
</item>
<item>
<div slot="name" class="font-color">户籍地址</div>
<input slot="content" v-model="baseInfo.address_on_resident_booklit" readonly>
<span slot="content">{{ baseInfo.address_on_resident_booklit }}</span>
</item>
<item>
<div slot="name" class="font-color">学历</div>
......@@ -49,7 +49,7 @@
</item>
</list-item>
<div v-if="baseInfo.marital_status == 'MARRIED'" class="equipment-list">配偶信息</div>
<list-item :item-height="44" v-if="baseInfo.marital_status == 'MARRIED'" class="second-part">
<list-item v-if="baseInfo.marital_status == 'MARRIED'" :item-height="44" class="second-part">
<item>
<div slot="name" class="font-color">姓名</div>
<input slot="content" v-model="baseInfo.bp_name_sp" readonly>
......
src/pages/userBind/np/bankInfo.vue
View file @ fff8cd22
......@@ -70,9 +70,9 @@ export default {
if (e === '0') {
return '未知类型'
} else if (e === '1') {
return '信用卡'
return '借记卡'
} else if (e === '2') {
return '储蓄卡'
return '信用卡'
}
},
sendFlag (isClear) {
......
src/pages/userBind/org/bankInfo.vue
View file @ fff8cd22
......@@ -2,7 +2,7 @@
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-09-24 21:29:35
* @LastEditTime: 2019-10-29 09:43:03
* @LastEditTime: 2019-11-26 17:49:05
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -77,9 +77,9 @@ export default {
if (e === '0') {
return '未知类型'
} else if (e === '1') {
return '信用卡'
return '借记卡'
} else if (e === '2') {
return '储蓄卡'
return '信用卡'
}
},
sendFlag (isClear) {
......
src/router/index.js
View file @ fff8cd22
......@@ -2,7 +2,7 @@
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-09-24 12:34:06
* @LastEditTime: 2019-11-07 09:49:46
* @LastEditTime: 2019-11-26 17:23:54
* @LastEditors: Please set LastEditors
*/
import Vue from 'vue'
......@@ -191,8 +191,8 @@ export default new Router({
{path: '/refund', component: Refund, name: 'Refund', meta: {keepAlive: false}},
{path: '/into-list', component: IntoList, name: 'IntoList', meta: {keepAlive: false}},
// 经销商签约
{path: '/contract-list', component: ContractList, name: 'ContractList', meta: {keepAlive: false}},
{path: '/contract-details', component: ContractDetails, name: 'ContractDetails', meta: {keepAlive: false}},
{path: '/contract-list', component: ContractList, name: 'ContractList', meta: {keepAlive: true}},
{path: '/contract-details', component: ContractDetails, name: 'ContractDetails', meta: {keepAlive: true}},
{path: '/financ-details', component: FinancDetails, name: 'FinancDetails', meta: {keepAlive: false}},
// 试算
{path: '/financing-trial', component: FinancingTrial, name: 'FinancingTrial', meta: {keepAlive: true}},
......
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