From 30c350ff93af3fcc7dcd9b78eb110212b2d44a49 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 11 二月 2020 08:53:53 +0800
Subject: [PATCH] 2020-02-11
---
src/templates/tableshare/verifycard/index.jsx | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 7 deletions(-)
diff --git a/src/templates/tableshare/verifycard/index.jsx b/src/templates/tableshare/verifycard/index.jsx
index 1b1efea..c28c8bb 100644
--- a/src/templates/tableshare/verifycard/index.jsx
+++ b/src/templates/tableshare/verifycard/index.jsx
@@ -18,8 +18,10 @@
class VerifyCard extends Component {
static propTpyes = {
- floor: PropTypes.any, // 鏄惁涓哄瓙琛�
- dict: PropTypes.object, // 瀛楀吀椤�
+ floor: PropTypes.any, // 鏄惁涓哄瓙琛�
+ btnTab: PropTypes.any, // 琛ㄥ崟鏍囩椤碉紙鎸夐挳锛夊弬鏁�
+ config: PropTypes.any, // 琛ㄥ崟鏍囩椤靛弬鏁�
+ dict: PropTypes.object, // 瀛楀吀椤�
card: PropTypes.object,
columns: PropTypes.array
}
@@ -356,7 +358,7 @@
}
UNSAFE_componentWillMount() {
- const { columns } = this.props
+ const { columns, config } = this.props
let _verify = this.props.card.verify || {}
this.setState({
@@ -373,6 +375,37 @@
}
})
+ if (this.props.card.btnType) { // 鎸夐挳-琛ㄥ崟鏍囩椤�
+ let _fields = []
+
+ config.groups.forEach(group => {
+ _fields.push(...group.sublist)
+ })
+
+ let _usefulfields = ['BID', 'ID', 'LoginUID', 'SessionUid', 'UserID', 'Appkey']
+ _fields.forEach(_f => {
+ if (_f.field) {
+ _usefulfields.push(_f.field)
+ }
+ })
+
+ if (columns && columns.length > 0 && this.props.btnTab.Ot !== 'notRequired') {
+ columns.forEach(_f => {
+ if (_f.field) {
+ _usefulfields.push(_f.field)
+ }
+ })
+ }
+
+ _usefulfields = Array.from(new Set(_usefulfields))
+ _usefulfields = _usefulfields.join(', ')
+
+ this.setState({
+ fields: _fields,
+ usefulfields: _usefulfields
+ })
+ return
+ }
if (this.props.card.OpenType === 'pop') {
Api.getSystemConfig({
func: 'sPC_Get_LongParam',
@@ -394,20 +427,32 @@
let _fields = []
if (_LongParam.groups.length > 0) {
_LongParam.groups.forEach(group => {
- group.sublist.forEach(field => {
- _fields.push(field)
- })
+ _fields.push(...group.sublist)
})
} else {
_fields = _LongParam.fields
}
let _usefulfields = ['BID', 'ID', 'LoginUID', 'SessionUid', 'UserID', 'Appkey']
+ let hasBid = false
+
_fields.forEach(_f => {
if (_f.field) {
_usefulfields.push(_f.field)
}
+ if (_f.field.toLowerCase() === 'bid') {
+ hasBid = true
+ }
})
+
+ if (this.props.floor === 'subtable' && !hasBid) { // 瀛愯〃琛ㄥ崟涓鍔燘ID
+ _fields.unshift({
+ uuid: 'BID',
+ field: 'BID',
+ label: 'BID',
+ type: 'text'
+ })
+ }
if (columns && columns.length > 0 && this.props.card.Ot !== 'notRequired') {
columns.forEach(_f => {
@@ -1029,7 +1074,6 @@
</TabPane>
<TabPane tab="鍗曞彿鐢熸垚" key="4">
<BillcodeForm
- floor={this.props.floor}
fields={fields}
billcodes={verify.billcodes}
columns={this.props.columns}
--
Gitblit v1.8.0