From 1fa43a2e13ccc40a2582600980d5e714a4b08887 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Tue, 6 Jun 2023 10:43:16 +0800
Subject: [PATCH] update

---
 jsowell-ui/src/views/pile/station/orderReport.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jsowell-ui/src/views/pile/station/orderReport.vue b/jsowell-ui/src/views/pile/station/orderReport.vue
index 74c267fcf..1331f18b0 100644
--- a/jsowell-ui/src/views/pile/station/orderReport.vue
+++ b/jsowell-ui/src/views/pile/station/orderReport.vue
@@ -157,8 +157,9 @@
     <el-table v-loading="loading" :data="reportList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="主键" align="center" prop="id" /> -->
-      <el-table-column label="运营商id" align="center" prop="merchantId" />
+<!--      <el-table-column label="运营商id" align="center" prop="merchantId" />-->
       <!-- <el-table-column label="站点id" align="center" prop="stationId" /> -->
+      <el-table-column label="交易日期" align="center" prop="tradeDate" />
       <el-table-column label="用电度数" align="center" prop="useElectricity" />
       <el-table-column label="充电次数" align="center" prop="chargeNum" />
       <el-table-column label="充电时长" align="center" prop="chargeTime" />
@@ -166,7 +167,6 @@
       <el-table-column label="服务费金额" align="center" prop="serviceAmount" />
       <el-table-column label="收入金额" align="center" prop="totalAmount" />
       <el-table-column label="虚拟金额" align="center" prop="virtualAmount" />
-      <el-table-column label="交易日期" align="center" prop="tradeDate" />
       <el-table-column label="交易金额" align="center" prop="tradeAmount" />
       <el-table-column label="交易手续费" align="center" prop="tradeFee" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -337,7 +337,7 @@ export default {
         createTime: null,
         delFlag: null
       };
-     
+
       this.resetForm("form");
     },
     /** 搜索按钮操作 */