From 24bba05db141f358bf1a8bb7213a2432c9de355e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 08 十月 2021 19:14:22 +0800
Subject: [PATCH] 2021-10-08
---
src/utils/utils.js | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index d3948e4..a64daf8 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -261,7 +261,7 @@
let _initval = JSON.parse(item.initval)
let _vals = [moment().subtract(_initval[0], 'days').format('YYYY-MM-DD'), moment().subtract(_initval[1], 'days').format('YYYY-MM-DD')]
item.initval = _vals.join(',')
- } catch {
+ } catch (e) {
item.initval = ''
}
}
@@ -309,7 +309,7 @@
} else if (_type === 'customized') {
try {
_val = JSON.parse(_val)
- } catch {
+ } catch (e) {
_val = [0, 0]
}
_dateRange = [moment().subtract(_val[0], 'days').format('YYYY-MM-DD'),
@@ -703,14 +703,18 @@
if (item.type === 'link') {
arrfield.push(item.linkField)
- } else if ((item.type === 'select' || item.type === 'radio') && item.linkSubField && item.linkSubField.length > 0) {
- arrfield.push(...item.linkSubField)
} else if (item.type === 'checkcard') {
arrfield = item.fields.map(f => f.field)
arrfield.push(item.cardValField)
if (item.urlField) {
arrfield.push(item.urlField)
}
+ }
+ if (['select', 'radio', 'link', 'checkcard'].includes(item.type) && item.linkSubField && item.linkSubField.length > 0) {
+ arrfield.push(...item.linkSubField)
+ }
+ if (item.disableField) {
+ arrfield.push(item.disableField)
}
arrfield = Array.from(new Set(arrfield))
@@ -1120,7 +1124,7 @@
})
// 闇�瑕佸０鏄庣殑鍙橀噺闆�
- let _vars = ['tbid', 'errorcode', 'retmsg', 'billcode', 'bvoucher', 'fibvoucherdate', 'fiyear', 'username', 'fullname', 'modulardetailcode']
+ let _vars = ['tbid', 'errorcode', 'retmsg', 'billcode', 'bvoucher', 'fibvoucherdate', 'fiyear', 'username', 'fullname', 'modulardetailcode', 'roleid', 'departmentcode', 'organization', 'login_city']
// 涓婚敭瀛楁
let primaryKey = setting.primaryKey || 'id'
--
Gitblit v1.8.0