From 9156c4387d45d8fa2c31102d5ec1fb1d21c189ad Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Fri, 30 Aug 2024 10:19:47 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B5=84=E9=87=91=E6=B5=81=E6=B0=B4=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=9E=8B=E5=8F=B7=202.=E5=AF=B9=E8=B4=A6=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/flow/index.vue           |  5 +++--
 src/views/system/reconciliation/index.vue | 11 ++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/views/system/flow/index.vue b/src/views/system/flow/index.vue
index bce96ee..462814d 100644
--- a/src/views/system/flow/index.vue
+++ b/src/views/system/flow/index.vue
@@ -108,8 +108,8 @@
       </el-table-column>
       <el-table-column label="区域" align="center" prop="areaName" />
       <el-table-column label="所属人" align="center" prop="owner" />
-      <el-table-column label="关联订单号" width="260" align="center" prop="orderNo" />
-      <el-table-column label="第三方交易单号" width="250" align="center" prop="outTradeNo" />
+      <el-table-column label="关联订单号" width="180" align="center" prop="orderNo" />
+      <el-table-column label="第三方交易单号" width="180" align="center" prop="outTradeNo" />
       <el-table-column label="收支类型" align="center" prop="type">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.et_flow_type" :value="scope.row.type"/>
@@ -136,6 +136,7 @@
           <dict-tag :options="dict.type.et_flow_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
+      <el-table-column label="车型" align="center" prop="model" />
     </el-table>
 
     <pagination
diff --git a/src/views/system/reconciliation/index.vue b/src/views/system/reconciliation/index.vue
index f7aa92d..f1c33a2 100644
--- a/src/views/system/reconciliation/index.vue
+++ b/src/views/system/reconciliation/index.vue
@@ -47,12 +47,13 @@
       <el-table-column label="时间" align="center" prop="day" />
       <el-table-column label="运营商" align="center" prop="deptName" />
       <el-table-column label="运营区" align="center" prop="areaName" />
-      <el-table-column label="累计营收" align="center" prop="income" />
-      <el-table-column label="运营商分账" align="center" prop="deptFee" />
-      <el-table-column label="合伙人分账" align="center" prop="partnerFee" />
+      <el-table-column label="订单收入" align="center" prop="payFee" />
+      <el-table-column label="退款" align="center" prop="refundFee" />
+      <el-table-column label="手续费" align="center" prop="serviceFee" />
       <el-table-column label="平台服务费" align="center" prop="platformServiceFee" />
-      <el-table-column label="骑行订单" align="center" prop="ridingFee" />
-      <el-table-column label="调度费用" align="center" prop="dispatchFee" />
+      <el-table-column label="累计营收" align="center" prop="income" />
+      <el-table-column label="运营商分账" align="center" prop="income" />
+      <el-table-column label="合伙人分账" align="center" prop="partnerFee" />
     </el-table>
 
   </div>