From 2254edb68c0685dae34d4754aa8f109e7889f4ba Mon Sep 17 00:00:00 2001
From: "BOOL\\25024" <http://192.168.2.2:8099/jsowell/jsowell-uniapp.git>
Date: Mon, 22 Jan 2024 14:40:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=90=AF=E5=8A=A8=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/views/order/order/index.vue | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/jsowell-ui/src/views/order/order/index.vue b/jsowell-ui/src/views/order/order/index.vue
index 23e6ce8da..8a9333b6a 100644
--- a/jsowell-ui/src/views/order/order/index.vue
+++ b/jsowell-ui/src/views/order/order/index.vue
@@ -39,17 +39,17 @@
                 </el-form-item>
                 <el-form-item label="充电桩编号" prop="pileSn">
                     <el-input v-model="queryParams.pileSn" placeholder="请输入充电桩编号" clearable
-                              @keyup.enter.native="handleQuery" />
+                        @keyup.enter.native="handleQuery" />
                 </el-form-item>
                 <el-form-item label="创建时间">
                     <el-date-picker v-model="createTimeRange" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
                         :default-time="['00:00:00', '23:59:59']" type="daterange" range-separator="-"
-                        start-placeholder="开始日期" end-placeholder="结束日期" :clearable="true"/>
+                        start-placeholder="开始日期" end-placeholder="结束日期" :clearable="true" />
                 </el-form-item>
                 <el-form-item label="结算时间">
                     <el-date-picker v-model="settleTimeRange" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
-                                    :default-time="['00:00:00', '23:59:59']" type="daterange" range-separator="-"
-                                    start-placeholder="开始日期" end-placeholder="结束日期" :clearable="true"/>
+                        :default-time="['00:00:00', '23:59:59']" type="daterange" range-separator="-"
+                        start-placeholder="开始日期" end-placeholder="结束日期" :clearable="true" />
                 </el-form-item>
             </div>
             <el-button @click="showOrHide()" style="
@@ -77,10 +77,11 @@
             <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
                 v-hasPermi="['order:order:export']">导出
             </el-button>
-            <div >
+            <div>
                 <ul>
-                    <li v-for="totalDate in totalDateList" >
-                        {{ totalDate.dateDescription }}期间，总用电量{{totalDate.sumUsedElectricity}}度，总消费金额{{ totalDate.sumOrderAmount }}元，总结算金额{{totalDate.sumSettleAmount}}元
+                    <li v-for="totalDate in totalDateList">
+                        {{ totalDate.dateDescription }}期间，总用电量{{ totalDate.sumUsedElectricity }}度，总消费金额{{
+                            totalDate.sumOrderAmount }}元，总结算金额{{ totalDate.sumSettleAmount }}元
                     </li>
                 </ul>
             </div>
@@ -148,13 +149,16 @@
                                 </el-descriptions-item>
                                 <el-descriptions-item label="结束充电时间">{{ item.chargeEndTime }}
                                 </el-descriptions-item>
-                                <el-descriptions-item label="启动方式">{{ startMode(item.startMode) }}
+                                <el-descriptions-item v-if="item.startMode == 4 && item.thirdPartyType != null"
+                                    label="启动方式">{{
+                                        item.thirdPartyType }}
+                                </el-descriptions-item>
+                                <el-descriptions-item v-else label="启动方式">{{ startMode(item.startMode) }}
                                 </el-descriptions-item>
                             </el-descriptions>
                             <div style="flex: 1; text-align: center; margin: auto"></div>
                         </div>
                     </div>
-
                     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
                         :limit.sync="queryParams.pageSize" @pagination="getList" />
                 </template>