From 3d8cba8da473ab4b241e6711616b942fc75927e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Wed, 12 Jun 2024 17:43:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reconciliation/tab/trading.vue                   | 12 ++++++------
 fuintAdmin_zt/src/views/tag/tagCode/index.vue        |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/trading.vue b/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/trading.vue
index b9893d439..bd8bc4119 100644
--- a/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/trading.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/trading.vue
@@ -127,7 +127,7 @@
           <el-table-column type="index" width="50" align="center" label="序号"/>
           <el-table-column prop="payTime" align="center" label="支付时间" width="220"> </el-table-column>
           <el-table-column prop="orderNo" align="center" label="订单号" width="220"> </el-table-column>
-          <el-table-column prop="storeName" align="center" label="门店"> </el-table-column>
+          <el-table-column prop="storeName" align="center" label="门店" width="150"> </el-table-column>
           <el-table-column prop="createBy" align="center" label="收银员"> </el-table-column>
           <el-table-column prop="payChannel" align="center" label="支付渠道">
             <template slot-scope="scope">
@@ -139,9 +139,9 @@
             </template>
 
           </el-table-column>
-          <el-table-column prop="mchntCd" align="center" label="商户号"> </el-table-column>
-          <el-table-column prop="amount" align="center" label="费率"> </el-table-column>
-          <el-table-column prop="type" align="center" label="订单来源">
+          <el-table-column prop="mchntCd" align="center" label="商户号" width="150"> </el-table-column>
+<!--          <el-table-column prop="amount" align="center" label="费率"> </el-table-column>-->
+          <el-table-column prop="type" align="center" label="订单来源" width="150">
             <template slot-scope="scope">
               <span v-if="scope.row.type=='1'">油品</span>
               <span v-else-if="scope.row.type=='2'">商品</span>
@@ -177,7 +177,7 @@
             </template>
 
           </el-table-column>
-          <el-table-column prop="payMoney" align="center" label="优惠后应付金额"> </el-table-column>
+          <el-table-column prop="payMoney" align="center" label="优惠后应付金额" width="150"> </el-table-column>
           <el-table-column prop="refMoney" align="center" label="退款金额">
             <template slot-scope="scope">
               <span v-if="scope.row.status == 'refund'">{{scope.row.payMoney}}</span>
@@ -186,7 +186,7 @@
           </el-table-column>
           <el-table-column prop="payMoney" align="center" label="实收金额"> </el-table-column>
 <!--          <el-table-column prop="payAmount" align="center" label="手续费"> </el-table-column>-->
-          <el-table-column prop="userName" align="center" label="付款用户" > </el-table-column>
+          <el-table-column prop="userName" align="center" label="付款用户" width="135"> </el-table-column>
           <el-table-column prop="content" align="content" label="备注" > </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
diff --git a/fuintAdmin_zt/src/views/tag/tagCode/index.vue b/fuintAdmin_zt/src/views/tag/tagCode/index.vue
index ad06e9f2e..daa9694bd 100644
--- a/fuintAdmin_zt/src/views/tag/tagCode/index.vue
+++ b/fuintAdmin_zt/src/views/tag/tagCode/index.vue
@@ -63,6 +63,7 @@
 <!--      <el-table-column label="码牌二维码：域名+字符串" align="center" prop="tagCodeSn" />-->
 <!--      <el-table-column label="二维码ID" align="center" prop="id" />-->
       <el-table-column label="二维码ID" align="center" prop="tagCodeSn" />
+      <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="二维码" align="center" prop="imageUrl" >
         <template slot-scope="scope">