From 437c6d72f76072e5ab1b09e78101370805113c4b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 01 十月 2023 18:46:37 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
index 85e463d..5b520c4 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
@@ -85,7 +85,9 @@
editable: true,
required: false,
width: '12%',
- render: (text) => {
+ render: (text, record) => {
+ if (record.type !== 'number') return ''
+
if (text === 'true') {
return '鏄�'
} else {
@@ -105,7 +107,8 @@
max: 18,
editable: true,
required: false,
- width: '12%'
+ width: '12%',
+ render: (text, record) => record.type === 'number' ? text : ''
},
{
title: '瀵煎嚭',
@@ -231,6 +234,13 @@
} else {
col.type = 'text'
}
+ }
+
+ if (col.type !== 'number') {
+ col.decimal = ''
+ col.abs = 'false'
+ } else {
+ col.abs = col.abs || 'false'
}
return col
@@ -884,7 +894,7 @@
return
}
- let sql = SettingUtils.getDebugSql(verify, scripts, (verify.useSearch === 'true' ? searches : []), Utils)
+ let sql = SettingUtils.getDebugSql(verify, scripts, (verify.useSearch === 'true' ? searches : []))
let _debugId = md5(sql)
--
Gitblit v1.8.0