From 5fdcdee11c98892955a4ea6e5371256dd5ed7c88 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 25 十月 2023 21:30:16 +0800
Subject: [PATCH] 2023-10-25
---
src/templates/zshare/modalform/index.jsx | 1 +
src/views/billprint/index.jsx | 17 ++++++++++++++++-
src/templates/sharecomponent/searchcomponent/searchform/index.jsx | 1 +
3 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
index 2acd0d3..4e27e1d 100644
--- a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
@@ -606,6 +606,7 @@
columns.push({ title: 'url', key: '$url', type: 'file' })
} else if (this.record.display === 'color') {
columns.push({ title: 'Color', key: '$color' })
+ extra = <span>浣跨敤鍗佸叚杩涘埗鑹插僵浠ｇ爜锛圚EX锛夋椂锛岃鍦ㄨ壊鍊煎墠娣诲姞 #</span>
}
fields.forEach(item => {
diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
index 0c6a6b7..c2a94e3 100644
--- a/src/templates/zshare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -818,6 +818,7 @@
columns.push({ title: 'url', key: '$url', type: 'file' })
} else if (this.record.display === 'color') {
columns.push({ title: 'Color', key: '$color' })
+ extra = <span>浣跨敤鍗佸叚杩涘埗鑹插僵浠ｇ爜锛圚EX锛夋椂锛岃鍦ㄨ壊鍊煎墠娣诲姞 #</span>
}
fields.forEach(item => {
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