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

.gitignore

@@ -11,4 +11,5 @@ selenium-debug.log
 config/**
 **/dev.env.js
 /*.json
+/.gitignore
 

src/views/order/modal/rentOrderDetailModal.vue

@@ -50,7 +50,7 @@
 					<th>优惠券</th>
 					<th>不计免赔</th>
 					<th>租房车押金</th>
-					<th>专职司机服务费</th>
+<!--					<th>专职司机服务费</th>-->
 				</tr>
 				<tr>
 					<td>
@@ -71,13 +71,17 @@
 							<span v-if=" orderDetailInfo.rentVehiclePriceVO.freeDayNum && orderDetailInfo.rentVehiclePriceVO.freeDayNum > 0">会员特权{{orderDetailInfo.rentVehiclePriceVO.freeDayNum}}天</span>
 							<span v-else>无</span>
 						</p>
-						<p v-else>无</p>
+            <p v-else>{{orderInfo('免费天数')}}</p>
+<!--						<p v-else>无</p>-->
 					</td>
 
 					<td>
-						<p
-							v-if="orderDetailInfo.rentVehiclePriceVO && orderDetailInfo.rentVehiclePriceVO.vehicleDayNum > 0"
-						>¥{{orderDetailInfo.rentVehiclePriceVO.modelAmount}}*{{orderDetailInfo.rentVehiclePriceVO.vehicleNum}}/{{orderDetailInfo.rentVehiclePriceVO.vehicleDayNum}}天</p>
+						<p v-if="orderDetailInfo.rentVehiclePriceVO && orderDetailInfo.rentVehiclePriceVO.dayNum > 0">
+              <span v-if="!orderDetailInfo.rentVehiclePriceVO.useAmountList">{{orderDetailInfo.rentVehiclePriceVO.modelAmount}}元/{{orderDetailInfo.rentVehiclePriceVO.dayNum}}天</span>
+              <span v-else> <div v-for="item in orderDetailInfo.rentVehiclePriceVO.useAmountList" :key="item.date" :label="item.date">{{getRentalDate(item.date)}}:{{item.price}}元/天</div></span>
+<!--              <span v-for="item in orderDetailInfo.rentVehiclePriceVO.useAmountList" :key="item"></span>-->
+            </p>
+            <p v-else>无</p>
 						<!-- <p v-else-if="orderDetailInfo.costDetail.children[0]">{{orderDetailInfo.costDetail.children[0].key}} : {{orderDetailInfo.costDetail.children[0].detail}}</p> -->
 					</td>
 
@@ -92,18 +96,22 @@
 						<p
 							v-if="orderDetailInfo.rentVehiclePriceVO && orderDetailInfo.rentVehiclePriceVO.damageSafeAmount > 0"
 						>¥{{orderDetailInfo.rentVehiclePriceVO.damageSafePrice}}/{{orderDetailInfo.rentVehiclePriceVO.dayNum}}天</p>
-						<p v-else>无</p>
+<!--						<p v-else>无</p>-->
+            <p v-else>{{orderInfo('不计免赔')}}</p>
 					</td>
 					<td>
 						<p v-if="orderDetailInfo.rentVehiclePriceVO">{{orderDetailInfo.rentVehiclePriceVO.deposit}}</p>
+<!--            <p v-else>无</p>-->
+            <p v-else>{{orderInfo('租房车押金')}}</p>
 						<!-- <p v-else-if="orderDetailInfo.costDetail.children[0]">{{orderDetailInfo.costDetail.children[1].key}} : {{orderDetailInfo.costDetail.children[1].val}}</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>
-					</td>
+<!--					<td>-->
+<!--						<p-->
+<!--							v-if="orderDetailInfo.rentVehiclePriceVO && orderDetailInfo.rentVehiclePriceVO.driverAmount > 0"-->
+<!--						>¥{{orderDetailInfo.rentVehiclePriceVO.driverPrice}}*{{orderDetailInfo.rentVehiclePriceVO.driverNum}}/{{orderDetailInfo.rentVehiclePriceVO.dayNum}}天</p>-->
+<!--&lt;!&ndash;						<p v-else>无</p>&ndash;&gt;-->
+<!--            <p v-else>{{orderInfo('专职司机服务费')}}</p>-->
+<!--					</td>-->
 				</tr>
 				<tr>
 					<td>
@@ -199,6 +207,7 @@ import ElFormItem from '../../../../node_modules/element-ui/packages/form/src/fo
 import ElForm from '../../../../node_modules/element-ui/packages/form/src/form.vue'
 import { editObj } from 'api/vehicle/vehicleInfo'
 import { getAll, updateEndCompany } from 'api/base_info/branch_company'
+import {getYMD} from 'src/utils/dateUtils'
 export default {
 	props: ['orderDetailInfo'],
 	name: 'rentOrderDetailModal',
@@ -256,13 +265,21 @@ export default {
 		this.getAllFn()
 	},
 	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
-			// 	}
+		  if (this.orderDetailInfo.costDetail.children) {
+        let info = this.orderDetailInfo.costDetail.children.filter(item=>item.key == val)
+        if (info == '' || info < 0) {
+          return '无'
+        }else{
+          return info[0].detail || info[0].val
+        }
+      }
+      return '无'
+		},
+
+    getRentalDate(time){
+      return getYMD(time);
     },
 		timestamp(now) {
 			var year = now.getFullYear()

src/views/order/rentVehicleInfo/index.vue

@@ -796,6 +796,7 @@ export default {
 				no: undefined,
 				orderAmount: undefined,
 				orderOrigin: undefined,
+        // useAmountList:undefined,
 				orderRentVehicleDetail: {
 					bookRecordId: undefined,
 					costDetail: undefined,
@@ -1052,8 +1053,8 @@ export default {
 					}
 					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) {
@@ -1080,7 +1081,9 @@ export default {
 						this.orderDetailInfo.ststusName = '已完成'
 					}
 				}
+          console.log(this.orderDetailInfo)
 				this.rentDialogVisible = true
+
 			})
 			}
 		},