Commit d0409f0f authored by 786817560's avatar 786817560

Merge branch 'ren' into develop

parents bd9ad78f 93441421
......@@ -2,7 +2,7 @@
* @Description: 合同详情
* @Author: your name
* @Date: 2019-09-25 15:38:21
* @LastEditTime: 2019-10-09 09:29:19
* @LastEditTime: 2019-10-09 15:12:47
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -10,7 +10,7 @@
<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>
<span @click="topsh">合同详情</span>
</div>
</h-header>
<Tab @getTabNum="getTabNum" />
......@@ -24,7 +24,7 @@
<Personal v-if="!bp_flag" :baseInfo="baseInfo"/>
<div class="equipment-list">担保人信息<span v-if="guarantorInfo.length === 0">(无)</span></div>
<list-item v-if="guarantorInfo[0].bp_class === 'NP'" :item-height="76">
<list-item v-if="guarantorInfo.length && guarantorInfo[0].bp_class === 'NP'" :item-height="76">
<item v-for="(item,index) in guarantorInfo" :key="index">
<div slot="name">
<span class="name-box">{{ index+1 }}</span>
......@@ -40,7 +40,7 @@
</item>
</list-item>
<list-item v-if="guarantorInfo[0].bp_class === 'ORG'" :item-height="76">
<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>
......@@ -62,7 +62,7 @@
<img src="@/assets/distributorSign/call.png" alt="">
</div>
<div class="center">
<p>业务经办:{{ baseInfo.bp_id_user_n }}</p>
<p>业务经办:{{ baseInfo.bp_user_id_n }}</p>
<p>联系电话:{{ baseInfo.phone }}</p>
</div>
<div class="right1" @click="callUp">
......@@ -145,7 +145,7 @@
<img src="@/assets/distributorSign/call.png" alt="">
</div>
<div class="center">
<p>业务经办:{{ baseInfo.bp_id_user_n }}</p>
<p>业务经办:{{ baseInfo.bp_user_id_n }}</p>
<p>联系电话:{{ baseInfo.phone }}</p>
</div>
<div class="right1" @click="callUp">
......@@ -261,6 +261,20 @@ export default {
},
methods:
{
topsh () {
console.log('tops')
// confirm('tops')
this.hlsPopup.showConfirm({
title: '提示',
content: '您确认吗?',
onConfirm: (data) => {
console.log(data)
if (data) {
}
},
})
},
// 基本信息
getBseMsg () {
let vm = this
......
......@@ -19,8 +19,33 @@
<img src="@/assets/distributorSign/search.png" alt="">
</div>
</div>
<h-content>
<div v-for="(item,index) in lists" :key="index" class="contract-list">
<h-content v-if="tabNum === 0">
<div v-for="(item,index) in submitLists" :key="index" class="contract-list">
<div class="item">
<img src="@/assets/distributorSign/icon-进件合同.png" alt="">
<p class="incoming-num">进件号</p>
<p class="code">{{ item.project_number }}</p>
</div>
<div class="details" @click="goDetails(item)">
<div class="option">
<p class="name">承租人</p>
<p class="full-name normal">{{ item.bp_name }}</p>
</div>
<div class="option">
<p class="name">合同租金</p>
<p class="normal money">{{ item.finance_amount|NumFormat }}</p>
<img src="@/assets/distributorSign/goDetails.png" alt="">
</div>
<div class="option">
<p class="name">申请时间</p>
<p class="normal">{{ dateConverse(item.confirm_start_date) }}</p>
</div>
</div>
</div>
</h-content>
<h-content v-if="tabNum === 1">
<div v-for="(item,index) in approvedLists" :key="index" class="contract-list">
<div class="item">
<img src="@/assets/distributorSign/icon-进件合同.png" alt="">
<p class="incoming-num">进件号</p>
......@@ -79,6 +104,8 @@ export default {
return {
tabNum: 0,
lists: [],
submitLists: [],
approvedLists: [],
}
},
created () {
......@@ -91,7 +118,9 @@ export default {
vm.hlsHttp.post(url, param).then(function (res) {
console.log(res.result)
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.lists = res.lists
}
})
},
......
......@@ -10,7 +10,7 @@
<list-item :item-height="44" class="second-part">
<item>
<div slot="name" class="font-color">业务经办</div>
<input slot="content" v-model="baseInfo.bp_id_user_n" readonly>
<input slot="content" v-model="baseInfo.bp_user_id_n" readonly>
</item>
<item>
<div slot="name" class="font-color">经销商</div>
......
......@@ -10,7 +10,7 @@
<list-item :item-height="44" class="second-part">
<item>
<div slot="name" class="font-color">业务经办</div>
<input slot="content" v-model="baseInfo.bp_id_user_n" readonly>
<input slot="content" v-model="baseInfo.bp_user_id_n" readonly>
</item>
<item>
<div slot="name" class="font-color">经销商</div>
......
......@@ -2,8 +2,8 @@
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-09-25 10:20:35
* @LastEditTime: 2019-09-25 10:20:35
* @LastEditors: your name
* @LastEditTime: 2019-10-09 13:43:07
* @LastEditors: Please set LastEditors
-->
<template>
<h-view id="approval" class="public-style" title="进件审批">
......@@ -107,7 +107,7 @@
<list-item :item-height="44">
<item>
<div slot="name">业务经办</div>
<input slot="content" v-model="personInfo.bp_id_user_n" readonly >
<input slot="content" v-model="personInfo.bp_user_id_n" readonly >
</item>
<item>
<div slot="name">经销商</div>
......@@ -205,7 +205,7 @@
<list-item :item-height="44">
<item>
<div slot="name">业务经办</div>
<input slot="content" v-model="companyInfo.bp_id_user_n" readonly >
<input slot="content" v-model="companyInfo.bp_user_id_n" readonly >
</item>
<item>
<div slot="name">经销商</div>
......@@ -316,10 +316,10 @@
</div>
</h-content>
<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" >拒绝
</tab-button>
<tab-button class="same" @click.native="showModalValue=true;confirm_status='APPROVED';charge()">
<tab-button class="same" @click.native="showModalValue=true;confirm_status='APPROVED';charge('同意')">
<img src="@/assets/intoApproval/approve.png" >同意
</tab-button>
</bottom-tab>
......@@ -372,7 +372,7 @@ export default {
working_place_sp: '',
academic_background: '',
bp_id_agent: '',
bp_id_user: '',
bp_user_id: '',
},
companyInfo: {
business_address: '',
......@@ -517,25 +517,38 @@ export default {
}
}, 10)
},
charge () {
let vm = this
let url = process.env.basePath + 'do_confrim_bp'
let param = {
'master': {
confirm_id: window.sessionStorage.confirm_id,
confirm_status: this.confirm_status,
confirm_note: this.confirm_note,
charge (val) {
this.hlsPopup.showConfirm({
title: '提示',
content: `您确认${val}吗?`,
onConfirm: (data) => {
console.log(data)
if (val === '拒绝') {
} else {
if (data) {
let vm = this
let url = process.env.basePath + 'do_confrim_bp'
let param = {
'master': {
confirm_id: window.sessionStorage.confirm_id,
confirm_status: this.confirm_status,
confirm_note: this.confirm_note,
},
}
vm.hlsPopup.showLoading('提交数据中!')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
vm.hlsPopup.showSuccess('审批成功')
if (res.result === 'S') {
vm.$router.push({
name: 'IntoList',
})
}
})
}
}
},
}
vm.hlsPopup.showLoading('提交数据中!')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
vm.hlsPopup.showSuccess('审批成功')
if (res.result === 'S') {
vm.$router.push({
name: 'IntoList',
})
}
})
},
},
......
<!--
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-09-29 10:02:11
* @LastEditors: your name
-->
<template>
<h-view id="refund" class="public-style" title="还款计划">
<div class="top">
......
<!--
* @Description: 修改参数项
* @Author: your name
* @Date: 2019-09-25 10:20:35
* @LastEditTime: 2019-10-09 09:48:48
* @LastEditors: Please set LastEditors
-->
<template>
<div id="rentInfo">
<list-item :item-height="44" style="margin-bottom:0px;">
......@@ -55,11 +62,11 @@
<list-item>
<item>
<div slot="name">参数项</div>
<input slot="content" v-model="rentInfo.product_id" readonly >
<input slot="content" v-model="rentInfo.product_code" readonly >
</item>
<item>
<div slot="name">产品线</div>
<input slot="content" v-model="rentInfo.division" readonly >
<input slot="content" v-model="rentInfo.product_name" readonly >
</item>
<item>
<div slot="name">产品数量</div>
......
<!--
* @Description: 修改部分样式和数据筛选
* @Author: your name
* @Date: 2019-09-27 11:23:25
* @LastEditTime: 2019-10-09 11:35:53
* @LastEditors: Please set LastEditors
-->
<template>
<h-view id="sign" class="public-style">
<h-header :proportion="[5,1,1]" class="bar-custom">
......@@ -13,8 +20,8 @@
<img src="@/assets/distributorSign/search.png" alt="">
</div>
</div>
<h-content>
<div v-for="(item,index) in showList" :key="index" class="contract-list" @click="goDetails (item)">
<h-content v-if="tabNum === 0">
<div v-for="(item,index) in submitLists" :key="index" class="contract-list" @click="goDetails (item)">
<div class="item">
<img src="@/assets/distributorSign/icon-进件合同.png" alt="">
<p class="incoming-num">进件号</p>
......@@ -25,7 +32,32 @@
<p class="name">承租人</p>
<p class="full-name normal">{{ item.bp_name }}</p>
</div>
<div class="option" style="margin-left:20px">
<div class="option">
<p class="name">合同租金</p>
<p class="normal money">{{ item.finance_amount|NumFormat }}</p>
<img src="@/assets/distributorSign/goDetails.png" alt="">
</div>
<div class="option">
<p class="name">申请时间</p>
<p class="normal">{{ item.confirm_start_date|timeFormat }}</p>
</div>
</div>
</div>
</h-content>
<h-content v-if="tabNum === 1">
<div v-for="(item,index) in approvedLists" :key="index" class="contract-list" @click="goDetails (item)">
<div class="item">
<img src="@/assets/distributorSign/icon-进件合同.png" alt="">
<p class="incoming-num">进件号</p>
<p class="code">{{ item.project_number }}</p>
</div>
<div class="details">
<div class="option">
<p class="name">承租人</p>
<p class="full-name normal">{{ item.bp_name }}</p>
</div>
<div class="option">
<p class="name">合同租金</p>
<p class="normal money">{{ item.finance_amount|NumFormat }}</p>
<img src="@/assets/distributorSign/goDetails.png" alt="">
......@@ -88,6 +120,8 @@ export default {
showList: [],
unConfirm: [],
confirm: [],
submitLists: [],
approvedLists: [],
}
},
watch: {
......@@ -147,6 +181,9 @@ export default {
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.submitLists = res.lists.filter(item => item.confirm_status === 'SUBMIT')
vm.approvedLists = res.lists.filter(item => item.confirm_status === 'APPROVED')
vm.contractMsg = res.lists
vm.showList = res.lists
// vm.showList = res.lists.filter(item => {
......@@ -307,6 +344,14 @@ export default {
}
}
.option:nth-of-type(2) {
position: relative;
// left: 0;
img{
position: absolute;
right: 10px;
}
}
}
}
}
......
......@@ -2,7 +2,7 @@
* @Description: In User Settings Edit
* @Author: liuxin
* @Date: 2019-09-19 09:18:14
* @LastEditTime: 2019-09-27 19:02:48
* @LastEditTime: 2019-10-09 13:11:10
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -465,59 +465,81 @@ export default {
this.bank.bank_branch_name = ''
},
addBankInfo () {
let bpName = window.localStorage.getItem('bp_name')
if (
this.bank.bank_account_num === '' ||
this.hlsPopup.showConfirm({
title: '提示',
content: '您确认添加吗?',
onConfirm: (data) => {
console.log(data)
if (data) {
let bpName = window.localStorage.getItem('bp_name')
if (
this.bank.bank_account_num === '' ||
this.bank.bank_account_name === '' ||
this.bank.bank_full_name === '' ||
this.bank.bank_branch_name === ''
) {
this.hlsPopup.showLongCenter('请输入完整字段')
} else if (this.hlsUtil.isBankAccount(this.bank.bank_account_num)) {
this.hlsPopup.showLongCenter('银行卡号有误')
} else if (this.bank.bank_account_name !== bpName) {
this.hlsPopup.showLongCenter('请输入本人银行卡')
} else {
let list = JSON.parse(JSON.stringify(this.bank))
this.bankList.push(list)
let vm = this
let url = process.env.basePath + 'bp_bank_save'
let param = {
master: {
bp_id: window.localStorage.getItem('user_id'),
bank_lists: this.bankList,
},
}
vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.successCall()
vm.hlsPopup.showLongCenter('保存成功')
setTimeout(vm.successCall, 2000)
) {
this.hlsPopup.showLongCenter('请输入完整字段')
} else if (this.hlsUtil.isBankAccount(this.bank.bank_account_num)) {
this.hlsPopup.showLongCenter('银行卡号有误')
} else if (this.bank.bank_account_name !== bpName) {
this.hlsPopup.showLongCenter('请输入本人银行卡')
} else {
let list = JSON.parse(JSON.stringify(this.bank))
this.bankList.push(list)
let vm = this
let url = process.env.basePath + 'bp_bank_save'
let param = {
master: {
bp_id: window.localStorage.getItem('user_id'),
bank_lists: this.bankList,
},
}
vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.successCall()
vm.hlsPopup.showLongCenter('保存成功')
setTimeout(vm.successCall, 2000)
}
})
}
}
})
}
},
})
},
putData () {
let vm = this
let url = process.env.basePath + 'bp_bind_submit'
let param = {
master: {
bp_id: window.localStorage.getItem('user_id'),
company_id: '2145',
},
if (window.localStorage.getItem('user_id') && window.localStorage.getItem('user_id') !== 'undefined') {
this.hlsPopup.showConfirm({
title: '提示',
content: '您确认提交吗?',
onConfirm: (data) => {
console.log(data)
if (data) {
let vm = this
let url = process.env.basePath + 'bp_bind_submit'
let param = {
master: {
bp_id: window.localStorage.getItem('user_id'),
company_id: '2145',
},
}
vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.hlsPopup.showSuccess('提交成功')
vm.$router.push({
name: 'Home',
})
}
})
}
},
})
} else {
this.hlsPopup.showLongCenter('基本信息还未保存')
}
vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.hlsPopup.showSuccess('提交成功')
vm.$router.push({
name: 'Home',
})
}
})
},
hideModal () {
this.showModalValue = false
......
......@@ -2,7 +2,7 @@
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-09-30 15:18:52
* @LastEditTime: 2019-10-08 17:26:46
* @LastEditTime: 2019-10-09 10:56:33
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -13,7 +13,7 @@
</item>
<item>
<div slot="name">发票类型</div>
<div slot="content">{{ baseInfo.invoice_kind_n }}</div>
<div slot="content">{{ baseInfo.invoice_kind === '0'?'增值税专用发票':'增值税普通发票' }}</div>
</item>
<item>
<div slot="name">发票抬头</div>
......
......@@ -2,7 +2,7 @@
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-09-30 15:18:52
* @LastEditTime: 2019-10-08 11:05:37
* @LastEditTime: 2019-10-09 16:41:11
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -56,7 +56,7 @@
<item>
<div slot="name">手机号码</div>
<!-- <div slot="content">{{ baseInfo.phone }}</div> -->
<input slot="content" v-model="baseInfo.phone" placeholder="请输入手机号码" >
<input slot="content" v-model="baseInfo.cell_phone" placeholder="请输入手机号码" >
</item>
<item>
<div slot="name">居住地址</div>
......@@ -92,7 +92,7 @@
<input slot="content" v-model="baseInfo.spouse_phone" placeholder="请输入手机号" >
</item>
<item>
<div slot="name">工作单位工作单位</div>
<div slot="name">工作单位</div>
<!-- <div slot="content">{{ baseInfo.working_place_sp }}</div> -->
<input slot="content" v-model="baseInfo.working_place_sp" placeholder="请输入工作单位" >
</item>
......@@ -161,6 +161,9 @@
</div>
</h-view>
</h-modal>
<bottom-tab class="footer-button">
<tab-button class="put1" @click.native="reSubmit">提交</tab-button>
</bottom-tab>
</h-view>
</template>
<script>
......@@ -383,6 +386,14 @@ export default {
border: 1px solid #00469c;
background-color: #fafafa;
}
.put1 {
width: 100%;
height: 45px;
color: #fff;
border-radius: 4px;
// border: 1px solid #00469c;
background-color: #00469c;
}
.save {
width: 175px;
height: 45px;
......
......@@ -2,7 +2,7 @@
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-09-19 09:31:19
* @LastEditTime: 2019-10-08 13:48:58
* @LastEditTime: 2019-10-09 13:00:51
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -401,74 +401,96 @@ export default {
})
},
handSubmit () {
let url = $config.basePath + 'bp_bind_submit'
let param = {
master: {
// bp_id: window.localStorage.getItem('user_id'),
bp_id: this.bp_id,
company_id: '2145',
},
if (this.bp_id) {
this.hlsPopup.showConfirm({
title: '提示',
content: '您确认提交吗?',
onConfirm: (data) => {
console.log(data)
if (data) {
let url = $config.basePath + 'bp_bind_submit'
let param = {
master: {
// bp_id: window.localStorage.getItem('user_id'),
bp_id: this.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',
})
}
})
}
},
})
} else {
this.hlsPopup.showLongCenter('基本信息未保存!')
}
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',
})
}
})
},
addBankInfo () {
for (var key in this.bank_lists) {
if (!this.bank_lists[key]) {
this.bank_card_flag = false
this.hlsPopup.showLongCenter('银行信息不完整!')
return
} else {
this.bank_card_flag = true
}
}
// 银行卡验证this.hlsUtil.isBankAccount(this.bank.bank_account_num)
if (this.hlsUtil.isBankAccount(this.bank_lists.bank_account_num)) {
this.bank_card_flag = false
this.hlsPopup.showLongCenter('请输入正确银行卡号!')
}
// 验证账户名称与承租人名称一致
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 url = $config.basePath + 'bp_bank_save'
let param = {
'master': {
'bp_id': this.bp_id,
'bank_lists': [this.bank_lists],
},
}
let vm = this
vm.hlsHttp.post(url, param).then(function (res) {
console.log(res)
if (res.result === 'S') {
vm.hlsPopup.hideLoading()
vm.showModalValue = false
vm.hlsPopup.showSuccess('添加成功')
let url = $config.basePath + 'bp_bank_query'
let param = {
bp_id: vm.bp_id,
this.hlsPopup.showConfirm({
title: '提示',
content: '您确认添加吗?',
onConfirm: (data) => {
console.log(data)
if (data) {
for (var key in this.bank_lists) {
if (!this.bank_lists[key]) {
this.bank_card_flag = false
this.hlsPopup.showLongCenter('银行信息不完整!')
return
} else {
this.bank_card_flag = true
}
}
// 银行卡验证this.hlsUtil.isBankAccount(this.bank.bank_account_num)
if (this.hlsUtil.isBankAccount(this.bank_lists.bank_account_num)) {
this.bank_card_flag = false
this.hlsPopup.showLongCenter('请输入正确银行卡号!')
}
// 验证账户名称与承租人名称一致
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 url = $config.basePath + 'bp_bank_save'
let param = {
'master': {
'bp_id': this.bp_id,
'bank_lists': [this.bank_lists],
},
}
let vm = this
vm.hlsHttp.post(url, param).then(function (res) {
console.log(res)
if (res.result === 'S') {
vm.hlsPopup.hideLoading()
vm.showModalValue = false
vm.hlsPopup.showSuccess('添加成功')
let url = $config.basePath + 'bp_bank_query'
let param = {
bp_id: vm.bp_id,
}
vm.hlsHttp.post(url, param).then(function (res) {
console.log('银行卡查询', res)
vm.getBankList = [...vm.getBankList, ...res.lists]
})
vm.hlsHttp.post(url, param).then(function (res) {
console.log('银行卡查询', res)
vm.getBankList = [...vm.getBankList, ...res.lists]
})
}
})
}
}
})
}
},
})
},
verified () {
......
<!--
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-09-30 15:18:52
* @LastEditTime: 2019-09-30 15:18:52
* @LastEditors: your name
-->
<template>
<list-item :item-height="44">
......@@ -7,7 +14,7 @@
</item>
<item>
<div slot="name" class="font-color">发票类型</div>
<div slot="content">{{ baseInfo.invoice_kind_n }}</div>
<div slot="content">{{ baseInfo.invoice_kind === '0'?'增值税专用发票':'增值税普通发票' }}</div>
</item>
<item>
<div slot="name" class="font-color">发票抬头</div>
......
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