From 36e7e025ab7ff269b80554edf6db214172bd8237 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Wed, 6 Sep 2023 10:35:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/order/order/orderDetail.vue     | 150 +++++++++++-------
 1 file changed, 89 insertions(+), 61 deletions(-)

diff --git a/jsowell-ui/src/views/order/order/orderDetail.vue b/jsowell-ui/src/views/order/order/orderDetail.vue
index 271b5f01b..e487bb8ff 100644
--- a/jsowell-ui/src/views/order/order/orderDetail.vue
+++ b/jsowell-ui/src/views/order/order/orderDetail.vue
@@ -6,22 +6,23 @@
     >
       <div style="margin: 10px">
         <span style="color: #bf1c1c"
-          >该笔订单为异常状态，请检查充电桩状态！</span
+        >该笔订单为异常状态，请检查充电桩状态！</span
         >
         <el-button
           type="primary"
           icon="el-icon-search"
           size="mini"
           @click="dialogVisible = true"
-          >手动结算</el-button
+        >手动结算
+        </el-button
         >
       </div>
 
       <el-dialog title="提示" :visible.sync="dialogVisible" width="35%">
-        <span>平台收到充电桩传来的最后一次实时监测数据<br /></span>
+        <span>平台收到充电桩传来的最后一次实时监测数据<br/></span>
 
         <el-table style="width: 100%" :data="monitorDataList" border>
-          <el-table-column prop="dateTime" label="时间" align="center" />
+          <el-table-column prop="dateTime" label="时间" align="center"/>
           <el-table-column
             prop="chargingAmount"
             label="消费金额"
@@ -67,7 +68,7 @@
         <span slot="footer" class="dialog-footer">
           <el-button @click="dialogVisible = false">取 消</el-button>
           <el-button type="primary" @click="confirmManualSettlement"
-            >确 定</el-button
+          >确 定</el-button
           >
         </span>
       </el-dialog>
@@ -112,39 +113,54 @@
         :label-style="LS"
       >
         <el-descriptions-item label="订单号">{{
-          orderInfo.orderCode
-        }}</el-descriptions-item>
+            orderInfo.orderCode
+          }}
+        </el-descriptions-item>
         <el-descriptions-item label="交易流水号">{{
-          orderInfo.transactionCode
-        }}</el-descriptions-item>
+            orderInfo.transactionCode
+          }}
+        </el-descriptions-item>
         <el-descriptions-item label="卡号">{{
-          orderInfo.logicCard
-        }}</el-descriptions-item>
+            orderInfo.logicCard
+          }}
+        </el-descriptions-item>
         <el-descriptions-item label="订单状态描述">{{
-          orderInfo.orderStatusDescribe
-        }}</el-descriptions-item>
+            orderInfo.orderStatusDescribe
+          }}
+        </el-descriptions-item>
         <el-descriptions-item label="充电开始时间">{{
-          orderInfo.startTime
-        }}</el-descriptions-item>
+            orderInfo.startTime
+          }}
+        </el-descriptions-item>
         <el-descriptions-item label="充电结束时间">{{
-          orderInfo.endTime
-        }}</el-descriptions-item>
+            orderInfo.endTime
+          }}
+        </el-descriptions-item>
         <el-descriptions-item label="订单创建时间">{{
-          orderInfo.createTime
-        }}</el-descriptions-item>
+            orderInfo.createTime
+          }}
+        </el-descriptions-item>
+        <el-descriptions-item label="订单结算金额">{{
+            orderInfo.settleAmount
+          }}
+        </el-descriptions-item>
         <el-descriptions-item label="订单结算时间">{{
-          orderInfo.settlementTime
-        }}</el-descriptions-item>
+            orderInfo.settlementTime
+          }}
+        </el-descriptions-item>
 
         <el-descriptions-item label="起始SOC">{{
-          orderInfo.startSOC
-        }}</el-descriptions-item>
+            orderInfo.startSOC
+          }}
+        </el-descriptions-item>
         <el-descriptions-item label="终止SOC">{{
-          orderInfo.endSOC
-        }}</el-descriptions-item>
+            orderInfo.endSOC
+          }}
+        </el-descriptions-item>
         <el-descriptions-item label="订单停止原因">{{
-          orderInfo.stopReasonMsg
-        }}</el-descriptions-item>
+            orderInfo.stopReasonMsg
+          }}
+        </el-descriptions-item>
       </el-descriptions>
       <div class="marginTop"></div>
     </el-card>
@@ -203,24 +219,29 @@
         :label-style="LS"
       >
         <el-descriptions-item label="时间">{{
-          orderRealTimeInfo.time
-        }}</el-descriptions-item>
+            orderRealTimeInfo.time
+          }}
+        </el-descriptions-item>
         <el-descriptions-item label="消费金额">{{
-          orderRealTimeInfo.orderAmount === "0.0000"
-            ? "0"
-            : orderRealTimeInfo.orderAmount
-        }}</el-descriptions-item>
+            orderRealTimeInfo.orderAmount === "0.0000"
+              ? "0"
+              : orderRealTimeInfo.orderAmount
+          }}
+        </el-descriptions-item>
         <el-descriptions-item label="充电度数">{{
-          orderRealTimeInfo.chargedDegree === "0.0000"
-            ? "0"
-            : orderRealTimeInfo.chargedDegree
-        }}</el-descriptions-item>
+            orderRealTimeInfo.chargedDegree === "0.0000"
+              ? "0"
+              : orderRealTimeInfo.chargedDegree
+          }}
+        </el-descriptions-item>
         <el-descriptions-item label="充电时长">{{
-          orderRealTimeInfo.chargingTime
-        }}</el-descriptions-item>
+            orderRealTimeInfo.chargingTime
+          }}
+        </el-descriptions-item>
         <el-descriptions-item label="当前soc">{{
-          orderRealTimeInfo.soc
-        }}</el-descriptions-item>
+            orderRealTimeInfo.soc
+          }}
+        </el-descriptions-item>
       </el-descriptions>
       <div class="marginTop"></div>
     </el-card>
@@ -238,23 +259,29 @@
           :key="index"
         >
           <el-descriptions-item label="支付金额">{{
-            item.payAmount
-          }}</el-descriptions-item>
+              item.payAmount
+            }}
+          </el-descriptions-item>
           <el-descriptions-item label="支付方式">{{
-            item.payModeDesc
-          }}</el-descriptions-item>
+              item.payModeDesc
+            }}
+          </el-descriptions-item>
           <el-descriptions-item label="支付状态">{{
-            item.payStatus === "1" ? "支付完成" : "待支付"
-          }}</el-descriptions-item>
+              item.payStatus === "1" ? "支付完成" : "待支付"
+            }}
+          </el-descriptions-item>
           <el-descriptions-item label="支付时间">{{
-            item.payTime
-          }}</el-descriptions-item>
+              item.payTime
+            }}
+          </el-descriptions-item>
           <el-descriptions-item label="支付流水号">{{
-            item.outTradeNo
-          }}</el-descriptions-item>
+              item.outTradeNo
+            }}
+          </el-descriptions-item>
           <el-descriptions-item label="退款金额">{{
-            item.refundAmount
-          }}</el-descriptions-item>
+              item.refundAmount
+            }}
+          </el-descriptions-item>
         </el-descriptions>
       </template>
       <div v-else style="text-align: center">暂无数据</div>
@@ -275,9 +302,9 @@
         </el-button>
       </div>
       <el-table style="width: 100%" :data="orderRefundInfoList" border>
-        <el-table-column prop="paymentId" label="支付流水号" align="center" />
-        <el-table-column prop="reverseId" label="退款流水号" align="center" />
-        <el-table-column prop="reverseAmt" label="退款金额" align="center" />
+        <el-table-column prop="paymentId" label="支付流水号" align="center"/>
+        <el-table-column prop="reverseId" label="退款流水号" align="center"/>
+        <el-table-column prop="reverseAmt" label="退款金额" align="center"/>
         <el-table-column
           prop="createdTime"
           label="退款申请时间"
@@ -301,7 +328,7 @@
           label="运营商名称"
           align="center"
         />
-        <el-table-column prop="pileSn" label="设备编号" align="center" />
+        <el-table-column prop="pileSn" label="设备编号" align="center"/>
         <el-table-column
           prop="ratedCurrent"
           label="额定电流(A)"
@@ -335,7 +362,7 @@
             </router-link>
           </template>
         </el-table-column>
-        <el-table-column prop="memberId" label="会员ID" align="center" />
+        <el-table-column prop="memberId" label="会员ID" align="center"/>
         <el-table-column
           prop="mobileNumber"
           label="用户手机号"
@@ -375,7 +402,7 @@ import OrderEcharts from "@/views/order/order/orderEcharts";
 
 export default {
   name: "",
-  components: { OrderEcharts },
+  components: {OrderEcharts},
   data() {
     return {
       CS: {
@@ -425,7 +452,7 @@ export default {
   },
   methods: {
     getSummaries(param) {
-      const { columns, data } = param;
+      const {columns, data} = param;
       const sums = [];
       columns.forEach((column, index) => {
         if (index === 0) {
@@ -478,7 +505,7 @@ export default {
       });
     },
     async getOrderDetail() {
-      const { data } = await getOrder(this.orderCode);
+      const {data} = await getOrder(this.orderCode);
       console.log("getOrder", data);
       this.obj = data;
       this.orderInfo = data.orderInfo;
@@ -530,6 +557,7 @@ export default {
 .cardStyle {
   margin-bottom: 10px;
 }
+
 .marginTop {
   margin-top: 10px;
 }