From 38781aa31a50c6d1eb121e4f05ab30fb06587da3 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期五, 26 四月 2024 14:10:51 +0800
Subject: [PATCH] Merge branch 'dev-threejs'
---
src/views/system/calculate/report/index.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/system/calculate/report/index.vue b/src/views/system/calculate/report/index.vue
index c9cc9c3..0875752 100644
--- a/src/views/system/calculate/report/index.vue
+++ b/src/views/system/calculate/report/index.vue
@@ -132,7 +132,7 @@
</el-table-column>
<el-table-column
label="鎵ｅ噺閲戦(鍏�)"
- prop="money"
+ prop="deductMoney"
width="180">
<template slot-scope="scope">
<el-input type="number"
@@ -338,6 +338,7 @@
sums[index] = '鍚堣';
return;
}
+
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
@@ -351,7 +352,7 @@
if (column.property === 'score') {
sums[index] = '-';
}
- if (column.property === 'value') {
+ if (column.property === 'deductMoney') {
sums[index] += '鍏�';
}
} else {
--
Gitblit v1.8.0