Skip to content

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

Merge branch 'ren' into develop

parents 31813c1f 4f5e0e59
Hide whitespace changes
Inline Side-by-side
Showing with 271 additions and 9 deletions
src/pages/contractCreate/creat-rent-info.vue
View file @ bc00c0ed
......@@ -387,6 +387,11 @@ export default {
},
})
},
goRent () {
this.$router.push({
name: 'CreateEnclosureInfo',
})
},
},
}
</script>
......
src/pages/contractCreate/create-enclosure-info.vue 0 → 100644
View file @ bc00c0ed
<template>
<h-view id="create-base-info">
<h-header :proportion="[5,1,1]" class="bar-custom">
<div slot="left" class="h-header-btn">
<img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
<span>基本信息</span>
</div>
</h-header>
<h-content>
<div class="top">
<div class="item">
<img src="@/assets/contractCreate/finished.png" >
<p>基本信息</p>
</div>
<span class="line" />
<div class="item">
<img src="@/assets/contractCreate/finished.png" >
<p>租赁信息</p>
</div>
<span class="line" />
<div class="item">
<span>3</span>
<p style="color: #383F45;">附件信息</p>
</div>
</div>
</h-content>
<bottom-tab class="add-box">
<tab-button class="before" @click.native="$routeGo()">上一步</tab-button>
<tab-button class="next" @click.native="goRent">下一步</tab-button>
</bottom-tab>
</h-view>
</template>
<script>
export default {
data () {
return {
}
},
watch: {
},
beforeRouteEnter (to, from, next) {
next(vm => {
vm.loadItemList()
})
},
methods: {
loadItemList () {
let vm = this
vm.dowload_list = []
let bpId = window.localStorage.getItem('bp_id')
let url = process.env.basePath + 'prj_cdd_check_list'
let param = {
master: {
document_id: bpId,
document_table: 'HLS_BP_MASTER',
tab_group: 'HLS_NP',
},
}
// vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) {
// vm.hlsPopup.hideLoading()
console.log(res)
// if (res.result === 'S') {
// var listTemp = [...res.lists]
// listTemp.forEach(item => {
// switch (item.cdd_item) {
// case 'HOUSE_CARD': // 房产证
// vm.house_id = item.check_id
// break
// case 'CAR_CARD': // 承租人身份证背面
// vm.car_id = item.check_id
// break
// case 'REAL_EST_CERTIFICATE': // 承租人身份证背面
// vm.estate_id = item.check_id
// break
// default:
// break
// }
// })
// vm.cddItemList = res.lists.filter(i => {
// return i.description.indexOf('身份证') === -1
// })
// // 查询图片
// vm.cddItemList.forEach((item, index) => {
// vm.load_picture(item.check_id, index, item.cdd_item)
// })
// }
})
},
// load_picture (check_id, index, cdd_item) {
// let vm = this
// let url =
// process.env.basePath + 'attachment_list_query' + '&index' + index // 附件查询
// let param = {
// check_id: check_id,
// }
// hlsPopup.showLoading('请稍候')
// vm.$post(url, param).then(function (res) {
// vm.hlsPopup.hideLoading()
// if (res.result === 'S') {
// res.lists.forEach(item => {
// item['url'] =
// process.env.filePath +
// 'attachment_id=' +
// item.attachment_id +
// '&access_token=' +
// window.localStorage.access_token
// })
// switch (cdd_item) {
// case 'HOUSE_CARD': // 房产证
// if (!vm.houseFlag) {
// vm.houseImg = res.lists[0].url
// }
// vm.houseAttachmentId = res.lists[0].attachment_id
// console.log(vm.houseAttachmentId)
// break
// case 'CAR_CARD': // 行驶证
// if (!vm.carFlag) {
// vm.carImg = res.lists[0].url
// }
// vm.carAttachmentId = res.lists[0].attachment_id
// break
// case 'REAL_EST_CERTIFICATE': // 行驶证
// if (!vm.estateFlag) {
// vm.estateImg = res.lists[0].url
// }
// vm.estateAttachmentId = res.lists[0].attachment_id
// break
// default:
// vm.dowload_list.push(res.lists)
// }
// } else {
// hlsPopup.showLongCenter(res.message)
// }
// })
// },
},
}
</script>
<style lang="less" >
#create-base-info {
.swipeout-list .item .function {
height: 68px;
background: url("../../assets/contractCreate/delete.png") 45% 45% #fde5e8
no-repeat;
background-size: 20px 20px;
}
.hls-list-item {
margin-bottom: 0px !important;
}
.swipeout-list {
padding: 0px;
}
.h-header-right {
display: flex;
align-items: center;
}
.flow {
z-index: 999;
}
.left-icon {
width: 18px;
height: 18px;
text-align: center;
line-height: 18px;
background-color: rgba(29, 63, 255, 0.2);
color: @headerColor;
border-radius: 4px;
}
input::placeholder {
color: #b4b4b5;
}
.top {
width: 100%;
height: 81px;
background-color: #faf5e0;
display: flex;
justify-content: center;
align-items: center;
.line {
display: inline-block;
width: 78px;
border-top: 1px solid #a4a4a4;
margin-bottom: 18px;
}
.line {
border-top: 1px solid #ffa000;
}
.item {
display: flex;
justify-content: center;
align-items: center;
flex-flow: column wrap;
font-family: PingFangSC-Semibold;
font-size: 12px;
color: rgba(56, 63, 69, 0.5);
letter-spacing: 0.43px;
img {
width: 18px;
}
span {
display: block;
text-align: center;
line-height: 18px;
border-radius: 50%;
width: 18px;
height: 18px;
color: #fff;
background: #a4a4a4;
}
p {
margin-top: 10px;
}
}
.item:nth-of-type(3) {
font-family: PingFangSC-Semibold;
font-size: 12px;
color: rgba(56, 63, 69, 0.5);
letter-spacing: 0.43px;
span {
background-color: #ffa000;
}
}
}
}
</style>
src/pages/contractCreate/sales-info.vue
View file @ bc00c0ed
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime : 2019-12-23 15:10:23
* @LastEditTime : 2019-12-23 16:14:57
* @LastEditors : Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -32,7 +32,7 @@
</item>
<item>
<div slot="name" class="font-color">经销商</div>
<input v-if="user_bp_type !== 'OFFICE'" slot="content" v-model="bp_agent_name" readonly>
<input v-if="user_bp_type === 'AGENT'" slot="content" v-model="bp_agent_name" readonly>
<input v-if="user_bp_type === 'OFFICE'" slot="content" placeholder="直销" readonly>
</item>
<item :showArrow="true">
......@@ -136,6 +136,9 @@
export default {
data () {
return {
inflow_line: '', // 授信总额度
inflow_used: '', // 已使用授信额度
inflow_reset: '', // 剩余授信额度
lessee: '', // 承租人
sales: '', // 销售人员
office_name: '', // 办事处
......@@ -180,6 +183,9 @@ export default {
vm.factory_name = ''
vm.bp_agent_id = ''
vm.bp_agent_name = ''
vm.inflow_line = '' // 授信总额度
vm.inflow_used = '' // 已使用授信额度
vm.inflow_reset = '' // 剩余授信额度
vm.user_bp_type = vm.$route.params.user_bp_type
vm.sales = window.localStorage.bp_name
vm.salesInfo = {
......@@ -273,6 +279,7 @@ export default {
vm.bp_agent_name = res.info.bp_agent_name
vm.bp_agent_id = res.info.bp_agent_id
vm.salesInfo.bp_id_agent = res.info.bp_agent_id
vm.salesInfo.bp_user_id = res.info.bp_user_id
vm.lesseeQuery()
vm.salesQuery()
vm.officeQuery()
......@@ -342,6 +349,7 @@ export default {
object: {},
returnItem: function (index, obj) {
console.log(obj)
vm.salesInfo.bp_user_id = obj.agent_type
vm.sales = obj.agent_type_n
},
})
......@@ -392,7 +400,9 @@ export default {
vm.hlsPopup.hideLoading()
console.log('授信额度查询', res)
if (res.result === 'S') {
// vm.certification_status = res.info.certification_status
// vm.inflow_line = '' // 授信总额度
// vm.inflow_used = '' // 已使用授信额度
// vm.inflow_reset = '' // 剩余授信额度
}
})
},
......
src/pages/myInfo/my-info.vue
View file @ bc00c0ed
<!--
* @Author: your name
* @Date: 2019-11-07 17:48:53
* @LastEditTime : 2019-12-23 10:01:15
* @LastEditTime : 2019-12-23 15:30:46
* @LastEditors : Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -49,7 +49,7 @@
<div class="content-top">
<div class="userInfo">我的合同</div>
<div class="my-contract">
<div class="content-wrap" @click="goCreate">
<div v-if="user_bp_type === 'AGENT' || user_bp_type === 'OFFICE'" class="content-wrap" @click="goCreate">
<!-- <span
v-if="signCount > 0"
:class="{'content-wrap-class-width':signCount>99, 'content-wrap-class':signCount<99}"
......
src/pages/userBindNew/org/enclosure.vue
View file @ bc00c0ed
......@@ -2,8 +2,8 @@
* @Description: 附件信息
* @Author: your name
* @Date: 2019-09-20 09:35:11
* @LastEditTime: 2019-12-19 12:29:08
* @LastEditors: Please set LastEditors
* @LastEditTime : 2019-12-23 19:17:03
* @LastEditors : Please set LastEditors
-->
<template>
<h-view id="enclosure" class="public-style">
......@@ -481,6 +481,23 @@ export default {
})
},
methods: {
// 附件信息保存前校验
addCheck () {
let vm = this
let url = process.env.basePath + 'bp_attachment_check'
let param = {
bp_id: vm.bp_id,
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
addRow (el) {
let num = Math.round((el.target.scrollHeight - 42) / 20)
if (num > 0) {
......
src/router/index.js
View file @ bc00c0ed
......@@ -2,8 +2,8 @@
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-09-24 12:34:06
* @LastEditTime: 2019-12-18 20:19:11
* @LastEditors: Please set LastEditors
* @LastEditTime : 2019-12-23 18:52:56
* @LastEditors : Please set LastEditors
*/
import Vue from 'vue'
import Router from 'vue-router'
......@@ -125,6 +125,7 @@ import PickLessee from '@/pages/contractCreate/pick-lessee'
import CreateBaseInfo from '@/pages/contractCreate/create-base-info'
import AddPerson from '@/pages/contractCreate/add-person'
import CreateRentInfo from '@/pages/contractCreate/creat-rent-info'
import CreateEnclosureInfo from '@/pages/contractCreate/create-enclosure-info'
Vue.use(Router)
export default new Router({
......@@ -297,6 +298,7 @@ export default new Router({
{path: '/create-base-info', component: CreateBaseInfo, name: 'CreateBaseInfo', meta: {keepAlive: true}},
{path: '/add-person', component: AddPerson, name: 'AddPerson', meta: {keepAlive: true}},
{path: '/create-rent-info', component: CreateRentInfo, name: 'CreateRentInfo', meta: {keepAlive: true}},
{path: '/create-enclosure-info', component: CreateEnclosureInfo, name: 'CreateEnclosureInfo', meta: {keepAlive: true}},
],
scrollBehavior (to, from, savedPosition) {
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