autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 11:05:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source 
# Conflicts:
#	jsowell-ui/src/views/financial/financeDetail.vue
This commit is contained in:
autumn.g@foxmail.com
2023-10-31 11:55:42 +08:00
parent e7bc7fa292 fc9fd3d867
commit babcc5cedd
1 changed files with 89 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

277
jsowell-ui/src/views/financial/financeDetail.vue
View File

@@ -1,6 +1,6 @@
<template>
<div class="app-container">
<div class="header">
<div class="header-cont ">
<div class="header-txt">运营汇总</div>
<el-button type="primary" @click="goAccount">开户信息</el-button>
</div>
@@ -12,13 +12,9 @@
</template>
<template v-else>
<template v-if="showAccountList">
<div
class="foot1"
v-for="(item, index) in settleAccountList"
:key="index"
>
<div class="foot1" v-for="(item, index) in settleAccountList" :key="index">
<el-descriptions :column="1">
<el-descriptions-item label="运营商">
<el-descriptions-item label="运营商" class="remarks">
<span class="color">
{{ merchant }}
</span>
@@ -109,8 +105,8 @@
<el-descriptions-item label="白名单支付(次)">
<span class="color">{{
merchantOrderReport.whitelistPaymentsNum === null
? "一"
: merchantOrderReport.whitelistPaymentsNum
? "一"
: merchantOrderReport.whitelistPaymentsNum
}}</span>
</el-descriptions-item>
</el-descriptions>
@@ -122,145 +118,58 @@
<div class="margin-right foot4">
<div class="color60">可提现(元)</div>
<div class="margin-20 color">{{ adapayMember.avlBalance }}</div>
<el-button
type="primary"
v-if="adapayMember.avlBalance > withdrawalFee"
@click="dialogVisible = true"
>提现申请</el-button
>
<el-button type="primary" v-if="adapayMember.avlBalance > withdrawalFee"
@click="dialogVisible = true">提现申请</el-button>
<div v-else>
注:
<span class="text"
>该余额大于{{ withdrawalFee }}元时，才可发起取现</span
>
<span class="text">该余额大于{{ withdrawalFee }}元时，才可发起取现</span>
</div>
</div>
<div class="margin-right foot4" style="width: 20%">
<div class="margin-right foot4">
<div class="color60" @click="already">已提现(元)</div>
<div class="margin-20 color">{{ adapayMember.withdrawn }}</div>
<div>
<span class="text">已成功提现到绑定银行卡的金额汇总</span>
</div>
</div>
<div class="margin-right foot4">
<el-button type="primary">提现中</el-button>
</div>
<!-- <div class="margin-right foot4" style="width: 20%">
<div class="color60">冻结金额(元)</div>
<div class="margin-20 color">{{ adapayMember.frzBalance }}</div>
<div>
注:
<span class="text"
>当配置了自动结算功能，在每日发起结算时会将可用余额转为冻结金额。该部分金额不允许取现。</span
>
<span class="text">当配置了自动结算功能，在每日发起结算时会将可用余额转为冻结金额。该部分金额不允许取现。</span>
</div>
</div>
<!-- <div class="foot4"> -->
<!-- <div class="margin-right">
<div class="color60">昨日日终余额(元)</div>
<div class="margin-20 color">{{ adapayMember.lastAvlBalance }}</div>
</div> -->
<!-- <div class="margin-right">
<div>提现申请中</div>
<div class="margin-10">
{{ adapayMember.withdrawalApplication }}(元)
</div>
<el-button type="primary" @click="recordDialog = true"
>提现记录</el-button
>
</div>
<div class="margin-right">
<div>已提现</div>
<div class="margin-10">{{ adapayMember.withdrawn }}(元)</div>
<div style="font-size: 13px">已成功提现到绑定银行卡的金额汇总</div>
</div> -->
<!-- </div> -->
</div> -->
</template>
</div>
<hr />
<div class="center">
<div class="header-txt">运营分析</div>
<el-form
:model="queryParams"
ref="queryForm"
size="small"
inline
label-width="68px"
>
<el-form :model="queryParams" ref="queryForm" size="small" inline label-width="68px">
<el-form-item label="日期" prop="tradeDate">
<el-date-picker
v-model="createTimeRange"
style="width: 240px"
value-format="yyyy-MM-dd"
:default-time="['00:00:00', '23:59:59']"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:clearable="false"
></el-date-picker>
<el-date-picker v-model="createTimeRange" style="width: 240px" value-format="yyyy-MM-dd"
:default-time="['00:00:00', '23:59:59']" type="daterange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期" :clearable="false"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
</el-form-item>
</el-form>
</div>
<hr />
<el-table :data="reportList">
<el-table-column label="日期" align="center" prop="tradeDate" />
<!-- <el-table-column label="站点名称" align="center" prop="stationName">
<template slot-scope="scope">
<router-link
:to="
'/station/detail/index/' +
scope.row.stationId +
'/' +
scope.row.stationName
"
class="link-type"
>
<span>{{ scope.row.stationName }}</span>
</router-link>
</template>
</el-table-column> -->
<el-table-column label="账单状态" align="center" prop="billStatus">
<template slot-scope="scope">
<dict-tag
:options="dict.type.bill_status"
:value="scope.row.billStatus"
/>
<dict-tag :options="dict.type.bill_status" :value="scope.row.billStatus" />
</template>
</el-table-column>
<el-table-column
label="应收金额（元）"
align="center"
prop="receivableAmount"
/>
<el-table-column
label="可提现金额（元）"
align="center"
prop="withdrawAbleAmount"
/>
<el-table-column
label="交易手续费（元）"
align="center"
prop="feeAmount"
/>
<!-- <el-table-column label="清分时间" align="center" prop="clearingTime" /> -->
<!-- <el-table-column
label="应清分金额"
align="center"
prop="shouldClearingAmount"
/>
<el-table-column
label="实际清分金额"
align="center"
prop="actualClearingAmount"
/>
<el-table-column
label="清分账单编号"
align="center"
prop="clearingBillCode"
/> -->
<el-table-column label="提现订单号" align="center" prop="withdrawCode" />
<el-table-column label="应收金额（元）" align="center" prop="receivableAmount" />
<el-table-column label="可提现金额（元）" align="center" prop="withdrawAbleAmount" />
<el-table-column label="交易手续费（元）" align="center" prop="feeAmount" />
<el-table-column label="提现订单号" align="center" prop=" withdrawCode" />
<el-table-column label="提现申请时间" align="center" prop="applicationTime"/>
<el-table-column label="操作" align="center">
<template slot-scope="scope">
@@ -268,13 +177,8 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="reportTotal > 0"
:total="reportTotal"
:page.sync="reportQueryParams.pageNum"
:limit.sync="reportQueryParams.pageSize"
@pagination="getList"
/>
<pagination v-show="reportTotal > 0" :total="reportTotal" :page.sync="reportQueryParams.pageNum"
:limit.sync="reportQueryParams.pageSize" @pagination="getList" />
<!-- 提现申请弹窗 -->
<el-dialog title="提现申请" :visible.sync="dialogVisible" width="33%">
温馨提示
@@ -294,7 +198,6 @@
<p>
实际到账（元）：
<span class="number color">
<!-- <span>11</span> -->
{{ adapayMember.avlBalance - withdrawalFee }}
</span>
</p>
@@ -306,57 +209,31 @@
<!-- 提现记录 -->
<el-dialog title="提现记录" :visible.sync="recordDialog">
<el-table :data="tableData" style="width: 100%">
<el-table-column label="日期" />
<el-table-column label="账单状态" />
<el-table-column label="应收金额(元)" />
<el-table-column label="充值手续费(元)" />
<el-table-column label="可提现金额(元)" />
<el-table-column label="提现订单号(元)" />
<el-table-column label="提现申请时间(元)" />
<el-table-column label="操作">
<template slot-scope="scope">
<router-link
:to="{
path: '/financial/merchant/merchantVirtual',
query: {
merchantId: scope.row.id,
merchantName: scope.row.merchantName,
},
}"
class="link-type"
>
<span>订单流水</span>
</router-link>
</template>
</el-table-column>
<el-table-column label="日期" align="center" />
<el-table-column label="状态" align="center" />
<el-table-column label="金额" align="center"></el-table-column>
</el-table>
<pagination v-show="orderTotal > 0" :total="orderTotal" :page.sync="getOrderParams.pageNum"
:limit.sync="getOrderParams.pageSize" @pagination="getOrderList" />
</el-dialog>
<el-dialog
title="订单流水"
:visible.sync="dialogTableVisible"
:before-close="orderClose"
>
<!-- 订单流水 -->
<el-dialog title="订单流水" :visible.sync="dialogTableVisible" :before-close="orderClose">
<el-table :data="orderList" v-loading="orderLoading">
<el-table-column property="orderCode" label="订单编号" />
<el-table-column property="settleAmount" label="结算金额(元)" />
<el-table-column property="clearingStatus" label="清分状态">
<el-table-column property="orderCode" label="订单编号" align="center" />
<el-table-column property="settleAmount" label="结算金额(元)" align="center" />
<el-table-column property="clearingStatus" label="清分状态" align="center">
<template slot-scope="scope">
<span>{{
scope.row.clearingStatus === "0" ? "未清分" : "已清分"
}}</span>
</template>
</el-table-column>
<el-table-column property="clearingBillCode" label="清分账单编号" />
<el-table-column property="withdrawStatus" label="提现状态" />
<el-table-column property="withdrawCode" label="提现编号" />
<el-table-column property="clearingBillCode" label="清分账单编号" align="center" />
<el-table-column property="withdrawStatus" label="提现状态" align="center" />
<el-table-column property="withdrawCode" label="提现编号" align="center" />
</el-table>
<pagination
v-show="orderTotal > 0"
:total="orderTotal"
:page.sync="getOrderParams.pageNum"
:limit.sync="getOrderParams.pageSize"
@pagination="getOrderList"
/>
<pagination v-show="orderTotal > 0" :total="orderTotal" :page.sync="getOrderParams.pageNum"
:limit.sync="getOrderParams.pageSize" @pagination="getOrderList" />
</el-dialog>
</div>
</template>
@@ -424,10 +301,8 @@ export default {
if (code == null) {
return "";
}
// if (code === undefined) return;
const bankList = text.bankList;
let arr = bankList.find((item) => item.bankCode === code);
// console.log("银行编码对应的银行名称 arr", arr);
if (arr.bankName != null) {
this.bankName = arr.bankName;
}
@@ -480,7 +355,6 @@ export default {
this.orderList = res.rows;
this.orderTotal = res.total;
this.orderLoading = false;
// console.log("this.orderTotal", this.orderTotal);
});
},
// 弹层关闭之前执行的事情
@@ -504,7 +378,6 @@ export default {
getList() {
console.log("queryParams", this.queryParams);
getMerchantOrderReport(this.reportQueryParams).then((response) => {
// console.log("查询报表", reportList, merchantOrderReport);
console.log("getMerchantOrderReport", response);
if (response.data) {
this.merchantOrderReport = response.data.merchantOrderReport;
@@ -536,7 +409,7 @@ export default {
});
this.dialogVisible = false;
})
.catch((_) => {});
.catch((_) => { });
},
// 点击提交按钮
submit() {
@@ -577,6 +450,9 @@ export default {
this.reportQueryParams.endTime = end;
this.getList();
},
already() {
this.recordDialog = true
}
},
created() {
this.defaultDate();
@@ -590,58 +466,83 @@ export default {
.color60 {
color: #606266;
}
.center {
display: flex;
align-content: center;
margin-top: 30px;
}
.margin-20 {
margin: 20px 0;
font-size: 20px;
}
.font-13 {
font-size: 13px;
}
.header {
display: flex;
align-items: center;
}
.header-cont {
display: flex;
justify-content: space-between;
align-items: center;
}
.header-txt {
font-size: 24px;
}
.text {
font-size: 12px;
color: red;
}
.foot1 {
width: 25%;
width: 20%;
margin-top: 10px;
// .el-descriptions__body .el-descriptions__table {
// width: 0 !important;
// }
::v-deep .el-descriptions-item__label {
width: 80px;
margin-right: 0;
}
}
.foot2 {
margin-left: 10px;
margin-right: 10px;
width: 200px;
width: 450px;
::v-deep .el-descriptions-item__label {
width: 105px;
margin-right: 0;
}
}
.foot3 {
width: 200px;
width: 400px;
margin-right: 10px;
::v-deep .el-descriptions-item__label {
width: 108px;
margin-right: 0;
}
}
.foot4 {
display: inline-block;
// flex: 1;
// display: flex;
// justify-content: space-between;
// margin-left: 50px;
}
.margin-right {
width: 180px;
margin-right: 10px;
width: 500px;
// margin-right: 50px;
text-align: center;
}
.color {
color: #000;
font-weight: bolder;