This commit is contained in:
JS-LM
2023-06-13 16:36:32 +08:00
parent e2a580f457
commit 1d2e70edb7
4 changed files with 2020 additions and 78 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -140,10 +140,11 @@ export default {
endTime: "",
};
getMerchantOrderReport(params).then(
({ data: { merchantOrderReport, reportList } }) => {
(response) => {
// console.log("查询报表", reportList, merchantOrderReport);
this.reportList = reportList;
this.merchantOrderReport = merchantOrderReport;
console.log('response',response)
this.reportList = response.data.reportList;
this.merchantOrderReport = response.data.merchantOrderReport;
console.log("查询报表", this.merchantOrderReport, this.reportList);
}
);

View File

@@ -0,0 +1,175 @@
<template>
<div class="app-container">
<div style="display: flex; background-color: #ebebf0; padding: 10px">
<div style="width: 25%">
<h2>钱包汇总</h2>
<p>运营商举视新能源</p>
<p>商家性质企业</p>
<p>开户状态进件成功</p>
<p>开户行名称中国农业银行股份有限公司</p>
<p>收款卡号46456412</p>
<p>预留手机号452584</p>
</div>
<div class="main" style="flex: 1; align-items: baseline">
<div class="bord"></div>
<div class="card">
<p>待清分</p>
<p>2121 </p>
<p style="text-align: justify">
包括未到清分时间以及尚未执行清分的订单数据
</p>
</div>
<div class="bord"></div>
<div class="card">
<p>清分在途</p>
<p>2121 </p>
<p>包括未到清分时间以及尚未执行清分的订单数据</p>
</div>
<div class="bord"></div>
<div class="card">
可提现
<p>1203 </p>
<button>提现申请</button>
</div>
<div class="bord"></div>
<div class="card">
<p>提现申请中</p>
<p>1203 </p>
<button>提现记录</button>
</div>
<div class="bord"></div>
<div class="card">
<p>已提现</p>
<p>165</p>
<p>以成功提现到绑定银行卡的金额汇总</p>
</div>
</div>
</div>
<el-tabs
v-model="activeName"
type="card"
@tab-click="handleClick"
style="margin-top: 10px"
>
<el-tab-pane label="清分记录" name="first">
<el-form
ref="queryForm"
:inline="true"
label-width="220px"
>
<el-form-item label="清分时间">
<el-date-picker
v-model="createTimeRange"
style="width: 240px"
value-format="yyyy-MM-dd HH:mm:ss"
: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 label="提现申请时间" prop="orderCode">
<el-date-picker
v-model="createTimeRange"
style="width: 240px"
value-format="yyyy-MM-dd HH:mm:ss"
: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 label="清分单号">
<el-input></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary">搜索</el-button>
<el-button>重置</el-button>
</el-form-item>
<div v-if="buttonBoolean">
<el-form-item label="电站ID"></el-form-item>
<el-form-item label="充电场站"></el-form-item>
<el-form-item label="订单单号"></el-form-item>
<el-form-item label="订单状态"></el-form-item>
<el-form-item label="流水状态"></el-form-item>
<el-form-item label="流水类型"></el-form-item>
<el-form-item label="清分单号"></el-form-item>
<el-form-item label="订单来源"></el-form-item>
<el-form-item label="清分周期类型"></el-form-item>
<el-form-item label="清分状态"></el-form-item>
<el-form-item label="提现单号"></el-form-item>
</div>
<el-button
@click="showOrHide()"
style="border-color: white;
background-color: white;
font-size: x-small;
color: #50bfff;
padding: 1px 2px;
margin-left: 40%;
margin-top: 0px;
margin-bottom: 15px;"
:icon="icon"
>{{ showOrHideText }}
</el-button>
</el-form>
</el-tab-pane>
<el-tab-pane label="订单流水" name="second">订单流水</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
export default {
data() {
return {
activeName: "first",
showOrHideText: "显示更多查询条件",
buttonBoolean: false,
//图标,可根据自己的需求匹配
icon: "el-icon-caret-bottom",
createTimeRange:''
};
},
methods: {
handleClick(tab, event) {
console.log(tab, event);
},
showOrHide() {
if (this.buttonBoolean) {
this.icon = "el-icon-caret-bottom";
this.showOrHideText = "显示更多查询条件";
this.buttonBoolean = !this.buttonBoolean;
} else {
this.icon = "el-icon-caret-top";
this.showOrHideText = "收起";
this.buttonBoolean = !this.buttonBoolean;
}
},
},
};
</script>
<style lang="scss" scoped>
.main {
display: flex;
justify-content: space-between;
align-items: baseline;
}
.bord {
position: relative;
top: 68px;
height: 60px;
border-left: 1px solid gray;
}
.card {
width: 190px;
}
</style>

View File

@@ -7,7 +7,9 @@
</el-tab-pane>
<el-tab-pane label="配置管理" name="second">配置管理</el-tab-pane>
<el-tab-pane label="角色管理" name="third">角色管理</el-tab-pane>
<el-tab-pane label="定时任务补偿" name="fourth">定时任务补偿</el-tab-pane>
<el-tab-pane label="钱包汇总" name="wallet">
<wallet-summary></wallet-summary>
</el-tab-pane>
<el-tab-pane label="营收报表" name="revenue">
<revenue :merchantId="merchantId"></revenue>
</el-tab-pane>
@@ -19,11 +21,12 @@
<script>
import adapayMember from './components/adapayMember.vue';
import Revenue from './components/revenue.vue';
import WalletSummary from './components/walletSummary.vue';
export default {
components: { adapayMember, Revenue },
components: { adapayMember, Revenue, WalletSummary },
data() {
return {
activeName: 'revenue',
activeName: 'first',
merchantId:this.$route.params.id
};
},