Skip to content

H
hls-xcmg-vue-app
Commit 6ed2f326 authored by 李晓兵's avatar 李晓兵
Browse files
Options

Merge branch 'develop' into uat

parents bf7cfeed f2ffbf06
Show whitespace changes
Inline Side-by-side
Showing with 669 additions and 483 deletions
config/prod.env.js
View file @ 6ed2f326
...@@ -11,5 +11,5 @@ module.exports = { ...@@ -11,5 +11,5 @@ module.exports = {
ocrPath:'"http://180.104.121.66:8088/r/api"', ocrPath:'"http://180.104.121.66:8088/r/api"',
fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="', fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
appId: '"com.xcmg.app"', appId: '"com.xcmg.app"',
currentVersion: '"1.0.0"' currentVersion: '"1.0.1"'
} }
config/uat.env.js
View file @ 6ed2f326
...@@ -11,5 +11,5 @@ module.exports = { ...@@ -11,5 +11,5 @@ module.exports = {
ocrPath:'"http://180.104.121.66:8088/r/api"', ocrPath:'"http://180.104.121.66:8088/r/api"',
fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_DEV&apiName="', fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_DEV&apiName="',
appId: '"com.xcmg.app.dev"', appId: '"com.xcmg.app.dev"',
currentVersion: '"1.2.8"' currentVersion: '"1.2.9"'
} }
src/pages/carConfirm/confirm-detail.vue
View file @ 6ed2f326
...@@ -253,16 +253,37 @@ export default { ...@@ -253,16 +253,37 @@ export default {
}) })
}, },
methods: { methods: {
// 签约校验
async signCheck () {
let vm = this
let url = process.env.basePath + 'sign_check'
let param = {
confirm_id: vm.confirm_id,
data_class: 'LEASE_ITEM',
}
vm.hlsPopup.showLoading('请稍后!')
let res = vm.hlsHttp.post(url, param)
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
return true
} else {
// vm.hlsPopup.showLongCenter(res.message)
}
},
getTabNum (i) { getTabNum (i) {
this.tabNum = i this.tabNum = i
}, },
takePhonto () { takePhonto () {
let vm = this let vm = this
hlsPopup.showPopup({ hlsPopup.showConfirm({
title: '提示', title: '提示',
content: `请自拍一张`, content: '请自拍一张',
onConfirm: () => { onConfirm: function (index) {
if (index === 1) {
vm.takePhontoOpenCamera() vm.takePhontoOpenCamera()
} else {
}
}, },
}) })
}, },
...@@ -398,7 +419,10 @@ export default { ...@@ -398,7 +419,10 @@ export default {
hlsPopup.hideLoading() hlsPopup.hideLoading()
} }
}, },
isConfirm () { async isConfirm () {
let vm = this
let flag = await this.signCheck()
if (flag) { // 只有认证通过后方可进行签约操作
this.hlsPopup.showConfirm({ this.hlsPopup.showConfirm({
title: '提示', title: '提示',
content: '您确定同意发车吗？', content: '您确定同意发车吗？',
...@@ -408,6 +432,7 @@ export default { ...@@ -408,6 +432,7 @@ export default {
} }
}, },
}) })
}
}, },
confirm () { confirm () {
let vm = this let vm = this
......
src/pages/contractCreate/creat-rent-info.vue
View file @ 6ed2f326
...@@ -2,22 +2,22 @@ ...@@ -2,22 +2,22 @@
<h-view id="create-rent-info"> <h-view id="create-rent-info">
<h-header :proportion="[5,1,1]" class="bar-custom"> <h-header :proportion="[5,1,1]" class="bar-custom">
<div slot="left" class="h-header-btn"> <div slot="left" class="h-header-btn">
<img src="@/assets/userBind/arrow.png" @click="routeGoCustom()" > <img src="@/assets/userBind/arrow.png" @click="routeGoCustom()">
<span>租赁信息</span> <span>租赁信息</span>
</div> </div>
</h-header> </h-header>
<h-content> <h-content>
<div class="top"> <div class="top">
<div class="item"> <div class="item">
<img src="@/assets/contractCreate/finished.png" > <img src="@/assets/contractCreate/finished.png">
<p>基本信息</p> <p>基本信息</p>
</div> </div>
<span class="line" /> <span class="line"/>
<div class="item"> <div class="item">
<span>2</span> <span>2</span>
<p style="color: #383F45;">租赁信息</p> <p style="color: #383F45;">租赁信息</p>
</div> </div>
<span class="line" /> <span class="line"/>
<div class="item"> <div class="item">
<span>3</span> <span>3</span>
<p>附件信息</p> <p>附件信息</p>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<list-item :item-height="44"> <list-item :item-height="44">
<item v-if="!isReadOnly" :showArrow="true" @click.native="selectProductLine"> <item v-if="!isReadOnly" :showArrow="true" @click.native="selectProductLine">
<div slot="name">产品线</div> <div slot="name">产品线</div>
<input slot="content" v-model="saveInfo.division_n" readonly placeholder="请选择" > <input slot="content" v-model="saveInfo.division_n" readonly placeholder="请选择">
</item> </item>
<item v-if="isReadOnly"> <item v-if="isReadOnly">
<div slot="name">产品线</div> <div slot="name">产品线</div>
...@@ -35,51 +35,51 @@ ...@@ -35,51 +35,51 @@
</item> </item>
<item v-if="!isReadOnly" :showArrow="true" @click.native="getProduct"> <item v-if="!isReadOnly" :showArrow="true" @click.native="getProduct">
<div slot="name">产品型号</div> <div slot="name">产品型号</div>
<input slot="content" v-model="productInfo.product_id_n" readonly placeholder="请选择" > <input slot="content" v-model="saveInfo.product_id_n" readonly placeholder="请选择">
</item> </item>
<item v-if="isReadOnly" :showArrow="true"> <item v-if="isReadOnly" :showArrow="true">
<div slot="name">产品型号</div> <div slot="name">产品型号</div>
<input slot="content" v-model="productInfo.product_id_n" readonly > <input slot="content" v-model="saveInfo.product_id_n" readonly>
</item> </item>
<item> <item>
<div slot="name">产品数量</div> <div slot="name">产品数量</div>
<input slot="content" v-model="productInfo.product_num" :readonly="isReadOnly" placeholder="请填写产品数量" > <input slot="content" v-model="saveInfo.product_num" :readonly="isReadOnly" placeholder="请填写产品数量">
</item> </item>
</list-item> </list-item>
<div class="userInfo">融资信息</div> <div class="userInfo">融资信息</div>
<div class="hint-info"> <div class="hint-info">
<img src="@/assets/contractCreate/hint.png" >提示 以下为单个设备商务政策 <img src="@/assets/contractCreate/hint.png">提示 以下为单个设备商务政策
</div> </div>
<list-item :item-height="44"> <list-item :item-height="44">
<item v-if="!isReadOnly" :showArrow="true" @click.native="getBusinessPolicy();showModalBusiness=true"> <item v-if="!isReadOnly" :showArrow="true" @click.native="getBusinessPolicy();showModalBusiness=true">
<div slot="name">商务政策</div> <div slot="name">商务政策</div>
<input slot="content" v-model="saveInfo.product_plan_name" readonly placeholder="请选择" > <input slot="content" v-model="saveInfo.product_plan_name" readonly placeholder="请选择">
</item> </item>
<item v-if="isReadOnly"> <item v-if="isReadOnly">
<div slot="name">商务政策</div> <div slot="name">商务政策</div>
<input slot="content" v-model="saveInfo.product_plan_name" readonly placeholder="请选择" > <input slot="content" v-model="saveInfo.product_plan_name" readonly placeholder="请选择">
</item> </item>
<item> <item>
<div slot="name">设备单价</div> <div slot="name">设备单价</div>
<CurrencyInput slot="content" v-model="saveInfo.equip_price" :readonly="isReadOnly" placeholder="0" /> <CurrencyInput slot="content" v-model="saveInfo.equip_price" :readonly="isReadOnly" placeholder="0"/>
</item> </item>
<item> <item>
<div slot="name">融资金额</div> <div slot="name">融资金额</div>
<CurrencyInput slot="content" v-model="finance_amount" :readonly="isReadOnly" placeholder="0" /> <CurrencyInput slot="content" v-model="finance_amount" :readonly="isReadOnly" placeholder="0"/>
</item> </item>
<item> <item>
<div slot="name">首付比例</div> <div slot="name">首付比例</div>
<input slot="content" v-model="saveInfo.down_payment_ratio_n" :readonly="isReadOnly" placeholder="%" > <input slot="content" v-model="saveInfo.down_payment_ratio_n" :readonly="isReadOnly" placeholder="%">
</item> </item>
<item> <item>
<div slot="name">首付款</div> <div slot="name">首付款</div>
<CurrencyInput <CurrencyInput
slot="content" v-model="saveInfo.down_payment" :readonly="isReadOnly" placeholder="0" slot="content" v-model="saveInfo.down_payment" :readonly="isReadOnly" placeholder="0"
@input="changeRatio" /> @input="changeRatio"/>
</item> </item>
<item> <item>
<div slot="name">保证金比例</div> <div slot="name">保证金比例</div>
<input slot="content" v-model="saveInfo.deposit_ratio_n" :readonly="isReadOnly" placeholder="%" > <input slot="content" v-model="saveInfo.deposit_ratio_n" :readonly="isReadOnly" placeholder="%">
</item> </item>
<item> <item>
<div slot="name">保证金</div> <div slot="name">保证金</div>
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
</item> </item>
<item> <item>
<div slot="name">手续费比例</div> <div slot="name">手续费比例</div>
<input slot="content" v-model="saveInfo.lease_charge_ratio_n" :readonly="isReadOnly" placeholder="%" > <input slot="content" v-model="saveInfo.lease_charge_ratio_n" :readonly="isReadOnly" placeholder="%">
</item> </item>
<item> <item>
<div slot="name">手续费</div> <div slot="name">手续费</div>
...@@ -99,55 +99,55 @@ ...@@ -99,55 +99,55 @@
</item> </item>
<item> <item>
<div slot="name">GPS费用</div> <div slot="name">GPS费用</div>
<CurrencyInput slot="content" v-model="saveInfo.gps_fee" :readonly="isReadOnly" placeholder="0" /> <CurrencyInput slot="content" v-model="saveInfo.gps_fee" :readonly="isReadOnly" placeholder="0"/>
</item> </item>
<item> <item>
<div slot="name">保险押金</div> <div slot="name">保险押金</div>
<CurrencyInput slot="content" v-model="saveInfo.insurance_fee" :readonly="isReadOnly" placeholder="0" /> <CurrencyInput slot="content" v-model="saveInfo.insurance_fee" :readonly="isReadOnly" placeholder="0"/>
</item> </item>
<item v-if="!isReadOnly" class="date-check" @click.native="showTime('YYYY-MM-DD')"> <item v-if="!isReadOnly" class="date-check" @click.native="showTime('YYYY-MM-DD')">
<div slot="name">预计付款日</div> <div slot="name">预计付款日</div>
<input slot="content" v-model="saveInfo.lease_start_date" readonly placeholder="请选择日期 " > <input slot="content" v-model="saveInfo.lease_start_date" readonly placeholder="请选择日期 ">
</item> </item>
<item v-if="isReadOnly" class="date-check"> <item v-if="isReadOnly" class="date-check">
<div slot="name">预计付款日</div> <div slot="name">预计付款日</div>
<input slot="content" v-model="saveInfo.lease_start_date" readonly> <input slot="content" v-model="saveInfo.lease_start_date" readonly>
</item> </item>
<item v-if="!isReadOnly" :showArrow="true" @click.native = "periodPull"> <item v-if="!isReadOnly" :showArrow="true" @click.native="periodPull">
<div slot="name">还款周期</div> <div slot="name">还款周期</div>
<input slot="content" v-model="saveInfo.annual_pay_times_n" readonly placeholder="请选择" > <input slot="content" v-model="saveInfo.annual_pay_times_n" readonly placeholder="请选择">
</item> </item>
<item v-if="isReadOnly"> <item v-if="isReadOnly">
<div slot="name">还款周期</div> <div slot="name">还款周期</div>
<input slot="content" v-model="saveInfo.annual_pay_times_n" readonly placeholder="请选择" > <input slot="content" v-model="saveInfo.annual_pay_times_n" readonly placeholder="请选择">
</item> </item>
<item> <item>
<div slot="name">租赁期数</div> <div slot="name">租赁期数</div>
<input slot="content" v-model="saveInfo.lease_times" :readonly="isReadOnly" placeholder="请填写租赁期数" > <input slot="content" v-model="saveInfo.lease_times" :readonly="isReadOnly" placeholder="请填写租赁期数">
</item> </item>
<item> <item>
<div slot="name">年利率</div> <div slot="name">年利率</div>
<input slot="content" v-model="saveInfo.int_rate_n" readonly placeholder="%" > <input slot="content" v-model="saveInfo.int_rate_n" readonly placeholder="%">
</item> </item>
<item v-if="!isReadOnly" :showArrow="true" @click.native="selectPayWay"> <item v-if="!isReadOnly" :showArrow="true" @click.native="selectPayWay">
<div slot="name">支付方式</div> <div slot="name">支付方式</div>
<input slot="content" v-model="saveInfo.pay_type_n" readonly placeholder="请选择" > <input slot="content" v-model="saveInfo.pay_type_n" readonly placeholder="请选择">
</item> </item>
<item v-if="isReadOnly"> <item v-if="isReadOnly">
<div slot="name">支付方式</div> <div slot="name">支付方式</div>
<input slot="content" v-model="saveInfo.pay_type_n" readonly placeholder="请选择" > <input slot="content" v-model="saveInfo.pay_type_n" readonly placeholder="请选择">
</item> </item>
<item> <item>
<div slot="name">逾期日利率</div> <div slot="name">逾期日利率</div>
<input slot="content" v-model="saveInfo.penalty_rate_n" readonly placeholder="%" > <input slot="content" v-model="saveInfo.penalty_rate_n" readonly placeholder="%">
</item> </item>
<item> <item>
<div slot="name">留购价</div> <div slot="name">留购价</div>
<CurrencyInput slot="content" v-model="saveInfo.residual_value" :readonly="isReadOnly" placeholder="请填写留购价" /> <CurrencyInput slot="content" v-model="saveInfo.residual_value" :readonly="isReadOnly" placeholder="请填写留购价"/>
</item> </item>
<item :showArrow="true" @click.native="goPlan"> <item :showArrow="true" @click.native="goPlan">
<div slot="name">查看还款计划</div> <div slot="name">查看还款计划</div>
<input slot="content" readonly > <input slot="content" readonly>
</item> </item>
</list-item> </list-item>
</h-content> </h-content>
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
</h-header> </h-header>
<h-content> <h-content>
<div class="search has-header"> <div class="search has-header">
<input v-model="keyWordProduct" placeholder="请输入产品名称" > <input v-model="keyWordProduct" placeholder="请输入产品名称">
</div> </div>
<div class="division-box"> <div class="division-box">
<scroll ref="scroll" :updateData="[divisionLists]" :pullUp="true" @pullingUp="loadMoreProduct"> <scroll ref="scroll" :updateData="[divisionLists]" :pullUp="true" @pullingUp="loadMoreProduct">
...@@ -191,7 +191,8 @@ ...@@ -191,7 +191,8 @@
</div> </div>
</item> </item>
</list-item> </list-item>
</scroll></div> </scroll>
</div>
</h-content> </h-content>
</h-view> </h-view>
</h-modal> </h-modal>
...@@ -203,14 +204,14 @@ ...@@ -203,14 +204,14 @@
</h-header> </h-header>
<h-content> <h-content>
<div class="search has-header"> <div class="search has-header">
<input v-model="policyKeyWord" placeholder="请输入商务政策名称" > <input v-model="policyKeyWord" placeholder="请输入商务政策名称">
</div> </div>
<scroll ref="scroll" :updateData="[businessLists]" :pullUp="true" @pullingUp="loadMorePolicy"> <scroll ref="scroll" :updateData="[businessLists]" :pullUp="true" @pullingUp="loadMorePolicy">
<div class="division-box"> <div class="division-box">
<section v-for="(item,index) in businessLists" :key="index" @click="selectBusinessPolicy(item)"> <section v-for="(item,index) in businessLists" :key="index" @click="selectBusinessPolicy(item)">
<div class="descript"> <div class="descript">
<img src="@/assets/trial/product.png" alt > <img src="@/assets/trial/product.png" alt>
<p class="produc">{{ item.product_plan_name }}</p> <p class="produc">{{ item.product_plan_name }}</p>
</div> </div>
<div class="tario"> <div class="tario">
...@@ -236,7 +237,8 @@ ...@@ -236,7 +237,8 @@
</div> </div>
</div> </div>
</section> </section>
</div></scroll> </div>
</scroll>
</h-content> </h-content>
</h-view> </h-view>
</h-modal> </h-modal>
...@@ -244,6 +246,7 @@ ...@@ -244,6 +246,7 @@
</template> </template>
<script> <script>
import CurrencyInput from '../../components/currencyInput' import CurrencyInput from '../../components/currencyInput'
export default { export default {
components: { components: {
CurrencyInput, CurrencyInput,
...@@ -270,14 +273,17 @@ export default { ...@@ -270,14 +273,17 @@ export default {
paywayLists: [], // 支付方式 paywayLists: [], // 支付方式
divisionLists: [], divisionLists: [],
productLine: [], // 产品线 productLine: [], // 产品线
productInfo: { /* productInfo: {
project_id: window.localStorage.project_id, project_id: window.localStorage.project_id,
product_id: '', product_id: '',
product_id_n: '', product_id_n: '',
product_num: '', product_num: '',
}, }, */
saveInfo: { saveInfo: {
project_id: window.localStorage.project_id, project_id: window.localStorage.project_id,
product_id: '',
product_id_n: '',
product_num: '',
product_plan_id: '', product_plan_id: '',
product_plan_name: '', product_plan_name: '',
equip_price: '', equip_price: '',
...@@ -355,11 +361,12 @@ export default { ...@@ -355,11 +361,12 @@ export default {
vm.pagenum = 1 vm.pagenum = 1
vm.pagenumPolicy = 1 vm.pagenumPolicy = 1
vm.saveInfo['project_id'] = window.localStorage.project_id // 重新赋值，防止缓存 vm.saveInfo['project_id'] = window.localStorage.project_id // 重新赋值，防止缓存
vm.productInfo['project_id'] = window.localStorage.project_id // 重新赋值，防止缓存 // vm.productInfo['project_id'] = window.localStorage.project_id // 重新赋值，防止缓存
if (from.name === 'CreateBaseInfo') { if (from.name === 'CreateBaseInfo') {
vm.isComputed = false vm.isComputed = false
vm.calculeFlag = false vm.calculeFlag = false
vm.salesEnter = vm.$route.params.salesEnter vm.salesEnter = vm.$route.params.salesEnter
vm.bp_agent_id = vm.$route.params.bp_agent_id
vm.saveTed = false vm.saveTed = false
if (vm.fromPage === 'sale') { if (vm.fromPage === 'sale') {
vm.fromList = false vm.fromList = false
...@@ -367,18 +374,17 @@ export default { ...@@ -367,18 +374,17 @@ export default {
vm.fromList = true vm.fromList = true
vm.rentInfoQuery() vm.rentInfoQuery()
} }
console.log('****************** '+JSON.stringify(vm.saveInfo))
Object.keys(vm.saveInfo).forEach(i => { // 置空saveInfo Object.keys(vm.saveInfo).forEach(i => { // 置空saveInfo
if (i !== 'project_id') { if (i !== 'project_id') {
vm.saveInfo[i] = '' vm.saveInfo[i] = ''
} }
}) })
console.log('@@@@@@@@@@@@@@@@@@'+JSON.stringify(vm.saveInfo)) /* console.log('@@@@@@@@@@@@@@@@@@'+JSON.stringify(vm.saveInfo))
Object.keys(vm.productInfo).forEach(i => { // 置空productInfo Object.keys(vm.productInfo).forEach(i => { // 置空productInfo
if (i !== 'project_id') { if (i !== 'project_id') {
vm.productInfo[i] = '' vm.productInfo[i] = ''
} }
}) }) */
setTimeout(() => { setTimeout(() => {
vm.getProductLine() // 产品线查询 vm.getProductLine() // 产品线查询
vm.repayPeriod()// 还款周期查询 vm.repayPeriod()// 还款周期查询
...@@ -427,9 +433,9 @@ export default { ...@@ -427,9 +433,9 @@ export default {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
Object.assign(vm.saveInfo, res.info) Object.assign(vm.saveInfo, res.info)
vm.productInfo.product_num = res.info.product_num /* vm.productInfo.product_num = res.info.product_num
vm.productInfo.product_id = res.info.product_id vm.productInfo.product_id = res.info.product_id
vm.productInfo.product_id_n = res.info.product_id_n vm.productInfo.product_id_n = res.info.product_id_n */
vm.saveInfo.product_plan_name = res.info.product_plan_id_n vm.saveInfo.product_plan_name = res.info.product_plan_id_n
vm.saveInfo.division_n = res.info.product_name vm.saveInfo.division_n = res.info.product_name
} else { } else {
...@@ -456,7 +462,7 @@ export default { ...@@ -456,7 +462,7 @@ export default {
vm.showModalBusiness = false vm.showModalBusiness = false
}, 100) }, 100)
}, },
calculateBack(){ calculateBack () {
let vm = this let vm = this
let url = process.env.basePath + 'prj_lease_info_save' let url = process.env.basePath + 'prj_lease_info_save'
vm.saveInfo.down_payment_ratio = (vm.saveInfo.down_payment_ratio_n.replace('%', '') / 100).toFixed(2) vm.saveInfo.down_payment_ratio = (vm.saveInfo.down_payment_ratio_n.replace('%', '') / 100).toFixed(2)
...@@ -477,6 +483,43 @@ export default { ...@@ -477,6 +483,43 @@ export default {
}, },
save () { save () {
let vm = this let vm = this
if (!vm.saveInfo.division_n) {
hlsPopup.showLongCenter('产品线不能为空!')
} else if (!vm.saveInfo.product_id_n) {
hlsPopup.showLongCenter('产品型号不能为空!')
} else if (!vm.saveInfo.product_num) {
hlsPopup.showLongCenter('产品数量不能为空!')
} else if (!vm.saveInfo.product_plan_name) {
hlsPopup.showLongCenter('商务政策不能为空!')
} else if (!vm.saveInfo.equip_price) {
hlsPopup.showLongCenter('设备单价不能为空!')
} else if (!vm.saveInfo.down_payment_ratio_n) {
hlsPopup.showLongCenter('首付比例不能为空!')
} else if (!vm.saveInfo.down_payment) {
hlsPopup.showLongCenter('首付款不能为空!')
} else if (!vm.saveInfo.deposit_ratio_n) {
hlsPopup.showLongCenter('保证金比例不能为空!')
} else if (!vm.saveInfo.deposit) {
hlsPopup.showLongCenter('保证金不能为空!')
} else if (!vm.saveInfo.lease_charge_ratio_n) {
hlsPopup.showLongCenter('手续费比例不能为空!')
} else if (!vm.saveInfo.lease_charge) {
hlsPopup.showLongCenter('手续费不能为空!')
} else if (!vm.saveInfo.gps_fee) {
hlsPopup.showLongCenter('GPS费用不能为空!')
} else if (!vm.saveInfo.insurance_fee) {
hlsPopup.showLongCenter('保险押金不能为空!')
} else if (!vm.saveInfo.lease_start_date) {
hlsPopup.showLongCenter('预计付款日不能为空!')
} else if (!vm.saveInfo.annual_pay_times_n) {
hlsPopup.showLongCenter('还款周期不能为空!')
} else if (!vm.saveInfo.lease_times) {
hlsPopup.showLongCenter('租赁期数不能为空!')
} else if (!vm.saveInfo.pay_type_n) {
hlsPopup.showLongCenter('支付方式不能为空!')
} else if (!vm.saveInfo.residual_value) {
hlsPopup.showLongCenter('留购价不能为空!')
} else {
let url = process.env.basePath + 'prj_lease_info_save' let url = process.env.basePath + 'prj_lease_info_save'
vm.saveInfo.down_payment_ratio = (vm.saveInfo.down_payment_ratio_n.replace('%', '') / 100).toFixed(2) vm.saveInfo.down_payment_ratio = (vm.saveInfo.down_payment_ratio_n.replace('%', '') / 100).toFixed(2)
vm.saveInfo.lease_charge_ratio = (vm.saveInfo.lease_charge_ratio_n.replace('%', '') / 100).toFixed(2) vm.saveInfo.lease_charge_ratio = (vm.saveInfo.lease_charge_ratio_n.replace('%', '') / 100).toFixed(2)
...@@ -497,17 +540,17 @@ export default { ...@@ -497,17 +540,17 @@ export default {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
}) })
}
}, },
saveBack () { saveBack () {
let vm = this let vm = this
vm.calculateBack() // 保存融资信息 let url = process.env.basePath + 'prj_lease_info_save'
let url = process.env.basePath + 'prj_product_info_save' vm.saveInfo.down_payment_ratio = (vm.saveInfo.down_payment_ratio_n.replace('%', '') / 100).toFixed(2)
vm.saveInfo.lease_charge_ratio = (vm.saveInfo.lease_charge_ratio_n.replace('%', '') / 100).toFixed(2)
vm.saveInfo.deposit_ratio = (vm.saveInfo.deposit_ratio_n.replace('%', '') / 100).toFixed(2)
vm.saveInfo.finance_amount = vm.finance_amount
let param = { let param = {
master: { master: vm.saveInfo,
division_n: vm.saveInfo.division_n,
bp_name: vm.$route.params.bp_name,
...vm.productInfo,
},
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
...@@ -521,6 +564,59 @@ export default { ...@@ -521,6 +564,59 @@ export default {
}) })
}, },
next () { next () {
let vm = this
if (vm.isReadOnly) {
vm.$router.push({
name: 'CreateEnclosureInfo',
})
} else {
if (vm.isComputed) {
vm.saveTed = true
vm.$router.push({
name: 'CreateEnclosureInfo',
})
} else {
hlsPopup.showLongCenter('请先进行计算')
}
}
},
// next () {
// let vm = this
// if (vm.isReadOnly) {
// vm.$router.push({
// name: 'CreateEnclosureInfo',
// // vm.$router.push({
// // name: 'CreateEnclosureInfo',
// // })
// })
// } else {
// if (vm.isComputed) {
// let url = process.env.basePath + 'prj_product_info_save'
// let param = {
// master: {
// division_n: vm.saveInfo.division_n,
// bp_name: vm.$route.params.bp_name,
// ...vm.productInfo,
// },
// }
// hlsPopup.showLoading('请稍候')
// vm.$post(url, param).then(function (res) {
// vm.hlsPopup.hideLoading()
// if (res.result === 'S') {
// vm.saveTed = true
// vm.$router.push({
// name: 'CreateEnclosureInfo',
// })
// } else {
// hlsPopup.showLongCenter(res.message)
// }
// })
// } else {
// hlsPopup.showLongCenter('请先进行计算')
// }
// }
// },
/* next () {
let vm = this let vm = this
if (vm.isReadOnly) { if (vm.isReadOnly) {
vm.$router.push({ vm.$router.push({
...@@ -555,7 +651,7 @@ export default { ...@@ -555,7 +651,7 @@ export default {
hlsPopup.showLongCenter('请先进行计算') hlsPopup.showLongCenter('请先进行计算')
} }
} }
}, }, */
showTime (format) { // 预计付款日 showTime (format) { // 预计付款日
let vm = this let vm = this
hlsPopup.showTime({ hlsPopup.showTime({
...@@ -648,7 +744,7 @@ export default { ...@@ -648,7 +744,7 @@ export default {
'&index' + '&index' +
`'${randomString}'` `'${randomString}'`
let param = { let param = {
bp_agent_id: vm.$route.params.bp_agent_id, bp_agent_id: vm.bp_agent_id,
pagesize: 10, pagesize: 10,
pagenum: vm.pagenumSearchPolicy, pagenum: vm.pagenumSearchPolicy,
searchInput: vm.policyKeyWord, searchInput: vm.policyKeyWord,
...@@ -688,7 +784,7 @@ export default { ...@@ -688,7 +784,7 @@ export default {
'&index' + '&index' +
`'${randomString}'` `'${randomString}'`
let param = { let param = {
bp_agent_id: vm.$route.params.bp_agent_id, bp_agent_id: vm.bp_agent_id,
pagesize: 10, pagesize: 10,
pagenum: vm.pagenumPolicy, pagenum: vm.pagenumPolicy,
searchInput: vm.policyKeyWord, searchInput: vm.policyKeyWord,
...@@ -721,8 +817,8 @@ export default { ...@@ -721,8 +817,8 @@ export default {
}, },
selectProduct (e) { selectProduct (e) {
let vm = this let vm = this
this.productInfo.product_id_n = e.product_name this.saveInfo.product_id_n = e.product_name
this.productInfo.product_id = e.product_id this.saveInfo.product_id = e.product_id
setTimeout(() => { setTimeout(() => {
vm.showModalValue = false vm.showModalValue = false
}, 100) }, 100)
...@@ -745,6 +841,7 @@ export default { ...@@ -745,6 +841,7 @@ export default {
'&index' + '&index' +
`'${randomString}'` `'${randomString}'`
let param = { let param = {
bp_agent_id: vm.bp_agent_id,
division: vm.saveInfo.division, division: vm.saveInfo.division,
user_phone: window.localStorage.getItem('user_phone'), user_phone: window.localStorage.getItem('user_phone'),
pagesize: 10, pagesize: 10,
...@@ -788,8 +885,8 @@ export default { ...@@ -788,8 +885,8 @@ export default {
'prd_product_list' + 'prd_product_list' +
'&index' + '&index' +
`'${randomString}'` `'${randomString}'`
console.log('++++++++++++++++++++ '+vm.saveInfo.division)
let param = { let param = {
bp_agent_id: vm.bp_agent_id,
division: vm.saveInfo.division, division: vm.saveInfo.division,
user_phone: window.localStorage.getItem('user_phone'), user_phone: window.localStorage.getItem('user_phone'),
pagesize: 10, pagesize: 10,
...@@ -827,8 +924,8 @@ export default { ...@@ -827,8 +924,8 @@ export default {
}, },
selectProductLine (e) { selectProductLine (e) {
let vm = this let vm = this
vm.productInfo.product_id = '' vm.saveInfo.product_id = ''
vm.productInfo.product_id_n = '' vm.saveInfo.product_id_n = ''
vm.hlsPopup.selectList({ vm.hlsPopup.selectList({
list: vm.productLine, list: vm.productLine,
code: 'bp_type', code: 'bp_type',
...@@ -843,7 +940,7 @@ export default { ...@@ -843,7 +940,7 @@ export default {
let vm = this let vm = this
let url = process.env.basePath + 'prj_product_division' let url = process.env.basePath + 'prj_product_division'
let param = { let param = {
bp_agent_id: vm.$route.params.bp_agent_id, bp_agent_id: vm.bp_agent_id,
} }
vm.hlsPopup.showLoading('请稍候') vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) { vm.hlsHttp.post(url, param).then(function (res) {
...@@ -862,7 +959,7 @@ export default { ...@@ -862,7 +959,7 @@ export default {
this.$router.push({ this.$router.push({
name: 'ContractRepayPlan', name: 'ContractRepayPlan',
params: { params: {
product_num: this.productInfo.product_num, product_num: this.saveInfo.product_num,
project_id: window.localStorage.project_id, project_id: window.localStorage.project_id,
}, },
}) })
...@@ -872,27 +969,33 @@ export default { ...@@ -872,27 +969,33 @@ export default {
name: 'CreateEnclosureInfo', name: 'CreateEnclosureInfo',
}) })
}, },
}, }
,
} }
</script> </script>
<style lang="less"> <style lang="less">
#create-rent-info { #create-rent-info {
input{ input {
color:#333; color: #333;
} }
input::placeholder{
input::placeholder {
color: #666; color: #666;
} }
.flow { .flow {
z-index: 999; z-index: 999;
} }
.hls-list-item { .hls-list-item {
margin-bottom: 0px !important; margin-bottom: 0px !important;
} }
.h-header-right { .h-header-right {
display: flex; display: flex;
align-items: center; align-items: center;
} }
#businuss-list { #businuss-list {
.search { .search {
background-color: #fff; background-color: #fff;
...@@ -901,9 +1004,9 @@ export default { ...@@ -901,9 +1004,9 @@ export default {
height: 1.02rem; height: 1.02rem;
z-index: 100; z-index: 100;
margin-bottom: 8px; margin-bottom: 8px;
input { input {
background: url("../../assets/contractStart/search1.png") 320px background: url("../../assets/contractStart/search1.png") 320px no-repeat;
no-repeat;
background-size: 16px 16px; background-size: 16px 16px;
background-color: rgba(239, 239, 239, 0.55); background-color: rgba(239, 239, 239, 0.55);
padding-left: 12px; padding-left: 12px;
...@@ -924,13 +1027,13 @@ export default { ...@@ -924,13 +1027,13 @@ export default {
} }
input:focus { input:focus {
background: url("../../assets/contractStart/search2.png") 320px background: url("../../assets/contractStart/search2.png") 320px no-repeat;
no-repeat;
background-size: 16px 16px; background-size: 16px 16px;
background-color: rgba(239, 239, 239, 0.55); background-color: rgba(239, 239, 239, 0.55);
border: 2px solid #bcc6ff; border: 2px solid #bcc6ff;
} }
} }
.descript { .descript {
width: 100%; width: 100%;
height: 44px; height: 44px;
...@@ -968,6 +1071,7 @@ export default { ...@@ -968,6 +1071,7 @@ export default {
border-bottom: 1px solid #f3f3f7; border-bottom: 1px solid #f3f3f7;
} }
} }
.tario { .tario {
width: 100%; width: 100%;
height: 60px; height: 60px;
...@@ -1000,10 +1104,12 @@ export default { ...@@ -1000,10 +1104,12 @@ export default {
} }
} }
} }
#product-list { #product-list {
.hls-list-item { .hls-list-item {
border-radius: 4px; border-radius: 4px;
} }
.item-pic { .item-pic {
width: 100px; width: 100px;
//height: 110px; //height: 110px;
...@@ -1012,14 +1118,17 @@ export default { ...@@ -1012,14 +1118,17 @@ export default {
height: 100%; height: 100%;
} }
} }
.item-content { .item-content {
width: 100%; width: 100%;
margin-left: 20px; margin-left: 20px;
.pro-name { .pro-name {
height: 42px; height: 42px;
width: 100%; width: 100%;
position: relative; position: relative;
border-bottom: 1px solid #f3f3f7; border-bottom: 1px solid #f3f3f7;
.arrow { .arrow {
position: absolute; position: absolute;
width: 16px; width: 16px;
...@@ -1027,6 +1136,7 @@ export default { ...@@ -1027,6 +1136,7 @@ export default {
right: 0; right: 0;
top: 13px; top: 13px;
} }
p { p {
height: 42px; height: 42px;
line-height: 42px; line-height: 42px;
...@@ -1046,6 +1156,7 @@ export default { ...@@ -1046,6 +1156,7 @@ export default {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
margin-top: 8px; margin-top: 8px;
.firsts1 { .firsts1 {
width: 60px; width: 60px;
height: 17px; height: 17px;
...@@ -1053,6 +1164,7 @@ export default { ...@@ -1053,6 +1164,7 @@ export default {
font-size: 13px; font-size: 13px;
color: rgba(56, 63, 69, 0.6); color: rgba(56, 63, 69, 0.6);
} }
.seconds1 { .seconds1 {
width: 70%; width: 70%;
margin-left: 16px; margin-left: 16px;
...@@ -1063,10 +1175,12 @@ export default { ...@@ -1063,10 +1175,12 @@ export default {
} }
} }
} }
.item { .item {
width: 359px; width: 359px;
margin: 0 auto; margin: 0 auto;
} }
.search { .search {
background-color: #fff; background-color: #fff;
padding: 8px 12px; padding: 8px 12px;
...@@ -1074,9 +1188,9 @@ export default { ...@@ -1074,9 +1188,9 @@ export default {
height: 1.02rem; height: 1.02rem;
z-index: 100; z-index: 100;
margin-bottom: 8px; margin-bottom: 8px;
input { input {
background: url("../../assets/contractStart/search1.png") 320px background: url("../../assets/contractStart/search1.png") 320px no-repeat;
no-repeat;
background-size: 16px 16px; background-size: 16px 16px;
background-color: rgba(239, 239, 239, 0.55); background-color: rgba(239, 239, 239, 0.55);
padding-left: 12px; padding-left: 12px;
...@@ -1097,19 +1211,20 @@ export default { ...@@ -1097,19 +1211,20 @@ export default {
} }
input:focus { input:focus {
background: url("../../assets/contractStart/search2.png") 320px background: url("../../assets/contractStart/search2.png") 320px no-repeat;
no-repeat;
background-size: 16px 16px; background-size: 16px 16px;
background-color: rgba(239, 239, 239, 0.55); background-color: rgba(239, 239, 239, 0.55);
border: 2px solid #bcc6ff; border: 2px solid #bcc6ff;
} }
} }
} }
.date-check { .date-check {
background: url("../../assets/trial/date.png") 350px no-repeat; background: url("../../assets/trial/date.png") 350px no-repeat;
background-size: 16px 16px; background-size: 16px 16px;
padding-right: 15px; padding-right: 15px;
} }
.hint-info { .hint-info {
width: 100%; width: 100%;
height: 36px; height: 36px;
...@@ -1120,6 +1235,7 @@ export default { ...@@ -1120,6 +1235,7 @@ export default {
background-color: #faf5e0; background-color: #faf5e0;
display: flex; display: flex;
align-items: center; align-items: center;
img { img {
width: 16px; width: 16px;
height: 16px; height: 16px;
...@@ -1127,21 +1243,25 @@ export default { ...@@ -1127,21 +1243,25 @@ export default {
margin-right: 17px; margin-right: 17px;
} }
} }
.add-box { .add-box {
.before { .before {
border: 1px solid #fdb62f; border: 1px solid #fdb62f;
border-radius: 4px; border-radius: 4px;
color: #fdb62f; color: #fdb62f;
} }
.next { .next {
background: #1d3fff; background: #1d3fff;
border-radius: 4px; border-radius: 4px;
color: #fff; color: #fff;
} }
} }
.userInfo：first-of-type { .userInfo：first-of-type {
margin-top: 10px; margin-top: 10px;
} }
.userInfo { .userInfo {
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
...@@ -1151,6 +1271,7 @@ export default { ...@@ -1151,6 +1271,7 @@ export default {
margin-left: 16px; margin-left: 16px;
position: relative; position: relative;
} }
.userInfo::before { .userInfo::before {
content: ""; content: "";
display: block; display: block;
...@@ -1161,6 +1282,7 @@ export default { ...@@ -1161,6 +1282,7 @@ export default {
left: -15px; left: -15px;
top: 12px; top: 12px;
} }
.top { .top {
width: 100%; width: 100%;
height: 81px; height: 81px;
...@@ -1168,15 +1290,18 @@ export default { ...@@ -1168,15 +1290,18 @@ export default {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.line { .line {
display: inline-block; display: inline-block;
width: 78px; width: 78px;
border-top: 1px solid #a4a4a4; border-top: 1px solid #a4a4a4;
margin-bottom: 18px; margin-bottom: 18px;
} }
.line:nth-of-type(1) { .line:nth-of-type(1) {
border-top: 1px solid #ffa000; border-top: 1px solid #ffa000;
} }
.item { .item {
display: flex; display: flex;
justify-content: center; justify-content: center;
...@@ -1186,9 +1311,11 @@ export default { ...@@ -1186,9 +1311,11 @@ export default {
font-size: 12px; font-size: 12px;
color: rgba(56, 63, 69, 0.5); color: rgba(56, 63, 69, 0.5);
letter-spacing: 0.43px; letter-spacing: 0.43px;
img { img {
width: 18px; width: 18px;
} }
span { span {
display: block; display: block;
text-align: center; text-align: center;
...@@ -1199,19 +1326,22 @@ export default { ...@@ -1199,19 +1326,22 @@ export default {
color: #fff; color: #fff;
background: #a4a4a4; background: #a4a4a4;
} }
p { p {
margin-top: 10px; margin-top: 10px;
} }
} }
.item:not(:nth-of-type(3)) { .item:not(:nth-of-type(3)) {
font-family: PingFangSC-Semibold; font-family: PingFangSC-Semibold;
font-size: 12px; font-size: 12px;
color: rgba(56, 63, 69, 0.5); color: rgba(56, 63, 69, 0.5);
letter-spacing: 0.43px; letter-spacing: 0.43px;
span { span {
background-color: #ffa000; background-color: #ffa000;
} }
} }
} }
} }
</style> </style>
src/pages/contractCreate/create-base-info.vue
View file @ 6ed2f326
...@@ -406,6 +406,7 @@ export default { ...@@ -406,6 +406,7 @@ export default {
}) })
vm.selectUdertake = [] vm.selectUdertake = []
setTimeout(() => { setTimeout(() => {
vm.getSaveInfo()
vm.getBaseInfo() vm.getBaseInfo()
}, 0) }, 0)
} else if (from.name === 'ContractCreateList' && vm.status === 'false') { } else if (from.name === 'ContractCreateList' && vm.status === 'false') {
...@@ -445,7 +446,7 @@ export default { ...@@ -445,7 +446,7 @@ export default {
} }
}, },
}) })
} else{ } else {
vm.$routeGo() vm.$routeGo()
} }
}, },
...@@ -460,6 +461,7 @@ export default { ...@@ -460,6 +461,7 @@ export default {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
Object.assign(vm.saveInfo, res.info) Object.assign(vm.saveInfo, res.info)
vm.selectUdertake = res.lists
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
...@@ -531,9 +533,17 @@ export default { ...@@ -531,9 +533,17 @@ export default {
name: 'CreateRentInfo', name: 'CreateRentInfo',
params: { params: {
bp_agent_id: vm.bp_agent_id, bp_agent_id: vm.bp_agent_id,
salesEnter: vm.salesEnter salesEnter: vm.salesEnter,
}, },
}) })
} else if (!vm.saveInfo.np_industry_exp_n) {
hlsPopup.showLongCenter('行业情况不能为空!')
} else if (!vm.saveInfo.np_occupation_n) {
hlsPopup.showLongCenter('职业情况不能为空!')
} else if (!vm.saveInfo.house_type_n) {
hlsPopup.showLongCenter('房产信息不能为空!')
} else if (!vm.saveInfo.equip_value) {
hlsPopup.showLongCenter('设备价值不能为空!')
} else { } else {
let url = process.env.basePath + 'prj_base_info_save' let url = process.env.basePath + 'prj_base_info_save'
let param = { let param = {
...@@ -549,7 +559,7 @@ export default { ...@@ -549,7 +559,7 @@ export default {
params: { params: {
bp_agent_id: vm.bp_agent_id, bp_agent_id: vm.bp_agent_id,
bp_name: vm.NPBaseInfo.bp_name, bp_name: vm.NPBaseInfo.bp_name,
salesEnter: vm.salesEnter salesEnter: vm.salesEnter,
}, },
}) })
} else { } else {
......
src/pages/contractCreate/create-enclosure-info.vue
View file @ 6ed2f326
...@@ -506,6 +506,7 @@ export default { ...@@ -506,6 +506,7 @@ export default {
let url = process.env.basePath + 'prj_project_submit' let url = process.env.basePath + 'prj_project_submit'
let param = { let param = {
project_id: window.localStorage.project_id, project_id: window.localStorage.project_id,
phone:window.localStorage.getItem('user_phone'),
} }
vm.hlsPopup.showLoading('请稍候') vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) { vm.hlsHttp.post(url, param).then(function (res) {
......
src/pages/contractCreate/sales-info.vue
View file @ 6ed2f326
...@@ -442,14 +442,26 @@ export default { ...@@ -442,14 +442,26 @@ export default {
// 销售信息保存 // 销售信息保存
confirmCreate () { confirmCreate () {
let vm = this let vm = this
if (!vm.lessee) {
hlsPopup.showLongCenter('请选择承租人!')
} else if (!vm.business) {
hlsPopup.showLongCenter('业务类型不能为空!')
} else if (!vm.sales) {
hlsPopup.showLongCenter('销售人员不能为空!')
} else if (!vm.office_name) {
hlsPopup.showLongCenter('办事处不能为空!')
} else if (!vm.factory_name) {
hlsPopup.showLongCenter('主机厂不能为空!')
} else if (!vm.manu_manager) {
hlsPopup.showLongCenter('主机厂业务员不能为空!')
} else if (!vm.salesInfo.dates) {
hlsPopup.showLongCenter('签约日期不能为空!')
} else {
let url = process.env.basePath + 'prj_sales_info_save' let url = process.env.basePath + 'prj_sales_info_save'
window.localStorage.setItem('bp_id_tenant', this.salesInfo.bp_id_tenant) window.localStorage.setItem('bp_id_tenant', this.salesInfo.bp_id_tenant)
let param = { let param = {
master: vm.salesInfo, master: vm.salesInfo,
} }
if (!this.lessee) {
hlsPopup.showLongCenter('请选择承租人')
} else {
vm.hlsPopup.showLoading('请稍候') vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) { vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
......
src/pages/contractRepayment/contract-repayment.vue
View file @ 6ed2f326
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</div> </div>
<div class="center"> <div class="center">
<div><span>合同金额</span><p>{{ item.total_price|currency }}</p></div> <div><span>合同金额</span><p>{{ item.total_price|currency }}</p></div>
<div><span>已还金额</span><p class="bold">{{ item.recivied_amount|currency }}</p></div> <div><span>已还金额</span><p class="bold">{{ item.received_amount|currency }}</p></div>
<span v-if="item.overdue_status==='已逾期'" class="red">已逾期</span> <span v-if="item.overdue_status==='已逾期'" class="red">已逾期</span>
<section @click="toRepayDetails(item)"> <section @click="toRepayDetails(item)">
<img src="@/assets/contractRepayment/view.png" alt=""> <img src="@/assets/contractRepayment/view.png" alt="">
......
src/pages/contractSigning/contract-detail.vue
View file @ 6ed2f326
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
</h-view> </h-view>
</h-modal> </h-modal>
<!--活体检测--> <!--活体检测-->
<body-check ref="body" :check_id="$route.params.check_id" :confirm_id="confirm_id"></body-check> <body-check ref="body" :check_id="$route.params.check_id" :confirm_id="confirm_id"/>
</h-view> </h-view>
</template> </template>
...@@ -418,7 +418,6 @@ export default { ...@@ -418,7 +418,6 @@ export default {
vm.getLease() vm.getLease()
vm.getGuarantor() vm.getGuarantor()
vm.getContractLists() // 合同列表 vm.getContractLists() // 合同列表
vm.signCheck() // 签约校验
} else if (from.name === 'EntryInfo') { } else if (from.name === 'EntryInfo') {
vm.bankCardQuery() vm.bankCardQuery()
} }
...@@ -444,19 +443,21 @@ export default { ...@@ -444,19 +443,21 @@ export default {
}, */ }, */
methods: { methods: {
// 签约校验 // 签约校验
signCheck () { async signCheck () {
let vm = this let vm = this
let url = process.env.basePath + 'sign_check' let url = process.env.basePath + 'sign_check'
let param = { let param = {
confirm_id: vm.confirm_id, confirm_id: vm.confirm_id,
data_class: 'PRJ_PROJECT',
} }
vm.hlsHttp.post(url, param).then(function (res) { vm.hlsPopup.showLoading('请稍后!')
if (res.result === 'E') { let res = vm.hlsHttp.post(url, param)
vm.signCheckFlag = false vm.hlsPopup.hideLoading()
if (res.result === 'S') {
return true
} else { } else {
vm.signCheckFlag = true // vm.hlsPopup.showLongCenter(res.message)
} }
})
}, },
// 征信查询 // 征信查询
creditCheck () { creditCheck () {
...@@ -484,7 +485,7 @@ export default { ...@@ -484,7 +485,7 @@ export default {
check_id: this.$route.params.check_id, check_id: this.$route.params.check_id,
confirm_id: confirm_id, confirm_id: confirm_id,
}, },
})*/ }) */
}, },
/* goElectronicSign () { // 电子签 /* goElectronicSign () { // 电子签
let vm = this let vm = this
...@@ -524,11 +525,15 @@ export default { ...@@ -524,11 +525,15 @@ export default {
}, },
takePhonto () { takePhonto () {
let vm = this let vm = this
hlsPopup.showPopup({ hlsPopup.showConfirm({
title: '提示', title: '提示',
content: `请自拍一张`, content: '请自拍一张',
onConfirm: () => { onConfirm: function (index) {
if (index === 1) {
vm.takePhontoOpenCamera() vm.takePhontoOpenCamera()
} else {
}
}, },
}) })
}, },
...@@ -629,7 +634,7 @@ export default { ...@@ -629,7 +634,7 @@ export default {
// 进入活体检测页面 // 进入活体检测页面
vm.goBodyCheck(vm.confirm_id) vm.goBodyCheck(vm.confirm_id)
}, },
})*/ }) */
}, },
// 确认签约逻辑 // 确认签约逻辑
doConfirm (status) { doConfirm (status) {
...@@ -852,15 +857,14 @@ export default { ...@@ -852,15 +857,14 @@ export default {
}, },
}) })
}, },
inSure () { async inSure () {
if (this.signCheckFlag) { // 只有认证通过后方可进行签约操作 let flag = await this.signCheck()
if (flag) { // 只有认证通过后方可进行签约操作
if (!this.bank_flag && this.abc_deduction_flag === 'Y') { if (!this.bank_flag && this.abc_deduction_flag === 'Y') {
this.isshow = true // 未查到农行卡给出提示且勾选农行代扣 this.isshow = true // 未查到农行卡给出提示且勾选农行代扣
} else { } else {
this.showModalValue = true // 审批内容框显示 this.showModalValue = true // 审批内容框显示
} }
} else {
hlsPopup.showLongCenter('请先进行认证')
} }
}, },
......
src/pages/distributorSign/contract-details.vue
View file @ 6ed2f326
...@@ -253,7 +253,6 @@ export default { ...@@ -253,7 +253,6 @@ export default {
vm.getGuarantor() vm.getGuarantor()
} }
vm.getLease() vm.getLease()
vm.signCheck() // 签约校验
} else if (from.name === 'ContractContent') { } else if (from.name === 'ContractContent') {
vm.tabNum = 2 vm.tabNum = 2
vm.agentPic = vm.readed vm.agentPic = vm.readed
...@@ -263,19 +262,21 @@ export default { ...@@ -263,19 +262,21 @@ export default {
created () {}, created () {},
methods: { methods: {
// 签约校验 // 签约校验
signCheck () { async signCheck () {
let vm = this let vm = this
let url = process.env.basePath + 'sign_check' let url = process.env.basePath + 'sign_check'
let param = { let param = {
confirm_id: vm.confirm_id, confirm_id: vm.confirm_id,
data_class: 'PRJ_PROJECT',
} }
vm.hlsHttp.post(url, param).then(function (res) { vm.hlsPopup.showLoading('请稍后!')
if (res.result === 'E') { let res = vm.hlsHttp.post(url, param)
vm.signCheckFlag = false vm.hlsPopup.hideLoading()
if (res.result === 'S') {
return true
} else { } else {
vm.signCheckFlag = true // vm.hlsPopup.showLongCenter(res.message)
} }
})
}, },
goBodyCheck (confirm_id) { // 活体检测 goBodyCheck (confirm_id) { // 活体检测
this.$refs.body.show() this.$refs.body.show()
...@@ -310,9 +311,10 @@ export default { ...@@ -310,9 +311,10 @@ export default {
}) })
}, */ }, */
// 签约确认 // 签约确认
contractConfirm () { async contractConfirm () {
let vm = this let vm = this
if (this.signCheckFlag) { // 只有认证通过后方可进行签约操作 let flag = await this.signCheck()
if (flag) { // 只有认证通过后方可进行签约操作
this.hlsPopup.showConfirm({ this.hlsPopup.showConfirm({
title: '提示', title: '提示',
content: '您确认签约吗？', content: '您确认签约吗？',
...@@ -322,18 +324,20 @@ export default { ...@@ -322,18 +324,20 @@ export default {
} }
}, },
}) })
} else {
hlsPopup.showLongCenter('请先进行认证')
} }
}, },
takePhonto () { takePhonto () {
let vm = this let vm = this
hlsPopup.showPopup({ hlsPopup.showConfirm({
title: '提示', title: '提示',
content: `请自拍一张`, content: '请自拍一张',
onConfirm: () => { onConfirm: function (index) {
if (index === 1) {
vm.takePhontoOpenCamera() vm.takePhontoOpenCamera()
} else {
}
}, },
}) })
}, },
......
src/pages/pay/firstPay/contract-record.vue
View file @ 6ed2f326
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<h-header :proportion="[5,1,1]" class="bar-custom"> <h-header :proportion="[5,1,1]" class="bar-custom">
<div slot="left" class="h-header-btn"> <div slot="left" class="h-header-btn">
<img src="@/assets/userBind/arrow.png" @click="$routeGo()" > <img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
<span>合同记录</span> <span>首付还款明细</span>
</div> </div>
</h-header> </h-header>
<div class="my-content" style="margin-top:-1px"> <div class="my-content" style="margin-top:-1px">
......
src/pages/pay/marginPay/first-pay.vue
View file @ 6ed2f326
...@@ -81,7 +81,7 @@ export default { ...@@ -81,7 +81,7 @@ export default {
toPayEntry (money) { toPayEntry (money) {
this.$router.push({ this.$router.push({
name: 'PayEntry', name: 'MarginPayEntry',
params: { params: {
money, money,
}, },
......
src/pages/pay/payment/contract-record.vue
View file @ 6ed2f326
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<h-header :proportion="[5,1,1]" class="bar-custom"> <h-header :proportion="[5,1,1]" class="bar-custom">
<div slot="left" class="h-header-btn"> <div slot="left" class="h-header-btn">
<img src="@/assets/userBind/arrow.png" @click="$routeGo()" > <img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
<span>合同记录</span> <span>租金还款明细</span>
</div> </div>
</h-header> </h-header>
<div style="margin-top:-1px;"> <div style="margin-top:-1px;">
......
src/pages/pay/payment/new-list.vue
View file @ 6ed2f326
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<h-header :proportion="[5,1,1]" class="bar-custom"> <h-header :proportion="[5,1,1]" class="bar-custom">
<div slot="left" class="h-header-btn"> <div slot="left" class="h-header-btn">
<img src="@/assets/userBind/arrow.png" @click="goHome" > <img src="@/assets/userBind/arrow.png" @click="goHome" >
<span>还款明细</span> <span>租金还款</span>
</div> </div>
</h-header> </h-header>
<h-content style="margin-top:-1px;"> <h-content style="margin-top:-1px;">
......
src/pages/userBindNew/np/base-info.vue
View file @ 6ed2f326
...@@ -729,12 +729,12 @@ export default { ...@@ -729,12 +729,12 @@ export default {
}, },
async saveWord () { async saveWord () {
let vm = this let vm = this
debugger
if (!vm.baseInfo.bp_type) { if (!vm.baseInfo.bp_type) {
vm.hlsPopup.showLongCenter('客户类型不能为空！') vm.hlsPopup.showLongCenter('客户类型不能为空！')
} else if (vm.isSelected && vm.isPaople && !vm.baseInfo.agent_username) { } else if (vm.isPaople && !vm.baseInfo.agent_username) {
vm.hlsPopup.showLongCenter('业务经办员工代码不能为空！') vm.hlsPopup.showLongCenter('业务经办员工代码不能为空！')
} else if ( } else if (
vm.isSelected &&
!vm.isPaople && !vm.isPaople &&
!vm.baseInfo.business_license_num !vm.baseInfo.business_license_num
) { ) {
......
www/index.html
View file @ 6ed2f326
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=o7fTnpVAGzXKN7SirV8xGU2xzWQS2NrI"></script><title>徐工融租</title><link href=./static/css/app.891dc19da1733fc7db7071712cea81e0.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.e547499500fbe65e7169.js></script><script type=text/javascript src=./static/js/app.2ea5061d831d7ce89173.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=o7fTnpVAGzXKN7SirV8xGU2xzWQS2NrI"></script><title>徐工融租</title><link href=./static/css/app.6d59020107b128a9483bf33b65590e69.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.e547499500fbe65e7169.js></script><script type=text/javascript src=./static/js/app.4211b99a04aaf2efdd3c.js></script></body></html>
\ No newline at end of file \ No newline at end of file
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