Skip to content

C
cloud-platform-ui
Commit d53be6a0 authored by libin's avatar libin
Browse files
Options

租车订单新增车牌查询

parent d7265ae2
Show whitespace changes
Inline Side-by-side
Showing with 977 additions and 827 deletions
src/views/order/rentVehicleInfo/index.vue
View file @ d53be6a0
...@@ -7,15 +7,16 @@ ...@@ -7,15 +7,16 @@
<el-form-item label="所属地区" prop="zoneId"> <el-form-item label="所属地区" prop="zoneId">
<el-select class="filter-item" v-model="listQuery.zoneId" placeholder="请选择" @change="getProvinceRegions"> <el-select class="filter-item" v-model="listQuery.zoneId" placeholder="请选择" @change="getProvinceRegions">
<el-option :key="undefined" label="无" :value="undefined"></el-option> <el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option v-for="val in getAllZoneList" :key="val.id" :label="val.name" :value="val.id"> </el-option> <el-option v-for="val in getAllZoneList" :key="val.id" :label="val.name" :value="val.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="所属公司" prop="startCompanyId"> <el-form-item label="所属公司" prop="startCompanyId">
<el-select class="filter-item" v-model="listQuery.startCompanyId" placeholder="请选择" @change="getAllBranchCompanyChange"> <el-select class="filter-item" v-model="listQuery.startCompanyId" placeholder="请选择"
@change="getAllBranchCompanyChange">
<el-option :key="undefined" label="无" :value="undefined"></el-option> <el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option v-for="val in allBranchCompany" :key="val.id" :label="val.name" :value="val.id"> </el-option> <el-option v-for="val in allBranchCompany" :key="val.id" :label="val.name" :value="val.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -26,6 +27,11 @@ ...@@ -26,6 +27,11 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="5">
<el-form-item label="车牌号">
<el-input v-model="listQuery.plateNumber" placeholder="请输入车牌号"></el-input>
</el-form-item>
</el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="订单号"> <el-form-item label="订单号">
<el-input v-model="listQuery.no" placeholder="请输入订单号"></el-input> <el-input v-model="listQuery.no" placeholder="请输入订单号"></el-input>
...@@ -35,7 +41,7 @@ ...@@ -35,7 +41,7 @@
<el-form-item label="订单状态"> <el-form-item label="订单状态">
<el-select class="filter-item" v-model="listQuery.status" placeholder="请选择状态"> <el-select class="filter-item" v-model="listQuery.status" placeholder="请选择状态">
<!--"0--删除"+"1--创建订单" +"2--取消" +"3--待付款" +"4--待出行" +"5--出行中（进行中）" +"6--已完成"--> <!--"0--删除"+"1--创建订单" +"2--取消" +"3--待付款" +"4--待出行" +"5--出行中（进行中）" +"6--已完成"-->
<el-option :key="null" label="全部订单" :value="null" ></el-option> <el-option :key="null" label="全部订单" :value="null"></el-option>
<el-option :key="3" label="待付款" :value="3"></el-option> <el-option :key="3" label="待付款" :value="3"></el-option>
<el-option :key="4" label="待出行" :value="4"></el-option> <el-option :key="4" label="待出行" :value="4"></el-option>
<el-option :key="5" label="出行中" :value="5"></el-option> <el-option :key="5" label="出行中" :value="5"></el-option>
...@@ -113,18 +119,26 @@ ...@@ -113,18 +119,26 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作" width="300" fixed="right"> <el-table-column align="center" label="操作" width="300" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button size="small" v-if="scope.row.status >=4" class="el-button el-button--text el-button--small" @click="handleHandoverOrderVehicle(scope.row)">交车记录</el-button> <el-button size="small" v-if="scope.row.status >=4" class="el-button el-button--text el-button--small"
<el-button size="small" v-if="scope.row.status == 6" class="el-button el-button--text el-button--small" @click="handleReturnOrderVehicle(scope.row)">还车记录</el-button> @click="handleHandoverOrderVehicle(scope.row)">交车记录
<el-button size="small" v-if="scope.row.status > 3" class="el-button el-button--text el-button--small" @click="handleRefundVehicle(scope.row)">押金记录</el-button> </el-button>
<el-button size="small" v-if="scope.row.status == 6&&order_btn_order_violcation_save" class="el-button el-button--text el-button--small" @click="illegalInquiry(scope.row)">违章查询</el-button> <el-button size="small" v-if="scope.row.status == 6" class="el-button el-button--text el-button--small"
@click="handleReturnOrderVehicle(scope.row)">还车记录
</el-button>
<el-button size="small" v-if="scope.row.status > 3" class="el-button el-button--text el-button--small"
@click="handleRefundVehicle(scope.row)">押金记录
</el-button>
<el-button size="small" v-if="scope.row.status == 6&&order_btn_order_violcation_save"
class="el-button el-button--text el-button--small" @click="illegalInquiry(scope.row)">违章查询
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!--违章查询弹框--> <!--违章查询弹框-->
<Illegal :row="currentRow" v-if="illegalVisible" v-on:illegalEvent = "illegalEvent"></Illegal> <Illegal :row="currentRow" v-if="illegalVisible" v-on:illegalEvent="illegalEvent"></Illegal>
<!--查看详情弹框--> <!--查看详情弹框-->
<Detail :row="currentRow" v-if="detailVisible" v-on:detailEvent= "detailEvent"></Detail> <Detail :row="currentRow" v-if="detailVisible" v-on:detailEvent="detailEvent"></Detail>
<div v-show="!listLoading" class="pagination-container"> <div v-show="!listLoading" class="pagination-container">
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
...@@ -133,30 +147,35 @@ ...@@ -133,30 +147,35 @@
</div> </div>
<!-- 订单详情 --> <!-- 订单详情 -->
<rentOrderDetailModal :form="form" :rentCostDetail="tourCostDetail" v-if="rentDialogVisible" v-on:rentOrderDetailDialogEvent="rentOrderDetailDialogEvent"></rentOrderDetailModal> <rentOrderDetailModal :form="form" :rentCostDetail="tourCostDetail" v-if="rentDialogVisible"
v-on:rentOrderDetailDialogEvent="rentOrderDetailDialogEvent"></rentOrderDetailModal>
<el-dialog :title="modalTitle" :visible.sync="orderVehicleCrosstownVisible"> <el-dialog :title="modalTitle" :visible.sync="orderVehicleCrosstownVisible">
<el-form :model="form" :rules="rules" ref="form" label-width="90px"> <el-form :model="form" :rules="rules" ref="form" label-width="90px">
<div class="label-title"> <div class="label-title">
<span >订单号:</span><span class="label-text">{{form.no}}</span> <span>订单号:</span><span class="label-text">{{form.no}}</span>
<span >支付时间:</span><span class="label-text">{{form.crtTime}}</span> <span>支付时间:</span><span class="label-text">{{form.crtTime}}</span>
</div> </div>
<div class="label-title"> <div class="label-title">
<span >订单状态:</span><span class="label-text">{{form.ststusName}}</span> <span>订单状态:</span><span class="label-text">{{form.ststusName}}</span>
</div> </div>
<div class="label-title"> <div class="label-title">
<span >姓名/手机号:</span> <span class="label-text"><span >{{form.username}}</span>/<span>{{form.telephone}}</span></span> <span>姓名/手机号:</span> <span
class="label-text"><span>{{form.username}}</span>/<span>{{form.telephone}}</span></span>
</div> </div>
<div class="label-title"> <div class="label-title">
<span >取车:</span> <span class="label-text">{{form.orderRentVehicleDetail.startTime}}</span><span class="label-text">{{form.orderRentVehicleDetail.startAddr}}</span> <span class="label-text">交车公司:</span><span>{{form.startCompanyName}}</span> <span>取车:</span> <span class="label-text">{{form.orderRentVehicleDetail.startTime}}</span><span
class="label-text">{{form.orderRentVehicleDetail.startAddr}}</span> <span
class="label-text">交车公司:</span><span>{{form.startCompanyName}}</span>
</div> </div>
<div class="label-title"> <div class="label-title">
<span >还车:</span> <span class="label-text">{{form.orderRentVehicleDetail.endTime}}</span><span class="label-text">{{form.orderRentVehicleDetail.endAddr}}</span> <span class="label-text">交车公司:</span><span>{{form.endCompanyName}}</span> <span>还车:</span> <span class="label-text">{{form.orderRentVehicleDetail.endTime}}</span><span
class="label-text">{{form.orderRentVehicleDetail.endAddr}}</span> <span class="label-text">交车公司:</span><span>{{form.endCompanyName}}</span>
</div> </div>
<div class="stepBox" v-if="depositDetail"> <div class="stepBox" v-if="depositDetail">
<div class="title" v-if="depositRefundRecord.length>0">押金退还进度</div> <div class="title" v-if="depositRefundRecord.length>0">押金退还进度</div>
<ul> <ul>
<li v-for = "(item,index) in depositRefundRecord" :class="{'active':item.iscomplete}" :key="index"> <li v-for="(item,index) in depositRefundRecord" :class="{'active':item.iscomplete}" :key="index">
<img class="activeImg" v-if="item.iscomplete" src="../../../assets/images/active.png" alt=""> <img class="activeImg" v-if="item.iscomplete" src="../../../assets/images/active.png" alt="">
<img class="activeImg" v-if="!item.iscomplete" src="../../../assets/images/doing.png" alt=""> <img class="activeImg" v-if="!item.iscomplete" src="../../../assets/images/doing.png" alt="">
<p class="stepTitle"> <p class="stepTitle">
...@@ -202,21 +221,26 @@ ...@@ -202,21 +221,26 @@
<template v-if="item.status==2">{{item.updTimeStr}} 到账</template> <template v-if="item.status==2">{{item.updTimeStr}} 到账</template>
<template v-if="item.status==3">预计{{item.endTimeStr}}之前到账</template> <template v-if="item.status==3">预计{{item.endTimeStr}}之前到账</template>
<template v-if="item.status==4">押金将在定损后退还，请耐心等待...</template> <template v-if="item.status==4">押金将在定损后退还，请耐心等待...</template>
<template v-if="item.status==5">定损流程有疑问可联系滴房车 客服<a :href="'tel://'+Tel" style="color: #666666;">{{Tel}}</a></template> <template v-if="item.status==5">定损流程有疑问可联系滴房车 客服<a :href="'tel://'+Tel"
<template v-if="item.status==6">定损流程有疑问可联系滴房车 客服<a :href="'tel://'+Tel" style="color: #666666;">{{Tel}}</a></template> style="color: #666666;">{{Tel}}</a></template>
<template v-if="item.status==6">定损流程有疑问可联系滴房车 客服<a :href="'tel://'+Tel"
style="color: #666666;">{{Tel}}</a></template>
</p> </p>
<p class="detailTitle" v-if="item.orderViolation && item.status==3" style="margin-top: 15px">违章罚款</p> <p class="detailTitle" v-if="item.orderViolation && item.status==3" style="margin-top: 15px">违章罚款</p>
<p class="detailTitle" v-if="item.orderViolation && item.status==3">违章截图：</p> <p class="detailTitle" v-if="item.orderViolation && item.status==3">违章截图：</p>
<div class="picBox" v-if="dedDetail.length>0"> <div class="picBox" v-if="dedDetail.length>0">
<img class="picItem" :src="itm" alt="" v-for = "(itm,idx) in item.pictureList" :key="idx"> <img class="picItem" :src="itm" alt="" v-for="(itm,idx) in item.pictureList" :key="idx">
</div> </div>
<p class="detailTitle" v-if="item.orderViolation && item.status==3" style="color: #666666;font-size: 13px">如有疑问，可联系滴房车客服 <a :href="'tel://'+Tel" style="color: #666666;">{{Tel}}</a></p> <p class="detailTitle" v-if="item.orderViolation && item.status==3"
<p class="detailTitle" v-if="dedDetail.length>0 && item.status==5" style="margin-top: 15px">定损总罚款{{dedTotal}}元</p> style="color: #666666;font-size: 13px">如有疑问，可联系滴房车客服 <a :href="'tel://'+Tel" style="color: #666666;">{{Tel}}</a>
</p>
<p class="detailTitle" v-if="dedDetail.length>0 && item.status==5" style="margin-top: 15px">
定损总罚款{{dedTotal}}元</p>
<p class="detailTitle" v-if="dedDetail.length>0 && item.status==5">明细</p> <p class="detailTitle" v-if="dedDetail.length>0 && item.status==5">明细</p>
<div v-if="dedDetail.length>0 && item.status==5" v-for="(itm,idx) in dedDetail" :key="idx"> <div v-if="dedDetail.length>0 && item.status==5" v-for="(itm,idx) in dedDetail" :key="idx">
<p class="detailTitle">{{itm.id}}、{{itm.statusName}}扣{{itm.cost}}元</p> <p class="detailTitle">{{itm.id}}、{{itm.statusName}}扣{{itm.cost}}元</p>
<div class="picBox"> <div class="picBox">
<img class="picItem" :src="it" alt="" v-for = "(it,ix) in itm.picList" :key="ix"> <img class="picItem" :src="it" alt="" v-for="(it,ix) in itm.picList" :key="ix">
</div> </div>
</div> </div>
</li> </li>
...@@ -224,11 +248,13 @@ ...@@ -224,11 +248,13 @@
</div> </div>
<div v-if="vehicleDetail" style="border: 1px solid;"> <div v-if="vehicleDetail" style="border: 1px solid;">
<div style="border-bottom: 1px solid;"> <div style="border-bottom: 1px solid;">
<span class="label-text">交车交接人:</span><span class="label-text">{{orderReturnVehicleCrosstown.username}}</span> <span class="label-text">交车交接人:</span><span
class="label-text">{{orderReturnVehicleCrosstown.username}}</span>
</div> </div>
<div> <div>
<span class="label-text">上传驾驶证*:</span><span class="label-text">{{orderReturnVehicleCrosstown.licenseName}}</span><span class="label-text">{{orderReturnVehicleCrosstown.licensePhone}}</span><br/> <span class="label-text">上传驾驶证*:</span><span
<span style="margin-left:110px;">身份证号:</span> <span class="label-text">{{orderReturnVehicleCrosstown.licenseIdCard}}</span><br /> class="label-text">{{orderReturnVehicleCrosstown.licenseName}}</span><span class="label-text">{{orderReturnVehicleCrosstown.licensePhone}}</span><br/>
<span style="margin-left:110px;">身份证号:</span> <span class="label-text">{{orderReturnVehicleCrosstown.licenseIdCard}}</span><br/>
<img :src="orderReturnVehicleCrosstown.licenseImg" style="width: 100px; height: 100px;margin-left:110px;"/> <img :src="orderReturnVehicleCrosstown.licenseImg" style="width: 100px; height: 100px;margin-left:110px;"/>
</div> </div>
...@@ -263,7 +289,6 @@ ...@@ -263,7 +289,6 @@
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
...@@ -285,7 +310,7 @@ ...@@ -285,7 +310,7 @@
import { import {
timestamp2Date timestamp2Date
} from 'utils/dateUtils'; } from 'utils/dateUtils';
import { mapGetters } from 'vuex'; import {mapGetters} from 'vuex';
import rsCode from '../../../utils/rsCode'; import rsCode from '../../../utils/rsCode';
import { import {
getSysRegionByIds getSysRegionByIds
...@@ -296,6 +321,7 @@ ...@@ -296,6 +321,7 @@
import ElRow from "element-ui/packages/row/src/row"; import ElRow from "element-ui/packages/row/src/row";
import ElCol from "element-ui/packages/col/src/col"; import ElCol from "element-ui/packages/col/src/col";
import ElButton from "../../../../node_modules/element-ui/packages/button/src/button.vue"; import ElButton from "../../../../node_modules/element-ui/packages/button/src/button.vue";
export default { export default {
name: 'branchCompanyStock', name: 'branchCompanyStock',
components: { components: {
...@@ -308,11 +334,11 @@ ...@@ -308,11 +334,11 @@
}, },
data() { data() {
return { return {
pictureList:[], pictureList: [],
dedDetail:[], dedDetail: [],
depositRefundRecord:[], depositRefundRecord: [],
dedTotal:'', dedTotal: '',
Tel:'', Tel: '',
form: { form: {
couponAmount: undefined, couponAmount: undefined,
crtHost: undefined, crtHost: undefined,
...@@ -334,7 +360,8 @@ ...@@ -334,7 +360,8 @@
licenseIdCard: "", licenseIdCard: "",
licenseImg: "", licenseImg: "",
licenseName: "", licenseName: "",
licensePhone: ""}, licensePhone: ""
},
orderRentVehicleDetail: { orderRentVehicleDetail: {
bookRecordId: undefined, bookRecordId: undefined,
costDetail: undefined, costDetail: undefined,
...@@ -370,7 +397,7 @@ ...@@ -370,7 +397,7 @@
refundStatus: undefined, refundStatus: undefined,
startCompanyName: undefined, startCompanyName: undefined,
status: undefined, status: undefined,
ststusName:undefined, ststusName: undefined,
telephone: undefined, telephone: undefined,
type: undefined, type: undefined,
updTime: undefined, updTime: undefined,
...@@ -379,11 +406,11 @@ ...@@ -379,11 +406,11 @@
vehicleNumberPlat: undefined, vehicleNumberPlat: undefined,
version: undefined version: undefined
}, },
orderVehicleCrosstownVisible:false, orderVehicleCrosstownVisible: false,
rentDialogVisible: false,//租车详情弹框 rentDialogVisible: false,//租车详情弹框
modalTitle: '订单详情', modalTitle: '订单详情',
illegalVisible: false,//违章查询弹框 illegalVisible: false,//违章查询弹框
detailVisible:false, detailVisible: false,
rules: { rules: {
// companyName: [ // companyName: [
// { // {
...@@ -399,32 +426,33 @@ ...@@ -399,32 +426,33 @@
listQuery: { listQuery: {
page: 1, page: 1,
limit: 20, limit: 20,
type:1, type: 1,
no: null, no: null,
status:null, status: null,
startTime: undefined, startTime: undefined,
endTime:undefined, endTime: undefined,
zoneId:undefined, zoneId: undefined,
startCompanyId: undefined startCompanyId: undefined,
plateNumber: undefined
}, },
baranchQuery: { baranchQuery: {
zoneId:null zoneId: null
}, },
orderVehicleQuery: { orderVehicleQuery: {
orderId:null, orderId: null,
type:undefined type: undefined
}, },
dialogFormVisible: false, dialogFormVisible: false,
dialogStatus: '', dialogStatus: '',
btn_del: true, btn_del: true,
btn_buy: true, btn_buy: true,
btn_cancel: true, btn_cancel: true,
allZoneArr:[],//全部片区 allZoneArr: [],//全部片区
allBranchCompany:[], allBranchCompany: [],
tourCostDetail:'', tourCostDetail: '',
damageSafe:'', damageSafe: '',
serviceCost:0, serviceCost: 0,
orderReturnVehicleCrosstown:{ orderReturnVehicleCrosstown: {
crtTime: undefined, crtTime: undefined,
deduction: undefined, deduction: undefined,
id: undefined, id: undefined,
...@@ -449,13 +477,13 @@ ...@@ -449,13 +477,13 @@
licensePhone: undefined licensePhone: undefined
},//还车记录 },//还车记录
tableKey: 0, tableKey: 0,
otherImg:[], otherImg: [],
handover:false, handover: false,
returnVehicle: false, returnVehicle: false,
refundshow:false,//退款信息 refundshow: false,//退款信息
vehicleDetail:false, //交还车信息，默认全部显示 vehicleDetail: false, //交还车信息，默认全部显示
order_btn_order_violcation_save:false, order_btn_order_violcation_save: false,
depositDetail:false, depositDetail: false,
} }
}, },
created() { created() {
...@@ -471,7 +499,7 @@ ...@@ -471,7 +499,7 @@
return getSonRegionByCodes(1); return getSonRegionByCodes(1);
}, },
//获取大区列表 //获取大区列表
getAllZoneList(){ getAllZoneList() {
return getAllZone(); return getAllZone();
}, },
cityRegions() { cityRegions() {
...@@ -503,12 +531,12 @@ ...@@ -503,12 +531,12 @@
this.form.orderRentVehicleDetail.endTime = timestamp2Date(this.form.orderRentVehicleDetail.endTime) this.form.orderRentVehicleDetail.endTime = timestamp2Date(this.form.orderRentVehicleDetail.endTime)
this.costDetail = JSON.parse(this.form.orderRentVehicleDetail.costDetail) this.costDetail = JSON.parse(this.form.orderRentVehicleDetail.costDetail)
var cost = ''; var cost = '';
this.costDetail.children.forEach(function(a) { this.costDetail.children.forEach(function (a) {
var detail = a.detail==undefined?'':a.detail var detail = a.detail == undefined ? '' : a.detail
cost += a.key + ":" +detail+" " cost += a.key + ":" + detail + " "
}) })
this.tourCostDetail = cost this.tourCostDetail = cost
if(this.form.orderRentVehicleDetail.driverType==1) { if (this.form.orderRentVehicleDetail.driverType == 1) {
this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600 this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600
} }
this.rentDialogVisible = true; this.rentDialogVisible = true;
...@@ -516,41 +544,41 @@ ...@@ -516,41 +544,41 @@
/** /**
* 租车订单详情弹框关闭 * 租车订单详情弹框关闭
* */ * */
rentOrderDetailDialogEvent(e){ rentOrderDetailDialogEvent(e) {
this.rentDialogVisible = false; this.rentDialogVisible = false;
if(e){ if (e) {
this.getList() this.getList()
} }
}, },
/** /**
* 操作-违章查询按钮，显示违章弹框 * 操作-违章查询按钮，显示违章弹框
*/ */
illegalInquiry(row){ illegalInquiry(row) {
this.currentRow = row; this.currentRow = row;
this.illegalVisible = true; this.illegalVisible = true;
}, },
/** /**
* 操作-查看详情按钮，显示详情弹框 * 操作-查看详情按钮，显示详情弹框
*/ */
detailInquiry(row){ detailInquiry(row) {
this.currentRow = row; this.currentRow = row;
this.detailVisible = true; this.detailVisible = true;
}, },
/** /**
* 关闭违章查询弹框 * 关闭违章查询弹框
* */ * */
illegalEvent(params){ illegalEvent(params) {
this.illegalVisible = false; this.illegalVisible = false;
if(params){ if (params) {
console.log(params); console.log(params);
} }
}, },
/** /**
* 关闭违章查询弹框 * 关闭违章查询弹框
* */ * */
detailEvent(params){ detailEvent(params) {
this.detailVisible = false; this.detailVisible = false;
if(params){ if (params) {
console.log(params); console.log(params);
} }
}, },
...@@ -577,11 +605,11 @@ ...@@ -577,11 +605,11 @@
this.form.orderRentVehicleDetail.endTime = timestamp2Date(this.form.orderRentVehicleDetail.endTime) this.form.orderRentVehicleDetail.endTime = timestamp2Date(this.form.orderRentVehicleDetail.endTime)
this.costDetail = JSON.parse(this.form.orderRentVehicleDetail.costDetail) this.costDetail = JSON.parse(this.form.orderRentVehicleDetail.costDetail)
var cost = ''; var cost = '';
this.costDetail.children.forEach(function(a) { this.costDetail.children.forEach(function (a) {
cost += a.key + ":" +a.detail+" " cost += a.key + ":" + a.detail + " "
}) })
this.tourCostDetail = cost this.tourCostDetail = cost
if(this.form.orderRentVehicleDetail.driverType==1) { if (this.form.orderRentVehicleDetail.driverType == 1) {
this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600 this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600
} }
this.orderVehicleQuery.orderId = this.form.id this.orderVehicleQuery.orderId = this.form.id
...@@ -589,7 +617,7 @@ ...@@ -589,7 +617,7 @@
this.getAllOrderVehicleCrosstown(); this.getAllOrderVehicleCrosstown();
this.handover = true this.handover = true
this.returnVehicle = false this.returnVehicle = false
this.vehicleDetail=true this.vehicleDetail = true
this.depositDetail = false this.depositDetail = false
}, },
...@@ -597,12 +625,12 @@ ...@@ -597,12 +625,12 @@
getOrderVehicleCrosstown(this.orderVehicleQuery) getOrderVehicleCrosstown(this.orderVehicleQuery)
.then(response => { .then(response => {
console.log(response) console.log(response)
if(response.data.length <=0 ) { if (response.data.length <= 0) {
alert("交还车记录不存在") alert("交还车记录不存在")
}else { } else {
this.orderVehicleCrosstownVisible = true this.orderVehicleCrosstownVisible = true
this.orderReturnVehicleCrosstown = response.data[0]; this.orderReturnVehicleCrosstown = response.data[0];
if(response.data[0].imgs) { if (response.data[0].imgs) {
this.otherImg = response.data[0].imgs.split(',') this.otherImg = response.data[0].imgs.split(',')
} }
} }
...@@ -634,11 +662,11 @@ ...@@ -634,11 +662,11 @@
this.form.orderRentVehicleDetail.endTime = timestamp2Date(this.form.orderRentVehicleDetail.endTime) this.form.orderRentVehicleDetail.endTime = timestamp2Date(this.form.orderRentVehicleDetail.endTime)
this.costDetail = JSON.parse(this.form.orderRentVehicleDetail.costDetail) this.costDetail = JSON.parse(this.form.orderRentVehicleDetail.costDetail)
var cost = ''; var cost = '';
this.costDetail.children.forEach(function(a) { this.costDetail.children.forEach(function (a) {
cost += a.key + ":" +a.detail+" " cost += a.key + ":" + a.detail + " "
}) })
this.tourCostDetail = cost this.tourCostDetail = cost
if(this.form.orderRentVehicleDetail.driverType==1) { if (this.form.orderRentVehicleDetail.driverType == 1) {
this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600 this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600
} }
this.orderVehicleQuery.orderId = this.form.id this.orderVehicleQuery.orderId = this.form.id
...@@ -646,40 +674,40 @@ ...@@ -646,40 +674,40 @@
this.getAllOrderVehicleCrosstown(); this.getAllOrderVehicleCrosstown();
this.returnVehicle = true this.returnVehicle = true
this.handover = false this.handover = false
this.vehicleDetail=true this.vehicleDetail = true
this.depositDetail = false this.depositDetail = false
}, },
handleRefundVehicle(row) { handleRefundVehicle(row) {
console.log(row) console.log(row)
var that = this; var that = this;
that.pictureList=[]; that.pictureList = [];
that.dedDetail=[]; that.dedDetail = [];
that.depositRefundRecord=[]; that.depositRefundRecord = [];
that.dedTotal=0; that.dedTotal = 0;
that.Tel=''; that.Tel = '';
getStep(row.no).then(response =>{ getStep(row.no).then(response => {
response.data.forEach(function(item) { response.data.forEach(function (item) {
if(item.type!=1){ if (item.type != 1) {
that.Tel = item.customerPhone that.Tel = item.customerPhone
that.type = item.type that.type = item.type
if(item.dedDetail){ if (item.dedDetail) {
var dedTotal = 0 var dedTotal = 0
var dedDetail = JSON.parse(item.dedDetail); var dedDetail = JSON.parse(item.dedDetail);
that.dedDetail = dedDetail; that.dedDetail = dedDetail;
dedDetail.forEach(function(item){ dedDetail.forEach(function (item) {
dedTotal += Number(item.cost) dedTotal += Number(item.cost)
}) })
that.dedTotal = dedTotal.toFixed(2); that.dedTotal = dedTotal.toFixed(2);
} }
item.depositRefundRecord.forEach(function(itm){ item.depositRefundRecord.forEach(function (itm) {
itm.updTimeStr = timestamp2Date(itm.updTime); itm.updTimeStr = timestamp2Date(itm.updTime);
if(itm.status==3){ if (itm.status == 3) {
itm.endTimeStr = timestamp2Date(Number(itm.updTime)+2592000000) itm.endTimeStr = timestamp2Date(Number(itm.updTime) + 2592000000)
if(itm.orderViolation){ if (itm.orderViolation) {
if(itm.orderViolation.picture){ if (itm.orderViolation.picture) {
var Arr = itm.orderViolation.picture.split(","); var Arr = itm.orderViolation.picture.split(",");
var arrivalPicList = []; var arrivalPicList = [];
Arr.map(function(it){ Arr.map(function (it) {
arrivalPicList.push(it); arrivalPicList.push(it);
}); });
itm.pictureList = arrivalPicList; itm.pictureList = arrivalPicList;
...@@ -687,11 +715,11 @@ ...@@ -687,11 +715,11 @@
} }
} }
}) })
if(item.type==3){ if (item.type == 3) {
var arr = item.depositRefundRecord; var arr = item.depositRefundRecord;
var item = arr.shift(); var item = arr.shift();
arr.push(item) arr.push(item)
}else{ } else {
var arr = item.depositRefundRecord; var arr = item.depositRefundRecord;
} }
...@@ -721,7 +749,7 @@ ...@@ -721,7 +749,7 @@
this.form.orderRentVehicleDetail.startTime = timestamp2Date(this.form.orderRentVehicleDetail.startTime) this.form.orderRentVehicleDetail.startTime = timestamp2Date(this.form.orderRentVehicleDetail.startTime)
this.form.orderRentVehicleDetail.endTime = timestamp2Date(this.form.orderRentVehicleDetail.endTime) this.form.orderRentVehicleDetail.endTime = timestamp2Date(this.form.orderRentVehicleDetail.endTime)
this.orderVehicleCrosstownVisible = true this.orderVehicleCrosstownVisible = true
this.vehicleDetail=false this.vehicleDetail = false
this.depositDetail = true this.depositDetail = true
}, },
//监听change事件 //监听change事件
...@@ -788,15 +816,15 @@ ...@@ -788,15 +816,15 @@
}); });
}, },
clearSearch() { clearSearch() {
this.listQuery ={ this.listQuery = {
page: 1, page: 1,
limit: 20, limit: 20,
type:1, type: 1,
no: null, no: null,
status:null, status: null,
startTime: undefined, startTime: undefined,
endTime:undefined, endTime: undefined,
zoneId:undefined, zoneId: undefined,
startCompanyId: undefined startCompanyId: undefined
} }
this.getList() this.getList()
...@@ -837,17 +865,20 @@ ...@@ -837,17 +865,20 @@
</script> </script>
<style scpoed> <style scpoed>
.label-text{ .label-text {
margin-left: 10px; margin-left: 10px;
margin-right: 20px; margin-right: 20px;
} }
.label-title{
.label-title {
margin-top: 10px; margin-top: 10px;
} }
.orderDetail tr th{
.orderDetail tr th {
background: #eef1f6; background: #eef1f6;
} }
.orderDetail tr td, .orderDetail tr th{
.orderDetail tr td, .orderDetail tr th {
width: 500px; width: 500px;
text-align: center; text-align: center;
border: 1px solid #dfe6ec; border: 1px solid #dfe6ec;
...@@ -855,36 +886,155 @@ ...@@ -855,36 +886,155 @@
margin-right: 100px; margin-right: 100px;
padding: 10px; padding: 10px;
} }
.label-value{
.label-value {
margin-left: 80px; margin-left: 80px;
margin-right: 100px; margin-right: 100px;
} }
#license-img{
#license-img {
width: 50px; width: 50px;
height: 50px; height: 50px;
} }
.order-details .el-form-item{
.order-details .el-form-item {
margin-bottom: 10px !important; margin-bottom: 10px !important;
} }
.stepBox{background-color: #fff;width: 100%;margin-top: 10px;}
.title{font-size: 17px;color: #171413;border-bottom: 1px solid #CCCCCC;margin-bottom: 10px;font-weight:400;padding: 10px;} .stepBox {
.stepBox ul{margin-left: 10px;padding-left: 10px;padding-top: 20px;} background-color: #fff;
.stepBox li{position: relative;padding: 0 20px 20px 20px;list-style: none;min-height: 40px;border-left: 1px solid #ccc;margin-top: -15px;} width: 100%;
.stepBox li.active{border-color: #47E270;} margin-top: 10px;
.stepBox ul li:last-child{border: none;} }
.activeImg,.doingImg{position: absolute;width: 28px;top: -18px;left: -14px;background: #fff}
.stepTitle{font-size: 15px;color: #171413;padding-bottom: 5px} .title {
.tip{font-size: 10px;color: #999999;} font-size: 17px;
.detailTitle{font-size: 10px;color: #171413;} color: #171413;
.orderBox{width: 100%;padding: 0 10px;background: #fff;} border-bottom: 1px solid #CCCCCC;
.orderItem{display: flex;display: -webkit-box;display: -webkit-flex;align-items: center;padding-bottom: 5px} margin-bottom: 10px;
.orderItemLeft{font-size: 13px;color: #171413} font-weight: 400;
.orderItemRight{font-size: 13px;color: #666666} padding: 10px;
.detailBox{display: flex;display: -webkit-box;display: -webkit-flex;padding: 0 10px 10px 10px;align-items: center} }
.detailBoxLeft{width: 80px;height: 80px;border-radius: 3px;margin-right: 7px}
.detailBoxRight{flex: 1;} .stepBox ul {
.copy{font-size: 10px;color: #666666;background: #EEEEEE;border-radius: 3px;padding: 3px;margin-left: 10px} margin-left: 10px;
.picBox{display: flex;display: -webkit-box;display: -webkit-flex;align-items: center;flex-wrap: wrap} padding-left: 10px;
.picItem{width: calc(33.3% - 10px);margin-right: 10px;margin-bottom: 10px;} padding-top: 20px;
.bag{background:#171413;border-radius:3px;padding:0 2px;color:#fff;font-size:10px;margin-right: 5px} }
.stepBox li {
position: relative;
padding: 0 20px 20px 20px;
list-style: none;
min-height: 40px;
border-left: 1px solid #ccc;
margin-top: -15px;
}
.stepBox li.active {
border-color: #47E270;
}
.stepBox ul li:last-child {
border: none;
}
.activeImg, .doingImg {
position: absolute;
width: 28px;
top: -18px;
left: -14px;
background: #fff
}
.stepTitle {
font-size: 15px;
color: #171413;
padding-bottom: 5px
}
.tip {
font-size: 10px;
color: #999999;
}
.detailTitle {
font-size: 10px;
color: #171413;
}
.orderBox {
width: 100%;
padding: 0 10px;
background: #fff;
}
.orderItem {
display: flex;
display: -webkit-box;
display: -webkit-flex;
align-items: center;
padding-bottom: 5px
}
.orderItemLeft {
font-size: 13px;
color: #171413
}
.orderItemRight {
font-size: 13px;
color: #666666
}
.detailBox {
display: flex;
display: -webkit-box;
display: -webkit-flex;
padding: 0 10px 10px 10px;
align-items: center
}
.detailBoxLeft {
width: 80px;
height: 80px;
border-radius: 3px;
margin-right: 7px
}
.detailBoxRight {
flex: 1;
}
.copy {
font-size: 10px;
color: #666666;
background: #EEEEEE;
border-radius: 3px;
padding: 3px;
margin-left: 10px
}
.picBox {
display: flex;
display: -webkit-box;
display: -webkit-flex;
align-items: center;
flex-wrap: wrap
}
.picItem {
width: calc(33.3% - 10px);
margin-right: 10px;
margin-bottom: 10px;
}
.bag {
background: #171413;
border-radius: 3px;
padding: 0 2px;
color: #fff;
font-size: 10px;
margin-right: 5px
}
</style> </style>
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