dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

前端BUG

Browse Source
This commit is contained in:
zhaohengkun 2024-09-27 11:15:39 +08:00
parent f2a7cd7b1a
commit 173af4884a
6 changed files with 43 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fuintAdmin_zt/src/api/allOrder.js
View File

@ -137,7 +137,7 @@ export function exportExcelDayApi(data) {
data: data // 通过 data 参数传递需要的数据
});
}
// 支付通道分析 下面列表数据
export function getFenxiByDailiApi(query) {
return request({
url: 'business/allOrderInfo/getFenxiByDaili',
@ -146,6 +146,7 @@ export function getFenxiByDailiApi(query) {
})
}
// 支付通道分析 上面 统计数据
export function getFenxiByDailiByDataApi(query) {
return request({
url: 'business/allOrderInfo/getFenxiByDailiBydata',
@ -154,7 +155,7 @@ export function getFenxiByDailiByDataApi(query) {
})
}
// 获取支付方式 下面数据列表
export function getFenxiByDailiTypeApi(query) {
return request({
url: 'business/allOrderInfo/getFenxiByDailiType',
@ -163,6 +164,7 @@ export function getFenxiByDailiTypeApi(query) {
})
}
// 获取 支付方式 上面统计数据
export function getFenxiByDailiTypeByDataApi(query) {
return request({
url: 'business/allOrderInfo/getFenxiByDailiTypeBydata',

36
fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/list.vue
View File

@ -1,21 +1,21 @@
<template>
<div class="app-center">
<div class="app-top">
<el-card :body-style="{ padding: '0px' }">
<div class="box">
<div class="nbox" :class="pointerClass" @click="updateRedio('支付方式分析')">
<div class="fount-box" :style="{ color: radio1 === '支付方式分析' ? '#FF770F' : '#999999' }">支付方式分析</div>
<div class="heng-box" v-if="radio1 == '支付方式分析'"></div>
<div class="heng-box" style="background-color: #FFFFFF" v-else></div>
<el-card :body-style="{ padding: '0px' }">
<div class="box">
<div class="nbox" :class="pointerClass" @click="updateRedio('支付方式分析')">
<div class="fount-box" :style="{ color: radio1 === '支付方式分析' ? '#FF770F' : '#999999' }">支付方式分析</div>
<div class="heng-box" v-if="radio1 == '支付方式分析'"></div>
<div class="heng-box" style="background-color: #FFFFFF" v-else></div>
</div>
<div class="nbox" :class="pointerClass" @click="updateRedio('支付通道分析')">
<div class="fount-box" :style="{ color: radio1 === '支付通道分析' ? '#FF770F' : '#999999' }">支付通道分析</div>
<div class="heng-box" v-if="radio1 == '支付通道分析'"></div>
<div class="heng-box" style="background-color: #FFFFFF" v-else></div>
</div>
</div>
<div class="nbox" :class="pointerClass" @click="updateRedio('支付通道分析')">
<div class="fount-box" :style="{ color: radio1 === '支付通道分析' ? '#FF770F' : '#999999' }">支付通道分析</div>
<div class="heng-box" v-if="radio1 == '支付通道分析'"></div>
<div class="heng-box" style="background-color: #FFFFFF" v-else></div>
</div>
</div>
</el-card>
</el-card>
</div>
@ -63,11 +63,11 @@ export default {
width: 100%;
box-sizing: border-box;
//padding: 10px;
//padding: 10px;
}
.app-top{
width: 100%;
//margin-bottom: 20px;
//margin-bottom: 20px;
height: 50px;
box-sizing: border-box;
@ -79,11 +79,11 @@ export default {
cursor: pointer;
margin-top: 10px ;
margin-left: 50px;
//height: 40px;
//height: 40px;
display: flex;
background-color: #FFFFFF;
background-color: #FFFFFF;
align-items: center;
//border: 1px solid #EBEEF5;
//border: 1px solid #EBEEF5;
}
.nbox{
margin-right: 30px;

29
fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue
View File

@ -1,4 +1,4 @@
<!-- 收银台订单-->
<!-- 支付通道分析-->
<template>
<div style="padding-top: 20px; padding-right: 20px; background: #f6f8f9;padding-bottom: 15px">
<div class="card-change2-1" style="" shadow="never">
@ -42,12 +42,12 @@
</el-form>
<div class="wrap-boxs">
<div class="k_" id="k_1">
<div class="size_">交易金额汇总数（万元）/交易笔数</div>
<div class="title_">{{ orderStatistics.payMoney?(orderStatistics.payMoney/10000).toFixed(2):0 }}/{{ orderStatistics.count }}</div>
<div class="size_">交易金额汇总数（元）/交易笔数</div>
<div class="title_">{{ orderStatistics.payMoney?orderStatistics.payMoney:0 }}/{{ orderStatistics.count }}</div>
</div>
<div class="k_" id="k_2" v-for="item in orderStatistics.fenxiByDaili2ByData">
<div class="size_">{{ item.paymentChannel}}交易金额（万元）</div>
<div class="title_">{{ item.payMoneyChannel?(item.payMoneyChannel/10000).toFixed(2):0 }}</div>
<div class="size_">{{ item.paymentChannel}}交易金额（元）</div>
<div class="title_">{{ item.payMoneyChannel?item.payMoneyChannel:0 }}</div>
</div>
</div>
</div>
@ -59,38 +59,38 @@
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column align="center" prop="storeName" label="机构名称"></el-table-column>
<el-table-column align="center" prop="parentName" label="所属机构"></el-table-column>
<el-table-column align="center" prop="payMoney" label="累计交易金额"></el-table-column>
<el-table-column align="center" prop="payMoney" label="累计交易金额（元）"></el-table-column>
<el-table-column align="center" prop="count" label="累计交易笔数"></el-table-column>
<el-table-column align="center" label="支付通道交易信息：金额（万元），笔数（万笔），占比（%）">
<el-table-column align="center" label="支付通道交易信息：金额（元），笔数（笔），占比（%）">
<template>
<el-table-column align="center" prop="fuYouAmount" label="富友交易金额">
<template slot-scope="scope">
<span>{{scope.row.fuYouAmount/100000 || 0}}</span>
<span>{{scope.row.fuYouAmount || 0}}</span>
</template>
</el-table-column>
<el-table-column align="center" prop="fuYouCount" label="富友交易笔数">
<template slot-scope="scope">
<span>{{scope.row.fuYouCount/1000 || 0}}</span>
<span>{{scope.row.fuYouCount || 0}}</span>
</template>
</el-table-column>
<el-table-column align="center" prop="fuYouAmount" label="富友交易占比">
<template slot-scope="scope">
<span>{{(scope.row.fuYouAmount/(scope.row.payMoney)).toFixed(2) || 0}}</span>
<span>{{(scope.row.fuYouAmount/(scope.row.payMoney)).toFixed(2) + '%' || 0}}</span>
</template>
</el-table-column>
<el-table-column align="center" prop="laKaLaAmount" label="拉卡拉交易金额">
<template slot-scope="scope">
<span>{{scope.row.laKaLaAmount/100000 || 0}}</span>
<span>{{scope.row.laKaLaAmount || 0}}</span>
</template>
</el-table-column>
<el-table-column align="center" prop="laKaLaCount" label="拉卡拉交易笔数">
<template slot-scope="scope">
<span>{{scope.row.laKaLaCount/1000 || 0}}</span>
<span>{{scope.row.laKaLaCount || 0}}</span>
</template>
</el-table-column>
<el-table-column align="center" prop="count92" label="拉卡拉交易占比">
<template slot-scope="scope">
<span>{{(scope.row.laKaLaAmount/(scope.row.payMoney)).toFixed(2) || 0}}</span>
<span>{{(scope.row.laKaLaAmount/(scope.row.payMoney)).toFixed(2) + '%' || 0}}</span>
</template>
</el-table-column>
</template>
@ -263,8 +263,7 @@ export default {
}
getFenxiByDailiByDataApi(this.addDateRange(this.queryParams, this.value2)).then(res => {
this.orderStatistics = res.data
if(this.orderStatistics.
fenxiByDaili2ByData.length==0) {
if(this.orderStatistics.fenxiByDaili2ByData.length==0) {
this.orderStatistics.fenxiByDaili2ByData = [{
paymentChannel:'交易',
payMoneyChannel:'0'

14
fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
View File

@ -50,11 +50,11 @@
</div>
<div class="k_" id="k_2">
<div class="size_" >交易金额汇总数（元）/交易笔数</div>
<div class="title_">{{ orderStatistics.payMoney?(orderStatistics.payMoney).toFixed(2):0 }}/{{orderStatistics.count}}</div>
<div class="title_">{{ orderStatistics.payMoney?orderStatistics.payMoney:0 }}/{{orderStatistics.count}}</div>
</div>
<div class="k_" id="k_3">
<div class="size_">退款金额（元）/退款笔数</div>
<div class="title_">{{ orderStatistics.refMoney?(orderStatistics.refMoney).toFixed(2):0 }}/{{orderStatistics.refCount}}</div>
<div class="title_">{{ orderStatistics.refMoney?orderStatistics.refMoney:0 }}/{{orderStatistics.refCount}}</div>
</div>
<div class="k_" id="k_4">
<div class="size_">新增油站数</div>
@ -70,9 +70,9 @@
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="storeName" align="center" label="机构名称"></el-table-column>
<el-table-column prop="parentName" align="center" label="所属机构"></el-table-column>
<el-table-column prop="payMoney" align="center" label="累计交易金额（万元）">
<el-table-column prop="payMoney" align="center" label="累计交易金额（元）">
<template slot-scope="scope">
<span>{{scope.row.payMoney/100000 || 0}}</span>
<span>{{scope.row.payMoney|| 0}}</span>
</template>
</el-table-column>
<el-table-column prop="count" align="center" label="累计交易笔数"></el-table-column>
@ -108,11 +108,8 @@
import {
exportExcelTradingApi, getFenxiByDailiTypeApi, getFenxiByDailiTypeByDataApi,
getRunningWaterByTissueApi,
getTissueByDataApi,
getTradingPageApi
getRunningWaterByTissueApi
} from "@/api/allOrder";
import {getFenXiUserbalanceDataApi, getFenXiUserbalanceListApi} from "@/api/financialStatement/yunyingfenxi";
import {parseTime} from "@/utils/fuint";
export default {
@ -190,7 +187,6 @@ export default {
this.value2 = [parseTime(start1), parseTime(new Date())];
this.getList();
this.getDeptList();
},
methods: {
editColor(index) {

2
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue
View File

@ -43,7 +43,7 @@
<el-select
v-model="queryParams.orderStatus"
clearable
placeholder="支付状态"
placeholder="订单状态"
>
<el-option label="支付成功" value="paid"/>
<el-option label="待支付" value="unpaid"/>

2
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
View File

@ -46,7 +46,7 @@
<el-select
v-model="queryParams.status"
clearable
placeholder="支付状态"
placeholder="订单状态"
>
<el-option label="支付成功" value="paid"/>
<el-option label="待支付" value="unpaid"/>