2024.08.05

- 财务明细页增加余额相关字段显示和类型选择下拉框；

src/views/customer/customerList/index.vue

@@ -17,7 +17,7 @@
         maxlength="11" style="width: 200px;margin-left: 10px;" placeholder="请输入手机号"
       />
       <el-select
-        v-model="listQuery.state" clearable size="mini" class="filter-item"
+        v-model="listQuery.labelId" clearable size="mini" class="filter-item"
         style="width: 200px;margin-left: 10px;" placeholder="请选择客户标签"
       >
         <el-option v-for="item in tagList" :key="item.labelId" :label="item.labelName" :value="item.labelId" />

src/views/finance/list/index.vue

@@ -145,17 +145,63 @@
             </div>
           </div>
         </div>
+        <div>
+          <div style="font-size: 18px;font-weight: bold;">余额相关</div>
+          <div style="display: flex;justify-content: space-around;align-items: center;flex-wrap: wrap;text-align: center;">
+            <div style="padding: 8px;">
+              <div style="font-size: 30px;font-weight: bold;color: #ffae11;margin-bottom: 6px;">
+                {{ financialData.rechargeTurnover || '0' }}
+              </div>
+              <div style="font-size: 16px;color: #333333;">营业额</div>
+            </div>
+            <div style="padding: 8px;">
+              <div style="font-size: 30px;font-weight: bold;color: #ffae11;margin-bottom: 6px;">
+                {{ financialData.rechargeFreeze || '0' }}
+              </div>
+              <div style="font-size: 16px;color: #333333;">待到账冻结</div>
+            </div>
+            <div style="padding: 8px;">
+              <div style="font-size: 30px;font-weight: bold;color: #ffae11;margin-bottom: 6px;">
+                {{ financialData.rechargeWithdrawn || '0' }}
+              </div>
+              <div style="font-size: 16px;color: #333333;">已提现</div>
+            </div>
+            <div style="padding: 8px;">
+              <div style="font-size: 30px;font-weight: bold;color: #ffae11;margin-bottom: 6px;">
+                {{ financialData.rechargeWithdrawalIn || '0' }}
+              </div>
+              <div style="font-size: 16px;color: #333333;">提现中</div>
+            </div>
+            <div style="padding: 8px;">
+              <div style="font-size: 30px;font-weight: bold;color: #ffae11;margin-bottom: 6px;">
+                {{ financialData.presenterRechargeVoucher || '0' }}
+              </div>
+              <div style="font-size: 16px;color: #333333;">余额赠送代金券</div>
+            </div>
+          </div>
+        </div>
       </el-card>
     </div>
     <!-- 选项卡 -->
-    <div>
-      <div class="rightSearch">
+    <div style="position: relative;">
+      <div style="position: absolute;top: 6px;right: 20px;z-index: 999;">
+        <el-select
+          v-model="listQuery.paymentMode" size="mini" class="filter-item"
+          style="width: 200px;margin-left: 10px;" placeholder="请选择类型"
+          @change="getList()"
+        >
+          <el-option label="普通订单" value="1" />
+          <el-option label="消费金" value="2" />
+          <el-option label="代金券" value="3" />
+          <el-option label="余额" value="4" />
+        </el-select>
         <el-date-picker
-          v-model="formInline.time" type="month" placeholder="选择日期" value-format="yyyy-MM"
+          v-model="listQuery.time" type="month" placeholder="选择日期" size="mini"
+          style="margin-left: 10px;line-height: 1;" value-format="yyyy-MM"
           @change="getList()"
         />
       </div>
-      <el-tabs v-model="formInline.condition" @tab-click="getList()">
+      <el-tabs v-model="listQuery.condition" @tab-click="getList()">
         <el-tab-pane label="日汇款" name="1" />
         <el-tab-pane label="月汇款" name="2" />
         <!-- <el-tab-pane label="交易金流水" name="3" /> -->
@@ -308,7 +354,13 @@ export default {
         presenterVoucherVoucher: 0, // 交易金赠送代金券
         voucherCoinRatio: 0, // 商家代金券提现比例
         voucherWithdrawal: 0, // 代金券支付金额（可提现）
-        ordersForVoucherWithdrawal: [] // 代金券支付金额（可提现）的相关订单
+        ordersForVoucherWithdrawal: [], // 代金券支付金额（可提现）的相关订单
+        rechargeTurnover: 0, // 余额营业额
+        rechargeFreeze: 0, // 余额支付金额（待到账冻结）
+        rechargeWithdrawn: 0, // 余额支付金额（已提现）
+        rechargeWithdrawalIn: 0, // 余额支付金额（提现中）
+        presenterRechargeVoucher: 0, // 余额赠送代金券
+        ordersForRechargeWithdrawal: [] // 余额支付金额（可提现）的相关订单
       },
       formData: {
         withdrawalType: 1,
@@ -326,9 +378,10 @@ export default {
         withdrawalType: [ { required: true, message: '请选择提现类型', trigger: 'blur' } ],
         withdrawalMoney: [ { required: true, message: '请输入提现金额', trigger: 'blur' } ]
       },
-      formInline: {
+      listQuery: {
         condition: '1', // 时间条件 1-日汇总 2-月汇总
-        time: '' // 时间值
+        time: '', // 时间值
+        paymentMode: '1'
       },
       tableDatas: [],
       isVisible: false,
@@ -354,7 +407,7 @@ export default {
     async handleWithdrawal() {
       this.isVisible = true
       this.formData.withdrawalMoney = ''
-      // const res = await getWithdrawalDetails(this.formInline);
+      // const res = await getWithdrawalDetails(this.listQuery);
       const res = await getBank({})
       if (JSON.stringify(res.data) === '{}') {
         this.show = false
@@ -413,16 +466,14 @@ export default {
     },
     // 初始化查询所有数据
     async getList() {
-      const res = await getFinanceCount(this.formInline)
-      if (res.code === '') this.financialData = res.data
+      const res = await getFinanceCount(this.listQuery)
+      this.financialData = res.data
     },
     // 查询明细
     async getInfo() {
       const res = await getDetails(this.moneyForm)
-      if (res.code === '') {
-        this.tableDatas = res.data.list
-        this.total = res.data.total
-      }
+      this.tableDatas = res.data.list
+      this.total = res.data.total
     }
   }
 }
@@ -435,12 +486,6 @@ export default {
 	flex-direction: column;
 }
 
-.rightSearch {
-	position: absolute;
-	right: 20px;
-	z-index: 999;
-}
-
 .text_tip {
 	margin-left: 50px;
 }