zianxin/pj_admin_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud

Browse Source
This commit is contained in:
zjf committed 2025-03-06 17:05:48 +08:00
2 parents aceb3c3312 5151924a27
commit 451a1f4cf5
2 files changed
+66 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/views/hard/hard-sb/index.vue
+33 -5
View File
@@ -61,22 +61,49 @@
</template>
</el-table-column>
<el-table-column label="商户" align="center" prop="merchantName" />
<el-table-column label="总消费金额" align="center" prop="totalPayPrice">
<el-table-column label="消费金额" align="center" prop="totalPayPrice">
<template #default="{ row }">
<span class="color-success">
<span class="color-primary">
{{ displayPrice(row.totalPayPrice) }}
</span>
</template>
</el-table-column>
<el-table-column label="总消费次数" align="center" prop="totalPayCount">
<el-table-column label="消费次数" align="center" prop="totalPayCount">
<template #default="{ row }">
<span class="color-primary">
{{ row.totalPayCount }}
</span>
</template>
</el-table-column>
<el-table-column label="退款金额" align="center" prop="totalRefundPrice">
<template #default="{ row }">
<span class="color-danger">
{{ displayPrice(row.totalRefundPrice) }}
</span>
</template>
</el-table-column>
<el-table-column label="退款次数" align="center" prop="totalRefundCount">
<template #default="{ row }">
<span class="color-danger">
{{ row.totalRefundCount }}
</span>
</template>
</el-table-column>
<el-table-column label="盈利金额" align="center" prop="totalProfitPrice">
<template #default="{ row }">
<span class="color-success">
{{ displayPrice(row.totalProfitPrice) }}
</span>
</template>
</el-table-column>
<el-table-column label="盈利次数" align="center" prop="totalProfitCount">
<template #default="{ row }">
<span class="color-success">
{{ row.totalProfitCount }}
</span>
</template>
</el-table-column>
</el-table>
<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
</template>
</DraggableDepTree>
</div>
@@ -102,6 +129,7 @@ const draggableDepTreeRef = ref() // 树组件ref引用
const { hard_type } = useDict("hard_type")
const state: BasicTableProps = reactive<BasicTableProps>({
isPage: false,
queryForm: {},
pageList: hardTotalApi.pageListSb,
})
@@ -116,7 +144,7 @@ const exportExcel = () => {
const getSummaries = (param: any) => {
const { columns, data } = param
const totalColumns = ["totalPayPrice", "totalPayCount"]
const totalColumns = ["totalPayPrice", "totalPayCount", "totalRefundPrice", "totalRefundCount", "totalProfitPrice", "totalProfitCount"]
const totalRow = Array.from({ length: columns.length })
totalRow[0] = "合计"
columns.forEach((i: any, index: number) => {
src/views/hard/hard-sh/index.vue
+33 -5
View File
@@ -53,22 +53,49 @@
<el-table-column type="selection" width="80" align="center" />
<el-table-column type="index" label="#" width="50" />
<el-table-column label="商户" align="center" prop="merchantName" />
<el-table-column label="总消费金额" align="center" prop="totalPayPrice">
<el-table-column label="消费金额" align="center" prop="totalPayPrice">
<template #default="{ row }">
<span class="color-success">
{{ displayPrice(row.totalPayPrice) }}
</span>
</template>
</el-table-column>
<el-table-column label="总消费次数" align="center" prop="totalPayCount">
<el-table-column label="消费次数" align="center" prop="totalPayCount">
<template #default="{ row }">
<span class="color-primary">
{{ row.totalPayCount }}
{{ row.totalPayCount || 0 }}
</span>
</template>
</el-table-column>
<el-table-column label="退款金额" align="center" prop="totalRefundPrice">
<template #default="{ row }">
<span class="color-danger">
{{ displayPrice(row.totalRefundPrice) }}
</span>
</template>
</el-table-column>
<el-table-column label="退款次数" align="center" prop="totalRefundCount">
<template #default="{ row }">
<span class="color-danger">
{{ row.totalRefundCount || 0 }}
</span>
</template>
</el-table-column>
<el-table-column label="盈利金额" align="center" prop="totalProfitPrice">
<template #default="{ row }">
<span class="color-success">
{{ displayPrice(row.totalProfitPrice) }}
</span>
</template>
</el-table-column>
<el-table-column label="盈利次数" align="center" prop="totalProfitCount">
<template #default="{ row }">
<span class="color-success">
{{ row.totalProfitCount || 0 }}
</span>
</template>
</el-table-column>
</el-table>
<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
</template>
</DraggableDepTree>
</div>
@@ -90,6 +117,7 @@ const multiple = ref(true)
const draggableDepTreeRef = ref() // 树组件ref引用
const state: BasicTableProps = reactive<BasicTableProps>({
isPage: false,
queryForm: {},
pageList: hardTotalApi.pageListCs,
})
@@ -116,7 +144,7 @@ const exportExcel = () => {
const getSummaries = (param: any) => {
const { columns, data } = param
const totalColumns = ["totalPayPrice", "totalPayCount"]
const totalColumns = ["totalPayPrice", "totalPayCount", "totalRefundPrice", "totalRefundCount", "totalProfitPrice", "totalProfitCount"]
const totalRow = Array.from({ length: columns.length })
totalRow[0] = "合计"
columns.forEach((i: any, index: number) => {