From 2c0eee83cfabff55f478fd5a0b4a4abeb49dd2af Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Wed, 23 Oct 2024 17:56:17 +0800
Subject: [PATCH] 10.23

---
 .../reconciliation/tab/favourable.vue         | 31 +++++++-----
 .../reconciliation/tab/ref.vue                | 17 ++++---
 .../reconciliation/tab/trading.vue            | 50 +++++++++----------
 3 files changed, 51 insertions(+), 47 deletions(-)

diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/favourable.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/favourable.vue
index 1dcac76f7..66c9064e7 100644
--- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/favourable.vue
+++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/favourable.vue
@@ -17,17 +17,6 @@
             <el-option label="POS端" value="POS"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="" prop="payChannel">
-          <el-select
-            v-model="queryParams.payChannel"
-            clearable
-            placeholder="请选择订单分类"
-          >
-            <el-option label="小程序" value="applet"/>
-            <el-option label="收银台" value="cashier"/>
-            <el-option label="POS端" value="POS"/>
-          </el-select>
-        </el-form-item>
 
 
         <el-form-item label="" prop="payType">
@@ -42,6 +31,17 @@
             <el-option label="余额" value="balance"/>
           </el-select>
         </el-form-item>
+        <el-form-item label="" prop="payChannel">
+          <el-select
+            v-model="queryParams.payChannel"
+            clearable
+            placeholder="请选择订单分类"
+          >
+            <el-option label="小程序" value="applet"/>
+            <el-option label="收银台" value="cashier"/>
+            <el-option label="POS端" value="POS"/>
+          </el-select>
+        </el-form-item>
         <el-form-item label="" prop="status">
           <el-select
             v-model="queryParams.status"
@@ -187,7 +187,14 @@
           <el-table-column prop="userName" align="center" label="付款用户" > </el-table-column>
 
 
-          <el-table-column prop="mchntCd" align="center" label="订单状态"> </el-table-column>
+          <el-table-column prop="mchntCd" align="center" label="订单状态">
+            <template slot-scope="scope">
+              <div v-if="scope.row.status == 'unpaid'"  style="color: #F44522">未支付</div>
+              <div v-else-if="scope.row.status == 'paid'" style="color: #0DC291">已支付</div>
+              <div v-else-if="scope.row.status == 'refund'" style="color: #FF7E00">已退款</div>
+              <div v-else  style="color: #F44522">支付失败</div>
+            </template>
+          </el-table-column>
           <el-table-column prop="createBy" align="center" label="关联员工"> </el-table-column>
 
           <el-table-column prop="updateTime" align="center" label="订单完成时间" width="220"> </el-table-column>
diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
index b11116e45..8a405c926 100644
--- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
+++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
@@ -165,21 +165,21 @@
               <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="payMoney" align="center" label="会员付款金额（元）"> </el-table-column>
 
-          <el-table-column prop="refMoney" align="center" label="退款金额">
+          <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="payType" align="center" label="支付方式">
             <template slot-scope="scope">
@@ -191,12 +191,13 @@
           </el-table-column>
           <el-table-column prop="status" align="center" label="支付状态">
             <template slot-scope="scope">
-              <el-tag v-if="scope.row.status == 'unpaid'">未支付</el-tag>
-              <el-tag type="success" v-else-if="scope.row.status == 'paid'">已支付</el-tag>
-              <el-tag type="danger" v-else-if="scope.row.status == 'refund'">已退款</el-tag>
-              <el-tag type="danger" v-else>支付失败</el-tag>
+              <div v-if="scope.row.status == 'unpaid'"  style="color: #F44522">未支付</div>
+              <div v-else-if="scope.row.status == 'paid'" style="color: #0DC291">已支付</div>
+              <div v-else-if="scope.row.status == 'refund'" style="color: #FF7E00">已退款</div>
+              <div v-else  style="color: #F44522">支付失败</div>
             </template>
           </el-table-column>
+          <el-table-column prop="mchntCd" align="center" label="支付渠道"> </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>
 
diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
index d9d57dc2c..0b84ad38d 100644
--- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
+++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
@@ -42,6 +42,17 @@
               <el-option label="余额" value="balance"/>
             </el-select>
           </el-form-item>
+        <el-form-item label="" prop="status">
+          <el-select
+            v-model="queryParams.status"
+            clearable
+            placeholder="请选择订单状态"
+          >
+            <el-option label="已支付" value="paid"/>
+            <el-option label="未支付" value="unpaid"/>
+            <el-option label="已退款" value="refund"/>
+          </el-select>
+        </el-form-item>
         <el-form-item label="" prop="payType">
           <el-select
             v-model="queryParams.payType"
@@ -54,17 +65,6 @@
             <el-option label="余额" value="balance"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="" prop="status">
-          <el-select
-            v-model="queryParams.status"
-            clearable
-            placeholder="请选择订单状态"
-          >
-            <el-option label="已支付" value="paid"/>
-            <el-option label="未支付" value="unpaid"/>
-            <el-option label="已退款" value="refund"/>
-          </el-select>
-        </el-form-item>
         <el-form-item label="" style="margin-right: 0px" prop="status">
           <el-select
             v-model="queryParams.status"
@@ -105,7 +105,7 @@
         <el-form-item  style="float: right; margin-right: 0px ">
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-          <el-button type="primary" icon="el-icon-search" >导出</el-button>
+          <el-button type="primary" >导出</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -210,21 +210,16 @@
               <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="退款金额">
-            <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="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="payMoney" 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">
@@ -234,14 +229,15 @@
               <span v-else="">余额</span>
             </template>
           </el-table-column>
-          <el-table-column prop="status" align="center" label="支付状态">
+          <el-table-column prop="status" align="center" label="订单状态">
             <template slot-scope="scope">
-              <el-tag v-if="scope.row.status == 'unpaid'">未支付</el-tag>
-              <el-tag type="success" v-else-if="scope.row.status == 'paid'">已支付</el-tag>
-              <el-tag type="danger" v-else-if="scope.row.status == 'refund'">已退款</el-tag>
-              <el-tag type="danger" v-else>支付失败</el-tag>
+              <div v-if="scope.row.status == 'unpaid'"  style="color: #F44522">未支付</div>
+              <div v-else-if="scope.row.status == 'paid'"  style="color: #0DC291">已支付</div>
+              <div v-else-if="scope.row.status == 'refund'" style="color: #F44522">已退款</div>
+              <div v-else style="color: #F44522">支付失败</div>
             </template>
           </el-table-column>
+          <el-table-column prop="mchntCd" align="center" label="支付渠道"> </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>