Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

src/api/order/rentVehicle.js

 import fetch from 'utils/fetch';
-
+//获取租车订单
 export function page(query) {
 	return fetch({
 		url: '/api/order/baseOrder/getAll',
@@ -8,6 +8,14 @@ export function page(query) {
 	});
 }
 
+//获取旅游订单
+export function getOrderList(query) {
+	return fetch({
+		url: '/api/order/baseOrder/getOrderList',
+		method: 'get',
+		params: query
+	});
+}
 /**
  * 获取所有分公司
  */

src/views/order/modal/rentOrderDetailModal.vue

@@ -254,7 +254,6 @@ export default {
 	mounted() {
 		this.dialogVisible = true
 		this.getAllFn()
-		console.log(this.orderDetailInfo)
 	},
 	methods: {
 		orderInfo(val) {
@@ -310,7 +309,7 @@ export default {
 					duration: 2000
 				})
 			} else {
-				this.returnForm.id = this.form.detailId
+				this.returnForm.id = this.orderDetailInfo.orderRentVehicleDetail.id
 				updateEndCompany(this.returnForm).then(data => {
 					if (data.status == 200) {
 						this.$notify({
@@ -336,7 +335,7 @@ export default {
 		resetCar() {
 			this.clearFrom()
 			this.resetCarVisible = true
-			this.resetCarForm.no = this.form.no
+			this.resetCarForm.no = this.orderDetailInfo.no
 		},
 		cancelResetCar() {
 			this.resetCarVisible = false
@@ -364,7 +363,7 @@ export default {
 								duration: 2000
 							})
 							this.resetCarVisible = false
-							this.form.vehicleNumberPlat = this.resetCarForm.numberPlate
+							this.orderDetailInfo.vehicleNumberPlat = this.resetCarForm.numberPlate
 							this.updateNumberPlat = true
 						} else {
 							this.$notify({

src/views/order/rentVehicleInfo/index.vue

@@ -1035,7 +1035,6 @@ export default {
 					"flag" : true
 				}
 				orderDetail(param).then(response => {
-					console.log(response)
 				this.orderDetailInfo = response.data
 				if(this.orderDetailInfo && this.orderDetailInfo.memberLevel) {
 					if(this.orderDetailInfo.memberLevel == 1) {
@@ -1055,7 +1054,6 @@ export default {
 							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) {
@@ -1082,14 +1080,11 @@ export default {
 						this.orderDetailInfo.ststusName = '已完成'
 					}
 				}
-				console.log(this.orderDetailInfo)
 				this.rentDialogVisible = true
 			})
 			}
 		},
 		checkViolateAmount() {
-			console.log(this.topAmount)
-			console.log(this.violateAmount)
 			if (this.topAmount < this.violateAmount) {
 				this.$notify({
 					title: '失败',
@@ -1134,7 +1129,6 @@ export default {
 				cancelReason: '后台取消',
 				appUserId: row.userId
 			}
-			console.log(row)
 			getViolatePrice(row.orderNo).then(data => {
 				if (data.status == 200) {
 					that.topAmount = data.data.topAmount
@@ -1209,7 +1203,6 @@ export default {
 		illegalEvent(params) {
 			this.illegalVisible = false
 			if (params) {
-				// console.log(params);
 			}
 		},
 		/**
@@ -1218,11 +1211,10 @@ export default {
 		detailEvent(params) {
 			this.detailVisible = false
 			if (params) {
-				// console.log(params);
 			}
 		},
 		handleHandoverOrderVehicle(row) {
-			// console.log(row);
+
 			this.modalTitle = '交车记录'
 			this.form = row
 			if (this.form.status == 2) {
@@ -1281,7 +1273,6 @@ export default {
 		},
 
 		handleReturnOrderVehicle(row) {
-			// console.log(row);
 			this.modalTitle = '还车记录'
 			this.form = row
 			if (this.form.status == 2) {
@@ -1319,7 +1310,6 @@ export default {
 			this.depositDetail = false
 		},
 		handleRefundVehicle(row) {
-			// console.log(row);
 			this.activeInfo = row
 			var that = this
 			that.pictureList = []
@@ -1372,7 +1362,7 @@ export default {
 							var arr = item.depositRefundRecord
 						}
 						that.depositRefundRecord = arr
-						// console.log(that.depositRefundRecord);
+
 					}
 				})
 			})
@@ -1507,7 +1497,6 @@ export default {
 			page(this.listQuery).then(response => {
 				if (response.data.data) {
 					response.data.data.map(function(el) {
-						// console.log(el);
 						if (el.status == 2) {
 							el.ststusName = '取消'
 						}

src/views/order/tourOrderInfo/index.vue

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

src/views/vehicle/vehicleSchedulManage/index.vue

@@ -161,7 +161,7 @@
     <vehiclePlanModal v-if="anpai" :currentItem="currentItem" v-on:anpaiDialogEvent = "anpaiDialogEvent"></vehiclePlanModal>
     <!--租车详情弹框-->
     <!--rentOrder-->
-    <rentOrderDetailModal :form="rentOrderInfo" :rentCostDetail="rentCostDetail" v-if="rentOrder" v-on:rentOrderDetailDialogEvent="rentOrderDetailDialogEvent"></rentOrderDetailModal>
+    <rentOrderDetailModal :orderDetailInfo="orderDetailInfo"  v-if="rentOrder" v-on:rentOrderDetailDialogEvent="rentOrderDetailDialogEvent"></rentOrderDetailModal>
     <!--旅游订单详情-->
     <tourOrderDetailModal :tourRow="tourRow" v-if="tourDialogVisible" v-on:tourOrderDetailDialogEvent="tourOrderDetailDialogEvent"></tourOrderDetailModal>
     <!--禁用弹框-->
@@ -359,7 +359,7 @@
   } from 'api/base_info/branch_company/';
   import {
     getAllBranchCompanyByZoneId,
-    page
+    orderDetail
   } from 'api/order/rentVehicle';
   import {
     formatDate
@@ -461,7 +461,7 @@
         anpai: false,//安排用车弹框
         jinyong: false,//禁用弹框
         currentItem: {},//待操作数据
-        rentOrderInfo: {},//租车订单详情
+        orderDetailInfo: {},//租车订单详情
         rentCostDetail: {},//租车订单费用明细
         tourDialogVisible: false,//旅游订单弹框
         tourRow: {},//旅游订单详情-当前行
@@ -686,50 +686,58 @@
        * 根据订单号获取订单详情
        * */
       getOneVechi: function(orderNo) {
-        let params = {
-          oneNo: orderNo
-        };
-        page(params).then(res => {
-          if (res.status == 200) {
-            let a = res.data.data[0];
-            let vehicleUserLicenses = {};
-//            if (a.status == 5) {
-//              vehicleUserLicenses = {
-//                name: a.orderVehicleCrosstownDto.licenseName,
-//                phone: a.orderVehicleCrosstownDto.licensePhone,
-//                idCard: a.orderVehicleCrosstownDto.licenseIdCard
-//              };
-//            } else {
-//              if (a.vehicleUserLicenses.length > 0) {
-//                vehicleUserLicenses = a.vehicleUserLicenses[0];
-//              }
-//            }
-            a.orderRentVehicleDetail.startTime = timestamp2Date(a.orderRentVehicleDetail.startTime);
-            a.orderRentVehicleDetail.endTime = timestamp2Date(a.orderRentVehicleDetail.endTime);
-            let arr = a.picture ? a.picture.split(",") : [];
-            a.picture = arr.length > 0 ? arr[0] : "";
-            a.payTime = timestamp2Date(a.payTime);
-            this.rentOrderInfo = a;
-
-            this.costDetail = JSON.parse(this.rentOrderInfo.orderRentVehicleDetail.costDetail);
-            var cost = '';
-            this.costDetail.children.map(function(a) {
-              cost += a.key + ":" +a.detail+" ";
-            });
-            this.rentCostDetail = cost;
-            if(this.rentOrderInfo.orderRentVehicleDetail.driverType==1) {
-              this.serviceCost = this.rentOrderInfo.orderRentVehicleDetail.dayNum * 600
-            }
-            this.rentOrder = true;
-          } else {
-            this.$notify({
-              title: '失败',
-              message: '操作失败！',
-              type: 'error',
-              duration: 2000
-            });
-          }
-        });
+       	var param = {
+       		"orderNo":orderNo,
+       		"flag" : true
+       	}
+       	orderDetail(param).then(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)
+       				
+       		}
+       		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 = '已完成'
+       		}
+       	}
+       	this.rentOrder = true
+       })
       },
       /**
        * 关闭保养弹框后逻辑处理