Skip to content

H
hls-xcmg-vue-app
Commit 5c9fd23f authored by jiacheng.mao's avatar jiacheng.mao
Browse files
Options

Merge remote-tracking branch 'origin/ios' into ios 

# Conflicts:
#	src/pages/contractCreate/my-contract.vue
#	src/pages/contractSigning/contract-signing.vue
#	src/pages/distributorSign/contract-list.vue
#	src/pages/functionCenter/function-list.vue
#	src/pages/myInfo/my-info.vue
#	src/router/index.js
parents 082eff1f 9d26f7c9
Show whitespace changes
Inline Side-by-side
Showing with 1041 additions and 650 deletions
config/prod.env.js
View file @ 5c9fd23f
...@@ -11,5 +11,5 @@ module.exports = { ...@@ -11,5 +11,5 @@ module.exports = {
ocrPath:'"http://www.xcmgfs.com:8087/r/api"', ocrPath:'"http://www.xcmgfs.com:8087/r/api"',
fileUploadSvcPath:'"http://www.xcmgfs.com:8087/r/api/app/fileUploadSvc?sysName=XCMG_PROD&apiName="', fileUploadSvcPath:'"http://www.xcmgfs.com:8087/r/api/app/fileUploadSvc?sysName=XCMG_PROD&apiName="',
appId: '"com.xcmg.app"', appId: '"com.xcmg.app"',
currentVersion: '"0.2.4"' currentVersion: '"0.2.5"'
} }
config/uat.env.js
View file @ 5c9fd23f
...@@ -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.dev"', appId: '"com.xcmg.app.dev"',
currentVersion: '"2.8.3"' currentVersion: '"2.8.9"'
} }
src/pages/carConfirm/confirm-detail.vue
View file @ 5c9fd23f
...@@ -99,7 +99,23 @@ ...@@ -99,7 +99,23 @@
</item> </item>
<item> <item>
<div slot="name">租赁物数量</div> <div slot="name">租赁物数量</div>
<input slot="content" v-model="info.product_num" readonly placeholder="请输入租赁物数量" > <input slot="content" v-model="info.product_num" readonly placeholder="暂无数据" >
</item>
<item>
<div slot="name" class="firstPay">签约日期</div>
<input
slot="content" v-model="info.sale_date" class="firstPay" readonly
placeholder="暂无数据" >
</item>
<item>
<div slot="name" class="firstPay">首次分期付款日</div>
<input
slot="content" v-model="info.lease_start_date" class="firstPay" readonly
placeholder="暂无数据" >
</item>
<item :showArrow="true" @click.native="goPlan">
<div slot="name">查看还款计划</div>
<input slot="content" readonly >
</item> </item>
</list-item> </list-item>
<div class="userInfo">设备清单</div> <div class="userInfo">设备清单</div>
...@@ -163,17 +179,17 @@ ...@@ -163,17 +179,17 @@
<tab-button class="approve" @click.native="isConfirm">确定</tab-button> <tab-button class="approve" @click.native="isConfirm">确定</tab-button>
</bottom-tab> </bottom-tab>
<!--活体检测--> <!--活体检测-->
<!-- <body-check ref="body" :check_id="$route.params.check_id" :confirm_id="confirm_id" /> --> <body-check ref="body" :check_id="$route.params.check_id" :confirm_id="confirm_id" />
</h-view> </h-view>
</template> </template>
<script> <script>
import Tab from '@/pages/carConfirm/tab' import Tab from '@/pages/carConfirm/tab'
// import bodyCheck from './body-check' import bodyCheck from './body-check'
export default { export default {
components: { components: {
Tab, Tab,
// bodyCheck, bodyCheck,
}, },
filters: { filters: {
lengthCheck: function (value) { lengthCheck: function (value) {
...@@ -190,6 +206,7 @@ export default { ...@@ -190,6 +206,7 @@ export default {
downNum: false, downNum: false,
attachArray: [], attachArray: [],
faceListUpload: [], faceListUpload: [],
check_id: this.$route.query.check_id,
show: false, show: false,
flag: false, // 判断是否为已确认 flag: false, // 判断是否为已确认
vehicleImg: '', // 查询到的合格证 vehicleImg: '', // 查询到的合格证
...@@ -197,7 +214,8 @@ export default { ...@@ -197,7 +214,8 @@ export default {
agentPic: '', // 经销商担保协议图片 agentPic: '', // 经销商担保协议图片
bankPic: '', // 农行代扣授权书图片 bankPic: '', // 农行代扣授权书图片
legalPic: '', // 法人授权书图片 legalPic: '', // 法人授权书图片
confirm_id: this.$route.params.confirm_id, confirm_id: this.$route.query.confirm_id,
project_id: this.$route.query.project_id,
readed: require('@/assets/constractSigning/read.png'), // 已读 readed: require('@/assets/constractSigning/read.png'), // 已读
unRead: require('@/assets/constractSigning/unread.png'), // 未读 unRead: require('@/assets/constractSigning/unread.png'), // 未读
tabNum: 0, tabNum: 0,
...@@ -216,6 +234,8 @@ export default { ...@@ -216,6 +234,8 @@ export default {
bp_agent_name: ' ', bp_agent_name: ' ',
product_plan_id_n: '', product_plan_id_n: '',
product_code: '', product_code: '',
sale_date: '',
lease_start_date: '',
}, },
signMsg: '', signMsg: '',
rentInfo: { rentInfo: {
...@@ -229,6 +249,7 @@ export default { ...@@ -229,6 +249,7 @@ export default {
invoice_date: '', invoice_date: '',
}, },
products: [], products: [],
confirm_status: this.$route.query.confirm_status,
equip: [ equip: [
{ {
product_id: '3', product_id: '3',
...@@ -238,23 +259,33 @@ export default { ...@@ -238,23 +259,33 @@ export default {
], ],
} }
}, },
computed: {}, // created () {
// let vm = this
// vm.getDetail()
// vm.getEquipment()
// vm.getAttachment()
// vm.agentPic = vm.unRead
// vm.leasePic = vm.unRead
// if (vm.confirm_status === 'SUBMIT') {
// vm.flag = false
// } else if (vm.confirm_status === 'APPROVED') {
// vm.flag = true
// }
// },
beforeRouteEnter (to, from, next) { beforeRouteEnter (to, from, next) {
next(vm => { next(vm => {
if (from.name === 'ConfirmList') { // if (from.name === 'ContractRepayPlan') {
// vm.$refs.body.hideBody()
vm.getDetail() vm.getDetail()
vm.getEquipment() vm.getEquipment()
vm.getAttachment() vm.getAttachment()
vm.confirm_id = vm.$route.params.confirm_id
}
vm.agentPic = vm.unRead vm.agentPic = vm.unRead
vm.leasePic = vm.unRead vm.leasePic = vm.unRead
if (vm.$route.params.confirm_status === 'SUBMIT') { if (vm.confirm_status === 'SUBMIT') {
vm.flag = false vm.flag = false
} else if (vm.$route.params.confirm_status === 'APPROVED') { } else if (vm.confirm_status === 'APPROVED') {
vm.flag = true vm.flag = true
} }
// }
}) })
}, },
methods: { methods: {
...@@ -263,7 +294,7 @@ export default { ...@@ -263,7 +294,7 @@ export default {
let vm = this let vm = this
let url = process.env.basePath + 'get_content_app' let url = process.env.basePath + 'get_content_app'
let param = { let param = {
confirm_id: vm.$route.params.confirm_id, confirm_id: vm.confirm_id,
data_class: 'LEASE_ITEM', data_class: 'LEASE_ITEM',
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
...@@ -276,6 +307,16 @@ export default { ...@@ -276,6 +307,16 @@ export default {
} }
}) })
}, },
goPlan () {
let vm = this
vm.$router.push({
name: 'ContractRepayPlan',
params: {
product_num: vm.info.product_num,
project_id: vm.project_id,
},
})
},
goContent (item, index) { goContent (item, index) {
// 详情 // 详情
// 合同状态更新保存 // 合同状态更新保存
...@@ -353,10 +394,126 @@ export default { ...@@ -353,10 +394,126 @@ export default {
getTabNum (i) { getTabNum (i) {
this.tabNum = i this.tabNum = i
}, },
async takePhonto () { takePhonto () {
let vm = this
hlsPopup.showConfirm({
title: '提示',
content: '请自拍一张',
onConfirm: function (index) {
if (index === 1) {
vm.takePhontoOpenCamera()
// vm.goElectronicSign()
}
},
})
},
// 图片上传
takePhontoOpenCamera () {
let vm = this let vm = this
vm.goElectronicSign() vm.faceListUpload = []
let obj = {
pkvalue: vm.check_id,
source_type: 'PRJ_CDD_ITEM_CHECK',
picture: '',
filePath: '',
attachment_id: '',
user_id: 1,
fileName: 'face',
}
let cameraoptions = {
quality: 100,
cameraDirection: 1,
}
let success = function (imgdata) {
obj.filePath = imgdata
vm.confirmContractSign(imgdata)
vm.faceListUpload.push(obj)
}
let error = function () {
hlsPopup.showLongCenter('请拍照')
}
hlsUtil.openCamera(cameraoptions, success, error)
}, },
// 执行同意的逻辑(查询对应的身份证正面图片->人脸识别->活体检测)
async confirmContractSign (faceImg) {
let idCardImgUrl = await this.idCardImgUrlGet()
if (idCardImgUrl) {
this.faceIdentify(faceImg, idCardImgUrl)
}
},
// 人脸比对
faceIdentify (faceImg, idCardImgUrl) {
let vm = this
let obj = {
fileUrl: faceImg,
idCardImgUrl: idCardImgUrl,
}
hlsPopup.showLoading('正在比对')
let url = process.env.ocrPath + '/baidu/ocr/face'
hlsUtil.baiduOcrFace(obj, url, function (res) {
hlsPopup.hideLoading()
if (res.success && res.result.result.score) {
vm.save_picture(vm.faceListUpload)
let identifyScore = res.result.result.score.toFixed(0)
if (identifyScore > 50) {
hlsPopup.showPopup({
title: '提示',
content: `识别分数为${identifyScore},请进行活体检测`,
onConfirm: () => {
// 进入活体检测页面
vm.goBodyCheck()
},
})
} else {
hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
}
} else {
hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
}
})
},
goBodyCheck () {
// 活体检测
this.$refs.body.show()
},
// 新插件版本
// async takePhonto () {
// let vm = this
// let flag = await this.signCheck()
// if (flag) {
// vm.hlsPopup.showLongCenter('已经验证过！')
// return
// }
// let url = process.env.basePath + 'bp_query'
// let param = {
// bp_id: window.localStorage.bp_id,
// }
// hlsPopup.showLoading('请稍候')
// vm.hlsHttp.post(url, param).then(res => {
// hlsPopup.hideLoading()
// if (res.result === 'S') {
// let data = res.lists[0]
// cordova.plugins.IdCardPlugin.faceContrast({'idNum': data.id_card_no, 'idName': data.bp_name}, function (suc) {
// let success = JSON.parse(suc)
// if (success.code === 1) {
// let filePath = JSON.stringify(success.message, '\\', null)
// filePath = 'file:\/\/' + filePath.replace('\"', '')
// filePath = filePath.substr(0, filePath.length - 1)
// console.log('filePath ==== ' + filePath)
// // 回调成功上传图片
// vm.uploadImg(filePath)
// vm.goElectronicSign()
// }
// }, function (reason) {
// let error = JSON.parse(reason)
// vm.hlsPopup.showLongCenter('认证失败: ' + error.message)
// })
// } else {
// vm.hlsPopup.showLongCenter(res.message)
// }
// })
// },
// 查看大图 // 查看大图
showBigPicture (pic) { showBigPicture (pic) {
let vm = this let vm = this
...@@ -369,7 +526,7 @@ export default { ...@@ -369,7 +526,7 @@ export default {
let vm = this let vm = this
vm.faceListUpload = [] vm.faceListUpload = []
let obj = { let obj = {
pkvalue: vm.$route.params.check_id, pkvalue: vm.check_id,
source_type: 'PRJ_CDD_ITEM_CHECK', source_type: 'PRJ_CDD_ITEM_CHECK',
picture: '', picture: '',
filePath: img, filePath: img,
...@@ -402,19 +559,12 @@ export default { ...@@ -402,19 +559,12 @@ export default {
} }
}) })
}, },
// 执行同意的逻辑(查询对应的身份证正面图片->人脸识别->确认签约)
async confirmContractSign (faceImg) {
let idCardImgUrl = await this.idCardImgUrlGet()
if (idCardImgUrl) {
this.faceIdentify(faceImg, idCardImgUrl)
}
},
// 获取身份证照片 // 获取身份证照片
async idCardImgUrlGet () { async idCardImgUrlGet () {
let vm = this let vm = this
let url = $config.basePath + 'car_id_card_query' let url = $config.basePath + 'car_id_card_query'
let param = { let param = {
confirm_id: vm.$route.params.confirm_id, confirm_id: vm.confirm_id,
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
let res = await vm.$post(url, param) let res = await vm.$post(url, param)
...@@ -435,51 +585,8 @@ export default { ...@@ -435,51 +585,8 @@ export default {
return null return null
} }
}, },
// 人脸比对
faceIdentify (faceImg, idCardImgUrl) {
let vm = this
let obj = {
fileUrl: faceImg,
idCardImgUrl: idCardImgUrl,
}
hlsPopup.showLoading('正在比对')
let url = process.env.ocrPath + '/baidu/ocr/face'
hlsUtil.baiduOcrFace(obj, url, function (res) {
hlsPopup.hideLoading()
if (res.success && res.result.result.score) {
// vm.save_picture(vm.faceListUpload)
let identifyScore = res.result.result.score.toFixed(0)
if (identifyScore >= 50) {
hlsPopup.showPopup({
title: '提示',
content: `识别分数为${identifyScore},请进行活体检测`,
onConfirm: () => {
// 进入活体检测页面
vm.goBodyCheck(vm.confirm_id)
},
})
} else {
hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
}
} else {
hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
}
})
},
goBodyCheck (confirm_id) {
// 活体检测
this.$refs.body.show()
/* this.$router.push({
name: 'BodyCheck',
params: {
check_id: this.$route.params.check_id,
confirm_id: confirm_id,
},
}) */
},
// 图片保存 // 图片保存
save_picture (list) { save_picture (list) {
// alert('list' + JSON.stringify(list))
let vm = this let vm = this
if (list.length) { if (list.length) {
// hlsPopup.showLoading('图片上传请稍候') // hlsPopup.showLoading('图片上传请稍候')
...@@ -488,8 +595,6 @@ export default { ...@@ -488,8 +595,6 @@ export default {
var recordUploadInterval = setInterval(function () { var recordUploadInterval = setInterval(function () {
if (alreadyUploadNum === attLength) { if (alreadyUploadNum === attLength) {
clearInterval(recordUploadInterval) clearInterval(recordUploadInterval)
/* hlsPopup.hideLoading()
hlsPopup.showLongCenter('图片上传成功') */
} }
}, 500) }, 500)
for (var i = 0; i < list.length; i++) { for (var i = 0; i < list.length; i++) {
...@@ -500,7 +605,6 @@ export default { ...@@ -500,7 +605,6 @@ export default {
if (list[j].filePath === res.response.filePath) { if (list[j].filePath === res.response.filePath) {
list[j].attachment_id = res.response.attachment_id list[j].attachment_id = res.response.attachment_id
vm.faceListUpload.push(list[j]) vm.faceListUpload.push(list[j])
// alert('faceListUpload' + JSON.stringify(vm.faceListUpload))
break break
} }
} }
...@@ -510,7 +614,6 @@ export default { ...@@ -510,7 +614,6 @@ export default {
} }
if (!list[i].attachment_id) { if (!list[i].attachment_id) {
attLength++ attLength++
// alert('list[i] = ' + list[i])
hlsUtil.fileUploadSvc(list[i], uploadSuccess) hlsUtil.fileUploadSvc(list[i], uploadSuccess)
} }
} }
...@@ -567,7 +670,7 @@ export default { ...@@ -567,7 +670,7 @@ export default {
name: 'ContractContent', name: 'ContractContent',
params: { params: {
name, name,
business_type: this.$route.params.business_type, business_type: this.$route.query.business_type,
}, },
}) })
if (name === '经销商担保协议') { if (name === '经销商担保协议') {
...@@ -584,7 +687,9 @@ export default { ...@@ -584,7 +687,9 @@ export default {
let vm = this let vm = this
let url = process.env.basePath + 'car_equip_list_query' let url = process.env.basePath + 'car_equip_list_query'
let param = { let param = {
project_id: this.$route.params.project_id, project_id: vm.project_id,
pagesize: 999,
pagenum: 1,
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
...@@ -617,14 +722,17 @@ export default { ...@@ -617,14 +722,17 @@ export default {
getDetail () { getDetail () {
let vm = this let vm = this
let url = process.env.basePath + 'con_contract_detial' let url = process.env.basePath + 'con_contract_detial'
debugger
let param = { let param = {
project_id: this.$route.params.project_id, project_id: vm.project_id,
} }
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.result === 'S') {
vm.info = res.info vm.info = res.info
vm.info.sale_date ? vm.info.sale_date = vm.info.sale_date.substr(0, 10) : vm.info.sale_date = ''
vm.info.lease_start_date ? vm.info.lease_start_date = vm.info.lease_start_date.substr(0, 10) : vm.info.lease_start_date = ''
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
...@@ -638,6 +746,10 @@ export default { ...@@ -638,6 +746,10 @@ export default {
input::placeholder { input::placeholder {
color: #888c8f; color: #888c8f;
} }
.firstPay {
color: #ff9200;
font-weight: bold;
}
.trans-enter-active, .trans-enter-active,
.trans-leave-active { .trans-leave-active {
transition: opacity 0.5s; transition: opacity 0.5s;
......
src/pages/carConfirm/confirm-list.vue
View file @ 5c9fd23f
...@@ -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>
<Tab :title="text" @getTabNum="getTabNum" /> <Tab :title="text" @getTabNum="getTabNum" />
...@@ -56,7 +56,7 @@ export default { ...@@ -56,7 +56,7 @@ export default {
}, },
data () { data () {
return { return {
text: {first: '待确认', second: '已确认'}, text: {first: '待签订', second: '已签订'},
tabNum: 0, tabNum: 0,
keyWord: '', keyWord: '',
status: '', status: '',
...@@ -140,9 +140,10 @@ export default { ...@@ -140,9 +140,10 @@ export default {
this.$refs.scroll.scrollToTop() this.$refs.scroll.scrollToTop()
}, },
changePage (e) { changePage (e) {
debugger
this.$router.push({ this.$router.push({
name: 'ConfirmDetail', name: 'ConfirmDetail',
params: { query: {
project_id: e.project_id, project_id: e.project_id,
confirm_status: e.confirm_status, confirm_status: e.confirm_status,
check_id: e.check_id, check_id: e.check_id,
......
src/pages/contractCreate/add-undertake.vue
View file @ 5c9fd23f
...@@ -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="search has-header"> <div class="search has-header">
......
src/pages/contractCreate/contract-create-list.vue
View file @ 5c9fd23f
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,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="tab-style has-header"> <div class="tab-style has-header">
......
src/pages/contractCreate/creat-rent-info.vue
View file @ 5c9fd23f
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
</list-item> </list-item>
</div> </div>
</div> </div>
</div></transition> </transition>
<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="routeGoCustomClick()"> <img src="@/assets/userBind/arrow.png" @click="routeGoCustomClick()">
...@@ -131,37 +131,7 @@ ...@@ -131,37 +131,7 @@
<div slot="name" class="required">产品数量</div> <div slot="name" class="required">产品数量</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>
<item v-if="isReadOnly" class="check">
<div slot="name" class="required">是否已发车</div>
<img v-if="saveInfo.if_sent_car" slot="content" src="@/assets/contractCreate/selected.png" >
<span v-if="!saveInfo.if_sent_car" slot="content" />
</item>
<item v-if="!isReadOnly" class="check" @click.native="saveInfo.if_sent_car=!saveInfo.if_sent_car">
<div slot="name" class="required">是否已发车</div>
<img v-if="saveInfo.if_sent_car" slot="content" src="@/assets/contractCreate/selected.png" >
<span v-if="!saveInfo.if_sent_car" slot="content" />
</item>
</list-item>
<div>
<div class="userInfo">租赁物信息<img v-if="!isReadOnly" src="@/assets/contractCreate/add.png" @click="downNum=true;resetRent()"></div>
<item-option v-for="(item,index) in leaseList" ref="underTake" :key="index" class="mySlider">
<list-item :item-height="68" @click.native="downNum=true;getRent(item.project_lease_item_id)">
<item>
<span slot="left-icon" class="left-icon">{{ index+1 }}</span>
<div slot="name">
租赁物信息<br >车辆型号
</div>
<div slot="content">
<input placeholder="" readonly >
<input v-model="item.vehicle_model" placeholder="" readonly >
</div>
</item>
</list-item> </list-item>
<div slot="buttons">
<option-button v-if="!isReadOnly" type="delete" text @click.native="delete_release(item.project_lease_item_id,index)" />
</div>
</item-option>
</div>
<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">提示 以下为单个设备商务政策
...@@ -481,7 +451,7 @@ export default { ...@@ -481,7 +451,7 @@ export default {
project_id: window.localStorage.project_id, project_id: window.localStorage.project_id,
business_type: '', business_type: '',
bp_name: '', bp_name: '',
if_sent_car: true, if_sent_car: 'N',
product_id: '', product_id: '',
product_id_n: '', product_id_n: '',
product_num: '', product_num: '',
...@@ -611,7 +581,7 @@ export default { ...@@ -611,7 +581,7 @@ export default {
vm.rentList() vm.rentList()
} }
Object.keys(vm.saveInfo).forEach(i => { // 置空saveInfo Object.keys(vm.saveInfo).forEach(i => { // 置空saveInfo
if (i !== 'project_id' && i !== 'bp_name' && i !== 'lease_start_date' && i !== 'if_sent_car') { if (i !== 'project_id' && i !== 'bp_name' && i !== 'lease_start_date') {
vm.saveInfo[i] = '' vm.saveInfo[i] = ''
} }
}) })
...@@ -631,28 +601,6 @@ export default { ...@@ -631,28 +601,6 @@ export default {
}) })
}, },
methods: { methods: {
delete_release (project_lease_item_id, index) {
hlsPopup.showConfirm({
title: '提示',
content: '您确认删除吗？',
onConfirm: (index2) => {
if (index2 === 1) {
let url = process.env.basePath + 'prj_leases_info_delete'
let param = {
project_lease_item_id: project_lease_item_id,
}
this.$post(url, param).then((res) => {
this.hlsPopup.hideLoading()
if (res.result === 'S') {
this.leaseList.splice(index, 1)
} else {
hlsPopup.showLongCenter(res.message)
}
})
}
},
})
},
// 查看大图 // 查看大图
showBigPicture (pic) { showBigPicture (pic) {
let vm = this let vm = this
...@@ -661,35 +609,6 @@ export default { ...@@ -661,35 +609,6 @@ export default {
width: '100%', width: '100%',
}) })
}, },
resetRent () {
this.rentInfo = {
project_lease_item_id: '',
project_id: window.localStorage.project_id,
frame_number: '',
engine: '',
vehicle_model: '',
certificate_number: '',
departure_date: '',
invoice_date: '',
}
},
getRent (id) {
let vm = this
let url = process.env.basePath + 'prj_leases_info_query'
let param = {
project_lease_item_id: id,
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
Object.assign(vm.rentInfo, res.info)
vm.getImg(id)
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
saveRent () { saveRent () {
let url = process.env.basePath + 'prj_leases_info_save' let url = process.env.basePath + 'prj_leases_info_save'
if (this.rentInfo.frame_number === '') { if (this.rentInfo.frame_number === '') {
...@@ -1028,11 +947,6 @@ export default { ...@@ -1028,11 +947,6 @@ export default {
if (res.result === 'S') { if (res.result === 'S') {
if (res.info !== undefined) { if (res.info !== undefined) {
Object.assign(vm.saveInfo, res.info) Object.assign(vm.saveInfo, res.info)
if (res.info.if_sent_car == 'Y') {
vm.saveInfo.if_sent_car = true
} else if (res.info.if_sent_car == 'N') {
vm.saveInfo.if_sent_car = false
}
vm.saveInfo.product_plan_name = res.info.product_plan_id_n vm.saveInfo.product_plan_name = res.info.product_plan_id_n
vm.factory_ocr_type = res.info.factory_ocr_type vm.factory_ocr_type = res.info.factory_ocr_type
vm.saveInfo.division_n = res.info.product_name vm.saveInfo.division_n = res.info.product_name
...@@ -1138,11 +1052,6 @@ export default { ...@@ -1138,11 +1052,6 @@ export default {
let param = { let param = {
master: JSON.parse(JSON.stringify(vm.saveInfo)), master: JSON.parse(JSON.stringify(vm.saveInfo)),
} }
if (vm.saveInfo.if_sent_car == true) {
param.master.if_sent_car = 'Y'
} else if (vm.saveInfo.if_sent_car == false) {
param.master.if_sent_car = 'N'
}
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
if (res.result === 'S') { if (res.result === 'S') {
......
src/pages/contractCreate/my-contract.vue
View file @ 5c9fd23f
...@@ -15,24 +15,24 @@ ...@@ -15,24 +15,24 @@
</h-header> </h-header>
<div class="my-contractlist"> <div class="my-contractlist">
<div class="contract-item" @click="goSign()"> <div class="contract-item" @click="goSign()">
<p :class="{'content-wrap-class-width':signCount > 99, 'content-wrap-class':signCount < 99}" v-if="signCount > 0">{{ signCount > 99 ? '99+' : signCount }}</p> <p v-if="signCount > 0" :class="{'content-wrap-class-width':signCount > 99, 'content-wrap-class':signCount < 99}">{{ signCount > 99 ? '99+' : signCount }}</p>
<img src="@/assets/myInfo/unSign.png" > <img src="@/assets/myInfo/unSign.png" >
<span>合同签约</span> <span>融租方案确认</span>
</div> </div>
<div class="contract-item" v-if="multipleRole == 'TENANT' || multipleRole == 'GUTA'" @click="goCarConfirm()"> <div v-if="multipleRole == 'TENANT' || multipleRole == 'GUTA'|| user_bp_type == 'AGENT'" class="contract-item" @click="goCarConfirm()">
<p :class="{'content-wrap-class-width':carCount > 99, 'content-wrap-class':carCount < 99}" v-if="carCount > 0">{{ carCount > 99 ? '99+' : carCount }}</p> <p v-if="carCount > 0" :class="{'content-wrap-class-width':carCount > 99, 'content-wrap-class':carCount < 99}">{{ carCount > 99 ? '99+' : carCount }}</p>
<img src="@/assets/myInfo/carConfirm.png" > <img src="@/assets/myInfo/carConfirm.png" >
<span>发车确认</span> <span>合同签订</span>
</div> </div>
<div class="contract-item" v-if="multipleRole == 'AGENT' || (multipleRole == 'OFFICE' || user_bp_type == 'OFFICE')" @click="goCreate()"> <div v-if="multipleRole == 'AGENT' || (multipleRole == 'OFFICE' || user_bp_type == 'OFFICE')" class="contract-item" @click="goCreate()">
<img src="@/assets/myInfo/contractCreate.png" > <img src="@/assets/myInfo/contractCreate.png" >
<span>合同创建</span> <span>融租申请创建</span>
</div> </div>
<div class="contract-item" v-if="multipleRole == 'GUTA'" @click="changeContract('GUTA')"> <div v-if="multipleRole == 'GUTA'" class="contract-item" @click="changeContract('GUTA')">
<img src="@/assets/myInfo/under.png" > <img src="@/assets/myInfo/under.png" >
<span>我担保的合同</span> <span>我担保的合同</span>
</div> </div>
<div class="contract-item" v-if="multipleRole == 'AGENT' || (multipleRole == 'OFFICE' || user_bp_type == 'OFFICE')" @click="goContract()"> <div v-if="multipleRole == 'AGENT' || (multipleRole == 'OFFICE' || user_bp_type == 'OFFICE')" class="contract-item" @click="goContract()">
<img src="@/assets/myInfo/agent.png" > <img src="@/assets/myInfo/agent.png" >
<span>我办理的合同</span> <span>我办理的合同</span>
</div> </div>
...@@ -76,7 +76,7 @@ export default { ...@@ -76,7 +76,7 @@ export default {
vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
if (res.result === 'S') { if (res.result === 'S') {
if ('info' in res) { if ('info' in res) {
vm.signCount = res.info.con_confirm_num || 0 //待确认数量 数字 必输 待确认数量 vm.signCount = res.info.con_confirm_num || 0 // 待确认数量 数字 必输 待确认数量
vm.productCount = res.info.collect_num || 0 // 产品收藏数量 数字 必输 产品收藏数量 vm.productCount = res.info.collect_num || 0 // 产品收藏数量 数字 必输 产品收藏数量
vm.carCount = res.info.car_confirm_num || 0 // 发车待确认数量 数字 必输 发车待确认数量 vm.carCount = res.info.car_confirm_num || 0 // 发车待确认数量 数字 必输 发车待确认数量
vm.faceSign = res.info.face_sign_num || 0 // 待面签数量 数字 必要 待面签数量 vm.faceSign = res.info.face_sign_num || 0 // 待面签数量 数字 必要 待面签数量
...@@ -105,7 +105,7 @@ export default { ...@@ -105,7 +105,7 @@ export default {
hlsPopup.showLongCenter('请先进行用户绑定') hlsPopup.showLongCenter('请先进行用户绑定')
} }
}, },
// 进入发车确认 // 进入合同签订
goCarConfirm () { goCarConfirm () {
if (this.bp_id) { if (this.bp_id) {
this.$router.push({ this.$router.push({
...@@ -115,7 +115,7 @@ export default { ...@@ -115,7 +115,7 @@ export default {
hlsPopup.showLongCenter('请先进行用户绑定') hlsPopup.showLongCenter('请先进行用户绑定')
} }
}, },
// 合同创建 // 融租申请创建
goCreate () { goCreate () {
this.$router.push({ this.$router.push({
name: 'ContractCreateList', name: 'ContractCreateList',
......
src/pages/contractCreate/sales-info.vue
View file @ 5c9fd23f
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,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>
<h-content> <h-content>
......
src/pages/contractSigning/contract-detail.vue
View file @ 5c9fd23f
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime : 2019-12-26 12:08:25
* @LastEditors : Please set LastEditors
* @Description: In User Settings Edit
-->
<template> <template>
<h-view id="contract-details" class="public-style"> <h-view id="contract-details" class="public-style">
<div v-show="isshow" class="all"> <div v-show="isshow" class="all">
...@@ -25,7 +18,7 @@ ...@@ -25,7 +18,7 @@
<span>合同详情</span> <span>合同详情</span>
</div> </div>
</h-header> </h-header>
<div <!-- <div
v-if="bookFlag" v-if="bookFlag"
class="myModal" class="myModal"
> >
...@@ -39,7 +32,7 @@ ...@@ -39,7 +32,7 @@
<button v-if="!ischecked" style="background:rgba(56, 63, 69, 0.5)">同意</button> <button v-if="!ischecked" style="background:rgba(56, 63, 69, 0.5)">同意</button>
<button v-if="ischecked" class="appro" style="background:#00469c" @click="confirm">同意</button> <button v-if="ischecked" class="appro" style="background:#00469c" @click="confirm">同意</button>
</div> </div>
</div> </div> -->
<div class="tab-style"> <div class="tab-style">
<div :class="{'done':num === 0,'undone':num !== 0}" @click="num = 0;"> <div :class="{'done':num === 0,'undone':num !== 0}" @click="num = 0;">
<img :src="num === 0?check1:uncheck1" >基本信息 <img :src="num === 0?check1:uncheck1" >基本信息
...@@ -423,7 +416,7 @@ export default { ...@@ -423,7 +416,7 @@ export default {
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_CONFIRM',
} }
let res = await vm.hlsHttp.post(url, param) let res = await vm.hlsHttp.post(url, param)
hlsPopup.hideLoading() hlsPopup.hideLoading()
...@@ -470,14 +463,14 @@ export default { ...@@ -470,14 +463,14 @@ export default {
let url = process.env.basePath + 'get_content_app' let url = process.env.basePath + 'get_content_app'
let param = { let param = {
confirm_id: vm.confirm_id, confirm_id: vm.confirm_id,
data_class: 'PRJ_PREVIEW', data_class: 'PRJ_CONFIRM',
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(res => { vm.hlsHttp.post(url, param).then(res => {
hlsPopup.hideLoading() hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
vm.attachArray = res.attachments vm.attachArray = res.attachments
vm.getBook() // vm.getBook()
} else { } else {
vm.hlsPopup.showLongCenter(res.message) vm.hlsPopup.showLongCenter(res.message)
} }
...@@ -570,7 +563,7 @@ export default { ...@@ -570,7 +563,7 @@ export default {
let url = process.env.basePath + 'get_sign_url' let url = process.env.basePath + 'get_sign_url'
let param = { let param = {
confirm_id: vm.confirm_id, confirm_id: vm.confirm_id,
data_class: 'PRJ_PROJECT', data_class: 'PRJ_CONFIRM',
} }
vm.hlsPopup.showLoading('请稍候') vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) { vm.hlsHttp.post(url, param).then(function (res) {
...@@ -602,40 +595,44 @@ export default { ...@@ -602,40 +595,44 @@ export default {
}, },
async takePhonto () { async takePhonto () {
let vm = this let vm = this
let flag = await this.signCheck()
if (flag) {
vm.hlsPopup.showLongCenter('已经验证过！')
return
}
let url = process.env.basePath + 'bp_query'
let param = {
bp_id: window.localStorage.bp_id,
}
hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(res => {
hlsPopup.hideLoading()
if (res.result === 'S') {
let data = res.lists[0]
cordova.plugins.IdCardPlugin.faceContrast({'idNum': data.id_card_no, 'idName': data.bp_name}, function (suc) {
let success = JSON.parse(suc)
if (success.code === 1) {
let filePath = JSON.stringify(success.message, '\\', null)
filePath = 'file:\/\/' + filePath.replace('\"', '')
filePath = filePath.substr(0, filePath.length - 1)
console.log('filePath ==== ' + filePath)
// 回调成功上传图片
vm.uploadImg(filePath)
vm.goElectronicSign() vm.goElectronicSign()
}
}, function (reason) {
let error = JSON.parse(reason)
vm.hlsPopup.showLongCenter('认证失败: ' + error.message)
})
} else {
vm.hlsPopup.showLongCenter(res.message)
}
})
}, },
// async takePhonto () {
// let vm = this
// let flag = await this.signCheck()
// if (flag) {
// vm.hlsPopup.showLongCenter('已经验证过！')
// return
// }
// let url = process.env.basePath + 'bp_query'
// let param = {
// bp_id: window.localStorage.bp_id,
// }
// hlsPopup.showLoading('请稍候')
// vm.hlsHttp.post(url, param).then(res => {
// hlsPopup.hideLoading()
// if (res.result === 'S') {
// let data = res.lists[0]
// cordova.plugins.IdCardPlugin.faceContrast({'idNum': data.id_card_no, 'idName': data.bp_name}, function (suc) {
// let success = JSON.parse(suc)
// if (success.code === 1) {
// let filePath = JSON.stringify(success.message, '\\', null)
// filePath = 'file:\/\/' + filePath.replace('\"', '')
// filePath = filePath.substr(0, filePath.length - 1)
// console.log('filePath ==== ' + filePath)
// // 回调成功上传图片
// vm.uploadImg(filePath)
// vm.goElectronicSign()
// }
// }, function (reason) {
// let error = JSON.parse(reason)
// vm.hlsPopup.showLongCenter('认证失败: ' + error.message)
// })
// } else {
// vm.hlsPopup.showLongCenter(res.message)
// }
// })
// },
// 图片上传 // 图片上传
uploadImg (img) { uploadImg (img) {
let vm = this let vm = this
......
src/pages/contractSigning/contract-repay-plan.vue
View file @ 5c9fd23f
<!--
* @Author: your name
* @Date: 2019-10-30 19:29:24
* @LastEditTime : 2019-12-26 16:47:28
* @LastEditors : Please set LastEditors
* @Description: In User Settings Edit
-->
<template> <template>
<h-view id="repay-pland" class="public-style"> <h-view id="repay-pland" class="public-style">
<h-header :proportion="[5,1,1]" class="bar-custom"> <h-header :proportion="[5,1,1]" class="bar-custom">
...@@ -86,19 +79,14 @@ export default { ...@@ -86,19 +79,14 @@ export default {
height: 0, height: 0,
oldHeight: 0, oldHeight: 0,
newHeight: 0, newHeight: 0,
product_num: '', // 产品数量 product_num: this.$route.params.product_num, // 产品数量
project_id: this.$route.params.project_id,
} }
}, },
computed: {}, computed: {},
watch: {}, watch: {},
beforeRouteEnter (to, from, next) { created () {
next(vm => { this.getInfo()
if (from.name === 'ContractDetail' || from.name === 'CreateRentInfo') {
vm.product_num = vm.$route.params.product_num
vm.getInfo()
}
})
next()
}, },
methods: { methods: {
dateConverse (date) { dateConverse (date) {
...@@ -140,7 +128,7 @@ export default { ...@@ -140,7 +128,7 @@ export default {
let vm = this let vm = this
let url = process.env.basePath + 'prj_cashflow_query' let url = process.env.basePath + 'prj_cashflow_query'
let param = { let param = {
project_id: vm.$route.params.project_id, project_id: vm.project_id,
} }
vm.hlsPopup.showLoading('数据加载中') vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) { vm.hlsHttp.post(url, param).then(function (res) {
...@@ -151,22 +139,6 @@ export default { ...@@ -151,22 +139,6 @@ export default {
} }
}) })
}, },
// repayQuery () {
// let vm = this
// let url = $config.basePath + 'prd_repayment_plan'
// let param = {
// quotation_id: vm.$route.params.quotation_id,
// }
// vm.hlsPopup.showLoading('数据加载中')
// vm.hlsHttp.post(url, param).then(function (res) {
// vm.hlsPopup.hideLoading()
// if (res.result === 'S') {
// vm.info = res.info
// } else {
// hlsPopup.showLongCenter(res.message)
// }
// })
// },
}, },
} }
......
src/pages/contractSigning/contract-signing.vue
View file @ 5c9fd23f
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
<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="tab-style has-header"> <div class="tab-style has-header">
<div :class="{'done':num === 1,'undone':num !== 1}" @click="num = 1;"><img :src="num === 1?check1:uncheck1"><span>待签约</span></div> <div :class="{'done':num === 1,'undone':num !== 1}" @click="num = 1;"><img :src="num === 1?check1:uncheck1"><span>待确认</span></div>
<div :class="{'done':num === 2,'undone':num !== 2}" @click="num = 2;"><img :src="num === 2?check2:uncheck2"><span>已签约</span></div> <div :class="{'done':num === 2,'undone':num !== 2}" @click="num = 2;"><img :src="num === 2?check2:uncheck2"><span>已确认</span></div>
</div> </div>
<!-- 搜索 --> <!-- 搜索 -->
<div class="search"> <div class="search">
......
src/pages/contractStart/add-car.vue
View file @ 5c9fd23f
...@@ -5,52 +5,89 @@ ...@@ -5,52 +5,89 @@
<div class="down"> <div class="down">
<div class="top"> <div class="top">
录入产品信息 录入产品信息
<img src="@/assets/intoApproval/close.png" @click="downNum=false" > <img
src="@/assets/intoApproval/close.png"
@click="downNum = false"
>
</div> </div>
<div class="down-content"> <div class="down-content">
<span>请上传照片</span> <span>请上传照片</span>
<div class="photo" @click="pickMethod()"> <div class="photo" @click="pickMethod()">
<img v-if="vehicleImg" :src="vehicleImg" alt=""> <img v-if="vehicleImg" :src="vehicleImg" alt="" >
</div> </div>
<list-item :item-height="44"> <list-item :item-height="44">
<item> <item>
<div slot="name" class="required">车架号</div> <div slot="name" class="required">车架号</div>
<input slot="content" v-model="info.frame_number" :readonly="flag" placeholder="自动识别车架号" > <input
slot="content"
v-model="info.frame_number"
:readonly="flag"
placeholder="自动识别车架号"
>
</item> </item>
<item> <item>
<div slot="name" class="required">发动机号</div> <div slot="name" class="required">发动机号</div>
<input slot="content" v-model="info.engine" :readonly="flag" placeholder="自动识别发动机号" > <input
slot="content"
v-model="info.engine"
:readonly="flag"
placeholder="自动识别发动机号"
>
</item> </item>
<item> <item>
<div slot="name" class="required">车辆型号 </div> <div slot="name" class="required">车辆型号</div>
<input slot="content" v-model="info.vehicle_model" :readonly="flag" placeholder="自动识别车辆型号" > <input
slot="content"
v-model="info.vehicle_model"
:readonly="flag"
placeholder="自动识别车辆型号"
>
</item> </item>
<item> <item>
<div slot="name" class="required">合格证编号 </div> <div slot="name" class="required">合格证编号</div>
<input slot="content" v-model="info.certificate_number" :readonly="flag" placeholder="自动识别合格证编号" > <input
slot="content"
v-model="info.certificate_number"
:readonly="flag"
placeholder="自动识别合格证编号"
>
</item> </item>
<item v-if="!flag"> <item v-if="!flag">
<div slot="name" class="required">发车日期</div> <div slot="name" class="required">发车日期</div>
<input <input
slot="content" v-model="info.departure_date" readonly placeholder="请输入发车日期" slot="content"
@click="showTime('YYYY-MM-DD')"> v-model="info.departure_date"
readonly
placeholder="请输入发车日期"
@click="showTime('YYYY-MM-DD')"
>
</item> </item>
<item v-if="flag"> <item v-if="flag">
<div slot="name" class="required">发车日期</div> <div slot="name" class="required">发车日期</div>
<input <input
slot="content" v-model="info.departure_date" readonly placeholder="请输入发车日期" slot="content"
v-model="info.departure_date"
readonly
placeholder="请输入发车日期"
> >
</item> </item>
<item v-if="!flag"> <item v-if="!flag">
<div slot="name" class="required">开票日期</div> <div slot="name" class="required">开票日期</div>
<input <input
slot="content" v-model="info.invoice_date" readonly placeholder="请输入开票日期" slot="content"
@click="showTimeInvoice('YYYY-MM-DD')"> v-model="info.invoice_date"
readonly
placeholder="请输入开票日期"
@click="showTimeInvoice('YYYY-MM-DD')"
>
</item> </item>
<item v-if="flag"> <item v-if="flag">
<div slot="name" class="required">开票日期</div> <div slot="name" class="required">开票日期</div>
<input <input
slot="content" v-model="info.invoice_date" readonly placeholder="请输入开票日期" slot="content"
v-model="info.invoice_date"
readonly
placeholder="请输入开票日期"
> >
</item> </item>
<!-- <item :showArrow="true" @click.native="showModalValue=true"> <!-- <item :showArrow="true" @click.native="showModalValue=true">
...@@ -63,13 +100,15 @@ ...@@ -63,13 +100,15 @@
</div> </div>
</div> </div>
</transition> </transition>
<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>
<Tab :title="text" @getTabNum="getTabNum" />
<h-content> <h-content>
<div v-show="tabNum===0">
<div class="userInfo">承租人信息</div> <div class="userInfo">承租人信息</div>
<list-item :item-height="44"> <list-item :item-height="44">
<item v-if="!read" :showArrow="true"> <item v-if="!read" :showArrow="true">
...@@ -83,7 +122,12 @@ ...@@ -83,7 +122,12 @@
</item> </item>
<item v-if="read"> <item v-if="read">
<div slot="name">合同号</div> <div slot="name">合同号</div>
<input slot="content" v-model="detail.project_number" readonly placeholder="暂无数据" > <input
slot="content"
v-model="detail.project_number"
readonly
placeholder="暂无数据"
>
</item> </item>
<item v-if="!read" :showArrow="true"> <item v-if="!read" :showArrow="true">
<div slot="name">经销商</div> <div slot="name">经销商</div>
...@@ -95,15 +139,21 @@ ...@@ -95,15 +139,21 @@
> >
</item> </item>
<item v-if="read"> <item v-if="read">
<div slot="name">{{ detail.bp_agent_name?'经销商':'办事处' }}</div> <div slot="name">
<div slot="content">{{ detail.bp_agent_name?detail.bp_agent_name:detail.office_name }}</div> {{ detail.bp_agent_name ? "经销商" : "办事处" }}
</div>
<div slot="content">
{{
detail.bp_agent_name ? detail.bp_agent_name : detail.office_name
}}
</div>
</item> </item>
<item> <item>
<div slot="name">承租人</div> <div slot="name">承租人</div>
<input <input
slot="content" slot="content"
v-model="detail.bp_name" v-model="detail.bp_name"
:placeholder="read?'暂无数据':'请输入承租人姓名'" :placeholder="read ? '暂无数据' : '请输入承租人姓名'"
readonly="read" readonly="read"
> >
</item> </item>
...@@ -118,18 +168,28 @@ ...@@ -118,18 +168,28 @@
</item> </item>
<item v-if="read"> <item v-if="read">
<div slot="name">产品名称</div> <div slot="name">产品名称</div>
<input slot="content" v-model="detail.division_n" readonly placeholder="暂无数据" > <input
slot="content"
v-model="detail.division_n"
readonly
placeholder="暂无数据"
>
</item> </item>
<item v-if="read"> <item v-if="read">
<div slot="name">产品型号</div> <div slot="name">产品型号</div>
<input slot="content" v-model="detail.product_code" readonly placeholder="暂无数据" > <input
slot="content"
v-model="detail.product_code"
readonly
placeholder="暂无数据"
>
</item> </item>
<item> <item>
<div slot="name">合同金额</div> <div slot="name">合同金额</div>
<input <input
slot="content" slot="content"
v-model="detail.total_price" v-model="detail.total_price"
:placeholder="read?'暂无数据':'请输入合同金额'" :placeholder="read ? '暂无数据' : '请输入合同金额'"
:readonly="read" :readonly="read"
> >
</item> </item>
...@@ -144,19 +204,89 @@ ...@@ -144,19 +204,89 @@
</item> </item>
<item v-if="read"> <item v-if="read">
<div slot="name">商务政策</div> <div slot="name">商务政策</div>
<input slot="content" v-model="detail.product_plan_id_n" readonly placeholder="暂无数据" > <input
slot="content"
v-model="detail.product_plan_id_n"
readonly
placeholder="暂无数据"
>
</item> </item>
<item> <item>
<div slot="name">租赁物数量</div> <div slot="name">租赁物数量</div>
<input slot="content" v-model="detail.product_num " :readonly="read" placeholder="请输入租赁物数量" > <input
slot="content"
v-model="detail.product_num"
:readonly="read"
placeholder="请输入租赁物数量"
>
</item>
<item
v-if="!flag"
class="date-check"
@click.native="showFirstTime('YYYY-MM-DD', 'Sign')"
>
<div slot="name" class="firstPay">签约日期</div>
<input
slot="content"
v-model="detail.sale_date"
readonly
placeholder="请选择日期 "
class="firstPay"
>
</item>
<item
v-if="flag"
>
<div slot="name" class="firstPay">签约日期</div>
<input
slot="content"
v-model="detail.sale_date"
readonly
placeholder="请选择日期 "
class="firstPay"
>
</item>
<item
v-if="!flag"
class="date-check"
@click.native="showFirstTime('YYYY-MM-DD', 'FirstPay')"
>
<div slot="name" class="firstPay">首次分期付款日</div>
<input
slot="content"
v-model="detail.lease_start_date"
readonly
placeholder="请选择日期 "
class="firstPay"
>
</item>
<item
v-if="flag"
>
<div slot="name" class="firstPay">首次分期付款日</div>
<input
slot="content"
v-model="detail.lease_start_date"
readonly
placeholder="请选择日期 "
class="firstPay"
>
</item>
<item :showArrow="true" @click.native="goPlan">
<div slot="name">查看还款计划</div>
<input slot="content" readonly >
</item> </item>
</list-item> </list-item>
<div class="userInfo">设备清单</div> <div class="userInfo">设备清单</div>
<div <div
v-for="(item,index) in equip" v-for="(item, index) in equip"
:key="index" :key="index"
class="equipment" class="equipment"
@click="downNum = true;getRent(item.contract_id,item.contract_lease_item_id)" @click="
downNum = true;
getRent(item.contract_id, item.contract_lease_item_id);
"
> >
<div class="left"> <div class="left">
<span> <span>
...@@ -165,20 +295,56 @@ ...@@ -165,20 +295,56 @@
</div> </div>
<div class="center"> <div class="center">
<span>租赁物信息</span> <span>租赁物信息</span>
<span :class="['status',item.lease_status === 'Y'?'unMantain':'mantain']">{{ item.lease_status === 'Y'?'已维护':'待维护' }}</span> <span
:class="[
'status',
item.lease_status === 'Y' ? 'unMantain' : 'mantain',
]"
>{{ item.lease_status === "Y" ? "已维护" : "待维护" }}</span
>
<p> <p>
设备识别号 设备识别号
<span>{{ item.product_code }}-{{ index+1|lengthCheck }}</span> <span>{{ item.product_code }}-{{ (index + 1) | lengthCheck }}</span>
</p> </p>
</div> </div>
<div class="right"> <div class="right">
<img src="@/assets/contractStart/into.png" > <img src="@/assets/contractStart/into.png" >
</div> </div>
</div> </div>
</div>
<div v-show="tabNum===1">
<list-item
:item-height="56"
class="contract-text"
style="background-color:rgb(250,250,250);"
>
<item v-for="(item,index) in attachArray" :proportion="[7,1]" :key="index">
<div slot="name" class="aguremrnt-list">
<img src="@/assets/constractSigning/npack.png" alt class="pics" >
<p class="second first">{{ item.attachment_file }}</p>
<img v-if="item.read_status === 'N'" class="unread" src="@/assets/constractSigning/unread.png" >
<img v-if="item.read_status === 'Y'" class="unread" src="@/assets/constractSigning/read.png" >
<div
v-if="item.template_code === 'PRE_ABC_PAYMENT'"
class="wrap-img"
@click="entryInfo"
>
<img src="@/assets/constractSigning/scan.png" >
</div>
</div>
<div slot="content" class="in-detail" @click="goContent(item,index)">
<img src="@/assets/constractSigning/detail.png" alt >
</div>
</item>
</list-item>
</div>
</h-content> </h-content>
<bottom-tab v-if="!flag"> <bottom-tab v-if="!flag">
<!-- <tab-button class="save" @click.native="handSave">同步电子签</tab-button> --> <tab-button class="save" @click.native="generateContract">生成合同文本</tab-button>
<tab-button class="approve" @click.native="checkStatus">发车申请</tab-button> <tab-button
class="approve" @click.native="checkStatus"
>融租合同创建</tab-button
>
</bottom-tab> </bottom-tab>
<div class="bottom-pop"> <div class="bottom-pop">
<div class="bottom-content"> <div class="bottom-content">
...@@ -197,7 +363,7 @@ ...@@ -197,7 +363,7 @@
</div> </div>
</div> </div>
<div class="wrap"> <div class="wrap">
<div v-for="(item,index) in 8" :key="index" class="bottom-item"> <div v-for="(item, index) in 8" :key="index" class="bottom-item">
<div class="left"> <div class="left">
<p> <p>
<img src="@/assets/contractStart/product.png" > <img src="@/assets/contractStart/product.png" >
...@@ -227,10 +393,14 @@ ...@@ -227,10 +393,14 @@
</h-view> </h-view>
</template> </template>
<script> <script>
import Tab from '@/pages/carConfirm/tab'
export default { export default {
components: {
Tab,
},
filters: { filters: {
lengthCheck: function (value) { lengthCheck: function (value) {
if ((value.toString()).length === 1) { if (value.toString().length === 1) {
return `0${value}` return `0${value}`
} else { } else {
return value return value
...@@ -243,68 +413,23 @@ export default { ...@@ -243,68 +413,23 @@ export default {
num: null, num: null,
downNum: false, downNum: false,
show: false, show: false,
project_id: this.$route.query.project_id,
read: false, // 表示只读 read: false, // 表示只读
showDate: '', showDate: '',
flag: false, flag: false,
isUpload: false, // 是否上传 isUpload: false, // 是否上传
contract_lease_item_id: '', contract_lease_item_id: '',
upload_list: [], // 上传列表 upload_list: [], // 上传列表
productLine: [ productLine: [],
{ productPlan: [],
code: '5', contract: [],
code_name: '测试3', tabNum: 0,
}, attachArray: [],
{ agent: [],
code: '9', text: {
code_name: 'PDJ', first: '合同详情',
}, second: '合同文本',
{ },
code: '6',
code_name: '测试1',
},
],
productPlan: [
{
code: '5',
code_name: '测试3',
},
{
code: '9',
code_name: 'PDJ',
},
{
code: '6',
code_name: '测试1',
},
],
contract: [
{
code: '5',
code_name: 'PRJ2019003',
},
{
code: '9',
code_name: 'PRJ2019025',
},
{
code: '6',
code_name: 'PRJ2019067',
},
],
agent: [
{
code: '7475',
code_name: '北京去楼下科技有限公司',
},
{
code: '7709',
code_name: '主机厂法人',
},
{
code: '7436',
code_name: '北京雪族科技有限公司',
},
],
info: { info: {
contract_id: '', contract_id: '',
frame_number: '', frame_number: '',
...@@ -330,6 +455,8 @@ export default { ...@@ -330,6 +455,8 @@ export default {
project_id: '', project_id: '',
bp_id: '', bp_id: '',
product_code: '', product_code: '',
sale_date: '',
lease_start_date: '',
}, },
equip: [], equip: [],
vehicleImg: '', vehicleImg: '',
...@@ -337,7 +464,8 @@ export default { ...@@ -337,7 +464,8 @@ export default {
} }
}, },
computed: { computed: {
numInt () { // 添加设备的时候处理值为空或者nul的情况 numInt () {
// 添加设备的时候处理值为空或者nul的情况
if (this.detail.product_num !== null && this.detail.product_num !== '') { if (this.detail.product_num !== null && this.detail.product_num !== '') {
return parseInt(this.detail.product_num) return parseInt(this.detail.product_num)
} else { } else {
...@@ -349,36 +477,37 @@ export default { ...@@ -349,36 +477,37 @@ export default {
let y = date.getFullYear() let y = date.getFullYear()
let m = date.getMonth() + 1 let m = date.getMonth() + 1
let d = date.getDate() let d = date.getDate()
if ((m.toString()).length < 2) { if (m.toString().length < 2) {
m = `0${m}` m = `0${m}`
} else if ((d.toString()).length < 2) { } else if (d.toString().length < 2) {
d = `0${d}` d = `0${d}`
} }
return `${y}-${m}-${d}` return `${y}-${m}-${d}`
}, },
}, },
watch: { watch: {
'downNum' (newVal, oldVal) { downNum (newVal, oldVal) {
if (!newVal) { if (!newVal) {
this.vehicleImg = '' this.vehicleImg = ''
} }
}, },
}, },
created () {
// this.showDate = this.carDate
},
beforeRouteEnter (to, from, next) { beforeRouteEnter (to, from, next) {
next(vm => { next((vm) => {
// if (from.name === 'StartList') { // if (from.name === 'StartList') {
// vm.getProductLine() // vm.getProductLine()
// vm.getProductPlan() // vm.getProductPlan()
// vm.getContractNum() // vm.getContractNum()
// } // }
if (vm.$route.params.project_id) { if (vm.$route.query.project_id) {
vm.read = true vm.read = true
vm.getDetail() vm.getDetail()
vm.getEquipment() vm.getEquipment()
if (vm.$route.params.car_start_status === 'REJECTED' || vm.$route.params.car_start_status === 'NEW') { vm.getAttachment()
if (
vm.$route.query.car_start_status === 'REJECTED' ||
vm.$route.query.car_start_status === 'NEW'
) {
vm.flag = false vm.flag = false
} else { } else {
vm.flag = true vm.flag = true
...@@ -393,7 +522,7 @@ export default { ...@@ -393,7 +522,7 @@ export default {
let vm = this let vm = this
let url = process.env.basePath + 'syn_content_app' let url = process.env.basePath + 'syn_content_app'
let param = { let param = {
project_id: vm.$route.params.project_id, project_id: vm.$route.query.project_id,
} }
vm.hlsPopup.showLoading('请稍候') vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) { vm.hlsHttp.post(url, param).then(function (res) {
...@@ -406,7 +535,44 @@ export default { ...@@ -406,7 +535,44 @@ export default {
} }
}) })
}, },
getImg (id) { // 获取合格证 goContent (item, index) {
// 详情
// 合同状态更新保存
let vm = this
vm.attachFlag = true
vm.attachUrl = item.attachment_file_path
let url = process.env.basePath + 'prj_content_check_status_save'
let param = {
master: {
content_id: item.content_id,
check_status: 'Y',
},
}
hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(res => {
hlsPopup.hideLoading()
if (res.result === 'S') {
let temp = vm.attachArray[index]
temp.read_status = 'Y'
vm.$router.push({name: 'previewPdf', params: {attachUrl: vm.attachUrl}})
vm.attachArray.splice(vm.attachArray[index], 1, temp)
} else {
vm.hlsPopup.showLongCenter(res.message)
}
})
},
goPlan () {
let vm = this
vm.$router.push({
name: 'ContractRepayPlan',
params: {
product_num: vm.detail.product_num,
project_id: vm.project_id,
},
})
},
getImg (id) {
// 获取合格证
let vm = this let vm = this
let randomString = Math.floor(Math.random() * 21) let randomString = Math.floor(Math.random() * 21)
let url = let url =
...@@ -415,15 +581,20 @@ export default { ...@@ -415,15 +581,20 @@ export default {
'&index' + '&index' +
`'${randomString}'` `'${randomString}'`
let param = { let param = {
'master': { master: {
'source_type': 'CON_CONTRACT_LEASE_ITEM', source_type: 'CON_CONTRACT_LEASE_ITEM',
'pkvalue': id, pkvalue: id,
}, },
} }
vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
if (res.result === 'S') { if (res.result === 'S') {
if (res.info) { if (res.info) {
vm.vehicleImg = process.env.filePath + 'attachment_id=' + res.info.attachment_id + '&access_token=' + window.localStorage.access_token vm.vehicleImg =
process.env.filePath +
'attachment_id=' +
res.info.attachment_id +
'&access_token=' +
window.localStorage.access_token
} }
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
...@@ -436,7 +607,7 @@ export default { ...@@ -436,7 +607,7 @@ export default {
hlsPopup.showActionSheet({ hlsPopup.showActionSheet({
titleText: '请选择证件类型', titleText: '请选择证件类型',
buttonArray: ['徐工重型合格证', '车辆登记证', '出厂合格证'], buttonArray: ['徐工重型合格证', '车辆登记证', '出厂合格证'],
callback: index => { callback: (index) => {
if (index === 0) { if (index === 0) {
vm.certificationType = 'NORMAL' vm.certificationType = 'NORMAL'
vm.ocrShow() vm.ocrShow()
...@@ -450,13 +621,16 @@ export default { ...@@ -450,13 +621,16 @@ export default {
}, },
}) })
}, },
getTabNum (i) {
this.tabNum = i
},
// ocr识别入口 // ocr识别入口
ocrShow () { ocrShow () {
let vm = this let vm = this
hlsPopup.showActionSheet({ hlsPopup.showActionSheet({
titleText: '请选择照片', titleText: '请选择照片',
buttonArray: ['拍照', '从相册取'], buttonArray: ['拍照', '从相册取'],
callback: index => { callback: (index) => {
if (index === 0) { if (index === 0) {
vm.openCamera() vm.openCamera()
} else { } else {
...@@ -596,6 +770,104 @@ export default { ...@@ -596,6 +770,104 @@ export default {
}, },
}) })
}, },
showFirstTime (format, code) {
this.hlsPopup.showTime({
nowDate: `${this.carDate}`,
format: format,
callback: (date) => {
if (code === 'FirstPay') {
if (this.detail.lease_start_date !== date) {
this.hlsPopup.showConfirm({
title: '提示',
content: `原首次分期付款日期：${this.detail.lease_start_date}<br/>修改后：<span style="color:#ff9200;font-weight:bold;">${date}</span><br/>修改后需<span style="color:#ff9200;font-weight:bold;">重算租金计划</span>，您是否确认修改？`,
confirmText: '确认',
onConfirm: (data) => {
if (data === 1) {
this.detail.lease_start_date = date
this.updateFirstPayDate()
}
},
})
}
} else if (code === 'Sign') {
if (this.detail.sale_date !== date) {
this.hlsPopup.showConfirm({
title: '提示',
content: `原签约日期：${this.detail.sale_date}<br/>修改后：<span style="color:#ff9200;font-weight:bold;">${date}</span><br/>您是否确认修改？`,
confirmText: '确认',
onConfirm: (data) => {
if (data === 1) {
this.detail.sale_date = date
this.updateSignDate()
}
},
})
}
}
},
})
},
recalculate () {
// 重算还款计划
let vm = this
let url = process.env.basePath + 'repay_calc_by_date'
let param = {
master: {
project_id: vm.project_id,
lease_start_date: vm.detail.lease_start_date,
},
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
hlsPopup.showLongCenter('还款计划重算成功！')
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
updateFirstPayDate () {
// 更新首次付款日
let vm = this
let url = process.env.basePath + 'prj_lease_start_date_upd'
let param = {
master: {
project_id: vm.project_id,
lease_start_date: vm.detail.lease_start_date,
},
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
// hlsPopup.showLongCenter('首次分期付款日期更新成功！')
vm.recalculate()
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
updateSignDate () {
// 更新签约日期
let vm = this
let url = process.env.basePath + 'prj_sale_date_upd'
let param = {
master: {
project_id: vm.project_id,
sale_date: vm.detail.sale_date,
},
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
hlsPopup.showLongCenter('签约日期更新成功！')
} else {
hlsPopup.showLongCenter(res.message)
}
})
},
showTimeInvoice (format) { showTimeInvoice (format) {
this.hlsPopup.showTime({ this.hlsPopup.showTime({
nowDate: `${this.carDate}`, nowDate: `${this.carDate}`,
...@@ -659,7 +931,7 @@ export default { ...@@ -659,7 +931,7 @@ export default {
this.hlsPopup.showConfirm({ this.hlsPopup.showConfirm({
title: '提示', title: '提示',
content: '您确定保存吗？', content: '您确定保存吗？',
onConfirm: data => { onConfirm: (data) => {
if (data === 1) { if (data === 1) {
this.save() this.save()
} }
...@@ -667,8 +939,44 @@ export default { ...@@ -667,8 +939,44 @@ export default {
}) })
} }
}, },
generateContract () {
// 生成合同文本
let vm = this
let url = process.env.basePath + 'car_create_all_content'
let param = {
project_id: vm.project_id,
}
hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(res => {
hlsPopup.hideLoading()
if (res.result === 'S') {
hlsPopup.showLongCenter('提交成功！')
vm.getAttachment()
} else {
vm.hlsPopup.showLongCenter(res.message)
}
})
},
// 合同文本详情附件查询
getAttachment () {
let vm = this
let url = process.env.basePath + 'get_content_app_agent'
let param = {
project_id: vm.project_id,
data_class: 'LEASE_ITEM',
}
hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(res => {
hlsPopup.hideLoading()
if (res.result === 'S') {
vm.attachArray = res.attachments
} else {
vm.hlsPopup.showLongCenter(res.message)
}
})
},
checkStatus () { checkStatus () {
let mantained = this.equip.filter(i => { let mantained = this.equip.filter((i) => {
return i.lease_status === 'N' return i.lease_status === 'N'
}) })
if (mantained.length > 0) { if (mantained.length > 0) {
...@@ -681,7 +989,7 @@ export default { ...@@ -681,7 +989,7 @@ export default {
this.hlsPopup.showConfirm({ this.hlsPopup.showConfirm({
title: '提示', title: '提示',
content: '您确定申请发车吗？', content: '您确定申请发车吗？',
onConfirm: data => { onConfirm: (data) => {
if (data === 1) { if (data === 1) {
this.approve() this.approve()
} }
...@@ -716,7 +1024,7 @@ export default { ...@@ -716,7 +1024,7 @@ export default {
let url = process.env.basePath + 'car_apply_submit' let url = process.env.basePath + 'car_apply_submit'
let param = { let param = {
master: { master: {
project_id: this.$route.params.project_id, project_id: vm.project_id,
}, },
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
...@@ -726,7 +1034,7 @@ export default { ...@@ -726,7 +1034,7 @@ export default {
vm.hlsPopup.showSuccess('申请成功') vm.hlsPopup.showSuccess('申请成功')
setTimeout(() => { setTimeout(() => {
vm.$router.push({ vm.$router.push({
name: 'MyInfo', name: 'StartList',
}) })
}, 2000) }, 2000)
} else { } else {
...@@ -738,7 +1046,9 @@ export default { ...@@ -738,7 +1046,9 @@ export default {
let vm = this let vm = this
let url = process.env.basePath + 'car_equip_list_query' let url = process.env.basePath + 'car_equip_list_query'
let param = { let param = {
project_id: this.$route.params.project_id, project_id: this.$route.query.project_id,
pagesize: 999,
pagenum: 1,
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
...@@ -760,7 +1070,7 @@ export default { ...@@ -760,7 +1070,7 @@ export default {
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.result === 'S') {
vm.contract = res.lists.map(item => { vm.contract = res.lists.map((item) => {
return { return {
code: item.project_id, code: item.project_id,
code_name: item.project_number, code_name: item.project_number,
...@@ -791,7 +1101,7 @@ export default { ...@@ -791,7 +1101,7 @@ export default {
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.result === 'S') {
vm.agent = res.lists.map(item => { vm.agent = res.lists.map((item) => {
return { return {
code: item.factory_bp_id, code: item.factory_bp_id,
code_name: item.bp_name, code_name: item.bp_name,
...@@ -815,29 +1125,18 @@ export default { ...@@ -815,29 +1125,18 @@ export default {
}) })
}, },
getDetail () { getDetail () {
// let obj = {
// product_plan_id: '29',
// product_num: '1',
// first_pay: '102500',
// division_n: '平地机',
// gps_fee: '500',
// bp_name: '黄冲',
// project_number: 'PJ2019050043',
// bp_agent_name: '上海汉得信息技术股份有限公司 ',
// product_plan_id_n: 'PDJ',
// total_price: '1111111111',
// }
// Object.assign(this.detail, obj)
let vm = this let vm = this
let url = process.env.basePath + 'con_contract_detial' let url = process.env.basePath + 'con_contract_detial'
let param = { let param = {
project_id: this.$route.params.project_id, project_id: this.$route.query.project_id,
} }
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.result === 'S') {
Object.assign(vm.detail, res.info) Object.assign(vm.detail, res.info)
vm.detail.sale_date ? vm.detail.sale_date = vm.detail.sale_date.substr(0, 10) : vm.detail.sale_date = ''
vm.detail.lease_start_date ? vm.detail.lease_start_date = vm.detail.lease_start_date.substr(0, 10) : vm.detail.lease_start_date = ''
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
...@@ -857,7 +1156,7 @@ export default { ...@@ -857,7 +1156,7 @@ export default {
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.result === 'S') {
vm.productLine = res.lists.map(item => { vm.productLine = res.lists.map((item) => {
return { return {
code: item.division, code: item.division,
code_name: item.division_n, code_name: item.division_n,
...@@ -888,7 +1187,7 @@ export default { ...@@ -888,7 +1187,7 @@ export default {
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.result === 'S') {
vm.productPlan = res.lists.map(item => { vm.productPlan = res.lists.map((item) => {
return { return {
code: item.product_plan_id, code: item.product_plan_id,
code_name: item.product_plan_name, code_name: item.product_plan_name,
...@@ -922,9 +1221,125 @@ export default { ...@@ -922,9 +1221,125 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
#addCar { #addCar {
.aguremrnt-list {
display: flex;
display: -webkit-flex;
align-items: center;
-webkit-align-items: center;
width: 100%;
height: 100%;
.unread {
width: 34px;
height: 20px;
margin: 0 10px;
}
.wrap-img {
width: 12%;
height: 100%;
display: flex;
display: -webkit-flex;
align-items: center;
-webkit-align-items: center;
justify-content: center;
-webkit-justify-content:center;
background: rgb(254, 251, 233);
img {
width: 22px;
height: 20px;
}
}
.pic {
margin-left: -3px;
}
.pics {
// width: 21px;
height: 30px;
}
.read {
height: 16px;
margin-top: 8px;
margin-left: 6px;
}
.second {
font-family: PingFangSC-Regular;
font-size: 14px;
margin-left: 16px;
color: #383f45;
letter-spacing: 0.43px;
}
.first {
margin-left: 13px;
width: 60%;
}
}
.contract-text {
.border-red {
border: 2px solid rgba(255, 0, 0, 0.4);
}
.hls-item {
margin-top: 8px;
background-color: #fff;
}
.contents {
padding: 0;
}
.in-detail {
background-color: rgba(0, 70, 156, 0.08);
width: 48px;
height: 56px;
text-align: center;
line-height: 65px;
img {
width: 16px;
}
}
.in-all {
//width: 96px;
display: flex;
img {
width: 16px;
}
div {
width: 48px;
height: 56px;
text-align: center;
line-height: 65px;
}
div:first-child {
background-color: rgba(252, 200, 0, 0.1);
}
div:nth-child(2) {
background-color: rgba(0, 70, 156, 0.08);
}
}
}
input::placeholder { input::placeholder {
color: #888c8f; color: #888c8f;
} }
.firstPay {
color: #ff9200;
font-weight: bold;
}
.date-check {
background: url("../../assets/trial/date.png") 350px no-repeat;
background-size: 16px 16px;
input {
margin-right: 16px;
}
}
.trans-enter-active, .trans-enter-active,
.trans-leave-active { .trans-leave-active {
transition: opacity 0.5s; transition: opacity 0.5s;
...@@ -1085,12 +1500,12 @@ export default { ...@@ -1085,12 +1500,12 @@ export default {
margin-left: 21px; margin-left: 21px;
margin-top: 12px; margin-top: 12px;
} }
.unMantain{ .unMantain {
background-color: #1d3fff; background-color: #1d3fff;
} }
.mantain{ .mantain {
background-color: #FFF; background-color: #fff;
border:1px solid #1d3fff; border: 1px solid #1d3fff;
color: #1d3fff; color: #1d3fff;
} }
p { p {
...@@ -1121,7 +1536,7 @@ export default { ...@@ -1121,7 +1536,7 @@ export default {
color: #fff; color: #fff;
background-color: #0041c4; background-color: #0041c4;
} }
.save{ .save {
border: 1px solid #fdb62f; border: 1px solid #fdb62f;
border-radius: 4px; border-radius: 4px;
color: #fdb62f; color: #fdb62f;
......
src/pages/contractStart/start-list.vue
View file @ 5c9fd23f
...@@ -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>
<Tab @getTabNum="getTabNum" /> <Tab @getTabNum="getTabNum" />
...@@ -154,7 +154,7 @@ export default { ...@@ -154,7 +154,7 @@ export default {
changePage (e) { changePage (e) {
this.$router.push({ this.$router.push({
name: 'AddCar', name: 'AddCar',
params: { query: {
project_id: e.project_id, project_id: e.project_id,
car_start_status: e.car_start_status, car_start_status: e.car_start_status,
}, },
......
src/pages/contractStart/tab.vue
View file @ 5c9fd23f
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
<template> <template>
<div class="tab-style"> <div class="tab-style">
<div :class="{'tab-content-bg':tabNum == 0}" class="tab-content" @click="tabNum = 0;sendTabNum()"><img :src="tabNum == 0?signed:sign"><span <div :class="{'tab-content-bg':tabNum == 0}" class="tab-content" @click="tabNum = 0;sendTabNum()"><img :src="tabNum == 0?signed:sign"><span
:class="{'colored':tabNum == 0}">待发车</span></div> :class="{'colored':tabNum == 0}">待创建</span></div>
<div :class="{'tab-content-bg':tabNum == 1}" class="tab-content" @click="tabNum = 1;sendTabNum()"><img :src="tabNum == 1?finished:finish"><span <div :class="{'tab-content-bg':tabNum == 1}" class="tab-content" @click="tabNum = 1;sendTabNum()"><img :src="tabNum == 1?finished:finish"><span
:class="{'colored':tabNum == 1}">已发车</span></div> :class="{'colored':tabNum == 1}">已创建</span></div>
</div> </div>
</template> </template>
<script> <script>
......
src/pages/distributorSign/contract-list.vue
View file @ 5c9fd23f
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,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="tab-style has-header"> <div class="tab-style has-header">
......
src/pages/functionCenter/function-list.vue
View file @ 5c9fd23f
<template> <template>
<h-view id="function-center" class="public-style" title="产品查询"> <h-view id="function-center" class="public-style" title="产品查询">
<h-header class="bar-custom"> <h-header class="bar-custom">
<div slot="center" class="top-word">业务指引-{{role}}</div> <div slot="center" class="top-word">业务指引-{{ role }}</div>
</h-header> </h-header>
<h-content> <h-content>
<!-- 搜索 --> <!-- 搜索 -->
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<div class="info-content"> <div class="info-content">
<div class="add-name"> <div class="add-name">
<img src="@/assets/functionCenter/con-sign@2x.png" alt="" > <img src="@/assets/functionCenter/con-sign@2x.png" alt="" >
<div class="name-title">合同签约</div> <div class="name-title">融租方案确认</div>
</div> </div>
<div class="add-content" @click="conSign"> <div class="add-content" @click="conSign">
<img src="@/assets/functionCenter/in@2x.png" alt="" > <img src="@/assets/functionCenter/in@2x.png" alt="" >
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<div class="info-content"> <div class="info-content">
<div class="add-name"> <div class="add-name">
<img src="@/assets/functionCenter/con-sign@2x.png" alt="" > <img src="@/assets/functionCenter/con-sign@2x.png" alt="" >
<div class="name-title">发车申请</div> <div class="name-title">融租合同创建</div>
</div> </div>
<div class="add-content" @click="goStart"> <div class="add-content" @click="goStart">
<img src="@/assets/functionCenter/in@2x.png" alt="" > <img src="@/assets/functionCenter/in@2x.png" alt="" >
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<div class="info-content"> <div class="info-content">
<div class="add-name"> <div class="add-name">
<img src="@/assets/functionCenter/car@2x.png" alt="" > <img src="@/assets/functionCenter/car@2x.png" alt="" >
<div class="name-title">发车确认-直租</div> <div class="name-title">合同签订</div>
</div> </div>
<div class="add-content" @click="goCarConfirm"> <div class="add-content" @click="goCarConfirm">
<img src="@/assets/functionCenter/in@2x.png" alt="" > <img src="@/assets/functionCenter/in@2x.png" alt="" >
...@@ -134,7 +134,6 @@ ...@@ -134,7 +134,6 @@
</div> </div>
</div> </div>
</div> </div>
</h-content> </h-content>
</h-view> </h-view>
...@@ -142,7 +141,7 @@ ...@@ -142,7 +141,7 @@
<script> <script>
export default { export default {
name: 'functionList', name: 'FunctionList',
data () { data () {
return { return {
prolists: [], prolists: [],
...@@ -196,9 +195,9 @@ export default { ...@@ -196,9 +195,9 @@ export default {
window.localStorage.setItem('bp_identity', res.info.bp_identity) window.localStorage.setItem('bp_identity', res.info.bp_identity)
window.localStorage.setItem('bp_class', res.info.user_bp_class) window.localStorage.setItem('bp_class', res.info.user_bp_class)
window.localStorage.setItem('bp_type', res.info.user_bp_type) window.localStorage.setItem('bp_type', res.info.user_bp_type)
if(window.localStorage.multipleRole){ if (window.localStorage.multipleRole) {
}else{ } else {
window.localStorage.setItem('multipleRole', res.info.user_bp_type) window.localStorage.setItem('multipleRole', res.info.user_bp_type)
} }
if (window.localStorage.getItem('multipleRole') == 'TENANT') { if (window.localStorage.getItem('multipleRole') == 'TENANT') {
...@@ -232,11 +231,11 @@ export default { ...@@ -232,11 +231,11 @@ export default {
} }
}) })
}, },
// 进入发车申请 // 进入融资合同创建
goStart () { goStart () {
let vm = this let vm = this
if (this.bp_id) { if (this.bp_id) {
if (window.localStorage.multipleRole === 'OFFICE' || window.localStorage.multipleRole === 'AGENT'){ if (window.localStorage.multipleRole === 'OFFICE' || window.localStorage.multipleRole === 'AGENT') {
this.$router.push({ this.$router.push({
name: 'StartList', name: 'StartList',
}) })
...@@ -247,8 +246,8 @@ export default { ...@@ -247,8 +246,8 @@ export default {
hlsPopup.showLongCenter('请先进行用户绑定') hlsPopup.showLongCenter('请先进行用户绑定')
} }
}, },
//合同签约 // 融租方案确认
conSign(){ conSign () {
let vm = this let vm = this
if (this.bp_id) { if (this.bp_id) {
this.$router.push({ this.$router.push({
...@@ -265,9 +264,9 @@ export default { ...@@ -265,9 +264,9 @@ export default {
goVideoSign () { goVideoSign () {
let vm = this let vm = this
if (this.bp_id) { if (this.bp_id) {
if(window.localStorage.multipleRole === 'OFFICE' || window.localStorage.multipleRole === 'FACTORY' || window.localStorage.multipleRole === 'AGENT'){ if (window.localStorage.multipleRole === 'OFFICE' || window.localStorage.multipleRole === 'FACTORY' || window.localStorage.multipleRole === 'AGENT') {
hlsPopup.showLongCenter('您当前角色非承租人或担保人，无法使用该功能！') hlsPopup.showLongCenter('您当前角色非承租人或担保人，无法使用该功能！')
}else{ } else {
this.$router.push({ this.$router.push({
name: 'VideoSign', name: 'VideoSign',
}) })
...@@ -279,21 +278,21 @@ export default { ...@@ -279,21 +278,21 @@ export default {
// 进入 合同查询 // 进入 合同查询
changeContract (e) { changeContract (e) {
let vm = this let vm = this
this.$router.push({ vm.$router.push({
name: 'ContractRecords', name: 'ContractRecords',
params: { params: {
bp_type: e, bp_type: e,
}, },
}) })
}, },
// 进入发车确认 // 进入合同签订
goCarConfirm () { goCarConfirm () {
let vm = this let vm = this
if (this.bp_id) { if (vm.bp_id) {
if(window.localStorage.multipleRole === 'OFFICE' || window.localStorage.multipleRole === 'FACTORY' || window.localStorage.multipleRole === 'AGENT'){ if (window.localStorage.multipleRole === 'OFFICE' || window.localStorage.multipleRole === 'FACTORY') {
hlsPopup.showLongCenter('您当前角色非承租人或担保人，无法使用该功能！') hlsPopup.showLongCenter('您当前角色非承租人或担保人或经销商，无法使用该功能！')
}else{ } else {
this.$router.push({ vm.$router.push({
name: 'ConfirmList', name: 'ConfirmList',
}) })
} }
...@@ -305,9 +304,9 @@ export default { ...@@ -305,9 +304,9 @@ export default {
goReimburse () { goReimburse () {
let vm = this let vm = this
if (this.bp_id) { if (this.bp_id) {
if(window.localStorage.multipleRole === 'OFFICE' || window.localStorage.multipleRole === 'FACTORY' || window.localStorage.multipleRole === 'AGENT'){ if (window.localStorage.multipleRole === 'OFFICE' || window.localStorage.multipleRole === 'FACTORY' || window.localStorage.multipleRole === 'AGENT') {
hlsPopup.showLongCenter('您当前角色非承租人或担保人，无法使用该功能！') hlsPopup.showLongCenter('您当前角色非承租人或担保人，无法使用该功能！')
}else{ } else {
this.$router.push({ this.$router.push({
name: 'FirstPay', name: 'FirstPay',
}) })
...@@ -319,11 +318,11 @@ export default { ...@@ -319,11 +318,11 @@ export default {
goInvoice () { goInvoice () {
let vm = this let vm = this
if (this.bp_id) { if (this.bp_id) {
if(window.localStorage.multipleRole === 'TENANT' ){ if (window.localStorage.multipleRole === 'TENANT') {
this.$router.push({ this.$router.push({
name: 'MyInvoice', name: 'MyInvoice',
}) })
}else{ } else {
hlsPopup.showLongCenter('您当前角色非承租人，无法使用该功能！') hlsPopup.showLongCenter('您当前角色非承租人，无法使用该功能！')
} }
} else { } else {
...@@ -343,9 +342,9 @@ export default { ...@@ -343,9 +342,9 @@ export default {
changeRent () { changeRent () {
let vm = this let vm = this
if (window.localStorage.getItem('bp_id') !== 'undefined') { if (window.localStorage.getItem('bp_id') !== 'undefined') {
if(window.localStorage.multipleRole === 'OFFICE' || window.localStorage.multipleRole === 'FACTORY' || window.localStorage.multipleRole === 'AGENT'){ if (window.localStorage.multipleRole === 'OFFICE' || window.localStorage.multipleRole === 'FACTORY' || window.localStorage.multipleRole === 'AGENT') {
hlsPopup.showLongCenter('您当前角色非承租人或担保人，无法使用该功能！') hlsPopup.showLongCenter('您当前角色非承租人或担保人，无法使用该功能！')
}else{ } else {
this.$router.push({ this.$router.push({
name: 'NewList', name: 'NewList',
}) })
...@@ -354,16 +353,16 @@ export default { ...@@ -354,16 +353,16 @@ export default {
hlsPopup.showLongCenter('请先进行用户绑定') hlsPopup.showLongCenter('请先进行用户绑定')
} }
}, },
userBind(){ userBind () {
let vm = this let vm = this
window.localStorage.setItem('from', true) window.localStorage.setItem('from', true)
if (!this.bp_id && this.user_bp_status === 'NEW') { if (!this.bp_id && this.user_bp_status === 'NEW') {
this.$router.push({ this.$router.push({
name: 'UserBind', name: 'UserBind',
}) })
}else if (this.bp_id && this.user_bp_status === 'NEW') { } else if (this.bp_id && this.user_bp_status === 'NEW') {
// this.description = '待提交' // this.description = '待提交'
if(this.user_bp_class ==='NP'){ if (this.user_bp_class === 'NP') {
this.$router.push({ this.$router.push({
name: 'NPBaseInfo', name: 'NPBaseInfo',
params: { params: {
...@@ -371,8 +370,7 @@ export default { ...@@ -371,8 +370,7 @@ export default {
user_bp_name: this.user_bp_name, user_bp_name: this.user_bp_name,
}, },
}) })
} else if (this.user_bp_class === 'ORG') {
}else if(this.user_bp_class ==='ORG'){
this.$router.push({ this.$router.push({
name: 'EnterpriseNew', name: 'EnterpriseNew',
params: { params: {
...@@ -381,16 +379,12 @@ export default { ...@@ -381,16 +379,12 @@ export default {
bp_class: this.user_bp_class, bp_class: this.user_bp_class,
}, },
}) })
} }
} else if (
}else if (
(this.bp_id && this.user_bp_status === 'RETURN') || (this.bp_id && this.user_bp_status === 'RETURN') ||
(this.bp_id && this.user_bp_status === 'REJECT') (this.bp_id && this.user_bp_status === 'REJECT')
) { ) {
if (this.user_bp_class === 'NP') {
if(this.user_bp_class ==='NP'){
this.$router.push({ this.$router.push({
name: 'NPBaseInfo', name: 'NPBaseInfo',
params: { params: {
...@@ -398,8 +392,7 @@ export default { ...@@ -398,8 +392,7 @@ export default {
user_bp_name: this.user_bp_name, user_bp_name: this.user_bp_name,
}, },
}) })
} else if (this.user_bp_class === 'ORG') {
}else if(this.user_bp_class ==='ORG'){
this.$router.push({ this.$router.push({
name: 'EnterpriseNew', name: 'EnterpriseNew',
params: { params: {
...@@ -408,34 +401,30 @@ export default { ...@@ -408,34 +401,30 @@ export default {
bp_class: this.user_bp_class, bp_class: this.user_bp_class,
}, },
}) })
} }
} else if (this.bp_id && this.user_bp_status === 'APPROVED') { } else if (this.bp_id && this.user_bp_status === 'APPROVED') {
//this.description = '解除绑定' 已绑定 // this.description = '解除绑定' 已绑定
hlsPopup.showLongCenter('您已完成用户绑定，请到个人中心查看或修改信息！') hlsPopup.showLongCenter('您已完成用户绑定，请到个人中心查看或修改信息！')
} else {
}else {
// this.description = '审批中' // this.description = '审批中'
hlsPopup.showLongCenter('您的用户绑定申请正在审批中！') hlsPopup.showLongCenter('您的用户绑定申请正在审批中！')
} }
}, },
toproduct() { toproduct () {
this.$router.push({ this.$router.push({
name: 'QueryHome', name: 'QueryHome',
}) })
}, },
financingTrial() { financingTrial () {
this.$router.push({ this.$router.push({
name: 'FinancingTrial', name: 'FinancingTrial',
}) })
}, },
todoList() { todoList () {
if (this.bp_id) { if (this.bp_id) {
if(window.localStorage.multipleRole !== 'OFFICE' && window.localStorage.multipleRole !== 'AGENT'){ if (window.localStorage.multipleRole !== 'OFFICE' && window.localStorage.multipleRole !== 'AGENT') {
hlsPopup.showLongCenter('仅经销商/办事处业务员角色可使用该功能！') hlsPopup.showLongCenter('仅经销商/办事处业务员角色可使用该功能！')
}else{ } else {
this.$router.push({ this.$router.push({
name: 'ToDoList', name: 'ToDoList',
}) })
...@@ -443,7 +432,7 @@ export default { ...@@ -443,7 +432,7 @@ export default {
} else { } else {
hlsPopup.showLongCenter('请先进行用户绑定') hlsPopup.showLongCenter('请先进行用户绑定')
} }
} },
}, },
} }
</script> </script>
...@@ -629,7 +618,6 @@ export default { ...@@ -629,7 +618,6 @@ export default {
} }
} }
} }
.fun-item-after{ .fun-item-after{
background: #FFFFFF; background: #FFFFFF;
...@@ -715,7 +703,6 @@ export default { ...@@ -715,7 +703,6 @@ export default {
} }
} }
} }
} }
......
src/pages/myInfo/my-info.vue
View file @ 5c9fd23f
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<div class="card-bottom"> <div class="card-bottom">
<div v-if="((user_bp_type!=='TENANT')&&(user_bp_type!=='GUTA')&&(multipleRole!=='GUTA')&&(multipleRole!=='TENANT'))||multipleRole==='AGENT'" @click="goStart"> <div v-if="((user_bp_type!=='TENANT')&&(user_bp_type!=='GUTA')&&(multipleRole!=='GUTA')&&(multipleRole!=='TENANT'))||multipleRole==='AGENT'" @click="goStart">
<img src="@/assets/myInfo/car.png" > <img src="@/assets/myInfo/car.png" >
<p>发车申请</p> <p>融租合同创建</p>
</div> </div>
<div v-if="((user_bp_type==='TENANT')&&(multipleRole==='TENANT'))||(multipleRole==='TENANT')||((user_bp_type==='TENANT')&&(!multipleRole))" @click="changePay"> <div v-if="((user_bp_type==='TENANT')&&(multipleRole==='TENANT'))||(multipleRole==='TENANT')||((user_bp_type==='TENANT')&&(!multipleRole))" @click="changePay">
<img src="@/assets/myInfo/pay.png" > <img src="@/assets/myInfo/pay.png" >
...@@ -457,7 +457,7 @@ export default { ...@@ -457,7 +457,7 @@ export default {
}, },
}) })
}, },
// 进入待签约功能，客户类型为经销商则进入经销商功能，非经销商则进入合同签约 // 进入待签约功能，客户类型为经销商则进入经销商功能，非经销商则进入融租方案确认
goSign () { goSign () {
if (this.bp_id) { if (this.bp_id) {
// if (this.user_bp_type === 'AGENT') { // if (this.user_bp_type === 'AGENT') {
...@@ -510,7 +510,7 @@ export default { ...@@ -510,7 +510,7 @@ export default {
}, },
}) })
}, },
// 进入发车申请 // 进入融租合同创建
goStart () { goStart () {
if (this.bp_id) { if (this.bp_id) {
this.$router.push({ this.$router.push({
...@@ -520,7 +520,7 @@ export default { ...@@ -520,7 +520,7 @@ export default {
hlsPopup.showLongCenter('请先进行用户绑定') hlsPopup.showLongCenter('请先进行用户绑定')
} }
}, },
// 进入发车确认 // 进入合同签订
goCarConfirm () { goCarConfirm () {
if (this.bp_id) { if (this.bp_id) {
this.$router.push({ this.$router.push({
......
src/router/index.js
View file @ 5c9fd23f
...@@ -52,7 +52,7 @@ import FinancDetails from '@/pages/distributorSign/financ-details' // 还款计 ...@@ -52,7 +52,7 @@ import FinancDetails from '@/pages/distributorSign/financ-details' // 还款计
import FinancingTrial from '@/pages/financingTrial/financing-trial' import FinancingTrial from '@/pages/financingTrial/financing-trial'
import FinancingDetails from '@/pages/financingTrial/financing-details' // 融资明细 import FinancingDetails from '@/pages/financingTrial/financing-details' // 融资明细
import TrialRepayPlan from '@/pages/financingTrial/trial-repay-plan' import TrialRepayPlan from '@/pages/financingTrial/trial-repay-plan'
// 合同签约 // 融租方案确认
import ContractSigning from '../pages/contractSigning/contract-signing' import ContractSigning from '../pages/contractSigning/contract-signing'
import ContractDetail from '@/pages/ContractSigning/contract-detail' import ContractDetail from '@/pages/ContractSigning/contract-detail'
import ContractContent from '@/pages/ContractSigning/contract-content' import ContractContent from '@/pages/ContractSigning/contract-content'
...@@ -95,11 +95,11 @@ import ContractRepayment from '@/pages/contractRepayment/contract-repayment' ...@@ -95,11 +95,11 @@ import ContractRepayment from '@/pages/contractRepayment/contract-repayment'
import RepayDetails from '@/pages/contractRepayment/repay-details' import RepayDetails from '@/pages/contractRepayment/repay-details'
import RepayPlan from '@/pages/contractRepayment/refund' import RepayPlan from '@/pages/contractRepayment/refund'
// 发车申请 // 融资合同创建
import StartList from '@/pages/contractStart/start-list' import StartList from '@/pages/contractStart/start-list'
import AddCar from '@/pages/contractStart/add-car' import AddCar from '@/pages/contractStart/add-car'
// 发车确认 // 合同签订
import ConfirmDetail from '@/pages/carConfirm/confirm-detail' import ConfirmDetail from '@/pages/carConfirm/confirm-detail'
import ConfirmList from '@/pages/carConfirm/confirm-list' import ConfirmList from '@/pages/carConfirm/confirm-list'
...@@ -256,12 +256,12 @@ export default new Router({ ...@@ -256,12 +256,12 @@ export default new Router({
{path: '/financing-trial', component: FinancingTrial, name: 'FinancingTrial', meta: {keepAlive: true}}, {path: '/financing-trial', component: FinancingTrial, name: 'FinancingTrial', meta: {keepAlive: true}},
{path: '/financing-details', component: FinancingDetails, name: 'FinancingDetails', meta: {keepAlive: true}}, {path: '/financing-details', component: FinancingDetails, name: 'FinancingDetails', meta: {keepAlive: true}},
{path: '/trial-repay-plan', component: TrialRepayPlan, name: 'TrialRepayPlan', meta: {keepAlive: true}}, {path: '/trial-repay-plan', component: TrialRepayPlan, name: 'TrialRepayPlan', meta: {keepAlive: true}},
// 合同签约 // 融租方案确认
{path: '/contract-signing', component: ContractSigning, name: 'ContractSigning', meta: {keepAlive: false}}, {path: '/contract-signing', component: ContractSigning, name: 'ContractSigning', meta: {keepAlive: false}},
{path: '/contract-detail', component: ContractDetail, name: 'ContractDetail', meta: {keepAlive: true}}, {path: '/contract-detail', component: ContractDetail, name: 'ContractDetail', meta: {keepAlive: true}},
{path: '/contract-content', component: ContractContent, name: 'ContractContent', meta: {keepAlive: true}}, {path: '/contract-content', component: ContractContent, name: 'ContractContent', meta: {keepAlive: true}},
{path: '/entry-info', component: EntryInfo, name: 'EntryInfo', meta: {keepAlive: true}}, {path: '/entry-info', component: EntryInfo, name: 'EntryInfo', meta: {keepAlive: true}},
{path: '/contract-repay-plan', component: ContractRepayPlan, name: 'ContractRepayPlan', meta: {keepAlive: true}}, {path: '/contract-repay-plan', component: ContractRepayPlan, name: 'ContractRepayPlan', meta: {keepAlive: false}},
{path: '/electronic-sign', component: ElectronicSign, name: 'ElectronicSign', meta: {keepAlive: false}}, {path: '/electronic-sign', component: ElectronicSign, name: 'ElectronicSign', meta: {keepAlive: false}},
// 首付款支付 // 首付款支付
{path: '/first-pay', component: FirstPay, name: 'FirstPay', meta: {keepAlive: true}}, {path: '/first-pay', component: FirstPay, name: 'FirstPay', meta: {keepAlive: true}},
...@@ -289,11 +289,11 @@ export default new Router({ ...@@ -289,11 +289,11 @@ export default new Router({
{path: '/contract-repayment', component: ContractRepayment, name: 'ContractRepayment', meta: {keepAlive: true}}, {path: '/contract-repayment', component: ContractRepayment, name: 'ContractRepayment', meta: {keepAlive: true}},
{path: '/repay-details', component: RepayDetails, name: 'RepayDetails', meta: {keepAlive: true}}, {path: '/repay-details', component: RepayDetails, name: 'RepayDetails', meta: {keepAlive: true}},
{path: '/repay-plan', component: RepayPlan, name: 'RepayPlan', meta: {keepAlive: true}}, {path: '/repay-plan', component: RepayPlan, name: 'RepayPlan', meta: {keepAlive: true}},
// 发车申请 // 融租合同创建
{path: '/start-List', component: StartList, name: 'StartList', meta: {keepAlive: false}}, {path: '/start-List', component: StartList, name: 'StartList', meta: {keepAlive: false}},
{path: '/add-car', component: AddCar, name: 'AddCar', meta: {keepAlive: false}}, {path: '/add-car', component: AddCar, name: 'AddCar', meta: {keepAlive: false}},
// 发车确认 // 合同签订
{path: '/confirm-detail', component: ConfirmDetail, name: 'ConfirmDetail', meta: {keepAlive: true}}, {path: '/confirm-detail', component: ConfirmDetail, name: 'ConfirmDetail', meta: {keepAlive: false}},
{path: '/confirm-list', component: ConfirmList, name: 'ConfirmList', meta: {keepAlive: false}}, {path: '/confirm-list', component: ConfirmList, name: 'ConfirmList', meta: {keepAlive: false}},
// 合同查询 // 合同查询
{path: '/contract-records', component: ContractRecords, name: 'ContractRecords', meta: {keepAlive: true}}, {path: '/contract-records', component: ContractRecords, name: 'ContractRecords', meta: {keepAlive: true}},
......
src/scripts/hlsPopup.js
View file @ 5c9fd23f
...@@ -153,7 +153,6 @@ export default { ...@@ -153,7 +153,6 @@ export default {
* @param confirmObject.cancelText 确定函数 * @param confirmObject.cancelText 确定函数
*/ */
showConfirm: function (confirmObject) { showConfirm: function (confirmObject) {
debugger
let def = { let def = {
title: confirmObject.title || '提示', title: confirmObject.title || '提示',
content: confirmObject.content || '', content: confirmObject.content || '',
......
www/index.html deleted 100644 → 0
View file @ 082eff1f
<!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=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.b873df7a523c2c07fdbbb8b6f0caa0a7.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.6a178e8d77c32e3c385d.js></script><script type=text/javascript src=./static/js/vendor.7191c48e0b160a3ab672.js></script><script type=text/javascript src=./static/js/app.e6a36266f29a64116e9e.js></script></body></html>
\ 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