Skip to content

H
hls-xcmg-vue-app
Commit 61e173c5 authored by linxin's avatar linxin
Browse files
Options

add

parent 0f844997
Show whitespace changes
Inline Side-by-side
Showing with 191 additions and 43 deletions
src/pages/contractCreate/contract-create-list.vue
View file @ 61e173c5
...@@ -338,11 +338,20 @@ export default { ...@@ -338,11 +338,20 @@ export default {
this.approvedearch() this.approvedearch()
} }
}, },
changePage () {
window.localStorage.setItem('contractReadonly', false)
window.localStorage.setItem('formPage', 'sale')
this.$router.push({
name: 'SalesInfo',
})
},
changeBase () { changeBase () {
if (this.num === 1) { if (this.num === 1) {
window.localStorage.setItem('contractReadonly', false) window.localStorage.setItem('contractReadonly', false)
window.localStorage.setItem('formPage', 'list')
} else if (this.num === 2) { } else if (this.num === 2) {
window.localStorage.setItem('contractReadonly', true) window.localStorage.setItem('contractReadonly', true)
window.localStorage.setItem('formPage', 'list')
} }
this.$router.push({ this.$router.push({
name: 'CreateBaseInfo', name: 'CreateBaseInfo',
......
src/pages/contractCreate/creat-rent-info.vue
View file @ 61e173c5
...@@ -222,8 +222,11 @@ export default { ...@@ -222,8 +222,11 @@ export default {
showModalValue: false, showModalValue: false,
showModalBusiness: false, showModalBusiness: false,
isComputed: false, isComputed: false,
fromPage: window.localStorage.fromPage,
keyWordProduct: '', keyWordProduct: '',
policyKeyWord: '', policyKeyWord: '',
fromPutted: false,
fromList: false, // 判断是否从列表过来
pagenum: 1, // 产品型号页码 pagenum: 1, // 产品型号页码
pagenumSearch: 1, // 产品型号查询时的页码 pagenumSearch: 1, // 产品型号查询时的页码
pagenumPolicy: 1, // 商务政策没有查询时的页码 pagenumPolicy: 1, // 商务政策没有查询时的页码
...@@ -309,14 +312,20 @@ export default { ...@@ -309,14 +312,20 @@ export default {
vm.divisionLists = [] vm.divisionLists = []
vm.pagenum = 1 vm.pagenum = 1
vm.pagenumPolicy = 1 vm.pagenumPolicy = 1
if (vm.fromPage === 'sale') {
vm.fromList = false
} else if (vm.status === 'list') {
vm.fromList = true
vm.rentInfoQuery()
}
if (from.name === 'CreateBaseInfo') { if (from.name === 'CreateBaseInfo') {
vm.isComputed = false vm.isComputed = false
Object.keys(vm.saveInfo).forEach(i => { Object.keys(vm.saveInfo).forEach(i => { // 置空saveInfo
if (i !== 'project_id') { if (i !== 'project_id') {
vm.saveInfo[i] = '' vm.saveInfo[i] = ''
} }
}) })
Object.keys(vm.productInfo).forEach(i => { Object.keys(vm.productInfo).forEach(i => { // 置空productInfo
if (i !== 'project_id') { if (i !== 'project_id') {
vm.saveInfo[i] = '' vm.saveInfo[i] = ''
} }
...@@ -339,6 +348,22 @@ export default { ...@@ -339,6 +348,22 @@ export default {
changeLeaseCharge () { changeLeaseCharge () {
this.saveInfo.lease_charge_ratio_n = `${(this.saveInfo.lease_charge / (this.saveInfo.equip_price - this.saveInfo.equip_price * this.saveInfo.down_payment_ratio_n.replace('%', '') / 100)).toFixed(2) * 100}%` this.saveInfo.lease_charge_ratio_n = `${(this.saveInfo.lease_charge / (this.saveInfo.equip_price - this.saveInfo.equip_price * this.saveInfo.down_payment_ratio_n.replace('%', '') / 100)).toFixed(2) * 100}%`
}, },
rentInfoQuery () { // 租赁信息查询
let vm = this
let url = process.env.basePath + 'prj_lease_query'
let param = {
project_id: window.localStorage.project_id,
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
Object.assign(vm.saveInfo, res.info)
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
selectBusinessPolicy (e) { selectBusinessPolicy (e) {
let vm = this let vm = this
vm.saveInfo.product_plan_id = e.product_plan_id vm.saveInfo.product_plan_id = e.product_plan_id
......
src/pages/contractCreate/create-base-info.vue
View file @ 61e173c5
...@@ -80,44 +80,74 @@ ...@@ -80,44 +80,74 @@
<img src="@/assets/contractCreate/otherInfo.png" >补充信息 <img src="@/assets/contractCreate/otherInfo.png" >补充信息
</div> </div>
<list-item :item-height="44"> <list-item :item-height="44">
<item :showArrow="true"> <item v-if="!fromPutted" :showArrow="true">
<div slot="name">行业情况</div> <div slot="name">行业情况</div>
<input <input
slot="content" v-model="saveInfo.np_industry_exp_n" readonly placeholder="请选择" slot="content" v-model="saveInfo.np_industry_exp_n" readonly placeholder="请选择"
@click="selectBussinessSituation" > @click="selectBussinessSituation" >
</item> </item>
<item :showArrow="true" > <item v-if="fromPutted">
<div slot="name">行业情况</div>
<span slot="content">{{ saveInfo.np_industry_exp_n }}</span>
</item>
<item v-if="!fromPutted" :showArrow="true" >
<div slot="name">职业情况</div> <div slot="name">职业情况</div>
<input <input
slot="content" v-model="saveInfo.np_occupation_n" readonly placeholder="请选择" slot="content" v-model="saveInfo.np_occupation_n" readonly placeholder="请选择"
@click="selectJobSituation" > @click="selectJobSituation" >
</item> </item>
<item :showArrow="true"> <item v-if="fromPutted">
<div slot="name">职业情况</div>
<span slot="content">{{ saveInfo.np_occupation_n }}</span>
</item>
<item v-if="!fromPutted" :showArrow="true">
<div slot="name">房产信息</div> <div slot="name">房产信息</div>
<input <input
slot="content" v-model="saveInfo.house_type_n" readonly placeholder="请选择" slot="content" v-model="saveInfo.house_type_n" readonly placeholder="请选择"
@click="selectHouseInfo"> @click="selectHouseInfo">
</item> </item>
<item :showArrow="true"> <item v-if="fromPutted">
<div slot="name">房产信息</div>
<span slot="content">{{ saveInfo.house_type_n }}</span>
</item>
<item v-if="!fromPutted" :showArrow="true">
<div slot="name">设备价值</div> <div slot="name">设备价值</div>
<input <input
slot="content" v-model="saveInfo.equip_value" placeholder="请选择" readonly slot="content" v-model="saveInfo.equip_value" placeholder="请选择" readonly
@click="selectEquipInfo"> @click="selectEquipInfo">
</item> </item>
<item class="check" @click.native="checked=!checked"> <item v-if="fromPutted">
<div slot="name">设备价值</div>
<span slot="content">{{ saveInfo.equip_value }}</span>
</item>
<item v-if="!fromPutted" class="check" @click.native="checked=!checked">
<div slot="name">农行代扣</div> <div slot="name">农行代扣</div>
<img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" > <img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" >
<span v-if="!checked" slot="content" /> <span v-if="!checked" slot="content" />
</item> </item>
<item class="check" @click.native="checkedApproved=!checkedApproved"> <item v-if="fromPutted" class="check">
<div slot="name">农行代扣</div>
<img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" >
<span v-if="!checked" slot="content" />
</item>
<item v-if="!fromPutted" class="check" @click.native="checkedApproved=!checkedApproved">
<div slot="name">是否特批</div>
<img v-if="checkedApproved" slot="content" src="@/assets/contractCreate/selected.png" >
<span v-if="!checkedApproved" slot="content" />
</item>
<item v-if="fromPutted" class="check">
<div slot="name">是否特批</div> <div slot="name">是否特批</div>
<img v-if="checkedApproved" slot="content" src="@/assets/contractCreate/selected.png" > <img v-if="checkedApproved" slot="content" src="@/assets/contractCreate/selected.png" >
<span v-if="!checkedApproved" slot="content" /> <span v-if="!checkedApproved" slot="content" />
</item> </item>
<item v-if="checkedApproved"> <item v-if="checkedApproved&&!fromPutted">
<div slot="name">特批事项</div> <div slot="name">特批事项</div>
<input slot="content" v-model="saveInfo.special_matter" placeholder="暂无信息"> <input slot="content" v-model="saveInfo.special_matter" placeholder="暂无信息">
</item> </item>
<item v-if="checkedApproved&&fromPutted">
<div slot="name">特批事项</div>
<span slot="content">{{ saveInfo.special_matter }}</span>
</item>
</list-item> </list-item>
</div> </div>
<div v-if="bp_class==='ORG'"> <div v-if="bp_class==='ORG'">
...@@ -175,43 +205,75 @@ ...@@ -175,43 +205,75 @@
<img src="@/assets/contractCreate/otherInfo.png" >补充信息 <img src="@/assets/contractCreate/otherInfo.png" >补充信息
</div> </div>
<list-item :item-height="44"> <list-item :item-height="44">
<item :showArrow="true" @click.native="selectORGEquipInfo"> <item v-if="!fromPutted" :showArrow="true" @click.native="selectORGEquipInfo">
<div slot="name">设备保有量</div>
<input slot="content" v-model="saveInfo.equip_num_n" readonly placeholder="请选择" >
</item>
<item v-if="fromPutted" :showArrow="true">
<div slot="name">设备保有量</div> <div slot="name">设备保有量</div>
<input slot="content" v-model="saveInfo.equip_num_n" readonly placeholder="请选择" > <input slot="content" v-model="saveInfo.equip_num_n" readonly placeholder="请选择" >
</item> </item>
<item :showArrow="true" @click.native="selectORGEnge"> <item v-if="!fromPutted" :showArrow="true" @click.native="selectORGEnge">
<div slot="name">工程合同</div> <div slot="name">工程合同</div>
<input slot="content" v-model="saveInfo.engineer_con_n" readonly placeholder="请选择" > <input slot="content" v-model="saveInfo.engineer_con_n" readonly placeholder="请选择" >
</item> </item>
<item :showArrow="true" @click.native="selectORGnative"> <item v-if="fromPutted" :showArrow="true">
<div slot="name">工程合同</div>
<input slot="content" v-model="saveInfo.engineer_con_n" readonly placeholder="请选择" >
</item>
<item v-if="!fromPutted" :showArrow="true" @click.native="selectORGnative">
<div slot="name">企业性质</div>
<input slot="content" v-model="saveInfo.enterpriese_nature_n" readonly placeholder="请选择" >
</item>
<item v-if="fromPutted" :showArrow="true">
<div slot="name">企业性质</div> <div slot="name">企业性质</div>
<input slot="content" v-model="saveInfo.enterpriese_nature_n" readonly placeholder="请选择" > <input slot="content" v-model="saveInfo.enterpriese_nature_n" readonly placeholder="请选择" >
</item> </item>
<item :showArrow="true" @click.native="selectEquipInfo"> <item v-if="!fromPutted" :showArrow="true" @click.native="selectEquipInfo">
<div slot="name">设备价值</div>
<input
slot="content" v-model="saveInfo.equip_value" placeholder="请选择" readonly
>
</item>
<item v-if="fromPutted" :showArrow="true">
<div slot="name">设备价值</div> <div slot="name">设备价值</div>
<input <input
slot="content" v-model="saveInfo.equip_value" placeholder="请选择" readonly slot="content" v-model="saveInfo.equip_value" placeholder="请选择" readonly
> >
</item> </item>
<item class="check" @click.native="checked=!checked"> <item v-if="!fromPutted" class="check" @click.native="checked=!checked">
<div slot="name">农行代扣</div>
<img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" >
<span v-if="!checked" slot="content" />
</item>
<item v-if="fromPutted" class="check">
<div slot="name">农行代扣</div> <div slot="name">农行代扣</div>
<img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" > <img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" >
<span v-if="!checked" slot="content" /> <span v-if="!checked" slot="content" />
</item> </item>
<item class="check" @click.native="checkedApproved=!checkedApproved"> <item v-if="!fromPutted" class="check" @click.native="checkedApproved=!checkedApproved">
<div slot="name">是否特批</div> <div slot="name">是否特批</div>
<img v-if="checkedApproved" slot="content" src="@/assets/contractCreate/selected.png" > <img v-if="checkedApproved" slot="content" src="@/assets/contractCreate/selected.png" >
<span v-if="!checkedApproved" slot="content" /> <span v-if="!checkedApproved" slot="content" />
</item> </item>
<item v-if="checkedApproved"> <item v-if="fromPutted" class="check">
<div slot="name">是否特批</div>
<img v-if="checkedApproved" slot="content" src="@/assets/contractCreate/selected.png" >
<span v-if="!checkedApproved" slot="content" />
</item>
<item v-if="checkedApproved&&!fromPutted">
<div slot="name">特批事项</div> <div slot="name">特批事项</div>
<input slot="content" placeholder="暂无信息"> <input slot="content" v-model="saveInfo.special_matter" placeholder="暂无信息">
</item>
<item v-if="checkedApproved&&fromPutted">
<div slot="name">特批事项</div>
<input slot="content" v-model="saveInfo.special_matter" readonly placeholder="暂无信息">
</item> </item>
</list-item> </list-item>
</div> </div>
<div class="another-info"> <div class="another-info">
<img src="@/assets/contractCreate/undertake.png" >担保人信息 <img src="@/assets/contractCreate/undertake.png" >担保人信息
<img src="@/assets/contractCreate/add.png" @click="addPerson"> <img v-if="!fromPutted" src="@/assets/contractCreate/add.png" @click="addPerson">
</div> </div>
</div> </div>
<item-option v-for="(item,index) in selectUdertake" :key="index" class="mySlider"> <item-option v-for="(item,index) in selectUdertake" :key="index" class="mySlider">
...@@ -277,6 +339,7 @@ export default { ...@@ -277,6 +339,7 @@ export default {
checkedApproved: false, // 是否特批 checkedApproved: false, // 是否特批
bp_class: '', bp_class: '',
showModalValue: false, showModalValue: false,
fromPutted: false, // 从已提交进来
keyWord: '', keyWord: '',
bp_agent_id: '', bp_agent_id: '',
pageNum: 1, pageNum: 1,
...@@ -294,7 +357,7 @@ export default { ...@@ -294,7 +357,7 @@ export default {
ORGBaseInfo: {}, // 企业基本信息 ORGBaseInfo: {}, // 企业基本信息
saveInfo: {// 需要保存的信息 saveInfo: {// 需要保存的信息
project_id: window.localStorage.project_id, project_id: window.localStorage.project_id,
bp_id: window.localStorage.bp_id_tenant, bp_id: '',
bp_class: window.localStorage.bp_class, bp_class: window.localStorage.bp_class,
equip_num: '', equip_num: '',
equip_num_n: '', equip_num_n: '',
...@@ -348,23 +411,43 @@ export default { ...@@ -348,23 +411,43 @@ export default {
vm.undertakeList = [] vm.undertakeList = []
vm.bp_class = window.localStorage.bp_class vm.bp_class = window.localStorage.bp_class
if (from.name === 'SalesInfo') { if (from.name === 'SalesInfo') {
vm.fromPutted = 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') {
vm.saveInfo[i] = window.localStorage.bp_id_tenant
} }
}) })
vm.selectUdertake = [] vm.selectUdertake = []
setTimeout(() => { setTimeout(() => {
vm.getBaseInfo() vm.getBaseInfo()
}, 0) }, 0)
} else if (from.name === 'SalesInfo' && !this.status) { } else if (from.name === 'ContractCreateList' && vm.status === 'false') {
vm.fromPutted = false
vm.saveInfo.bp_id = vm.$route.params.bp_id
vm.selectUdertake = []
setTimeout(() => {
vm.getSaveInfo()
vm.getBaseInfo()
}, 0)
} else if (from.name === 'ContractCreateList' && vm.status === 'true') {
vm.fromPutted = true
vm.saveInfo.bp_id = vm.$route.params.bp_id
vm.selectUdertake = []
setTimeout(() => {
vm.getSaveInfo()
vm.getBaseInfo() vm.getBaseInfo()
}, 0)
} }
}) })
}, },
methods: { methods: {
getSaveInfo () {
},
addPerson () { addPerson () {
this.showModalValue = true this.showModalValue = true
this.getUndertake() this.getUndertake()
...@@ -413,6 +496,14 @@ export default { ...@@ -413,6 +496,14 @@ export default {
}, },
save () { save () {
let vm = this let vm = this
if (vm.fromPutted) {
vm.$router.push({
name: 'CreateRentInfo',
params: {
bp_agent_id: vm.bp_agent_id,
},
})
} else {
let url = process.env.basePath + 'prj_base_info_save' let url = process.env.basePath + 'prj_base_info_save'
let param = { let param = {
master: {...vm.saveInfo, ...vm.makeData()}, master: {...vm.saveInfo, ...vm.makeData()},
...@@ -431,6 +522,7 @@ export default { ...@@ -431,6 +522,7 @@ export default {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
}) })
}
}, },
getBaseInfo () { getBaseInfo () {
this.getEquipInfo() this.getEquipInfo()
...@@ -540,7 +632,7 @@ export default { ...@@ -540,7 +632,7 @@ export default {
let vm = this let vm = this
let url = process.env.basePath + 'bp_np_info_query' let url = process.env.basePath + 'bp_np_info_query'
let param = { let param = {
bp_id: window.localStorage.getItem('bp_id_tenant'), bp_id: vm.saveInfo.bp_id,
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
...@@ -556,7 +648,7 @@ export default { ...@@ -556,7 +648,7 @@ export default {
let vm = this let vm = this
let url = process.env.basePath + 'bp_org_info_query' let url = process.env.basePath + 'bp_org_info_query'
let param = { let param = {
bp_id: window.localStorage.bp_id_tenant, bp_id: vm.saveInfo.bp_id,
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
......
src/pages/contractCreate/sales-info.vue
View file @ 61e173c5
...@@ -163,6 +163,7 @@ export default { ...@@ -163,6 +163,7 @@ export default {
factory: '', // 主机厂id factory: '', // 主机厂id
manu_manager: '', // 办事处业务员 manu_manager: '', // 办事处业务员
dates: '请选择', dates: '请选择',
project_id: window.localStorage.project_id,
}, },
} }
}, },
...@@ -199,10 +200,13 @@ export default { ...@@ -199,10 +200,13 @@ export default {
manu_manager: '', // 办事处业务员 manu_manager: '', // 办事处业务员
dates: '请选择', dates: '请选择',
bp_type: window.localStorage.bp_type, bp_type: window.localStorage.bp_type,
project_id: '',
} }
vm.businessQuery() vm.businessQuery()
vm.agentQuery() vm.agentQuery()
vm.factoryQuery() vm.factoryQuery()
} else if (from.name === 'CreateBaseInfo') {
vm.salesInfo.project_id = window.localStorage.project_id
} }
}) })
}, },
......
src/pages/pay/pay-page.vue
View file @ 61e173c5
...@@ -213,9 +213,27 @@ export default { ...@@ -213,9 +213,27 @@ export default {
vm.isSuccess = false vm.isSuccess = false
hlsPopup.showLongCenter(res.error_message) hlsPopup.showLongCenter(res.error_message)
} else { } else {
if (res.status === '01') {
vm.isSuccess = false
vm.isFaild = false
hlsPopup.showLongCenter('可再次提交')
} else if (res.status === '02') {
vm.isSuccess = false
vm.isFaild = false
hlsPopup.showLongCenter('正在支付...')
} else if (res.status === '03') {
vm.isSuccess = true vm.isSuccess = true
vm.isFaild = false vm.isFaild = false
hlsPopup.showLongCenter('交易成功') hlsPopup.showLongCenter('交易成功')
} else if (res.status === '04') {
vm.isSuccess = true
vm.isFaild = false
hlsPopup.showLongCenter('交易完成')
} else {
vm.isSuccess = false
vm.isFaild = true
hlsPopup.showLongCenter('交易失败')
}
} }
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
......
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