Commit 6b58d875 authored by 李晓兵's avatar 李晓兵

Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

parents d8673f10 c574939b
Pipeline #3738 canceled with stages
<!--
* @Author: your name
* @Date: 2019-10-31 09:49:57
* @LastEditTime: 2019-11-19 11:12:37
* @LastEditTime: 2019-11-22 10:28:20
* @LastEditors: Please set LastEditors
* @Description: 合同查询--明细
* @FilePath:
......@@ -73,7 +73,7 @@
</div>
</div>
<div slot="content">
<span v-if="item.overdue_times" :class="['status','red']">逾期{{ item.overdue_times }}</span>
<span v-if="item.overdue_times != 0" :class="['status','red']">逾期{{ item.overdue_times }}</span>
<div class="plan" @click="toRepayPlans(item.contract_id)">
<img src="@/assets/contractRepayment/plan.png" alt="">
<span>还款计划</span>
......
......@@ -41,36 +41,39 @@
</list-item>
<div class="header">设备清单</div>
<list-item :item-height="104" class="equipment-list">
<item v-for="(item,index) in lists" :proportion="[2,1]" :key="index">
<div slot="name" class="parameters">
<div class="list">
<p>参数项</p>
<span class="bold">{{ item.product_code }}</span>
<scroll
ref="scroll" :updateData="[lists]" :pullUp="true"
@pullingUp="getEquipment">
<list-item :item-height="104" class="equipment-list">
<item v-for="(item,index) in lists" :proportion="[2,1]" :key="index">
<div slot="name" class="parameters">
<div class="list">
<p>参数项</p>
<span class="bold">{{ item.product_code }}</span>
</div>
<div class="list">
<p>发动机号</p>
<span>{{ item.lease_item_engine_num }}</span>
</div>
<div class="list">
<p>车辆型号</p>
<span>{{ item.vehicle_model }}</span>
</div>
<div class="list">
<p>合格证编号</p>
<span>{{ item.certificate_number }}</span>
</div>
</div>
<div class="list">
<p>发动机号</p>
<span>{{ item.lease_item_engine_num }}</span>
<div slot="content">
<span v-if="item.overdue_times!=0" :class="['status','red']">逾期{{ item.overdue_times }}</span>
<div class="plan" @click="toRepayPlan(item.contract_id)">
<img src="@/assets/contractRepayment/plan.png" alt="">
<span>还款计划</span>
</div>
</div>
<div class="list">
<p>车辆型号</p>
<span>{{ item.vehicle_model }}</span>
</div>
<div class="list">
<p>合格证编号</p>
<span>{{ item.certificate_number }}</span>
</div>
</div>
<div slot="content">
<span v-if="item.overdue_times!=0" :class="['status','red']">逾期{{ item.overdue_times }}</span>
<div class="plan" @click="toRepayPlan(item.contract_id)">
<img src="@/assets/contractRepayment/plan.png" alt="">
<span>还款计划</span>
</div>
</div>
</item>
</list-item>
</h-content>
</item>
</list-item>
</scroll></h-content>
</h-view>
</template>
......@@ -82,7 +85,7 @@ export default {
},
data () {
return {
overdue_status: this.$route.params.overdue_status,
pagenum: 1,
detailInfo: {
project_number: '',
agent_bp_name: '',
......@@ -100,6 +103,8 @@ export default {
beforeRouteEnter (to, from, next) {
next(vm => {
if (from.name === 'ContractRepayment') {
vm.pagenum = 1
vm.lists = []
vm.getDetail()
vm.getEquipment()
}
......@@ -111,12 +116,30 @@ export default {
let url = process.env.basePath + 'con_equip_list'
let param = {
project_id: this.$route.params.project_id,
pagesize: 10,
pagenum: vm.pagenum,
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.lists = res.lists
let returnData = []
returnData = res.lists
if (returnData.length === 0) {
vm.$refs.scroll.update(true)
} else if (returnData.length > 0 && returnData.length < 10) {
vum.forEach(returnData, function (data, index, array) {
vm.lists.push(array[index])
})
vm.pagenum++
vm.$refs.scroll.update(true)
} else if (returnData.length === 10) {
vum.forEach(returnData, function (data, index, array) {
vm.lists.push(array[index])
})
vm.pagenum++
vm.$refs.scroll.update(false)
}
} else {
hlsPopup.showLongCenter(res.message)
}
......
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-11-21 16:32:18
* @LastEditTime: 2019-11-22 15:02:02
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -22,15 +22,41 @@
<input v-model="searchInput" type="text" placeholder="请输入合同号/承租人名称">
</div>
<!-- <h-content > -->
<scroll
v-if="num === 1"
ref="scroll"
:updateData="[showLists]"
:updateData="[submitLists]"
:pullUp="true"
@pullingUp="loadMore"
>
<div class="wrap">
<div v-for="(item,index) in showLists" :key="index" class="contract-lists" >
<div v-for="(item,index) in submitLists" :key="index" class="contract-lists" >
<div class="pro-code" @click="goDetails(item)">
<img src="@/assets/distributorSign/fileIcon.png" alt="" class="file-icon">
<p>
<span>合同号</span>
<span>{{ item.project_number }}</span>
</p>
<img src="@/assets/distributorSign/goDetails.png" alt="" class="arrow">
</div>
<div class="box">
<div><p>承租人</p><p>{{ item.bp_name }}</p></div>
<div><p>合同租金</p><p class="money">{{ item.total_price|currency }}</p></div>
<div><p>申请时间</p><p>{{ dateConverse(item.confirm_start_date) }}</p></div>
</div>
</div>
</div>
</scroll>
<scroll
v-if="num === 2"
ref="scrolls"
:updateData="[approvedLists]"
:pullUp="true"
@pullingUp="loadMore"
>
<div class="wrap">
<div v-for="(item,index) in approvedLists" :key="index" class="contract-lists" >
<div class="pro-code" @click="goDetails(item)">
<img src="@/assets/distributorSign/fileIcon.png" alt="" class="file-icon">
<p>
......@@ -61,6 +87,8 @@ export default {
return {
num: null,
pagenum: 1,
submitPagenum: 1,
approvedPagenum: 1,
searchInput: '',
check1: Check1,
check2: Check2,
......@@ -71,15 +99,21 @@ export default {
approvedLists: [], // 已签约
showLists: [],
lists: [],
submitFlag: false,
approvedFlag: false,
}
},
watch: {
'num': {
handler (newVal, oldVal) {
if (newVal === 1) {
this.showLists = this.submitLists
if (!this.submitFlag) {
this.contractList()
}
} else if (newVal === 2) {
this.showLists = this.approvedLists
if (!this.approvedFlag) {
this.contractList()
}
}
},
immediate: true,
......@@ -105,6 +139,8 @@ export default {
if (from.name === 'MyInfo') {
vm.num = 1
vm.pagenum = 1
vm.submitPagenum = 1
vm.approvedPagenum = 1
vm.searchInput = ''
vm.user_bp_type = vm.$route.params.user_bp_type
}
......@@ -119,101 +155,176 @@ export default {
// 合同查询
contractList () {
let vm = this
let url = $config.basePath + 'prj_confirm_list_query'
let param = {
user_phone: window.localStorage.user_phone,
pagesize: 10,
pagenum: vm.pagenum,
searchInput: vm.searchInput,
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.lists = res.lists
vm.submitLists = res.lists.filter(item => item.confirm_status === 'SUBMIT')
vm.approvedLists = res.lists.filter(item => item.confirm_status === 'APPROVED')
vm.showLists = vm.submitLists
if (res.lists.length > 0 && res.lists.length < 10) {
vm.$refs.scroll.update(true)
} else if (res.lists.length === 10) {
vm.$refs.scroll.update(false)
if (vm.num === 1) {
let url = $config.basePath + 'prj_confirm_list_query'
let param = {
user_phone: window.localStorage.user_phone,
pagesize: 10,
pagenum: vm.pagenum,
confirm_status: 'SUBMIT',
searchInput: vm.searchInput,
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.showLists = res.lists
vm.submitFlag = true
if (res.lists.length > 0 && res.lists.length < 10) {
vm.$refs.scroll.update(true)
} else if (res.lists.length === 10) {
vm.$refs.scroll.update(false)
}
} else {
hlsPopup.showLongCenter(res.message)
}
} else {
hlsPopup.showLongCenter(res.message)
})
} else if (vm.num === 2) {
let url = $config.basePath + 'prj_confirm_list_query'
let param = {
pagesize: 10,
pagenum: vm.approvedPagenum,
searchInput: vm.searchInput,
confirm_status: 'APPROVED',
user_phone: window.localStorage.user_phone,
}
})
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
console.log(res.lists)
vm.approvedLists = res.lists
vm.approvedFlag = true
if (res.lists.length > 0 && res.lists.length < 10) {
vm.$refs.scrolls.update(true)
} else if (res.lists.length === 10) {
vm.$refs.scrolls.update(false)
}
} else {
hlsPopup.showLongCenter(res.message)
}
})
}
},
loadMore () {
let vm = this
vm.pagenum++
if (vm.num === 1) {
vm.submitPagenum++
let url = $config.basePath + 'prj_confirm_list_query'
let param = {
user_phone: window.localStorage.user_phone,
pagesize: 10,
pagenum: vm.submitPagenum,
confirm_status: 'SUBMIT',
searchInput: vm.searchInput,
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
let returnData = []
if (res.result === 'S') {
returnData = res.lists
if (returnData.length === 0) {
vm.$refs.scroll.update(true)
} else if (returnData.length > 0 && returnData.length < 10) {
returnData.forEach((data, index, array) => {
vm.submitLists.push(array[index])
})
vm.$refs.scroll.update(true)
} else if (returnData.length === 10) {
returnData.forEach((data, index, array) => {
vm.submitLists.push(array[index])
})
vm.$refs.scroll.update(false)
}
} else {
hlsPopup.showLongCenter(res.message)
}
})
} else if (vm.tabNum === 2) {
vm.approvedPagenum++
let url = $config.basePath + 'prj_confirm_list_query'
let param = {
user_phone: window.localStorage.user_phone,
pagesize: 10,
pagenum: vm.approvedPagenum,
confirm_status: 'APPROVED',
searchInput: vm.searchInput,
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
let returnData = []
if (res.result === 'S') {
returnData = res.lists
if (returnData.length === 0) {
vm.$refs.scrolls.update(true)
} else if (returnData.length > 0 && returnData.length < 10) {
returnData.forEach((data, index, array) => {
vm.approvedLists.push(array[index])
})
vm.$refs.scrolls.update(true)
} else if (returnData.length === 10) {
returnData.forEach((data, index, array) => {
vm.approvedLists.push(array[index])
})
vm.$refs.scrolls.update(false)
}
} else {
hlsPopup.showLongCenter(res.message)
}
})
}
},
submitSearch () {
let vm = this
vm.submitPagenum = 1
let url = $config.basePath + 'prj_confirm_list_query'
let param = {
user_phone: window.localStorage.user_phone,
pagesize: 10,
pagenum: vm.pagenum,
pagenum: vm.submitPagenum,
confirm_status: 'SUBMIT',
searchInput: vm.searchInput,
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
let returnData = []
if (res.result === 'S') {
returnData = res.lists
if (returnData.length === 0) {
vm.$refs.scroll.update(true)
} else if (returnData.length > 0 && returnData.length < 10) {
returnData.forEach((data, index, array) => {
vm.lists.push(array[index])
})
vm.$refs.scroll.update(true)
} else if (returnData.length === 10) {
returnData.forEach((data, index, array) => {
vm.lists.push(array[index])
})
vm.$refs.scroll.update(false)
}
vm.submitLists = vm.lists.filter(item => item.confirm_status === 'SUBMIT')
vm.approvedLists = vm.lists.filter(item => item.confirm_status === 'APPROVED')
if (vm.num === 1) {
vm.showLists = vm.submitLists
} else {
vm.showLists = vm.approvedLists
}
} else {
hlsPopup.showLongCenter(res.message)
// console.log(res.lists)
vm.submitLists = res.lists
if (res.lists.length >= 0 && res.lists.length < 10) {
vm.$refs.scroll.update(true)
} else if (res.lists.length === 10) {
vm.$refs.scroll.update(false)
}
})
},
search () {
approvedearch () {
let vm = this
vm.pagenum = 1
let url = $config.basePath + 'prj_confirm_list_query'
vm.approvedPagenum = 1
let param = {
user_phone: window.localStorage.user_phone,
pagesize: 10,
pagenum: vm.pagenum,
pagenum: vm.approvedPagenum,
confirm_status: 'APPROVED',
searchInput: vm.searchInput,
}
vm.hlsPopup.showLoading('数据加载中')
// vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
vm.lists = res.lists
vm.submitLists = vm.lists.filter(item => item.confirm_status === 'SUBMIT')
vm.approvedLists = vm.lists.filter(item => item.confirm_status === 'APPROVED')
if (vm.num === 1) {
vm.showLists = vm.submitLists
} else {
vm.showLists = vm.approvedLists
}
if (vm.lists.length >= 0 && vm.lists.length < 10) {
vm.$refs.scroll.update(true)
} else if (vm.lists.length === 10) {
vm.$refs.scroll.update(false)
vm.approvedLists = res.lists
if (res.lists.length >= 0 && res.lists.length < 10) {
vm.$refs.scrolls.update(true)
} else if (res.lists.length === 10) {
vm.$refs.scrolls.update(false)
}
})
},
search () {
this.submitSearch()
setTimeout(this.approvedearch, 1000)
},
goDetails (item) {
this.$router.push({
......
......@@ -18,13 +18,39 @@
<input v-model="searchInput" type="text" placeholder="请输入合同号/承租人名称">
</div>
<scroll
v-if="tabNum === 0"
ref="scroll"
:updateData="[showLists]"
:updateData="[submitLists]"
:pullUp="true"
@pullingUp="loadMore"
>
<div class="wrap">
<div v-for="(item,index) in showLists" :key="index" class="contract-lists" >
<div v-for="(item,index) in submitLists" :key="index" class="contract-lists" >
<div class="pro-code" @click="goDetails(item)">
<img src="@/assets/distributorSign/fileIcon.png" alt="" class="file-icon">
<p>
<span>合同号</span>
<span>{{ item.project_number }}</span>
</p>
<img src="@/assets/distributorSign/goDetails.png" alt="" class="arrow">
</div>
<div class="box">
<div><p>承租人</p><p>{{ item.bp_name }}</p></div>
<div><p>合同租金</p><p class="money">{{ item.total_price|currency }}</p></div>
<div><p>申请时间</p><p>{{ dateConverse(item.confirm_start_date) }}</p></div>
</div>
</div>
</div>
</scroll>
<scroll
v-if="tabNum === 1"
ref="scrolls"
:updateData="[approvedLists]"
:pullUp="true"
@pullingUp="loadMore"
>
<div class="wrap">
<div v-for="(item,index) in approvedLists" :key="index" class="contract-lists" >
<div class="pro-code" @click="goDetails(item)">
<img src="@/assets/distributorSign/fileIcon.png" alt="" class="file-icon">
<p>
......@@ -55,20 +81,28 @@ export default {
return {
tabNum: null,
pagenum: 1,
submitPagenum: 1,
approvedPagenum: 1,
searchInput: '',
lists: [],
showLists: [],
submitLists: [],
approvedLists: [],
submitFlag: false,
approvedFlag: false,
}
},
watch: {
'tabNum': {
handler (newVal, oldVal) {
if (newVal === 0) {
this.showLists = this.submitLists
if (!this.submitFlag) {
this.getLists()
}
} else if (newVal === 1) {
this.showLists = this.approvedLists
if (!this.approvedFlag) {
this.getLists()
}
}
},
immediate: true,
......@@ -85,107 +119,185 @@ export default {
},
created () {
this.tabNum = 0
this.getLists()
// this.getLists()
},
methods: {
// 查询签约列表
getLists () {
let vm = this
let url = $config.basePath + 'prj_confirm_list_query'
let param = {
pagesize: 10,
pagenum: vm.pagenum,
searchInput: vm.searchInput,
user_phone: window.localStorage.user_phone,
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.lists = res.lists
vm.submitLists = res.lists.filter(item => item.confirm_status === 'SUBMIT')
vm.approvedLists = res.lists.filter(item => item.confirm_status === 'APPROVED')
vm.showLists = vm.submitLists
if (res.lists.length > 0 && res.lists.length < 10) {
vm.$refs.scroll.update(true)
} else if (res.lists.length === 10) {
vm.$refs.scroll.update(false)
if (vm.tabNum === 0) {
let url = $config.basePath + 'prj_confirm_list_query'
let param = {
pagesize: 10,
pagenum: vm.submitPagenum,
searchInput: vm.searchInput,
confirm_status: 'SUBMIT',
user_phone: window.localStorage.user_phone,
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
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)
} else if (res.lists.length === 10) {
vm.$refs.scroll.update(false)
}
} else {
hlsPopup.showLongCenter(res.message)
}
} else {
hlsPopup.showLongCenter(res.message)
})
} else if (vm.tabNum === 1) {
let url = $config.basePath + 'prj_confirm_list_query'
let param = {
pagesize: 10,
pagenum: vm.approvedPagenum,
searchInput: vm.searchInput,
confirm_status: 'APPROVED',
user_phone: window.localStorage.user_phone,
}
})
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
console.log(res.lists)
vm.approvedLists = res.lists
vm.approvedFlag = true
if (res.lists.length > 0 && res.lists.length < 10) {
vm.$refs.scrolls.update(true)
} else if (res.lists.length === 10) {
vm.$refs.scrolls.update(false)
}
} else {
hlsPopup.showLongCenter(res.message)
}
})
}
},
loadMore () {
let vm = this
vm.pagenum++
if (vm.tabNum === 0) {
vm.submitPagenum++
let url = $config.basePath + 'prj_confirm_list_query'
let param = {
user_phone: window.localStorage.user_phone,
pagesize: 10,
pagenum: vm.submitPagenum,
confirm_status: 'SUBMIT',
searchInput: vm.searchInput,
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
let returnData = []
if (res.result === 'S') {
returnData = res.lists
if (returnData.length === 0) {
vm.$refs.scroll.update(true)
} else if (returnData.length > 0 && returnData.length < 10) {
returnData.forEach((data, index, array) => {
vm.submitLists.push(array[index])
})
vm.$refs.scroll.update(true)
} else if (returnData.length === 10) {
returnData.forEach((data, index, array) => {
vm.submitLists.push(array[index])
})
vm.$refs.scroll.update(false)
}
} else {
hlsPopup.showLongCenter(res.message)
}
})
} else if (vm.tabNum === 1) {
vm.approvedPagenum++
let url = $config.basePath + 'prj_confirm_list_query'
let param = {
user_phone: window.localStorage.user_phone,
pagesize: 10,
pagenum: vm.approvedPagenum,
confirm_status: 'APPROVED',
searchInput: vm.searchInput,
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
let returnData = []
if (res.result === 'S') {
returnData = res.lists
if (returnData.length === 0) {
vm.$refs.scrolls.update(true)
} else if (returnData.length > 0 && returnData.length < 10) {
returnData.forEach((data, index, array) => {
vm.approvedLists.push(array[index])
})
vm.$refs.scrolls.update(true)
} else if (returnData.length === 10) {
returnData.forEach((data, index, array) => {
vm.approvedLists.push(array[index])
})
vm.$refs.scrolls.update(false)
}
} else {
hlsPopup.showLongCenter(res.message)
}
})
}
},
submitSearch () {
let vm = this
vm.submitPagenum = 1
let url = $config.basePath + 'prj_confirm_list_query'
let param = {
user_phone: window.localStorage.user_phone,
pagesize: 10,
pagenum: vm.pagenum,
pagenum: vm.submitPagenum,
confirm_status: 'SUBMIT',
searchInput: vm.searchInput,
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
let returnData = []
if (res.result === 'S') {
returnData = res.lists
if (returnData.length === 0) {
vm.$refs.scroll.update(true)
} else if (returnData.length > 0 && returnData.length < 10) {
returnData.forEach((data, index, array) => {
vm.lists.push(array[index])
})
vm.$refs.scroll.update(true)
} else if (returnData.length === 10) {
returnData.forEach((data, index, array) => {
vm.lists.push(array[index])
})
vm.$refs.scroll.update(false)
}
vm.submitLists = vm.lists.filter(item => item.confirm_status === 'SUBMIT')
vm.approvedLists = vm.lists.filter(item => item.confirm_status === 'APPROVED')
if (vm.tabNum === 0) {
vm.showLists = vm.submitLists
} else {
vm.showLists = vm.approvedLists
}
} else {
hlsPopup.showLongCenter(res.message)
// console.log(res.lists)
vm.submitLists = res.lists
if (res.lists.length >= 0 && res.lists.length < 10) {
vm.$refs.scroll.update(true)
} else if (res.lists.length === 10) {
vm.$refs.scroll.update(false)
}
})
},
search () {
approvedearch () {
let vm = this
vm.pagenum = 1
let url = $config.basePath + 'prj_confirm_list_query'
vm.approvedPagenum = 1
let param = {
user_phone: window.localStorage.user_phone,
pagesize: 10,
pagenum: vm.pagenum,
pagenum: vm.approvedPagenum,
confirm_status: 'APPROVED',
searchInput: vm.searchInput,
}
vm.hlsPopup.showLoading('数据加载中')
// vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
vm.lists = res.lists
vm.submitLists = vm.lists.filter(item => item.confirm_status === 'SUBMIT')
vm.approvedLists = vm.lists.filter(item => item.confirm_status === 'APPROVED')
if (vm.tabNum === 0) {
vm.showLists = vm.submitLists
} else {
vm.showLists = vm.approvedLists
}
if (vm.lists.length >= 0 && vm.lists.length < 10) {
vm.$refs.scroll.update(true)
} else if (vm.lists.length === 10) {
vm.$refs.scroll.update(false)
// vm.hlsPopup.hideLoading()
// console.log(res.lists)
vm.approvedLists = res.lists
if (res.lists.length >= 0 && res.lists.length < 10) {
vm.$refs.scrolls.update(true)
} else if (res.lists.length === 10) {
vm.$refs.scrolls.update(false)
}
})
},
search () {
this.submitSearch()
setTimeout(this.approvedearch, 1000)
},
goDetails (item) {
window.sessionStorage.setItem('confirm_id', item.confirm_id)
window.sessionStorage.setItem('bp_class', item.bp_class)
......
......@@ -2,7 +2,7 @@
* @Descrip 融资试算
* @Author: your name
* @Date: 2019-09-29 17:09:49
* @LastEditTime: 2019-11-22 09:15:25
* @LastEditTime: 2019-11-22 09:28:00
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -22,6 +22,7 @@
ref="scroll"
:updateData="[lists]"
:pullUp="true"
@pullingUp="loadMore"
>
<section v-for="(item,index) in lists" :key="index">
<div class="descript" @click="goDetails(item.product_plan_id)">
......@@ -147,7 +148,11 @@ export default {
})
} else {
let url = $config.basePath + 'prd_calculation_query'
let param = {}
let param = {
pagesize: 10,
searchInput: vm.searchInput,
pagenum: vm.pagenum,
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
......
......@@ -122,7 +122,7 @@ export default {
vm.prj_lists = res.prj_lists
vm.prj_lists.forEach(i => {
i.cf_lists.forEach(j => {
let num = (parseFloat(j.due_amount) - parseFloat(j.received_amount)).toFixed(2)
let num = parseFloat(j.due_amount) - parseFloat(j.received_amount)
vm.$set(j, 'amount', num)
})
})
......
......@@ -27,14 +27,21 @@
</div>
<div class="pay-input">
<span>应还保证金</span>
<input v-model="money" type="text" placeholder="请输入支付金额" >
<input v-model="money" type="number" placeholder="请输入支付金额" >
<!-- <div @click="createOrder">
<img src="@/assets/payment/into.png" >
</div> -->
</div>
</div>
</div>
<div class="write">
<div class="box">
<span>备注</span>
<textarea placeholder="请输入您的备注……" />
</div>
</div>
</section>
<div class="prompt">
<div>
<img src="@/assets/payment/prompt.png" alt >
......@@ -82,6 +89,32 @@ export default {
</script>
<style lang='less' >
#first-pay {
.write {
width: 96%;
height: 172px;
background-color: #fff;
margin-top:10px;
box-shadow: 0 1px 3px 2px rgba(168, 168, 168, 0.14);
span {
font-family: PingFangSC-Regular;
font-size: 14px;
color: #656464;
letter-spacing: 0;
}
.box {
width: 343px;
margin: 0 auto;
padding-top: 8px;
textarea {
width: 343px;
height: 119px;
margin-top: 12.5px;
font-family: PingFangSC-Regular;
font-size: 13px;
letter-spacing: 0;
}
}
}
.top-head {
width: 100%;
height: 142px;
......@@ -117,6 +150,7 @@ export default {
height: 94px;
display: flex;
justify-content: center;
flex-flow: row wrap;
.pos {
width: 96%;
height: 100%;
......
......@@ -177,7 +177,6 @@ export default {
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
console.log(res)
vm.lists = res.lists
vm.lists.forEach(item => {
item['url'] = process.env.filePath + 'attachment_id=' + item.product_attachment_id + '&access_token=' + window.localStorage.access_token
......
......@@ -2,7 +2,7 @@
* @Descrip: 查询首页
* @Author: your name
* @Date: 2019-10-15 14:30:00
* @LastEditTime: 2019-11-21 16:51:39
* @LastEditTime: 2019-11-22 09:45:40
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -13,38 +13,41 @@
<span>产品选择</span>
</div>
</h-header>
<h-content>
<!-- 搜索 -->
<div class="search has-header">
<input type="text" placeholder="请输入产品类别/产品线">
</div>
<scroll ref="scrollLists">
<div class="scroll-box">
<!-- 搜索 -->
<div class="search has-header">
<input v-model="searchInput" type="text" placeholder="请输入产品类别/产品线">
</div>
<scroll
ref="scrollLists"
:updateData="[prolists]"
:pullUp="true"
@pullingUp="loadMore"
>
<div class="scroll-box">
<div v-for="(item,index) in prolists" :key="index" class="wrap">
<div v-for="(item,index) in prolists" :key="index" class="wrap">
<div class="box" @click="goLists(item.division)">
<div class="leftPic">
<div class="box" @click="goLists(item.division)">
<div class="leftPic">
<img src="@/assets/productQuery/product-query.png" alt="" class="leftPic">
</div>
<div class="first">
<p class="product-class">主机厂</p>
<p class="product">{{ item.factory_bp_name }}</p>
</div>
<div class="second">
<p class="product-class">产品名称</p>
<div class="product">
<p>{{ item.division_n }}</p>
</div>
<img src="@/assets/productQuery/down.png" alt="" @click.stop="queryDivision(item.factory_bp_id,index)">
<img src="@/assets/productQuery/product-query.png" alt="" class="leftPic">
</div>
<div class="first">
<p class="product-class">主机厂</p>
<p class="product">{{ item.factory_bp_name }}</p>
</div>
<div class="second">
<p class="product-class">产品名称</p>
<div class="product">
<p>{{ item.division_n }}</p>
</div>
<!-- <img class="arrow" src="@/assets/productQuery/getIn.png" alt="" > -->
<img src="@/assets/productQuery/down.png" alt="" @click.stop="queryDivision(item.factory_bp_id,index)">
</div>
<!-- <img class="arrow" src="@/assets/productQuery/getIn.png" alt="" > -->
</div>
</div>
</scroll>
</h-content>
</div>
</scroll>
</h-view>
</template>
......@@ -57,13 +60,27 @@ export default {
divisionList: [],
list_flag: false,
factory_bp_id: '',
searchInput: '', // 搜索内容
pagenum: 1,
}
},
computed: {},
watch: {},
watch: {
searchInput () {
let vm = this
if (vm.timeout) {
clearTimeout(vm.timeout)
}
vm.timeout = setTimeout(() => {
vm.search()
}, 1000)
},
},
beforeRouteEnter (to, from, next) {
if (from.name === 'HomePage') {
next(vm => {
vm.searchInput = ''
vm.pagenum = 1
vm.proQuery()
})
}
......@@ -71,16 +88,27 @@ export default {
},
methods:
{
// 产品查询
// 初始产品查询
proQuery () {
let vm = this
let url = $config.basePath + 'prd_product_type_list'
let param = { }
let param = {
searchInput: vm.searchInput,
pagenum: vm.pagenum,
pagesize: 10,
}
vm.hlsPopup.showLoading('数据加载中')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.prolists = res.lists
if (vm.prolists.length === 0) {
vm.$refs.scrollLists.update(true)
} else if (vm.prolists.length > 0 && vm.prolists.length < 10) {
vm.$refs.scrollLists.update(true)
} else if (vm.prolists.length === 10) {
vm.$refs.scrollLists.update(false)
}
} else {
hlsPopup.showLongCenter(res.message)
}
......@@ -94,6 +122,60 @@ export default {
})
},
loadMore () {
let vm = this
vm.pagenum = vm.pagenum + 1
let url = $config.basePath + 'prd_product_type_list'
let param = {
searchInput: vm.searchInput,
pagenum: vm.pagenum,
pagesize: 10,
}
vm.hlsPopup.showLoading('数据加载中')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
let returnData = []
if (res.result === 'S') {
returnData = res.lists
if (returnData.length === 0) {
vm.$refs.scrollLists.update(true)
} else if (returnData.length > 0 && returnData.length < 10) {
returnData.forEach((data, index, array) => {
vm.prolists.push(array[index])
})
vm.$refs.scrollLists.update(true)
} else if (returnData.length === 10) {
returnData.forEach((data, index, array) => {
vm.prolists.push(array[index])
})
vm.$refs.scrollLists.update(false)
}
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
// 搜索
search () {
let vm = this
vm.pagenum = 1
let url = $config.basePath + 'prd_product_type_list'
let param = {
pagesize: 10,
pagenum: vm.pagenum,
searchInput: vm.searchInput,
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
vm.prolists = res.lists
if (vm.prolists.length >= 0 && vm.prolists.length < 10) {
vm.$refs.scrollLists.update(true)
} else if (vm.lists.length === 10) {
vm.$refs.scrollLists.update(false)
}
})
},
// 产品线查询val=主机厂id,ind=产品列表索引
queryDivision (val, ind) {
let vm = this
......
......@@ -311,7 +311,7 @@
</div>
</div>
</div>
<div v-if="from&&isApproved&&isAGENT" class="tax" @click="changeUndertake">
<div v-if="(from&&isApproved&&isAGENT)||fromPromisePay" class="tax" @click="changeUndertake">
<img src="@/assets/userBind/tax.png" class="left-img">
<div>
<span>缴纳保证金</span>
......@@ -405,6 +405,7 @@ export default {
data () {
return {
list: {},
fromPromisePay: false,
hasSP: false,
isPaople: false,
isLesons: false,
......@@ -538,13 +539,20 @@ export default {
}
},
beforeRouteEnter (to, from, next) {
if (from.fullPath === '/tab/my-info' || from.fullPath === '/margin-first-pay') { // 绑定查询入口
if (from.fullPath === '/tab/my-info') { // 绑定查询入口
next(vm => {
vm.from = true
vm.basicInfoQuery()
vm.loadItemList()// 附件查询
vm.getBankInfo()
})
} else if (from.fullPath === '/margin-first-pay') {
next(vm => {
vm.fromPromisePay = true
vm.basicInfoQuery()
vm.loadItemList()// 附件查询
vm.getBankInfo()
})
}
next()
},
......@@ -556,7 +564,7 @@ export default {
let vm = this
let url = process.env.basePath + 'bp_np_info_query'
let param = {
bp_id: vm.$route.params.bp_id,
bp_id: vm.fromPromisePay ? window.sessionStorage.getItem('bp_id') : vm.$route.params.bp_id,
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
......@@ -627,7 +635,7 @@ export default {
},
loadItemList () {
let vm = this
let bpId = vm.from ? vm.$route.params.bp_id : window.localStorage.getItem('user_id')
let bpId = vm.from ? vm.$route.params.bp_id : window.sessionStorage.getItem('bp_id')
let url = process.env.basePath + 'prj_cdd_check_list'
let param = {
master: {
......@@ -746,7 +754,7 @@ export default {
vm.hlsPopup.showSuccess('保存成功')
vm.isSave = true
window.localStorage.setItem('user_id', res.bp_id)
window.sessionStorage.setItem('user_id', res.bp_id)
window.sessionStorage.setItem('bp_id', res.bp_id)
window.sessionStorage.setItem('bp_name', vm.baseInfo.bp_name)
window.localStorage.setItem('bp_name', vm.baseInfo.bp_name)
return res.bp_id
......@@ -1144,7 +1152,7 @@ export default {
let url = process.env.basePath + 'bp_bank_save'
let param = {
master: {
bp_id: this.from ? this.$route.params.bp_id : window.localStorage.getItem('user_id'),
bp_id: this.from ? this.$route.params.bp_id : window.sessionStorage.getItem('bp_id'),
bank_lists: this.bankList,
},
}
......@@ -1163,7 +1171,7 @@ export default {
})
},
putData () {
let bp_id = this.from ? this.$route.params.bp_id : window.localStorage.getItem('user_id')
let bp_id = this.from ? this.$route.params.bp_id : window.sessionStorage.getItem('bp_id')
if (bp_id) {
this.hlsPopup.showConfirm({
title: '提示',
......@@ -1174,7 +1182,7 @@ export default {
let url = process.env.basePath + 'bp_bind_submit'
let param = {
master: {
bp_id: this.from ? this.$route.params.bp_id : window.localStorage.getItem('user_id'),
bp_id: this.from ? this.$route.params.bp_id : window.sessionStorage.getItem('bp_id'),
company_id: '2145',
},
}
......@@ -1233,8 +1241,7 @@ export default {
},
getBankInfo () {
let vm = this
// let bpId = window.localStorage.getItem('user_id')
let id = vm.from ? vm.$route.params.bp_id : window.localStorage.getItem('user_id')
let id = vm.from ? vm.$route.params.bp_id : window.sessionStorage.getItem('bp_id')
let url = process.env.basePath + 'bp_bank_query'
let param = {
bp_id: id,
......
......@@ -795,10 +795,10 @@ export default {
this.hlsPopup.showLongCenter('请输入正确银行卡号!')
}
// 验证账户名称与承租人名称一致
/* if (this.bank_lists.bank_account_name !== this.saveInfo.bp_name) {
/* if (this.bank_lists.bank_account_name !== this.saveInfo.bp_name) {
this.bank_card_flag = false
this.hlsPopup.showLongCenter('企业名称与账户名称不一致')
}*/
} */
if (this.bank_card_flag) {
this.hlsPopup.showLoading('请稍后')
let id
......@@ -1770,14 +1770,14 @@ export default {
buttonArray: ['拍照', '从相册取'],
callback: index => {
if (index === 0) {
vm.imgUploadOpenCamera(description,check_id)
vm.imgUploadOpenCamera(description, check_id)
} else {
vm.imgUploadTakePicture(description,check_id)
vm.imgUploadTakePicture(description, check_id)
}
},
})
},
imgUploadOpenCamera (description,check_id) {
imgUploadOpenCamera (description, check_id) {
let vm = this
let obj = {
'pkvalue': check_id,
......@@ -1806,7 +1806,7 @@ export default {
}
hlsUtil.openCamera(cameraoptions, success, error)
},
imgUploadTakePicture (description,check_id) {
imgUploadTakePicture (description, check_id) {
let vm = this
let cameraoptions = {
quality: 100,
......
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