Skip to content

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

Merge branch 'ren' into develop

parents b20538e5 64ba09a1
Hide whitespace changes
Inline Side-by-side
Showing with 192 additions and 53 deletions
src/pages/contractCreate/contract-create-list.vue
View file @ b1651891
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-12-19 10:23:09
* @LastEditTime: 2019-12-19 14:28:00
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -68,9 +68,9 @@ export default {
uncheck2: unCheck2,
searchInput: '', // 搜索内容
showLists: [
{ project_number: '201903022001', bp_name: 'zhangsan', total_price: '1000000', confirm_start_date: '2019-12-18' },
{ project_number: '201903022001', bp_name: 'zhangsan', total_price: '1000000', confirm_start_date: '2019-12-18' },
{ project_number: '201903022001', bp_name: 'zhangsan', total_price: '1000000', confirm_start_date: '2019-12-18' },
{ project_number: '201903022001', bp_name: '张三', total_price: '1000000', confirm_start_date: '2019-12-18' },
{ project_number: '201903022001', bp_name: '张三', total_price: '1000000', confirm_start_date: '2019-12-18' },
{ project_number: '201903022001', bp_name: '张三', total_price: '1000000', confirm_start_date: '2019-12-18' },
],
}
},
......
src/pages/contractCreate/pick-lessee.vue
View file @ b1651891
<!--
* @Author: your name
* @Date: 2019-12-18 20:15:42
* @LastEditTime: 2019-12-19 10:09:43
* @LastEditTime: 2019-12-19 15:54:45
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \hls-xcmg-vue-app\src\pages\contractCreate\pick-lessee.vue
......@@ -60,8 +60,26 @@ export default {
},
computed: {},
watch: {},
beforeRouteEnter (to, from, next) {
next(vm => {
vm.lesseeQuery()
})
},
methods: {
// 承租人查询
lesseeQuery () {
let vm = this
let url = process.env.basePath + 'prj_bp_master_query'
let param = { }
vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
console.log('承租人', res)
if (res.result === 'S') {
// vm.certification_status = res.info.certification_status
}
})
},
},
}
</script>
......
src/pages/contractCreate/sales-info.vue
View file @ b1651891
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-12-19 09:35:51
* @LastEditTime: 2019-12-19 16:06:34
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -21,7 +21,13 @@
</item>
<item :showArrow="true">
<div slot="name" class="font-color">业务类型</div>
<input slot="content" placeholder="请选择">
<input
slot="content"
type="text"
readonly
placeholder="请选择"
@click="selectBusiness"
>
</item>
<item>
<div slot="name" class="font-color">经销商</div>
......@@ -124,7 +130,12 @@ export default {
},
beforeRouteEnter (to, from, next) {
next(vm => {
vm.businessQuery()
vm.agentQuery()
vm.factoryQuery()
vm.salesQuery()
vm.officeQuery()
vm.creditQuery()
})
},
methods: {
......@@ -139,6 +150,112 @@ export default {
},
})
},
// 业务类型查询
businessQuery () {
let vm = this
let url = process.env.basePath + 'prj_business_type'
let param = { }
vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
console.log('业务类型', res)
if (res.result === 'S') {
// vm.certification_status = res.info.certification_status
}
})
},
// 业务类型选择
selectBusiness () {
let vm = this
vm.hlsPopup.selectList({
// list: vm.taxpayerList,
// code: 'bp_type',
// object: {},
// returnItem: function (index, obj) {
// vm.invoiceInfo.taxpayer_type = obj.bp_type
// vm.invoiceInfo.taxpayer_type_n = obj.bp_type_n
// console.log('obj', vm.invoiceInfo)
// },
})
},
// 经销商查询
agentQuery () {
let vm = this
let url = process.env.basePath + 'prj_bp_agent_query'
let param = {
user_phone: window.localStorage.user_phone,
}
vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
console.log('经销商', res)
if (res.result === 'S') {
// vm.certification_status = res.info.certification_status
}
})
},
// 主机厂查询
factoryQuery () {
let vm = this
let url = process.env.basePath + 'prj_factory_list'
let param = { }
vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
console.log('主机厂', res)
if (res.result === 'S') {
// vm.certification_status = res.info.certification_status
}
})
},
// 销售人员查询
salesQuery () {
let vm = this
let url = process.env.basePath + 'prj_bp_agent_user'
let param = {
bp_agent_id: '7781',
}
vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
console.log('销售人员', res)
if (res.result === 'S') {
// vm.certification_status = res.info.certification_status
}
})
},
// 办事处查询
officeQuery () {
let vm = this
let url = process.env.basePath + 'prj_office_list'
let param = {
bp_agent_id: '7781',
}
vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
console.log('办事处', res)
if (res.result === 'S') {
// vm.certification_status = res.info.certification_status
}
})
},
// 授信额度查询
creditQuery () {
let vm = this
let url = process.env.basePath + 'prj_agent_credit_query'
let param = {
bp_agent_id: '7781',
}
vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
console.log('授信额度查询', res)
if (res.result === 'S') {
// vm.certification_status = res.info.certification_status
}
})
},
picker () {
this.$router.push({
name: 'PickLessee',
......@@ -153,7 +270,7 @@ export default {
.date-pic {
height: 17px;
width: 17px;
margin-top: 13px;
margin-top: 14px;
margin-left: 6px;
}
.bottom-tab-button{
......
src/pages/myInfo/my-info.vue
View file @ b1651891
<!--
* @Author: your name
* @Date: 2019-11-07 17:48:53
* @LastEditTime: 2019-12-18 18:45:40
* @LastEditTime: 2019-12-19 14:49:11
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -723,6 +723,7 @@ export default {
window.localStorage.setItem('bp_id', res.info.user_bp_id)
window.localStorage.setItem('user_bp_status', res.info.user_bp_status)
window.localStorage.setItem('bp_name', res.info.user_bp_name)
window.localStorage.setItem('bp_identity', res.info.bp_identity)
vm.user_bp_name = res.info.user_bp_name
vm.user_bp_type = res.info.user_bp_type
vm.user_phone = res.info.user_phone
......
src/pages/userBindNew/org/bankInfo.vue
View file @ b1651891
......@@ -2,7 +2,7 @@
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-09-24 21:29:35
* @LastEditTime: 2019-12-19 12:21:38
* @LastEditTime: 2019-12-19 15:06:22
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -160,7 +160,11 @@ export default {
vm.certification_status = ''
vm.getBankInfo()
vm.electQuery()
vm.getOrgCertificationUrl()
if (window.localStorage.bp_identity === 'ORG_NO') {
vm.getOrgCertificationUrl()
} else {
vm.getNpCertificationUrl()
}
}
})
},
......@@ -275,37 +279,31 @@ export default {
}
let vm = this
vm.hlsPopup.showLoading('请稍候')
this.hlsHttp.post(url, param).then(function (res) {
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.hlsPopup.showSuccess('提交成功')
vm.$router.push({
name: 'MyInfo',
})
if (vm.certification_status === 'Y') {
vm.$router.push({
name: 'MyInfo',
})
} else {
if (vm.authUrl) {
vm.$router.push({
name: 'Certification',
params: {
authUrl: vm.authUrl,
},
})
} else {
vm.hlsPopup.showSuccess(vm.errorMsg)
}
}
}
})
}
},
})
// debugger
// let vm = this
// if (vm.certification_status === 'Y') {
// vm.$router.push({
// name: 'MyInfo',
// })
// } else {
// if (vm.authUrl) {
// vm.$router.push({
// name: 'MyInfo',
// params: {
// authUrl: vm.authUrl,
// },
// })
// } else {
// vm.hlsPopup.showSuccess(vm.errorMsg)
// }
// }
// this.hlsPopup.showConfirm({
// title: '提示',
// content: '您确认提交吗？',
......@@ -320,32 +318,37 @@ export default {
// }
// let vm = this
// vm.hlsPopup.showLoading('请稍候')
// vm.hlsHttp.post(url, param).then(function (res) {
// this.hlsHttp.post(url, param).then(function (res) {
// vm.hlsPopup.hideLoading()
// if (res.result === 'S') {
// vm.hlsPopup.showSuccess('提交成功')
// if (vm.certification_status === 'Y') {
// vm.$router.push({
// name: 'MyInfo',
// })
// } else {
// if (vm.authUrl) {
// vm.$router.push({
// name: 'MyInfo',
// params: {
// authUrl: vm.authUrl,
// },
// })
// } else {
// vm.hlsPopup.showSuccess(vm.errorMsg)
// }
// }
// vm.$router.push({
// name: 'MyInfo',
// })
// }
// })
// }
// },
// })
},
// 获取个人认证url
getNpCertificationUrl () {
let vm = this
let url = $config.basePath + 'auth_user_sign'
let param = {
phone: window.localStorage.user_phone,
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
hlsPopup.hideLoading()
console.log('获取个人认证url', res)
if (res.info.code === 0) {
vm.authUrl = res.info.data.authUrl
} else {
vm.errorMsg = res.info.msg
}
})
},
// 获取企业认证url
getOrgCertificationUrl () {
let vm = this
......
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