123

src/api/order/rentVehicle.js

 import fetch from 'utils/fetch';
-//获取租车订单
+
 export function page(query) {
-	return fetch({
-		url: '/api/order/baseOrder/getAll',
-		method: 'get',
-		params: query
-	});
+  return fetch({
+    url: '/api/order/baseOrder/getOrderList',
+    method: 'get',
+		params:query
+  });
 }
 
-//获取旅游订单
-export function getOrderList(query) {
-	return fetch({
-		url: '/api/order/baseOrder/getOrderList',
-		method: 'get',
-		params: query
-	});
-}
 /**
  * 获取所有分公司
  */
 export function getAllBranchCompany() {
-	return fetch({
-		url: '/vehicle/branchCompany',
-		method: 'get'
-	});
+  return fetch({
+    url: '/vehicle/branchCompany',
+    method: 'get'
+  });
 }
 //根据大区Id获取分公司列表
 export function getAllBranchCompanyByZoneId(query) {
-	return fetch({
-		url: '/vehicle/branchCompany/app/unauth/getByZone',
-		method: 'get',
-		params: query
-	});
+  return fetch({
+    url: '/vehicle/branchCompany/app/unauth/getByZone',
+    method: 'get',
+		params:query
+  });
 }
 
 export function getOrderVehicleCrosstown(query) {
-	return fetch({
-		url: '/api/order/orderVehicle/getByOrderId',
-		method: 'get',
-		params: query
-	});
+  return fetch({
+    url: '/api/order/orderVehicle/getByOrderId',
+    method: 'get',
+		params:query
+  });
 }
 
 /**
@@ -47,10 +39,10 @@ export function getOrderVehicleCrosstown(query) {
  * @param query
  */
 export function getOneIllegalRow(id) {
-	return fetch({
-		url: '/api/order/orderViolation/getOne/' + id,
-		method: 'get'
-	});
+  return fetch({
+    url: '/api/order/orderViolation/getOne/' + id,
+    method: 'get'
+  });
 }
 
 /**
@@ -62,11 +54,11 @@ detailId:租车订单id
 }
  */
 export function saveOrderViolation(params) {
-	return fetch({
-		url: '/api/order/orderViolation/saveOrderViolation',
-		method: 'post',
-		data: params
-	});
+  return fetch({
+    url: '/api/order/orderViolation/saveOrderViolation',
+    method: 'post',
+    data: params
+  });
 }
 
 /**
@@ -74,36 +66,36 @@ export function saveOrderViolation(params) {
  * @param query
  */
 export function getStep(orderNo) {
-	return fetch({
-		url: '/api/order/orderVehicle/getByOrderId?orderNo=' + orderNo,
-		method: 'get'
-	});
+  return fetch({
+    url: '/api/order/orderVehicle/getByOrderId?orderNo=' + orderNo,
+    method: 'get'
+  });
 }
 
 export function inquire(query) {
-	return fetch({
-		url: '/vehicle/vehicleInfo/rent/back-stage/usable-vehicle',
-		method: 'get',
-		params: query
-	});
+  return fetch({
+    url: '/vehicle/vehicleInfo/rent/back-stage/usable-vehicle',
+    method: 'get',
+    params:query
+  });
 }
 
 //创建订单
 export function addIndent(params) {
-	return fetch({
-		url: '/api/order/orderRentVehicle/back-stage/add',
-		method: 'post',
-		data: params
-	});
+  return fetch({
+    url: '/api/order/orderRentVehicle/back-stage/add',
+    method: 'post',
+    data:params
+  });
 }
 
 //删除订单
 export function calculate(no, params) {
-	return fetch({
-		url: '/api/order/baseOrder/back-stage/cancel/' + no,
-		method: 'post',
-		data: params
-	});
+  return fetch({
+    url: '/api/order/baseOrder/back-stage/cancel/'+ no,
+    method: 'post',
+    data:params
+  });
 }
 
 /**
@@ -111,63 +103,54 @@ export function calculate(no, params) {
  * @param {Object} params计算违约价格
  */
 export function getViolatePrice(no) {
-	return fetch({
-		url: '/api/order/orderRefund/bg-stage/getViolatePrice/' + no,
-		method: 'get',
-	});
+  return fetch({
+    url: '/api/order/orderRefund/bg-stage/getViolatePrice/'+ no,
+    method: 'get',
+  });
 }
 
 //创建订单
 export function orderStatistics(params) {
-	return fetch({
-		url: 'api/order/orderStatistics/order',
-		method: 'post',
-		data: params
-	});
+  return fetch({
+    url: 'api/order/orderStatistics/order',
+    method: 'post',
+    data:params
+  });
 }
 
 //订单下载
 export function downloadExcel(params) {
-	return fetch({
-		url: '/api/order/orderStatistics/excel',
-		method: 'post',
-		data: params,
-		responseType: 'blob'
-	});
+  return fetch({
+    url: '/api/order/orderStatistics/excel',
+    method: 'post',
+    data: params,
+    responseType: 'blob'
+  });
 }
 
 //会员订单管理列表
 export function pageList(params) {
-	return fetch({
-		url: '/api/order/orderMember/page',
-		method: 'post',
-		data: params
-	});
+  return fetch({
+    url: '/api/order/orderMember/page',
+    method: 'post',
+    data: params
+  });
 }
 
 //会员订单管理导出
 export function orderMemberExcel(params) {
-	return fetch({
-		url: '/api/order/orderMember/export',
-		method: 'post',
-		data: params,
-		responseType: 'blob'
-	});
+  return fetch({
+    url: '/api/order/orderMember/export',
+    method: 'post',
+    data: params,
+    responseType: 'blob'
+  });
 }
 
 //用户信息
 export function user_info(id) {
-	return fetch({
-		url: '/api/admin/appUsersManage/user_info/' + id,
-		method: 'get'
-	});
-}
-
+  return fetch({
+    url: '/api/admin/appUsersManage/user_info/' + id,
+    method: 'get'
+  });
+}
\ No newline at end of file
-//获取订单详情
-export function orderDetail(query) {
-	return fetch({
-		url: '/api/order/baseOrder/orderDetail',
-		method: 'get',
-		params: query
-	});
-}

src/views/order/modal/rentOrderDetailModal.vue

 <template>
 	<el-dialog title="租车订单详情" :visible.sync="dialogVisible" class="order-details">
-		<el-form :model="orderDetailInfo" ref="orderDetailInfo" label-width="110px">
+		<el-form :model="form" ref="form" label-width="110px">
 			<el-row>
 				<el-col :span="8">
 					<el-form-item label="订单号:">
-						<span v-if="orderDetailInfo.no">{{orderDetailInfo.no}}</span>
+						<span>{{form.no}}</span>
 					</el-form-item>
 				</el-col>
 				<el-col :span="8">
 					<el-form-item label="创建订单时间:">
-						<span v-if="orderDetailInfo.crtTime">{{orderDetailInfo.crtTime}}</span>
+						<span>{{form.crtTime}}</span>
 					</el-form-item>
 				</el-col>
 
 				<el-col :span="8">
 					<el-form-item label="实际支付时间:">
-						<span>{{!!orderDetailInfo.payTime ? timestamp(new Date(orderDetailInfo.payTime)) : '无'}}</span>
+						<span>{{!!form.payTime ? timestamp(new Date(form.payTime)) : '无'}}</span>
 					</el-form-item>
 				</el-col>
 			</el-row>
 			<el-row>
 				<el-col :span="8">
 					<el-form-item label="订单状态:">
-						<span>{{orderDetailInfo.ststusName}}</span>
+						<span>{{form.ststusName}}</span>
 					</el-form-item>
 				</el-col>
 				<el-col :span="8">
 					<el-form-item label="姓名/手机号:">
-						<span v-if="orderDetailInfo.username">{{orderDetailInfo.username}}/{{orderDetailInfo.telephone}}</span>
+						<span v-if="form.realName">{{form.realName}}/{{form.telephone}}</span>
 						<span v-else>无</span>
 					</el-form-item>
 				</el-col>
 				<el-col :span="8">
 					<el-form-item label="会员等级/身份:">
-						<span v-if="orderDetailInfo != undefined && orderDetailInfo.memberLevel">{{orderDetailInfo.memberName}}/{{orderDetailInfo. jobTitle}}</span>
+						<span v-if="form.memberName">{{form.memberName}}/{{form. jobTitle}}</span>
 						<span v-else>无</span>
 					</el-form-item>
 				</el-col>
+				<!-- <el-col :span="8">
+					<el-form-item label="配车:">
+						<span
+							style="margin-right: 10px;"
+						>{{form.vehicleNumberPlat?form.vehicleNumberPlat:form.vehicalNumberPlat}}</span>
+						<el-button
+							size="small"
+							type="primary"
+							icon="edit"
+							v-if="form.status==4"
+							@click="resetCar"
+						>重新配车</el-button>
+					</el-form-item>
+				</el-col>-->
 			</el-row>
+			<!-- <el-row>
+				<el-col :span="8">
+					<el-form-item label="取车:">
+						<span>{{form.orderRentVehicleDetail.startTime}}</span>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label label-width="10px">
+						<span>{{form.orderRentVehicleDetail.startAddr}}</span>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="交车公司:">
+						<span>{{form.startCompanyName}}</span>
+					</el-form-item>
+				</el-col>
+			</el-row>-->
+			<!-- <el-row>
+				<el-col :span="8">
+					<el-form-item label="还车:">
+						<span>{{form.orderRentVehicleDetail.endTime}}</span>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label label-width="10px">
+						<span>{{form.orderRentVehicleDetail.endAddr}}</span>
+					</el-form-item>
+				</el-col>
+				<el-col :span="8">
+					<el-form-item label="还车公司:">
+						<span>{{form.endCompanyName}}</span>
+						<el-button
+							v-show="form.status == 4 || form.status == 5"
+							size="mini"
+							type="primary"
+							style="padding: 7px 9px;"
+							@click="resetReturn = true"
+						>更换</el-button>
+					</el-form-item>
+				</el-col>
+			</el-row>-->
 			<table class="orderDetail">
 				<tr>
 					<th>房车</th>
@@ -54,66 +109,68 @@
 				</tr>
 				<tr>
 					<td>
-						{{orderDetailInfo.name}}  </br>  {{orderDetailInfo.vehicalNumberPlat}}
-						<span v-if="orderDetailInfo.code">({{orderDetailInfo.code}})</span>
+						{{form.name}}{{form.vehicleNumberPlat}}
+						<span v-if="form.vehicleCode">({{form.vehicleCode}})</span>
 						<span v-else></span>
 					</td>
 					<td>
-						<p>取:{{orderDetailInfo.orderRentVehicleDetail.startTime}}</p>
-						<p>还:{{orderDetailInfo.orderRentVehicleDetail.endTime}}</p>
-						<p v-show="orderDetailInfo.orderRentVehicleDetail.dayNum">租借天数{{orderDetailInfo.orderRentVehicleDetail.dayNum}}天</p>
+						<p>取:{{form.orderRentVehicleDetail.startTime}}</p>
+						<p>还:{{form.orderRentVehicleDetail.endTime}}</p>
+						<p v-show="form.orderRentVehicleDetail.dayNum">租借天数{{form.orderRentVehicleDetail.dayNum}}天</p>
 					</td>
-					<td>{{orderDetailInfo.startCompanyName}}</td>
-					<td>{{orderDetailInfo.endCompanyName}}</td>
+					<td>{{form.startCompanyName}}</td>
+					<td>{{form.endCompanyName}}</td>
 
 					<td>
-						<p v-if="orderDetailInfo.rentVehiclePriceVO">
-							<span v-if=" orderDetailInfo.rentVehiclePriceVO.freeDayNum && orderDetailInfo.rentVehiclePriceVO.freeDayNum > 0">会员特权{{orderDetailInfo.rentVehiclePriceVO.freeDayNum}}天</span>
-							<span v-else>无</span>
+						<p v-if="form.rentVehiclePriceVO">
+							<span v-if="form.rentVehiclePriceVO.freeDayNum == 0">无</span>
+							<span v-else>会员特权{{form.rentVehiclePriceVO.freeDayNum}}天</span>
 						</p>
-						<p v-else>无</p>
+						<p v-else>{{orderInfo('免费天数')}}</p>
 					</td>
 
 					<td>
 						<p
-							v-if="orderDetailInfo.rentVehiclePriceVO && orderDetailInfo.rentVehiclePriceVO.vehicleDayNum > 0"
-						>¥{{orderDetailInfo.rentVehiclePriceVO.modelAmount}}*{{orderDetailInfo.rentVehiclePriceVO.vehicleNum}}/{{orderDetailInfo.rentVehiclePriceVO.vehicleDayNum}}天</p>
-						<p v-else>{{orderDetailInfo.costDetail.children[0].key}} : {{orderDetailInfo.costDetail.children[0].detail}}</p>
+							v-if="form.rentVehiclePriceVO && form.rentVehiclePriceVO.vehicleDayNum > 0"
+						>¥{{form.rentVehiclePriceVO.modelAmount}}*{{form.rentVehiclePriceVO.vehicleNum}}/{{form.rentVehiclePriceVO.vehicleDayNum}}天</p>
+						<p v-else>{{orderInfo('车辆租赁费')}}</p>
 					</td>
 
 					<td>
-						<p v-if="orderDetailInfo.rentVehiclePriceVO && orderDetailInfo.rentVehiclePriceVO.couponAmount > 0">
-							<span>{{orderDetailInfo.rentVehiclePriceVO.couponDesc}}-{{orderDetailInfo.rentVehiclePriceVO.couponAmount}}元</span>
+						<p v-if="form.couponList">
+							<span
+								v-for="(item,index) in form.couponList"
+								:key="index"
+							>{{item.title}}-{{item.usedAmount}}元</span>
 						</p>
-						<p v-else-if="orderDetailInfo.costDetail.children && orderDetailInfo.costDetail.children[2]">{{orderDetailInfo.costDetail.children[2].key}} : {{orderDetailInfo.costDetail.children[2].val}}</p>
 						<p v-else>无</p>
 					</td>
 					<td>
 						<p
-							v-if="orderDetailInfo.rentVehiclePriceVO && orderDetailInfo.rentVehiclePriceVO.damageSafeAmount > 0"
-						>¥{{orderDetailInfo.rentVehiclePriceVO.damageSafePrice}}/{{orderDetailInfo.rentVehiclePriceVO.dayNum}}天</p>
-						<p v-else>无</p>
+							v-if="form.rentVehiclePriceVO && form.rentVehiclePriceVO.damageSafeAmount > 0"
+						>¥{{form.rentVehiclePriceVO.damageSafePrice}}/{{form.rentVehiclePriceVO.dayNum}}天</p>
+						<p v-else>{{orderInfo('不计免赔')}}</p>
 					</td>
 					<td>
-						<p v-if="orderDetailInfo.rentVehiclePriceVO">{{orderDetailInfo.rentVehiclePriceVO.deposit}}</p>
-						<p v-else>{{orderDetailInfo.costDetail.children[1].key}} : {{orderDetailInfo.costDetail.children[1].val}}</p>
+						<p v-if="form.rentVehiclePriceVO">{{form.rentVehiclePriceVO.deposit}}</p>
+						<p v-else>{{orderInfo('租房车押金')}}</p>
 					</td>
 					<td>
 						<p
-							v-if="orderDetailInfo.rentVehiclePriceVO && orderDetailInfo.rentVehiclePriceVO.driverAmount > 0"
-						>¥{{orderDetailInfo.rentVehiclePriceVO.driverPrice}}*{{orderDetailInfo.rentVehiclePriceVO.driverNum}}/{{orderDetailInfo.rentVehiclePriceVO.dayNum}}天</p>
-						<p v-else>无</p>
+							v-if="form.rentVehiclePriceVO && form.rentVehiclePriceVO.driverAmount > 0"
+						>¥{{form.rentVehiclePriceVO.driverPrice}}*{{form.rentVehiclePriceVO.driverNum}}/{{form.rentVehiclePriceVO.dayNum}}天</p>
+						<p v-else>{{orderInfo('专职司机服务费')}}</p>
 					</td>
 				</tr>
 				<tr>
 					<td>
-						<el-button size="small" type="text" v-if="orderDetailInfo.status==4" @click="resetCar">重新配车</el-button>
+						<el-button size="small" type="text" v-if="form.status==4" @click="resetCar">重新配车</el-button>
 					</td>
 					<td></td>
 					<td></td>
 					<td>
 						<el-button
-							v-show="orderDetailInfo.status == 4 || orderDetailInfo.status == 5"
+							v-show="form.status == 4 || form.status == 5"
 							size="mini"
 							type="text"
 							@click="resetReturn = true"
@@ -121,15 +178,15 @@
 					</td>
 					<td
 						colspan="6"
-					>{{orderDetailInfo.payWay == 1 ? '微信支付' : orderDetailInfo.payWay == 2 ? '支付宝支付' : orderDetailInfo.payWay == 3 ? '银联支付' : '微信支付'}} 共计:￥{{orderDetailInfo.realAmount}}</td>
+					>{{form.payWay == 1 ? '微信支付' : form.payWay == 2 ? '支付宝支付' : form.payWay == 3 ? '银联支付' : '微信支付'}} 共计:￥{{form.realAmount}}</td>
 				</tr>
 			</table>
 
 			<p>
 				<b>额外随车物品:</b>
-				<span v-if="this.orderDetailInfo.carArticlesJson">
+				<span v-if="this.form.carArticlesJson">
 					<span
-						v-for="(item,index) in JSON.parse(this.orderDetailInfo.carArticlesJson)"
+						v-for="(item,index) in JSON.parse(this.form.carArticlesJson)"
 						:key="index"
 						style="margin-right:10px"
 					>{{item.name || '无'}}</span>
@@ -137,13 +194,13 @@
 			</p>
 			<p>
 				<b>内部邀请人:</b>
-				<span>{{orderDetailInfo.facilitatePhone || '无'}}</span>
+				<span>{{form.facilitatePhone || '无'}}</span>
 			</p>
 			<p>
 				<b>驾驶证:</b>
 				<span
-					v-if="orderDetailInfo.orderVehicleCrosstownDto"
-				>{{orderDetailInfo.orderVehicleCrosstownDto.licenseName}} {{orderDetailInfo.orderVehicleCrosstownDto.licensePhone}} {{orderDetailInfo.orderVehicleCrosstownDto.licenseIdCard}}</span>
+					v-if="form.orderVehicleCrosstownDto"
+				>{{form.orderVehicleCrosstownDto.licenseName}} {{form.orderVehicleCrosstownDto.licensePhone}} {{form.orderVehicleCrosstownDto.licenseIdCard}}</span>
 				<span v-else>无</span>
 			</p>
 			<!-- <div v-if="form.orderVehicleCrosstownDto" style="margin: 20px 0;">
@@ -200,7 +257,7 @@ import ElForm from '../../../../node_modules/element-ui/packages/form/src/form.v
 import { editObj } from 'api/vehicle/vehicleInfo'
 import { getAll, updateEndCompany } from 'api/base_info/branch_company'
 export default {
-	props: ['orderDetailInfo'],
+	props: ['form', 'rentCostDetail'],
 	name: 'rentOrderDetailModal',
 	components: {
 		ElFormItem,
@@ -253,17 +310,31 @@ export default {
 	},
 	mounted() {
 		this.dialogVisible = true
+		if (this.form.status == 2) {
+			this.form.ststusName = '取消'
+		}
+		if (this.form.status == 3) {
+			this.form.ststusName = '待付款'
+		}
+		if (this.form.status == 4) {
+			this.form.ststusName = '待出行'
+		}
+		if (this.form.status == 5) {
+			this.form.ststusName = '出行中'
+		}
+		if (this.form.status == 6) {
+			this.form.ststusName = '已完成'
+		}
 		this.getAllFn()
-		console.log(this.orderDetailInfo)
 	},
 	methods: {
 		orderInfo(val) {
-			// let info = this.form.detailsOfExpenses.filter(item=>item.key == val)
-			// 	if (info == '' || info < 0) {
-			// 		return '无'
-			// 	}else{
-			// 		return info[0].detail || info[0].val
-			// 	}
+			let info = this.form.detailsOfExpenses.filter(item=>item.key == val)
+				if (info == '' || info < 0) {
+					return '无'
+				}else{
+					return info[0].detail || info[0].val
+				}
 		},
 		timestamp(now) {
 			var year = now.getFullYear()

src/views/order/rentVehicleInfo/index.vue

@@ -115,12 +115,12 @@
 		>
 			<el-table-column align="center" label="ID" width="70">
 				<template scope="scope">
-					<span>{{scope.row.orderId}}</span>
+					<span>{{scope.row.id}}</span>
 				</template>
 			</el-table-column>
 			<el-table-column width="200" align="center" label="订单号/下单时间">
 				<template scope="scope">
-					<span>{{scope.row.orderNo}}</span>
+					<span>{{scope.row.no}}</span>
 					<br />
 					<span>{{scope.row.crtTime}}</span>
 				</template>
@@ -132,23 +132,23 @@
 			</el-table-column>
 			<el-table-column min-width="250" align="center" label="名称/车牌号">
 				<template scope="scope">
-					<span>{{scope.row.vehicleName}}</span>
+					<span>{{scope.row.name}}</span>
 					<br />
-					<span>{{scope.row.numberPlate}}</span>
+					<span>{{scope.row.vehicleNumberPlat}}</span>
 				</template>
 			</el-table-column>
 			<el-table-column width="150" align="center" label="姓名/手机号">
 				<template scope="scope">
-					<span>{{scope.row.username}}</span>/
+					<span>{{scope.row.realName}}</span>/
 					<span>{{scope.row.telephone}}</span>
 				</template>
 			</el-table-column>
 			<el-table-column width="200" align="center" label="取车时间/还车时间">
 				<template scope="scope">
 					取:
-					<span>{{dateFormat(scope.row.startTime)}}</span>
+					<span>{{dateFormat(scope.row.orderRentVehicleDetail.startTime)}}</span>
 					<br />还:
-					<span>{{dateFormat(scope.row.endTime)}}</span>
+					<span>{{dateFormat(scope.row.orderRentVehicleDetail.endTime)}}</span>
 				</template>
 			</el-table-column>
 			<el-table-column width="200" align="center" label="交车公司">
@@ -167,7 +167,7 @@
 			</el-table-column>
 			<el-table-column width="110" align="center" label="订单金额">
 				<template scope="scope">
-					<span>{{scope.row.realAmount}}元</span>
+					<span>{{scope.row.orderAmount}}元</span>
 				</template>
 			</el-table-column>
 			<el-table-column width="110" align="center" label="支付方式">
@@ -246,7 +246,8 @@
 
 		<!-- 订单详情 -->
 		<rentOrderDetailModal
-			:orderDetailInfo="orderDetailInfo"
+			:form="form"
+			:rentCostDetail="tourCostDetail"
 			v-if="rentDialogVisible"
 			v-on:rentOrderDetailDialogEvent="rentOrderDetailDialogEvent"
 		></rentOrderDetailModal>
@@ -258,7 +259,7 @@
 					<el-row :gutter="20">
 						<el-col :span="10">
 							<el-form-item label="客户姓名:">
-								<span>{{form.username}}</span>
+								<span>{{form.realName}}</span>
 							</el-form-item>
 						</el-col>
 						<el-col :span="10">
@@ -357,8 +358,8 @@
 				</div>
 				<div v-show="modalTitle=='还车记录'">
 					<div v-show="orderReturnVehicleCrosstown.type == 3">
-						<!-- <el-form-item label="定损类型:">
-							<span></span> -->
+						<el-form-item label="定损类型:">
+							<span></span>
 						</el-form-item>
 						<el-form-item label="定损总赔:">
 							<span>{{dedDetailDTOListAll}}</span>
@@ -572,8 +573,7 @@ import {
 	getOrderVehicleCrosstown,
 	getStep,
 	calculate,
-	getViolatePrice,
-	orderDetail
+	getViolatePrice
 } from 'api/order/rentVehicle'
 import {
 	toEast8Date,
@@ -627,12 +627,10 @@ export default {
 				hasDiscount: undefined,
 				hasMemberRight: undefined,
 				hasPay: undefined,
-				orderId: undefined,
+				id: undefined,
 				name: undefined,
-				username: undefined,
-				orderNo: undefined,
-				startTime: undefined,
-				endTime: undefined,
+				realName: undefined,
+				no: undefined,
 				orderAmount: undefined,
 				orderOrigin: undefined,
 				orderVehicleCrosstownDto: {
@@ -771,102 +769,17 @@ export default {
 			order_btn_order_violcation_save: false,
 			depositDetail: false,
 			checkUserInfo: [],
-			orderDetailInfo: {
-				code: undefined,
-				couponAmount: undefined,
-				crtHost: undefined,
-				crtName: undefined,
-				crtTime: undefined,
-				crtUser: undefined,
-				damagesAmount: undefined,
-				dedDetailDTO: undefined,
-				detailId: undefined,
-				endCompanyName: undefined,
-				extraAmount: undefined,
-				goodsAmount: undefined,
-				hasDiscount: undefined,
-				hasMemberRight: undefined,
-				hasPay: undefined,
-				id: undefined,
-				illegalReserve: undefined,
-				items: [],
-				memberLevel: undefined,
-				memberName: undefined,
-				name: undefined,
-				no: undefined,
-				orderAmount: undefined,
-				orderOrigin: undefined,
-				orderRentVehicleDetail: {
-					bookRecordId: undefined,
-					costDetail: undefined,
-					crtTime: undefined,
-					damageSafe: undefined,
-					dayNum: 0,
-					deposit: undefined,
-					driverType: undefined,
-					endAddr: undefined,
-					endCity: undefined,
-					endCityName: undefined,
-					endCompanyId: undefined,
-					endTime: undefined,
-					fixedLossStatus: undefined,
-					freeDays: undefined,
-					handelViolation: undefined,
-					id: undefined,
-					modelId: undefined,
-					orderId: undefined,
-					rebate: undefined,
-					score: undefined,
-					startAddr: undefined,
-					startCity: undefined,
-					startCityName: undefined,
-					startCompanyId: undefined,
-					startTime: undefined,
-					stime: undefined,
-					suserid: undefined,
-					updTime: undefined,
-					usedDay: undefined,
-					vehicleId: undefined,
-					violateTrafficAmount: undefined
-				},
-				orderVehicleCrosstownDto: {
-					licenseIdCard: '',
-					licenseImg: '',
-					licenseName: '',
-					licensePhone: ''
-				},
-				outTradeNo: undefined,
-				payOrigin: undefined,
-				payTime: undefined,
-				picture: undefined,
-				realAmount: undefined,
-				refundStatus: undefined,
-				rentVehiclePriceVO: undefined,
-				startCompanyName: undefined,
-				status: undefined,
-				telephone: undefined,
-				type: undefined,
-				updTime: undefined,
-				userCompanyStatus: undefined,
-				userId: undefined,
-				username: undefined,
-				vehicalNumberPlat: undefined,
-				vehicleUserLicenses: undefined,
-				version: undefined,
-				violateAmount: undefined,
-				costDetail: {
-					key: undefined,
-					val: undefined,
-					children: [
-						{
-							key: undefined,
-							detail: undefined,
-							val: undefined
-						}
-					]
-				}
-			},
-			
+			costDetail: {
+				key: undefined,
+				val: undefined,
+				children: [
+					{
+						key: undefined,
+						detail: undefined,
+						val: undefined
+					}
+				]
+			}
 		}
 	},
 	created() {
@@ -1028,65 +941,6 @@ export default {
 				that.row = row
 			}
 		},
-		getOrderDetail() {
-			if(this.form.orderNo) {
-				var param = {
-					"orderNo":this.form.orderNo,
-					"flag" : true
-				}
-				orderDetail(param).then(response => {
-					console.log(response)
-				this.orderDetailInfo = response.data
-				if(this.orderDetailInfo && this.orderDetailInfo.memberLevel) {
-					if(this.orderDetailInfo.memberLevel == 1) {
-						this.orderDetailInfo.memberName = "普通会员"
-					}
-					if(this.orderDetailInfo.memberLevel == 2) {
-						this.orderDetailInfo.memberName = "黄金会员"
-					}
-					if(this.orderDetailInfo.memberLevel == 3) {
-						this.orderDetailInfo.memberName = "钻石会员"
-					}
-					if(this.orderDetailInfo.orderRentVehicleDetail.costDetail) {
-							this.orderDetailInfo.costDetail = JSON.parse(this.orderDetailInfo.orderRentVehicleDetail.costDetail)
-							
-					}
-					if(this.orderDetailInfo.costDetail.paramJson) {
-							this.orderDetailInfo.rentVehiclePriceVO = JSON.parse(this.orderDetailInfo.costDetail.paramJson)
-							
-					}
-					console.log(this.orderDetailInfo.items)
-					if(this.orderDetailInfo.items) {
-						for (var i = 0;i< this.orderDetailInfo.items.length;i++) {
-							if(this.orderDetailInfo.items[i].type == 104) {
-								this.orderDetailInfo.carArticlesJson = this.orderDetailInfo.items[i].detail
-							}
-						}
-					}
-					if (this.orderDetailInfo.status == 2) {
-						this.orderDetailInfo.ststusName = '取消'
-					}
-					if (this.orderDetailInfo.status == -1) {
-						this.orderDetailInfo.ststusName = '定损中'
-					}
-					if (this.orderDetailInfo.status == 3) {
-						this.orderDetailInfo.ststusName = '待付款'
-					}
-					if (this.orderDetailInfo.status == 4) {
-						this.orderDetailInfo.ststusName = '待出行'
-					}
-					if (this.orderDetailInfo.status == 5) {
-						this.orderDetailInfo.ststusName = '出行中'
-					}
-					if (this.orderDetailInfo.status == 6) {
-						this.orderDetailInfo.ststusName = '已完成'
-					}
-				}
-				console.log(this.orderDetailInfo)
-				this.rentDialogVisible = true
-			})
-			}
-		},
 		checkViolateAmount() {
 			console.log(this.topAmount)
 			console.log(this.violateAmount)
@@ -1134,8 +988,7 @@ export default {
 				cancelReason: '后台取消',
 				appUserId: row.userId
 			}
-			console.log(row)
-			getViolatePrice(row.orderNo).then(data => {
+			getViolatePrice(row.no).then(data => {
 				if (data.status == 200) {
 					that.topAmount = data.data.topAmount
 					that.cancel(row, data.data.cutAmount)
@@ -1169,15 +1022,37 @@ export default {
 			if (this.form.status == -1) {
 				this.form.ststusName = '定损中'
 			}
-			this.form.startTime = this.form
-				.startTime
-				? timestamp2Date(this.form.startTime)
+			this.form.orderRentVehicleDetail.startTime = this.form
+				.orderRentVehicleDetail.startTime
+				? timestamp2Date(this.form.orderRentVehicleDetail.startTime)
 				: ''
-			this.form.endTime = this.form
-				.endTime
-				? timestamp2Date(this.form.endTime)
+			this.form.orderRentVehicleDetail.endTime = this.form
+				.orderRentVehicleDetail.endTime
+				? timestamp2Date(this.form.orderRentVehicleDetail.endTime)
 				: ''
-			this.getOrderDetail();
+			if (this.form.orderRentVehicleDetail.costDetail) {
+				try {
+					this.costDetail = JSON.parse(
+						this.form.orderRentVehicleDetail.costDetail
+					)
+					var cost = ''
+					// console.log(this.costDetail.children);
+					if (this.costDetail.children) {
+						this.costDetail.children.forEach(function(a) {
+							var detail = a.detail == undefined ? '' : a.detail
+							cost += a.key + ':' + detail + ' '
+						})
+					}
+				} catch (e) {
+					this.templateModel()
+				}
+			}
+			// console.log(cost);
+			this.tourCostDetail = cost
+			if (this.form.orderRentVehicleDetail.driverType == 1) {
+				this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600
+			}
+			this.rentDialogVisible = true
 		},
 		/**
 		 * 租车订单详情弹框关闭
@@ -1243,7 +1118,27 @@ export default {
 			if (this.form.status == -1) {
 				this.form.ststusName = '定损中'
 			}
-			this.orderVehicleQuery.orderId = this.form.orderId
+			this.form.orderRentVehicleDetail.startTime = timestamp2Date(
+				this.form.orderRentVehicleDetail.startTime
+			)
+			this.form.orderRentVehicleDetail.endTime = timestamp2Date(
+				this.form.orderRentVehicleDetail.endTime
+			)
+			this.costDetail = JSON.parse(
+				this.form.orderRentVehicleDetail.costDetail
+			)
+			var cost = ''
+			if (this.costDetail.children) {
+				this.costDetail.children.forEach(function(a) {
+					var detail = a.detail == undefined ? '' : a.detail
+					cost += a.key + ':' + detail + ' '
+				})
+			}
+			this.tourCostDetail = cost
+			if (this.form.orderRentVehicleDetail.driverType == 1) {
+				this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600
+			}
+			this.orderVehicleQuery.orderId = this.form.id
 			this.orderVehicleQuery.type = 1
 			this.orderVehicleQuery.types = null
 			this.getAllOrderVehicleCrosstown()
@@ -1302,14 +1197,27 @@ export default {
 			if (this.form.status == -1) {
 				this.form.ststusName = '定损中'
 			}
-			this.form.startTime = timestamp2Date(
-				this.form.startTime
+			this.form.orderRentVehicleDetail.startTime = timestamp2Date(
+				this.form.orderRentVehicleDetail.startTime
+			)
+			this.form.orderRentVehicleDetail.endTime = timestamp2Date(
+				this.form.orderRentVehicleDetail.endTime
 			)
-			this.form.endTime = timestamp2Date(
-				this.form.endTime
+			this.costDetail = JSON.parse(
+				this.form.orderRentVehicleDetail.costDetail
 			)
-			
-			this.orderVehicleQuery.orderId = this.form.orderId
+			var cost = ''
+			if (this.costDetail.children) {
+				this.costDetail.children.forEach(function(a) {
+					var detail = a.detail == undefined ? '' : a.detail
+					cost += a.key + ':' + detail + ' '
+				})
+			}
+			this.tourCostDetail = cost
+			if (this.form.orderRentVehicleDetail.driverType == 1) {
+				this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600
+			}
+			this.orderVehicleQuery.orderId = this.form.id
 			this.orderVehicleQuery.types = '2,3'
 			this.orderVehicleQuery.type = null
 			this.getAllOrderVehicleCrosstown()
@@ -1327,7 +1235,7 @@ export default {
 			that.depositRefundRecord = []
 			that.dedTotal = 0
 			that.Tel = ''
-			getStep(row.orderNo + '&address=1').then(response => {
+			getStep(row.no + '&address=1').then(response => {
 					this.activeRecord = response.data[0]
 				response.data.forEach(function(item) {
 				
@@ -1396,11 +1304,11 @@ export default {
 			if (this.form.status == -1) {
 				this.form.ststusName = '定损中'
 			}
-			this.form.startTime = timestamp2Date(
-				this.form.startTime
+			this.form.orderRentVehicleDetail.startTime = timestamp2Date(
+				this.form.orderRentVehicleDetail.startTime
 			)
-			this.form.endTime = timestamp2Date(
-				this.form.endTime
+			this.form.orderRentVehicleDetail.endTime = timestamp2Date(
+				this.form.orderRentVehicleDetail.endTime
 			)
 			this.orderVehicleCrosstownVisible = true
 			this.vehicleDetail = false

src/views/order/tourOrderInfo/index.vue

@@ -156,7 +156,6 @@
   import tourOrderDetailModal from "../modal/tourOrderDetailModal";//租车订单详情
   import {
     page,
-		getOrderList,
     getAllBranchCompany,
     getAllBranchCompanyByZoneId,
 		calculate,
@@ -615,7 +614,7 @@ import {getAllCompany } from 'api/base_info/branch_company'
         if(this.listQuery){
           localStorage.setItem("tourOrderInfo", JSON.stringify(this.listQuery));
         }
-        getOrderList(this.listQuery)
+        page(this.listQuery)
           .then(response => {
             this.list = response.data.data;
             this.total = response.data.totalCount;