Commit f0d7a7c6 authored by 李晓兵's avatar 李晓兵

''

parents 1b6e7c34 cb11b843
Pipeline #4430 canceled with stages
...@@ -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.2"' currentVersion: '"1.0.3"'
} }
...@@ -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.9"' currentVersion: '"1.3.2"'
} }
...@@ -19,6 +19,10 @@ export default { ...@@ -19,6 +19,10 @@ export default {
type: Boolean, type: Boolean,
default: false, default: false,
}, },
content: {
type: String,
default: '',
},
}, },
data () { data () {
...@@ -36,7 +40,9 @@ export default { ...@@ -36,7 +40,9 @@ export default {
formatValue () { formatValue () {
let currency = this.$options.filters['currency'] let currency = this.$options.filters['currency']
if (!this.focused) { if (!this.focused) {
if (this.value !== '0.00' && this.value !== '' && this.value !== null) {
return `¥${currency(this.value)}` return `¥${currency(this.value)}`
}
} else { } else {
return this.value return this.value
} }
...@@ -55,14 +61,6 @@ export default { ...@@ -55,14 +61,6 @@ export default {
let value = event.target.value let value = event.target.value
event.target.value = '' event.target.value = ''
event.target.value = value event.target.value = value
/* if (document.selection) {
var sel = value.createTextRange()
sel.moveStart('character', value.length)
sel.collapse()
sel.select()
} else if (typeof value.selectionStart === 'number' && typeof value.selectionEnd === 'number') {
value.selectionStart = value.selectionEnd = value.length
}*/
setTimeout(function () { setTimeout(function () {
event.target.type = 'number' event.target.type = 'number'
event.target.focus() event.target.focus()
......
...@@ -262,7 +262,7 @@ export default { ...@@ -262,7 +262,7 @@ export default {
data_class: 'LEASE_ITEM', data_class: 'LEASE_ITEM',
} }
vm.hlsPopup.showLoading('请稍后!') vm.hlsPopup.showLoading('请稍后!')
let res = vm.hlsHttp.post(url, param) let res = await vm.hlsHttp.post(url, param)
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
return true return true
......
...@@ -321,6 +321,7 @@ export default { ...@@ -321,6 +321,7 @@ export default {
}) })
}, },
changeBase (item) { changeBase (item) {
window.localStorage.setItem('bp_name_tenant', item.bp_name)
if (this.num === 1) { if (this.num === 1) {
window.localStorage.setItem('contractReadonly', false) window.localStorage.setItem('contractReadonly', false)
window.localStorage.setItem('fromPage', 'list') window.localStorage.setItem('fromPage', 'list')
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</item> </item>
<item> <item>
<div slot="name">产品数量</div> <div slot="name">产品数量</div>
<input slot="content" v-model="saveInfo.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>
...@@ -61,11 +61,11 @@ ...@@ -61,11 +61,11 @@
</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="请输入设备单价"/>
</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="请输入融资信息"/>
</item> </item>
<item> <item>
<div slot="name">首付比例</div> <div slot="name">首付比例</div>
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<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="请输入首付款"
@input="changeRatio"/> @input="changeRatio"/>
</item> </item>
<item> <item>
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<item> <item>
<div slot="name">保证金</div> <div slot="name">保证金</div>
<CurrencyInput <CurrencyInput
slot="content" v-model="saveInfo.deposit" :readonly="isReadOnly" placeholder="0" slot="content" v-model="saveInfo.deposit" :readonly="isReadOnly" placeholder="请输入保证金"
@input="changeDeposit"/> @input="changeDeposit"/>
</item> </item>
<item> <item>
...@@ -94,16 +94,16 @@ ...@@ -94,16 +94,16 @@
<item> <item>
<div slot="name">手续费</div> <div slot="name">手续费</div>
<CurrencyInput <CurrencyInput
slot="content" v-model="saveInfo.lease_charge" :readonly="isReadOnly" placeholder="0" slot="content" v-model="saveInfo.lease_charge" :readonly="isReadOnly" placeholder="请输入手续费"
@input="changeLeaseCharge"/> @input="changeLeaseCharge"/>
</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="请输入GPS费用"/>
</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="请输入保险押金"/>
</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>
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
</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>
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
</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>
...@@ -281,6 +281,7 @@ export default { ...@@ -281,6 +281,7 @@ export default {
}, */ }, */
saveInfo: { saveInfo: {
project_id: window.localStorage.project_id, project_id: window.localStorage.project_id,
bp_name: '',
product_id: '', product_id: '',
product_id_n: '', product_id_n: '',
product_num: '', product_num: '',
...@@ -367,6 +368,7 @@ export default { ...@@ -367,6 +368,7 @@ export default {
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.bp_agent_id = vm.$route.params.bp_agent_id
vm.saveInfo.bp_name = window.localStorage.bp_name_tenant
vm.saveTed = false vm.saveTed = false
if (vm.fromPage === 'sale') { if (vm.fromPage === 'sale') {
vm.fromList = false vm.fromList = false
...@@ -375,7 +377,7 @@ export default { ...@@ -375,7 +377,7 @@ export default {
vm.rentInfoQuery() vm.rentInfoQuery()
} }
Object.keys(vm.saveInfo).forEach(i => { // 置空saveInfo Object.keys(vm.saveInfo).forEach(i => { // 置空saveInfo
if (i !== 'project_id') { if (i !== 'project_id' && i !== 'bp_name') {
vm.saveInfo[i] = '' vm.saveInfo[i] = ''
} }
}) })
...@@ -534,6 +536,7 @@ export default { ...@@ -534,6 +536,7 @@ export default {
if (res.result === 'S') { if (res.result === 'S') {
vm.isComputed = true vm.isComputed = true
vm.calculeFlag = true vm.calculeFlag = true
vm.saveTed = true
hlsPopup.showLongCenter('计算成功') hlsPopup.showLongCenter('计算成功')
vm.goPlan() vm.goPlan()
} else { } else {
...@@ -571,7 +574,6 @@ export default { ...@@ -571,7 +574,6 @@ export default {
}) })
} else { } else {
if (vm.isComputed) { if (vm.isComputed) {
vm.saveTed = true
vm.$router.push({ vm.$router.push({
name: 'CreateEnclosureInfo', name: 'CreateEnclosureInfo',
}) })
......
...@@ -276,6 +276,7 @@ ...@@ -276,6 +276,7 @@
<img v-if="!fromPutted" src="@/assets/contractCreate/add.png" @click="addPerson"> <img v-if="!fromPutted" src="@/assets/contractCreate/add.png" @click="addPerson">
</div> </div>
</div> </div>
<div v-if="!fromPutted" >
<item-option v-for="(item,index) in selectUdertake" :key="index" class="mySlider"> <item-option v-for="(item,index) in selectUdertake" :key="index" class="mySlider">
<list-item :item-height="68"> <list-item :item-height="68">
<item> <item>
...@@ -285,7 +286,7 @@ ...@@ -285,7 +286,7 @@
<br >证件号 <br >证件号
</div> </div>
<div slot="content"> <div slot="content">
<input v-model="item.bp_name" placeholder="暂无信息" readonly > <input v-model="item.bp_guta_name" placeholder="暂无信息" readonly >
<input v-model="item.id_card_no" placeholder="暂无信息" readonly > <input v-model="item.id_card_no" placeholder="暂无信息" readonly >
</div> </div>
</item> </item>
...@@ -294,6 +295,20 @@ ...@@ -294,6 +295,20 @@
<option-button type="warn" text @click.native="deleteFun(item)" /> <option-button type="warn" text @click.native="deleteFun(item)" />
</div> </div>
</item-option> </item-option>
</div>
<list-item v-if="fromPutted" :item-height="68">
<item v-for="(item,index) in selectUdertake" :key="index">
<span slot="left-icon" class="left-icon">{{ index+1 }}</span>
<div slot="name">
担保人{{ index+1 }}姓名
<br >证件号
</div>
<div slot="content">
<input v-model="item.bp_guta_name" placeholder="暂无信息" readonly >
<input v-model="item.id_card_no" placeholder="暂无信息" readonly >
</div>
</item>
</list-item>
</h-content> </h-content>
<bottom-tab class="add-box"> <bottom-tab class="add-box">
<tab-button class="before" @click.native="$routeGo()">上一步</tab-button> <tab-button class="before" @click.native="$routeGo()">上一步</tab-button>
...@@ -321,7 +336,7 @@ export default { ...@@ -321,7 +336,7 @@ export default {
bp_agent_id: '', bp_agent_id: '',
pageNum: 1, pageNum: 1,
pageNumSearch: 1, pageNumSearch: 1,
status: window.localStorage.contractReadonly, status: '', // 是否为已提交
BussinessSituationList: [], // 行业情况 BussinessSituationList: [], // 行业情况
jobSituationList: [], // 职业情况 jobSituationList: [], // 职业情况
houseInfonList: [], // 房产信息 houseInfonList: [], // 房产信息
...@@ -365,6 +380,26 @@ export default { ...@@ -365,6 +380,26 @@ export default {
}, },
immediate: true, immediate: true,
}, },
'saveInfo.abc_deduction_flag': {
handler (newVal, oldVal) {
if (newVal === 'N') {
this.checked = false
} else if (newVal === 'Y') {
this.checked = true
}
},
immediate: true,
},
'saveInfo.special_flag': {
handler (newVal, oldVal) {
if (newVal === 'N') {
this.checkedApproved = false
} else if (newVal === 'Y') {
this.checkedApproved = true
}
},
immediate: true,
},
'checkedApproved': { 'checkedApproved': {
handler (newVal, oldVal) { handler (newVal, oldVal) {
if (newVal === false) { if (newVal === false) {
...@@ -384,20 +419,21 @@ export default { ...@@ -384,20 +419,21 @@ export default {
vm.salesEnter = '' vm.salesEnter = ''
vm.saveTed = false vm.saveTed = false
vm.showModalValue = false vm.showModalValue = false
vm.checked = false // 农行代扣
vm.checkedApproved = false // 是否特批
vm.pageNum = 1 vm.pageNum = 1
vm.pageNumSearch = 1 vm.pageNumSearch = 1
vm.undertakeList = [] vm.undertakeList = []
vm.bp_class = window.localStorage.bp_class_tenant vm.bp_class = window.localStorage.bp_class_tenant
vm.status = window.localStorage.contractReadonly
vm.saveInfo['project_id'] = window.localStorage.project_id // 重新赋值,防止缓存 vm.saveInfo['project_id'] = window.localStorage.project_id // 重新赋值,防止缓存
if (from.name === 'SalesInfo') { if (from.name === 'SalesInfo') {
vm.salesEnter = 'SalesInfo' vm.salesEnter = 'SalesInfo'
vm.fromPutted = false vm.fromPutted = false
vm.checked = false // 农行代扣
vm.checkedApproved = false // 是否特批
Object.keys(vm.saveInfo).forEach(i => { Object.keys(vm.saveInfo).forEach(i => {
if (i !== 'project_id' && i !== 'bp_id' && i !== 'bp_class' && i !== 'abc_deduction_flag' && i !== 'special_flag') { if (i !== 'project_id' && i !== 'bp_id' && i !== 'bp_class' && i !== 'abc_deduction_flag' && i !== 'special_flag') {
vm.saveInfo[i] = '' vm.saveInfo[i] = ''
} else if (i === 'abc_deduction_flag' && i === 'special_flag') { } else if (i === 'abc_deduction_flag' || i === 'special_flag') {
vm.saveInfo[i] = 'N' vm.saveInfo[i] = 'N'
} else if (i === 'bp_id') { } else if (i === 'bp_id') {
vm.saveInfo[i] = window.localStorage.bp_id_tenant vm.saveInfo[i] = window.localStorage.bp_id_tenant
...@@ -823,7 +859,7 @@ export default { ...@@ -823,7 +859,7 @@ export default {
deleteFun (e) { deleteFun (e) {
let deleteIndex let deleteIndex
this.selectUdertake.forEach((i, index, arr) => { this.selectUdertake.forEach((i, index, arr) => {
if (arr[index].bp_name.indexOf(e.bp_name) !== -1) { if (arr[index].bp_name.indexOf(e.bp_guta_name) !== -1) {
deleteIndex = index deleteIndex = index
} }
}) })
......
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
</h-content> </h-content>
<bottom-tab class="add-box"> <bottom-tab class="add-box">
<tab-button class="before" @click.native="handSave">保存</tab-button> <tab-button class="before" @click.native="handSave">保存</tab-button>
<tab-button class="next" @click.native="handleSubmit">提交</tab-button> <tab-button class="next" @click.native="isSubmit">提交</tab-button>
</bottom-tab> </bottom-tab>
</h-view> </h-view>
</template> </template>
...@@ -500,23 +500,36 @@ export default { ...@@ -500,23 +500,36 @@ export default {
handSave () { handSave () {
hlsPopup.showLongCenter('保存成功!') hlsPopup.showLongCenter('保存成功!')
}, },
isSubmit () {
let vm = this
this.hlsPopup.showConfirm({
title: '提示',
content: '您确定提交吗?',
onConfirm: data => {
if (data === 1) {
this.handleSubmit()
}
},
})
},
// 项目提交审批 // 项目提交审批
handleSubmit () { handleSubmit () {
let vm = this let vm = this
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'), 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) {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
console.log('项目提交审批', res)
if (res.result === 'S') { if (res.result === 'S') {
vm.hlsPopup.showSuccess('提交成功')
vm.$router.push({ vm.$router.push({
name: 'MyInfo', name: 'ContractCreateList',
}) })
// vm.showLists = res.lists } else {
vm.hlsPopup.showLongCenter(res.message)
} }
}) })
}, },
......
...@@ -144,6 +144,7 @@ export default { ...@@ -144,6 +144,7 @@ export default {
office_name: '', // 办事处 office_name: '', // 办事处
factory_name: '', factory_name: '',
business: '', business: '',
factoty: '', // 主机厂列表
showModal: false, showModal: false,
showLists: [], showLists: [],
user_bp_type: '', // 客户类型 user_bp_type: '', // 客户类型
...@@ -168,6 +169,18 @@ export default { ...@@ -168,6 +169,18 @@ export default {
} }
}, },
watch: { watch: {
'salesInfo.factory': {
handler (newVal, oldVal) {
this.factoty.forEach(i => {
if (i.bp_factory_id === this.salesInfo['factory']) {
this.inflow_line = i.inflow_line
this.inflow_used = i.inflow_used
this.inflow_reset = i.inflow_reset
}
})
},
immediate: true,
},
}, },
activated () { activated () {
...@@ -309,7 +322,7 @@ export default { ...@@ -309,7 +322,7 @@ export default {
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()
console.log('主机厂', res) vm.factoty = res.lists
if (res.result === 'S') { if (res.result === 'S') {
vm.factoryLists = res.lists.map(item => { vm.factoryLists = res.lists.map(item => {
return { return {
...@@ -436,6 +449,7 @@ export default { ...@@ -436,6 +449,7 @@ export default {
this.showModal = false this.showModal = false
window.localStorage.setItem('bp_id_tenant', this.salesInfo.bp_id_tenant) window.localStorage.setItem('bp_id_tenant', this.salesInfo.bp_id_tenant)
window.localStorage.setItem('bp_class_tenant', item.bp_class) window.localStorage.setItem('bp_class_tenant', item.bp_class)
window.localStorage.setItem('bp_name_tenant', item.bp_name)
}, },
hideModal () { hideModal () {
this.showModal = false this.showModal = false
...@@ -456,7 +470,7 @@ export default { ...@@ -456,7 +470,7 @@ export default {
hlsPopup.showLongCenter('办事处不能为空!') hlsPopup.showLongCenter('办事处不能为空!')
} else if (!vm.factory_name) { } else if (!vm.factory_name) {
hlsPopup.showLongCenter('主机厂不能为空!') hlsPopup.showLongCenter('主机厂不能为空!')
} else if (!vm.manu_manager) { } else if (!vm.salesInfo.manu_manager) {
hlsPopup.showLongCenter('主机厂业务员不能为空!') hlsPopup.showLongCenter('主机厂业务员不能为空!')
} else if (!vm.salesInfo.dates) { } else if (!vm.salesInfo.dates) {
hlsPopup.showLongCenter('签约日期不能为空!') hlsPopup.showLongCenter('签约日期不能为空!')
......
...@@ -445,14 +445,14 @@ export default { ...@@ -445,14 +445,14 @@ export default {
// 签约校验 // 签约校验
async signCheck () { async signCheck () {
let vm = this let vm = this
hlsPopup.showLoading('请稍候')
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', data_class: 'PRJ_PROJECT',
} }
vm.hlsPopup.showLoading('请稍后!') let res = await vm.hlsHttp.post(url, param)
let res = vm.hlsHttp.post(url, param) hlsPopup.hideLoading()
vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
return true return true
} else { } else {
......
...@@ -472,11 +472,11 @@ export default { ...@@ -472,11 +472,11 @@ export default {
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.code === '00') {
vm.hlsPopup.showSuccess('保存成功') vm.hlsPopup.showSuccess('保存成功')
vm.getEquipment()
setTimeout(() => { setTimeout(() => {
vm.downNum = false vm.downNum = false
vm.getEquipment()
}, 2000) }, 2000)
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
......
...@@ -270,7 +270,7 @@ export default { ...@@ -270,7 +270,7 @@ export default {
data_class: 'PRJ_PROJECT', data_class: 'PRJ_PROJECT',
} }
vm.hlsPopup.showLoading('请稍后!') vm.hlsPopup.showLoading('请稍后!')
let res = vm.hlsHttp.post(url, param) let res = await vm.hlsHttp.post(url, param)
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
return true return true
......
...@@ -30,14 +30,14 @@ ...@@ -30,14 +30,14 @@
<CurrencyInput v-model="money" type="number" placeholder="请输入支付金额" /> <CurrencyInput v-model="money" type="number" placeholder="请输入支付金额" />
<!-- <div @click="createOrder"> <!-- <div @click="createOrder">
<img src="@/assets/payment/into.png" > <img src="@/assets/payment/into.png" >
</div> --> </div>-->
</div> </div>
</div> </div>
</div> </div>
<div class="write"> <div class="write">
<div class="box"> <div class="box">
<span>备注</span> <span>备注</span>
<textarea placeholder="请输入您的备注……" /> <textarea v-model="pay_note" placeholder="请输入您的备注……" />
</div> </div>
</div> </div>
</section> </section>
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</div> </div>
</h-content> </h-content>
<bottom-tab> <bottom-tab>
<tab-button class="footer" @click.native="toPayEntry(money)">&nbsp;&nbsp;</tab-button> <tab-button class="footer" @click.native="putOrder(money)">提交订单</tab-button>
</bottom-tab> </bottom-tab>
</h-view> </h-view>
</template> </template>
...@@ -69,25 +69,40 @@ export default { ...@@ -69,25 +69,40 @@ export default {
return { return {
money: 0, money: 0,
default: 0, default: 0,
pay_note: '', // 备注
} }
}, },
beforeRouteEnter (to, from, next) { beforeRouteEnter (to, from, next) {
next(vm => { next(vm => {})
})
}, },
computed: {}, computed: {},
watch: {}, watch: {},
methods: { methods: {
putOrder (money) {
toPayEntry (money) { let vm = this
this.$router.push({ let url = process.env.basePath + 'create_order_agent_amt'
let param = {
info: {
bp_id: window.localStorage.bp_id,
amount: money,
pay_note: this.pay_note,
},
}
vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.$router.push({
name: 'MarginPayEntry', name: 'MarginPayEntry',
params: { params: {
order_id: res.order_id,
money, money,
}, },
}) })
}
})
}, },
toPayEntry (money) {},
}, },
} }
</script> </script>
...@@ -97,7 +112,7 @@ export default { ...@@ -97,7 +112,7 @@ export default {
width: 96%; width: 96%;
height: 172px; height: 172px;
background-color: #fff; background-color: #fff;
margin-top:10px; margin-top: 10px;
box-shadow: 0 1px 3px 2px rgba(168, 168, 168, 0.14); box-shadow: 0 1px 3px 2px rgba(168, 168, 168, 0.14);
span { span {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
......
This diff is collapsed.
...@@ -436,7 +436,6 @@ export default { ...@@ -436,7 +436,6 @@ export default {
beforeRouteEnter (to, from, next) { beforeRouteEnter (to, from, next) {
// 绑定查询入口 // 绑定查询入口
next(vm => { next(vm => {
if (from.fullPath === '/tab/my-info') {
vm.list = {} vm.list = {}
vm.multiBpType = {} vm.multiBpType = {}
vm.upload_list = [] // 上传图片列表 vm.upload_list = [] // 上传图片列表
...@@ -465,6 +464,8 @@ export default { ...@@ -465,6 +464,8 @@ export default {
vm.idCardFrontSpEditFlag = false // 配偶身份证正面修改标识,为true则标识已修改,后续需要重新上传此照片 vm.idCardFrontSpEditFlag = false // 配偶身份证正面修改标识,为true则标识已修改,后续需要重新上传此照片
vm.idCardBackSpEditFlag = false // 配偶身份证反面修改标识,为true则标识已修改,后续需要重新上传此照片 vm.idCardBackSpEditFlag = false // 配偶身份证反面修改标识,为true则标识已修改,后续需要重新上传此照片
vm.isClear = false vm.isClear = false
if (from.fullPath === '/tab/my-info') {
vm.from = true vm.from = true
vm.basicInfoQuery() vm.basicInfoQuery()
vm.loadItemList() // 附件查询 vm.loadItemList() // 附件查询
......
...@@ -210,8 +210,10 @@ export default { ...@@ -210,8 +210,10 @@ export default {
code: 'bp_type', code: 'bp_type',
object: {}, object: {},
returnItem: function (index, obj) { returnItem: function (index, obj) {
vm.invoiceInfo.invoice_kind = obj.bp_type vm.$set(vm.invoiceInfo,'invoice_kind',obj.bp_type)
vm.invoiceInfo.invoice_kind_n = obj.bp_type_n vm.$set(vm.invoiceInfo,'invoice_kind_n',obj.bp_type_n)
/*vm.invoiceInfo.invoice_kind = obj.bp_type
vm.invoiceInfo.invoice_kind_n = obj.bp_type_n*/
}, },
}) })
}, },
...@@ -222,8 +224,10 @@ export default { ...@@ -222,8 +224,10 @@ export default {
code: 'bp_type', code: 'bp_type',
object: {}, object: {},
returnItem: function (index, obj) { returnItem: function (index, obj) {
vm.invoiceInfo.taxpayer_type = obj.bp_type vm.$set(vm.invoiceInfo,'taxpayer_type',obj.bp_type)
vm.invoiceInfo.taxpayer_type_n = obj.bp_type_n vm.$set(vm.invoiceInfo,'taxpayer_type_n',obj.bp_type_n)
/* vm.invoiceInfo.taxpayer_type = obj.bp_type
vm.invoiceInfo.taxpayer_type_n = obj.bp_type_n*/
}, },
}) })
}, },
......
...@@ -227,7 +227,7 @@ ...@@ -227,7 +227,7 @@
<div slot="name" class="font-color required">姓名</div> <div slot="name" class="font-color required">姓名</div>
<input <input
slot="content" slot="content"
v-model="baseInfo.legal_person" v-model="legal_personMsg.bp_legal_name"
readonly readonly
placeholder="上传身份证自动填充" placeholder="上传身份证自动填充"
class="auto" class="auto"
...@@ -451,7 +451,7 @@ export default { ...@@ -451,7 +451,7 @@ export default {
}, },
legal_personMsg: { legal_personMsg: {
id_card_no: null, id_card_no: null,
// legal_person: '', bp_legal_name: '',
cell_phone: window.localStorage.getItem('user_phone'), cell_phone: window.localStorage.getItem('user_phone'),
living_address: '', living_address: '',
id_card_date_from: '', // 法定代表人身份证有效期从 id_card_date_from: '', // 法定代表人身份证有效期从
...@@ -567,18 +567,10 @@ export default { ...@@ -567,18 +567,10 @@ export default {
created () {}, created () {},
beforeRouteEnter (to, from, next) { beforeRouteEnter (to, from, next) {
next(vm => { next(vm => {
vm.getBpType()
vm.getProvince()
if (vm.$route.params.status === 'APPROVED') {
vm.isApproved = true
window.localStorage.setItem('isApproved', vm.isApproved)
}
if (from.fullPath === '/tab/my-info') { /* || from.fullPath === '/margin-first-pay' */
vm.legal_personMsg = {} vm.legal_personMsg = {}
vm.baseInfo = {} vm.baseInfo = {}
vm.bank_lists = {} vm.bank_lists = {}
vm.authMsg = {} vm.authMsg = {}
vm.bp_id = vm.$route.params.bp_id
vm.idCardFront = '' // 身份证正面图片 vm.idCardFront = '' // 身份证正面图片
vm.idCardBack = '' // 身份证反面图片 vm.idCardBack = '' // 身份证反面图片
vm.authidCardFront = '' // 授权人身份证正面图片 vm.authidCardFront = '' // 授权人身份证正面图片
...@@ -587,7 +579,6 @@ export default { ...@@ -587,7 +579,6 @@ export default {
vm.laImg = '' // 授权书图片 vm.laImg = '' // 授权书图片
vm.upload_list = [] // 上传图片列表 vm.upload_list = [] // 上传图片列表
vm.dowload_list = [] // 下载图片列表 vm.dowload_list = [] // 下载图片列表
vm.from = true
vm.idCardFrontEditFlag = false // 身份证正面修改标识,为true则标识已修改,后续需要重新上传此照片 vm.idCardFrontEditFlag = false // 身份证正面修改标识,为true则标识已修改,后续需要重新上传此照片
vm.idCardBackEditFlag = false // 身份证正面修改标识,为true则标识已修改,后续需要重新上传此照片 vm.idCardBackEditFlag = false // 身份证正面修改标识,为true则标识已修改,后续需要重新上传此照片
...@@ -603,6 +594,15 @@ export default { ...@@ -603,6 +594,15 @@ export default {
vm.authidCardBackUrlFlag = false // 授权人身份证反面图片,为false则用查询出来的,为true则用拍照出来的 vm.authidCardBackUrlFlag = false // 授权人身份证反面图片,为false则用查询出来的,为true则用拍照出来的
vm.licenseImgUrlFlag = false // 营业执照照片,为false则用查询出来的,为true则用拍照出来的 vm.licenseImgUrlFlag = false // 营业执照照片,为false则用查询出来的,为true则用拍照出来的
vm.laImgUrlFlag = false // 授权书图片,为false则用查询出来的,为true则用拍照出来的 vm.laImgUrlFlag = false // 授权书图片,为false则用查询出来的,为true则用拍照出来的
vm.getBpType()
vm.getProvince()
if (vm.$route.params.status === 'APPROVED') {
vm.isApproved = true
window.localStorage.setItem('isApproved', vm.isApproved)
}
if (from.fullPath === '/tab/my-info') { /* || from.fullPath === '/margin-first-pay' */
vm.bp_id = vm.$route.params.bp_id
vm.from = true
vm.getbaseInfo() vm.getbaseInfo()
} }
}) })
...@@ -794,6 +794,9 @@ export default { ...@@ -794,6 +794,9 @@ export default {
case 'living_address': case 'living_address':
vm.hlsPopup.showLongCenter('联系地址未填写') vm.hlsPopup.showLongCenter('联系地址未填写')
break break
case 'bp_legal_name':
vm.hlsPopup.showLongCenter('法定代表人姓名未填写')
break
case 'id_card_date_from': case 'id_card_date_from':
vm.hlsPopup.showLongCenter('身份证有效期从未填写') vm.hlsPopup.showLongCenter('身份证有效期从未填写')
break break
...@@ -887,6 +890,15 @@ export default { ...@@ -887,6 +890,15 @@ export default {
case 'living_address': case 'living_address':
vm.hlsPopup.showLongCenter('联系地址未填写') vm.hlsPopup.showLongCenter('联系地址未填写')
break break
case 'bp_legal_name':
vm.hlsPopup.showLongCenter('法定代表人姓名未填写')
break
case 'id_card_date_from':
vm.hlsPopup.showLongCenter('身份证有效期从未填写')
break
case 'id_card_date_to':
vm.hlsPopup.showLongCenter('身份证有效期到未填写')
break
case 'auth_person_name': case 'auth_person_name':
vm.hlsPopup.showLongCenter('授权人姓名未填写') vm.hlsPopup.showLongCenter('授权人姓名未填写')
break break
...@@ -1260,7 +1272,7 @@ export default { ...@@ -1260,7 +1272,7 @@ export default {
let result = res.result.words_result let result = res.result.words_result
if (cardType === 'idCard') { // 法定代表人 if (cardType === 'idCard') { // 法定代表人
// 未授权 姓名,身份证号 // 未授权 姓名,身份证号
vm.baseInfo.legal_person = result.姓名.words vm.legal_personMsg.bp_legal_name = result.姓名.words
vm.legal_personMsg.id_card_no = result.公民身份号码.words vm.legal_personMsg.id_card_no = result.公民身份号码.words
vm.legal_personMsg.living_address = result.住址.words // 联系地址默认为户籍地址,支持修改 vm.legal_personMsg.living_address = result.住址.words // 联系地址默认为户籍地址,支持修改
} else { // 授权人 } else { // 授权人
......
...@@ -606,10 +606,11 @@ export default { ...@@ -606,10 +606,11 @@ export default {
// vm.hauseInfo.regist_date.substr(0, 10) // vm.hauseInfo.regist_date.substr(0, 10)
console.log('regist_date', vm.hauseInfo.regist_date) console.log('regist_date', vm.hauseInfo.regist_date)
let param = { let param = {
master: { /*master: {
...vm.hauseInfo, ...vm.hauseInfo,
regist_date: vm.hauseInfo.regist_date.substr(0, 10), regist_date: vm.hauseInfo.regist_date.substr(0, 10),
}, },*/
master: vm.hauseInfo,
} }
// hlsPopup.showLoading('请稍候') // hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
......
...@@ -106,7 +106,15 @@ export default { ...@@ -106,7 +106,15 @@ export default {
watch: {}, watch: {},
beforeRouteEnter (to, from, next) { beforeRouteEnter (to, from, next) {
next(vm => { next(vm => {
if (from.name === 'EnterpriseNew') { if (from.name === 'EnterpriseNew' && vm.$route.params.from) {
vm.invoiceInfo = {}
vm.invoiceInfo.invoice_title = vm.$route.params.bp_name
vm.invoiceInfo.organization_code = vm.$route.params.organization_code
vm.bp_id = vm.$route.params.bp_id
vm.invoiceQuery() // 开票信息查询
}
/* if (from.name === 'EnterpriseNew') {
vm.invoiceInfo = { vm.invoiceInfo = {
invoice_kind: '', invoice_kind: '',
invoice_kind_n: '', invoice_kind_n: '',
...@@ -129,10 +137,16 @@ export default { ...@@ -129,10 +137,16 @@ export default {
} }
vm.addRows(this.invoiceInfo.invoice_adds) vm.addRows(this.invoiceInfo.invoice_adds)
vm.addRowsLive(this.invoiceInfo.open_bank) vm.addRowsLive(this.invoiceInfo.open_bank)
} }*/
}) })
}, },
created () {}, created () {
let vm = this
vm.getInvoiceType()
vm.getTaxpayer()
vm.addRows(this.invoiceInfo.invoice_adds)
vm.addRowsLive(this.invoiceInfo.open_bank)
},
methods: { methods: {
invoiceQuery () { invoiceQuery () {
let vm = this let vm = this
...@@ -210,8 +224,10 @@ export default { ...@@ -210,8 +224,10 @@ export default {
code: 'bp_type', code: 'bp_type',
object: {}, object: {},
returnItem: function (index, obj) { returnItem: function (index, obj) {
vm.invoiceInfo.taxpayer_type = obj.bp_type vm.$set(vm.invoiceInfo,'taxpayer_type',obj.bp_type)
vm.invoiceInfo.taxpayer_type_n = obj.bp_type_n vm.$set(vm.invoiceInfo,'taxpayer_type_n',obj.bp_type_n)
/*vm.invoiceInfo.taxpayer_type = obj.bp_type
vm.invoiceInfo.taxpayer_type_n = obj.bp_type_n*/
console.log('obj', vm.invoiceInfo) console.log('obj', vm.invoiceInfo)
}, },
}) })
...@@ -223,8 +239,10 @@ export default { ...@@ -223,8 +239,10 @@ export default {
code: 'bp_type', code: 'bp_type',
object: {}, object: {},
returnItem: function (index, obj) { returnItem: function (index, obj) {
vm.invoiceInfo.invoice_kind = obj.bp_type vm.$set(vm.invoiceInfo,'invoice_kind',obj.bp_type)
vm.invoiceInfo.invoice_kind_n = obj.bp_type_n vm.$set(vm.invoiceInfo,'invoice_kind_n',obj.bp_type_n)
/* vm.invoiceInfo.invoice_kind = obj.bp_type
vm.invoiceInfo.invoice_kind_n = obj.bp_type_n*/
}, },
}) })
}, },
......
...@@ -244,8 +244,8 @@ export default new Router({ ...@@ -244,8 +244,8 @@ export default new Router({
{path: '/new-list', component: NewList, name: 'NewList', meta: {keepAlive: true}}, {path: '/new-list', component: NewList, name: 'NewList', meta: {keepAlive: true}},
{path: '/payment-contract-record', component: PaymentContractRecord, name: 'PaymentContractRecord', meta: {keepAlive: true}}, {path: '/payment-contract-record', component: PaymentContractRecord, name: 'PaymentContractRecord', meta: {keepAlive: true}},
// 保证金支付 // 保证金支付
{path: '/margin-first-pay', component: MarginFirstPay, name: 'MarginFirstPay', meta: {keepAlive: true}}, {path: '/margin-first-pay', component: MarginFirstPay, name: 'MarginFirstPay', meta: {keepAlive: false}},
{path: '/margin-pay-entry', component: MarginPayEntry, name: 'MarginPayEntry', meta: {keepAlive: true}}, {path: '/margin-pay-entry', component: MarginPayEntry, name: 'MarginPayEntry', meta: {keepAlive: false}},
// 支付页 // 支付页
{path: '/pay-page', component: PayPage, name: 'PayPage', meta: {keepAlive: false}}, {path: '/pay-page', component: PayPage, name: 'PayPage', meta: {keepAlive: false}},
// 产品查询 // 产品查询
......
<!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.63486490583bd45586f9f17263d8372c.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.e9be7f7cd0f8a8828ab2.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.63486490583bd45586f9f17263d8372c.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.e9be7f7cd0f8a8828ab2.js></script></body></html>
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