From 742f7d11557526038d332e60a8c8ca18177bc4e4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 26 十月 2023 15:51:58 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/views/billprint/index.jsx | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/views/billprint/index.jsx b/src/views/billprint/index.jsx
index c46417f..f7d3a35 100644
--- a/src/views/billprint/index.jsx
+++ b/src/views/billprint/index.jsx
@@ -358,7 +358,20 @@
if (component.type === 'table') {
let getColumns = (cols) => {
return cols.filter(item => {
- if (item.type === 'colspan') {
+ if (item.Hide === 'true') return false
+
+ if (item.type === 'number') {
+ if (typeof(item.decimal) === 'number') {
+ item.round = Math.pow(10, item.decimal)
+ if (item.format === 'percent') {
+ item.decimal = item.decimal > 2 ? item.decimal - 2 : 0
+ }
+ }
+ } else if (item.type === 'formula') {
+ if (typeof(item.decimal) === 'number') {
+ item.round = Math.pow(10, item.decimal)
+ }
+ } else if (item.type === 'colspan') {
item.subcols = getColumns(item.subcols)
if (item.subcols.length === 0) {
return false
@@ -596,6 +609,8 @@
if (cell.format === 'percent') {
cell.decimal = cell.decimal > 2 ? cell.decimal - 2 : 0
}
+ } else if (cell.eleType === 'formula' && typeof(cell.decimal) === 'number') {
+ cell.round = Math.pow(10, cell.decimal)
}
}
--
Gitblit v1.8.0