Commit 906d9fb3 authored by 肖健's avatar 肖健

Merge remote-tracking branch 'origin/dev_cd' into dev_jd

parents 3aa8475b 4baf4e33
...@@ -78,21 +78,15 @@ export default { ...@@ -78,21 +78,15 @@ export default {
this.moveLog = res.data.data this.moveLog = res.data.data
let moveLogInfo = [] let moveLogInfo = []
moveLogInfo.push({title: "车主车牌号:", value: this.moveLog.carNo}) moveLogInfo.push({title: "车主车牌号:", value: this.moveLog.carNo})
if(this.moveLog.brand){ moveLogInfo.push({title: "品牌:", value: this.moveLog.brand || ''})
moveLogInfo.push({title: "品牌:", value: this.moveLog.brand}) moveLogInfo.push({title: "车型:", value: this.moveLog.carModel || ''})
}else{ if(this.moveLog.confirmType == '1'){
moveLogInfo.push({title: "品牌:", value: ""}) moveLogInfo.push({title: "车主手机号:", value: this.moveLog.userMobile || ''})
} }
if(this.moveLog.carModel){
moveLogInfo.push({title: "车型:", value: this.moveLog.carModel})
}else{
moveLogInfo.push({title: "车型:", value: ""})
}
moveLogInfo.push({title: "车主手机号:", value: this.moveLog.userMobile || ''})
moveLogInfo.push({title: "时间:", value: this.moveLog.applyDate}) moveLogInfo.push({title: "时间:", value: this.moveLog.applyDate})
moveLogInfo.push({title: "地点:", value: this.moveLog.detailInfo}) moveLogInfo.push({title: "地点:", value: this.moveLog.detailInfo})
moveLogInfo.push({title: "申请手机号:", value: this.moveLog.applyUserMobile|| ''})
if(this.moveLog.confirmType == '1'){ if(this.moveLog.confirmType == '1'){
moveLogInfo.push({title: "申请手机号:", value: this.moveLog.applyUserMobile|| ''})
moveLogInfo.push({title: "通知方式:", value: "拨打电话"}) moveLogInfo.push({title: "通知方式:", value: "拨打电话"})
}else{ }else{
moveLogInfo.push({title: "通知方式:", value: "微信通知"}) moveLogInfo.push({title: "通知方式:", value: "微信通知"})
......
...@@ -45,21 +45,15 @@ export default { ...@@ -45,21 +45,15 @@ export default {
this.moveLog = res.data.data this.moveLog = res.data.data
let moveLogInfo = [] let moveLogInfo = []
moveLogInfo.push({title: "车主车牌号:", value: this.moveLog.carNo}) moveLogInfo.push({title: "车主车牌号:", value: this.moveLog.carNo})
if(this.moveLog.brand){ moveLogInfo.push({title: "品牌:", value: this.moveLog.brand || ''})
moveLogInfo.push({title: "品牌:", value: this.moveLog.brand}) moveLogInfo.push({title: "车型:", value: this.moveLog.carModel || ''})
}else{ if(this.moveLog.confirmType == '1'){
moveLogInfo.push({title: "品牌:", value: ""}) moveLogInfo.push({title: "车主手机号:", value: this.moveLog.userMobile})
} }
if(this.moveLog.carModel){
moveLogInfo.push({title: "车型:", value: this.moveLog.carModel})
}else{
moveLogInfo.push({title: "车型:", value: ""})
}
moveLogInfo.push({title: "车主手机号:", value: this.moveLog.userMobile})
moveLogInfo.push({title: "时间:", value: this.moveLog.applyDate}) moveLogInfo.push({title: "时间:", value: this.moveLog.applyDate})
moveLogInfo.push({title: "地点:", value: this.moveLog.detailInfo}) moveLogInfo.push({title: "地点:", value: this.moveLog.detailInfo})
moveLogInfo.push({title: "申请手机号:", value: this.moveLog.applyUserMobile})
if(this.moveLog.confirmType == '1'){ if(this.moveLog.confirmType == '1'){
moveLogInfo.push({title: "申请手机号:", value: this.moveLog.applyUserMobile})
moveLogInfo.push({title: "通知方式:", value: "拨打电话"}) moveLogInfo.push({title: "通知方式:", value: "拨打电话"})
}else{ }else{
moveLogInfo.push({title: "通知方式:", value: "微信通知"}) moveLogInfo.push({title: "通知方式:", value: "微信通知"})
......
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