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

Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud

Browse Source
This commit is contained in:
ctw committed 2025-01-22 19:54:06 +08:00
2 parents 240a964b1c 8292325f02
commit 3dd000ced5
6 files changed
+77 -130
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/views/hard/hard-sb/index.vue
+2 -2
View File
@@ -38,7 +38,7 @@
@selection-change="selectionChangHandle"
@sort-change="sortChangeHandle"
>
<el-table-column type="selection" width="40" align="center" />
<el-table-column type="selection" width="80" align="center" />
<el-table-column type="index" label="#" width="50" />
<el-table-column label="设备" align="center">
<template #default="{ row }">
@@ -104,7 +104,7 @@ const getSummaries = (param: any) => {
const { columns, data } = param
const totalColumns = ["totalPayPrice", "totalPayCount"]
const totalRow = Array.from({ length: columns.length })
totalRow[2] = "合计"
totalRow[0] = "合计"
columns.forEach((i: any, index: number) => {
if (totalColumns.includes(i.property)) {
const total = data
src/views/hard/hard-sh/index.vue
+2 -2
View File
@@ -38,7 +38,7 @@
@selection-change="selectionChangHandle"
@sort-change="sortChangeHandle"
>
<el-table-column type="selection" width="40" align="center" />
<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">
@@ -101,7 +101,7 @@ const getSummaries = (param: any) => {
const { columns, data } = param
const totalColumns = ["totalPayPrice", "totalPayCount"]
const totalRow = Array.from({ length: columns.length })
totalRow[2] = "合计"
totalRow[0] = "合计"
columns.forEach((i: any, index: number) => {
if (totalColumns.includes(i.property)) {
const total = data