update 订单详情中的收费明细

jsowell-ui/src/views/order/order/orderDetail.vue

@@ -6,29 +6,29 @@
         <div
           style="text-align: center; margin-bottom: 30px"
           v-if="
-            orderDetail[0].orderStatus === '4' ||
-            orderDetail[0].orderStatus === '6'
+            orderInfo[0].orderStatus === '4' ||
+            orderInfo[0].orderStatus === '6'
           "
         >
           停止理由：
-          <span style="color: red">{{ orderDetail[0].stopReasonMsg }}</span>
+          <span style="color: red">{{ orderInfo[0].stopReasonMsg }}</span>
         </div>
         <el-steps
-          :active="orderDetail[0].orderStatus !== '6' ? 2 : 4"
+          :active="orderInfo[0].orderStatus !== '6' ? 2 : 4"
           align-center
           finish-status="success"
         >
           <el-step
             title="客户下单"
-            :description="orderDetail[0].createTime"
+            :description="orderInfo[0].createTime"
           ></el-step>
           <el-step
             title="开始充电"
-            :description="status(orderDetail[0].orderStatus)"
+            :description="status(orderInfo[0].orderStatus)"
           ></el-step>
           <el-step
             title="结束充电"
-            :description="orderDetail[0].endTime"
+            :description="orderInfo[0].endTime"
           ></el-step>
           <el-step title="完成充电" description="充电时长"></el-step>
         </el-steps>
@@ -37,7 +37,7 @@
     <!--  订单信息  -->
     <el-card class="cardStyle">
       <h3>订单信息</h3>
-      <el-table style="width: 100%" :data="orderDetail" border>
+      <el-table style="width: 100%" :data="orderInfo" border>
         <el-table-column
           prop="orderCode"
           label="订单号"
@@ -88,6 +88,34 @@
       <div class="marginTop"></div>
     </el-card>
 
+    <!--  收费明细  -->
+    <el-card class="cardStyle">
+      <h3>收费明细</h3>
+      <el-table style="width: 100%" :data="orderDetail" border>
+        <el-table-column prop="totalUsedElectricity" label="总用电量" align="center"/>
+        <el-table-column prop="totalOrderAmount" label="订单总金额" align="center"/>
+        <el-table-column prop="totalElectricityAmount" label="电费总金额" align="center"/>
+        <el-table-column prop="totalServiceAmount" label="服务费总金额" align="center"/>
+
+        <el-table-column prop="sharpUsedElectricity" label="尖时段用电量" align="center"/>
+        <el-table-column prop="sharpElectricityPrice" label="尖时段电费单价" align="center"/>
+        <el-table-column prop="sharpServicePrice" label="尖时段服务费单价" align="center"/>
+
+        <el-table-column prop="peakUsedElectricity" label="峰时段用电量" align="center"/>
+        <el-table-column prop="peakElectricityPrice" label="峰时段电费单价" align="center"/>
+        <el-table-column prop="peakServicePrice" label="峰时段服务费单价" align="center"/>
+
+        <el-table-column prop="flatUsedElectricity" label="平时段用电量" align="center"/>
+        <el-table-column prop="flatElectricityPrice" label="平时段电费单价" align="center"/>
+        <el-table-column prop="flatServicePrice" label="平时段服务费单价" align="center"/>
+
+        <el-table-column prop="valleyUsedElectricity" label="谷时段用电量" align="center"/>
+        <el-table-column prop="valleyElectricityPrice" label="谷时段电费单价" align="center"/>
+        <el-table-column prop="valleyServicePrice" label="谷时段服务费单价" align="center"/>
+      </el-table>
+      <div class="marginTop"></div>
+    </el-card>
+
     <el-card class="cardStyle">
       <h3>实时订单数据</h3>
       <el-table style="width: 100%" :data="orderRealTimeInfo" border>
@@ -246,7 +274,7 @@
     <el-card
       class="cardStyle"
       v-if="
-        orderDetail[0].orderStatus === '1' || orderDetail[0].orderStatus === '6'
+        orderInfo[0].orderStatus === '1' || orderInfo[0].orderStatus === '6'
       "
     >
       <div class="marginTop"></div>
@@ -264,10 +292,11 @@ export default {
   data() {
     return {
       orderList: this.$route.params.orderCode,
-      orderDetail: [],
+      orderInfo: [],
       payDetail: [],
       userInfo: [],
       obj: {},
+      orderDetail:[],
       pileIn: [],
       orderRealTimeInfo: null,
     };
@@ -282,8 +311,8 @@ export default {
       const { data } = await getOrder(this.orderList);
       console.log("getOrder", data);
       this.obj = data;
-      this.orderDetail = [data.orderInfo];
-      console.log("this.orderDetail", this.orderDetail);
+      this.orderInfo = [data.orderInfo];
+      console.log("this.orderInfo", this.orderDetail);
       this.payDetail = data.payRecordList;
       console.log("this.payDetail", this.payDetail);
       this.userInfo = [data.memberInfo];
@@ -291,6 +320,7 @@ export default {
       this.pileIn = [data.pileInfo];
       console.log("this.pileIn", this.pileIn);
       this.orderRealTimeInfo = [data.orderRealTimeInfo];
+      this.orderDetail = [data.orderDetail];
     },
     status(e) {
       let arr = [