租车订单管理

config/dev.env.js

 module.exports = {
     NODE_ENV: '"development"',
-  BASE_API:'"https://xxtest.upyuns.com"',//'"https://dev.dfangche.com"',//'"https://xxtest.upyuns.com"',//'"https://xxtest.upyuns.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
+  BASE_API:'"https://dev.dfangche.com"',//'"https://xxtest.upyuns.com"',//'"https://xxtest.upyuns.com"',//'"https://xxtest.upyuns.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
     APP_ORIGIN: '"https://wallstreetcn.com"'
 }

src/api/admin/userManagement/index.js

@@ -4,6 +4,7 @@ export function appPage(obj) {
   return fetch({
     url: '/api/admin/appUsersManage/findAll',
     method: 'post',
+    timeout: '30000',
     data: obj
   });
 }

src/views/order/modal/rentOrderDetailModal.vue

@@ -27,12 +27,14 @@
 				</el-col>
 				<el-col :span="8">
 					<el-form-item label="姓名/手机号:">
-						<span>{{form.realName}}/{{form.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>{{form.memberName}}/{{form. 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">
@@ -106,10 +108,11 @@
 					<th>专职司机服务费</th>
 				</tr>
 				<tr>
-					<td>{{form.name}}</td>
+					<td>{{form.name}}{{form.vehicleNumberPlat}}{{form.vehicleCode ? (form.vehicleCode) : ''}}</td>
 					<td>
 						<p>取:{{form.orderRentVehicleDetail.startTime}}</p>
 						<p>还:{{form.orderRentVehicleDetail.endTime}}</p>
+						<p v-show="form.orderRentVehicleDetail.dayNum">租借天数{{form.orderRentVehicleDetail.dayNum}}天</p>
 					</td>
 					<td>{{form.startCompanyName}}</td>
 					<td>{{form.endCompanyName}}</td>
@@ -136,7 +139,6 @@
 					</td>
 					<td>
 						<p v-if="form.couponList">
-							优惠券:
 							<span
 								v-for="(item,index) in form.couponList"
 								:key="index"
@@ -183,7 +185,7 @@
 							@click="resetReturn = true"
 						>更换</el-button>
 					</td>
-					<td colspan="6">{{form.payWay == 1 ? '微信公众号支付' : form.payWay == 2 ? '支付宝即时支付' : form.payWay == 3 ? '银联支付' : ''}} 共计:￥{{form.realAmount}}</td>
+					<td colspan="6">{{form.payWay == 1 ? '微信支付' : form.payWay == 2 ? '支付宝支付' : form.payWay == 3 ? '银联支付' : '微信公支付'}} 共计:￥{{form.realAmount}}</td>
 				</tr>
 			</table>
 
@@ -486,6 +488,9 @@ export default {
 	width: 50px;
 	height: 50px;
 }
+.order-details .el-dialog--small{
+	width: 1100px !important;
+}
 .order-details .el-form-item {
 	margin-bottom: 10px !important;
 }

src/views/order/rentVehicleInfo/index.vue

@@ -113,11 +113,11 @@
 			highlight-current-row
 			style="width: 100%"
 		>
-			<el-table-column align="center" label="ID" width="70">
+			<!-- <el-table-column align="center" label="ID" width="70">
 				<template scope="scope">
 					<span>{{scope.row.id}}</span>
 				</template>
-			</el-table-column>
+			</el-table-column>-->
 			<el-table-column width="200" align="center" label="订单号/下单时间">
 				<template scope="scope">
 					<span>{{scope.row.no}}</span>
@@ -154,15 +154,15 @@
 			<el-table-column width="200" align="center" label="交车公司">
 				<template scope="scope">
 					<span>{{scope.row.startCompanyName}}</span>
-					<br />
-					<span>({{scope.row.orderRentVehicleDetail.startAddr}})</span>
+					<!-- <br />
+					<span>({{scope.row.orderRentVehicleDetail.startAddr}})</span>-->
 				</template>
 			</el-table-column>
 			<el-table-column width="200" align="center" label="收车公司">
 				<template scope="scope">
 					<span>{{scope.row.endCompanyName}}</span>
-					<br />
-					<span>({{scope.row.orderRentVehicleDetail.endAddr}})</span>
+					<!-- <br />
+					<span>({{scope.row.orderRentVehicleDetail.endAddr}})</span>-->
 				</template>
 			</el-table-column>
 			<el-table-column width="110" align="center" label="订单金额">
@@ -170,6 +170,11 @@
 					<span>{{scope.row.orderAmount}}元</span>
 				</template>
 			</el-table-column>
+			<el-table-column width="110" align="center" label="支付方式">
+				<template scope="scope">
+					<span>{{scope.row.payWay == 1 ? '微信支付' : scope.row.payWay == 2 ? '支付宝支付' : scope.row.payWay == 3 ? '银联支付' : '微信支付'}}</span>
+				</template>
+			</el-table-column>
 
 			<!--      <el-table-column align="center" label="订单状态">-->
 			<!--        <template scope="scope">-->
@@ -202,19 +207,19 @@
 					>还车记录</el-button>
 					<el-button
 						size="small"
-						v-if="scope.row.status!=5&&scope.row.status > 3  || scope.row.status == '-1'"
+						v-if="scope.row.status!=5&&scope.row.status > 4  || scope.row.status == '-1'"
 						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"
+						v-if="scope.row.status == 6&&order_btn_order_violcation_save  || scope.row.status == '-1'"
 						class="el-button el-button--text el-button--small"
 						@click="illegalInquiry(scope.row)"
 					>违章查询</el-button>
 					<el-button
 						size="small"
-						v-if="scope.row.status == 3 || scope.row.status == 4"
+						v-if="scope.row.status == 4"
 						class="el-button el-button--text el-button--small"
 						@click="handleViolatePrice(scope.row)"
 					>取消订单</el-button>
@@ -268,18 +273,6 @@
 							<img :src="form.userLicenseImg" class="voucher" />
 						</viewer>
 					</el-form-item>
-					<el-row :gutter="20">
-						<el-col :span="10">
-							<el-form-item label="交车操作人:">
-								<span class="label-text">{{orderReturnVehicleCrosstown.operatorName}} {{orderReturnVehicleCrosstown.operatorPhone}}</span>
-							</el-form-item>
-						</el-col>
-						<el-col :span="10">
-							<el-form-item label="交车时间:">
-								<span class="label-text">{{orderReturnVehicleCrosstown.operatorTime ? dateFormat(orderReturnVehicleCrosstown.operatorTime) : ''}}</span>
-							</el-form-item>
-						</el-col>
-					</el-row>
 				</div>
 
 				<div v-else-if="modalTitle=='还车记录'">
@@ -330,7 +323,24 @@
 						<span>{{form.remak}}</span>
 					</el-form-item>
 				</div>
-
+				<div v-if="modalTitle=='交车记录'">
+					<el-row :gutter="20">
+						<el-col :span="10">
+							<el-form-item label="交车操作人:">
+								<span
+									class="label-text"
+								>{{orderReturnVehicleCrosstown.operatorName}} {{orderReturnVehicleCrosstown.operatorPhone}}</span>
+							</el-form-item>
+						</el-col>
+						<el-col :span="10">
+							<el-form-item label="交车时间:">
+								<span
+									class="label-text"
+								>{{orderReturnVehicleCrosstown.operatorTime ? dateFormat(orderReturnVehicleCrosstown.operatorTime) : ''}}</span>
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</div>
 				<div v-show="modalTitle=='还车记录'">
 					<div v-show="orderReturnVehicleCrosstown.type == 3">
 						<el-form-item label="定损类型:">
@@ -364,7 +374,9 @@
 						</el-col>
 						<el-col :span="10">
 							<el-form-item label="收车时间:">
-								<span class="label-text">{{orderReturnVehicleCrosstown.operatorTime ? dateFormat(orderReturnVehicleCrosstown.operatorTime): ''}}</span>
+								<span
+									class="label-text"
+								>{{orderReturnVehicleCrosstown.operatorTime ? dateFormat(orderReturnVehicleCrosstown.operatorTime): ''}}</span>
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -373,7 +385,7 @@
 				<div class="stepBox" v-if="depositDetail">
 					<div class="title" v-if="depositRefundRecord.length>0">押金退还进度</div>
 					<ul>
-						<li >
+						<li>
 							<p class="inline successInline"></p>
 							<p>
 								成功收车
@@ -397,17 +409,37 @@
 								<template v-if="item.status==2">
 									<div class="picBox">
 										<div v-show="item.iscomplete">退还押金{{item.restAmount}}(扣除{{item.amount}}元)</div>
-										<div v-show='!item.iscomplete'>退还押金15000元</div>
-										<div style="color: #999" v-show="item.iscomplete">{{item.updTimeStr}}</div>
-										<button v-if="item.iscomplete">详情</button>
+										<div v-show="!item.iscomplete">退还押金15000元</div>
+										<div style="color: #999" v-show="item.iscomplete">
+											{{item.updTimeStr}}
+											<span>
+												详情可在
+												<el-button
+													type="text"
+													v-if="item.iscomplete"
+													style="color:#20a0ff !important"
+													@click="handleReturnOrderVehicle(activeInfo)"
+												>【还车记录】</el-button>中查看
+											</span>
+										</div>
 									</div>
 								</template>
 								<template v-if="item.status==3">
 									<div class="picBox">
 										<div v-show="item.iscomplete">退还违章保证金{{item.restAmount}}元（扣除{{item.amount}}元）</div>
 										<div v-show="!item.iscomplete">退还押金5000元</div>
-										<div style="color: #999" v-show="item.iscomplete">{{item.updTimeStr}}</div>
-										<div v-if="item.iscomplete">详情</div>
+										<div style="color: #999" v-show="item.iscomplete">
+											{{item.updTimeStr}}
+											<span>
+												详情可在
+												<el-button
+													type="text"
+													v-if="item.iscomplete"
+													style="color:#20a0ff !important"
+													@click="illegalInquiry(activeInfo)"
+												>【违章记录】</el-button>中查看
+											</span>
+										</div>
 									</div>
 								</template>
 								<template v-if="item.status==5">
@@ -419,9 +451,19 @@
 								<template v-if="item.status==6">
 									<div class="picBox">
 										<div v-show="item.iscomplete">退还押金{{item.restAmount}}(扣除{{item.amount}}元)</div>
-										<div v-show='!item.iscomplete'>退还押金15000元</div>
-										<div style="color: #999" v-show="item.iscomplete">{{item.updTimeStr}}</div>
-										<button v-if="item.iscomplete">详情</button>
+										<div v-show="!item.iscomplete">退还押金15000元</div>
+										<div style="color: #999" v-show="item.iscomplete">
+											{{item.updTimeStr}}
+											<span>
+												详情可在
+												<el-button
+													type="text"
+													v-if="item.iscomplete"
+													style="color:#20a0ff !important"
+													@click="handleReturnOrderVehicle(activeInfo)"
+												>【还车记录】</el-button>中查看
+											</span>
+										</div>
 									</div>
 								</template>
 							</p>
@@ -438,7 +480,7 @@
 									定损流程有疑问可联系滴房车 客服
 									<a :href="'tel://'+Tel" style="color: #666666;">{{Tel}}</a>
 								</template>
-							</p> -->
+							</p>-->
 							<!-- <p
 								class="detailTitle"
 								v-if="item.orderViolation && item.status==3"
@@ -467,7 +509,7 @@
 								<div class="picBox">
 									<img class="picItem" :src="it" alt v-for="(it,ix) in itm.picList" :key="ix" />
 								</div>
-							</div> -->
+							</div>-->
 						</li>
 					</ul>
 				</div>
@@ -511,7 +553,12 @@ import {
 	calculate,
 	getViolatePrice
 } from 'api/order/rentVehicle'
-import { toEast8Date, deepCopyDate, newEast8Date,timestamp2Date } from 'utils/dateUtils'
+import {
+	toEast8Date,
+	deepCopyDate,
+	newEast8Date,
+	timestamp2Date
+} from 'utils/dateUtils'
 import { mapGetters } from 'vuex'
 import rsCode from '../../../utils/rsCode'
 import { getSysRegionByIds } from 'api/vehicle/vehicleInfo/'
@@ -532,7 +579,7 @@ export default {
 	},
 	data() {
 		return {
-			isInline:false,
+			isInline: false,
 			pictureList: [],
 			dedDetail: [],
 			depositRefundRecord: [],
@@ -543,6 +590,7 @@ export default {
 			violateAmount: null,
 			row: null,
 			topAmount: null,
+			activeInfo: null,
 			form: {
 				couponAmount: undefined,
 				crtHost: undefined,
@@ -644,7 +692,7 @@ export default {
 				orderStartTime: undefined,
 				orderEndTime: undefined
 			},
-			crtTimeIndex:null,
+			crtTimeIndex: null,
 			baranchQuery: {
 				zoneId: null
 			},
@@ -772,7 +820,10 @@ export default {
 			},
 			set: function(date) {
 				if (this.$utils.isDate(date)) {
-						this.listQuery.orderStartTime = formatDate(date, 'yyyy-MM-dd')
+					this.listQuery.orderStartTime = formatDate(
+						date,
+						'yyyy-MM-dd'
+					)
 				} else {
 					this.listQuery.orderStartTime = undefined
 				}
@@ -986,6 +1037,7 @@ export default {
 		 * 操作-违章查询按钮，显示违章弹框
 		 */
 		illegalInquiry(row) {
+			this.activeInfo = row
 			this.currentRow = row
 			this.illegalVisible = true
 		},
@@ -1141,13 +1193,14 @@ export default {
 		},
 		handleRefundVehicle(row) {
 			// console.log(row);
+			this.activeInfo = row
 			var that = this
 			that.pictureList = []
 			that.dedDetail = []
 			that.depositRefundRecord = []
 			that.dedTotal = 0
 			that.Tel = ''
-			getStep(row.no+'&address=1').then(response => {
+			getStep(row.no + '&address=1').then(response => {
 				response.data.forEach(function(item) {
 					if (item.type != 1) {
 						that.Tel = item.customerPhone
@@ -1190,8 +1243,6 @@ export default {
 							var arr = item.depositRefundRecord
 						}
 
-
-
 						that.depositRefundRecord = arr
 						// console.log(that.depositRefundRecord);
 					}
@@ -1296,7 +1347,7 @@ export default {
 				endTime: undefined,
 				zoneId: undefined,
 				orderEndTime: undefined,
-				orderStartTime:undefined,
+				orderStartTime: undefined,
 				startCompanyId: undefined
 			}
 			this.getList()
@@ -1307,10 +1358,15 @@ export default {
 		getList() {
 			this.listLoading = true
 			if (this.listQuery.orderStartTime) {
-					 this.listQuery.startTime = toEast8Date(this.listQuery.orderStartTime).getTime()
+				this.listQuery.startTime = toEast8Date(
+					this.listQuery.orderStartTime
+				).getTime()
 			}
-			if(this.listQuery.orderEndTime){
-			  this.listQuery.endTime = toEast8Date(this.listQuery.orderEndTime).getTime() + 1000*3600*24 - 1;
+			if (this.listQuery.orderEndTime) {
+				this.listQuery.endTime =
+					toEast8Date(this.listQuery.orderEndTime).getTime() +
+					1000 * 3600 * 24 -
+					1
 			}
 			if (this.listQuery) {
 				localStorage.setItem(
@@ -1450,13 +1506,12 @@ export default {
 	color: #333;
 }
 .stepBox li p span {
-	color: #999;
+	/* color: #999; */
 }
-.successInline{
+.successInline {
 	background: rgb(0, 153, 255) !important;
-
 }
-.successInline::before{
+.successInline::before {
 	background: rgb(0, 153, 255) !important;
 }
 .stepBox li .inline:nth-child(1) {
@@ -1471,7 +1526,7 @@ export default {
 	content: '';
 	position: absolute;
 	left: -40px;
-	top: -43px;
+	top: -51px;
 	width: 100px;
 	height: 1px;
 	/* background: rgb(0, 153, 255); */