From 03673579f57a83070ec60e173d259f2e9eaf8a27 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Thu, 24 Oct 2024 18:01:22 +0800
Subject: [PATCH] 10.24

---
 .../src/views/EventMarketing/center/index.vue |  6 ++++-
 .../src/views/handover/info/rec/trading.vue   | 22 +++++++++++++------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/center/index.vue b/fuintAdmin/src/views/EventMarketing/center/index.vue
index 03b645588..cc6d798fe 100644
--- a/fuintAdmin/src/views/EventMarketing/center/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/center/index.vue
@@ -237,7 +237,11 @@
                 <span>{{ scope.row.userGradeName || "--" }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="sendNum" label="已领数量"></el-table-column>
+            <el-table-column prop="sendNum" label="已领数量">
+              <template slot-scope="scope">
+                <span>{{ scope.row.sendNum || 0 }}</span>
+              </template>
+            </el-table-column>
             <el-table-column prop="activeStatus" label="状态">
               <template slot-scope="scope">
                 <el-switch
diff --git a/fuintAdmin/src/views/handover/info/rec/trading.vue b/fuintAdmin/src/views/handover/info/rec/trading.vue
index a73f725be..ba07af3b1 100644
--- a/fuintAdmin/src/views/handover/info/rec/trading.vue
+++ b/fuintAdmin/src/views/handover/info/rec/trading.vue
@@ -210,22 +210,22 @@
               <span v-else="">其他</span>
             </template>
           </el-table-column>
-          <el-table-column prop="goodsMoney" align="center" label="订单金额">
+          <el-table-column prop="goodsMoney" align="center" label="订单金额（元）">
             <template slot-scope="scope">
               <span v-if="scope.row.type=='3'">{{scope.row.goodsMoney + scope.row.payMoney}}</span>
               <span v-else>{{scope.row.goodsMoney}}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="payMoney" align="center" label="优惠后应付金额"> </el-table-column>
-          <el-table-column prop="refMoney" align="center" label="退款金额">
+          <el-table-column prop="payMoney" align="center" label="优惠金额（元）"> </el-table-column>
+          <el-table-column prop="payMoney" align="center" label="实收金额（元）"> </el-table-column>
+          <el-table-column prop="payMoney" align="center" label="会员消费金额（元）"> </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>
               <span type="danger" v-else>--</span>
             </template>
           </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="用户手机号" > </el-table-column>
           <el-table-column prop="payType" align="center" label="支付方式">
             <template slot-scope="scope">
               <span v-if="scope.row.payType=='CASH'">现金</span>
@@ -242,11 +242,19 @@
               <el-tag type="danger" v-else>支付失败</el-tag>
             </template>
           </el-table-column>
-          <el-table-column prop="mchntCd" align="center" label="商户号"> </el-table-column>
           <el-table-column prop="createBy" align="center" label="关联员工"> </el-table-column>
 
           <el-table-column prop="createTime" align="center" label="订单创建时间" width="220"> </el-table-column>
           <el-table-column prop="updateTime" align="center" label="订单完成时间" width="220"> </el-table-column>
+          <el-table-column align="center" label="操作">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                @click="getOrdersInfo(scope.row)"
+              >详情</el-button>
+            </template>
+          </el-table-column>
         </el-table>
       </div>
       <pagination