后台订单详情修改

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,60 @@
        * 根据订单号获取订单详情
        * */
       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;
+       	var param = {
+       		"orderNo":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)
        				
-            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
-            });
+       		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 = '已完成'
+       		}
+       	}
+       	this.rentOrder = true
+       })
       },
       /**
        * 关闭保养弹框后逻辑处理