From 46f79b491173d284a4900d19e7aecf7509481438 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 一月 2022 17:21:25 +0800
Subject: [PATCH] 2022-01-21
---
src/templates/zshare/verifycard/index.jsx | 45 ++++++++++++++++++++-------------------------
1 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
index 9d42d79..6a3ecb5 100644
--- a/src/templates/zshare/verifycard/index.jsx
+++ b/src/templates/zshare/verifycard/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { Form, Tabs, Row, Col, Radio, Button, Select, Popconfirm, notification, Modal, message, InputNumber, Tooltip, Typography } from 'antd'
-import { QuestionCircleOutlined, CheckCircleOutlined, StopOutlined, EditOutlined, SwapOutlined, DeleteOutlined } from '@ant-design/icons'
+import { QuestionCircleOutlined, CheckCircleOutlined, StopOutlined, EditOutlined, SwapOutlined, DeleteOutlined, ExclamationOutlined } from '@ant-design/icons'
import moment from 'moment'
import Api from '@/api'
@@ -595,7 +595,14 @@
new Promise(resolve => {
let _fields = []
- if (config.Template === 'FormTab') {
+ if (card.OpenType === 'form') {
+ _fields.push({
+ field: card.field,
+ label: card.label,
+ type: 'text'
+ })
+ resolve(_fields)
+ } else if (config.Template === 'FormTab') {
config.groups.forEach(group => {
_fields.push(...group.sublist)
})
@@ -813,7 +820,11 @@
if (!item.field || item.writein === 'false') return
_arr.push(item.field.toLowerCase())
- _form.push(item.field + '=@' + item.field)
+ if (item.field.toLowerCase() === 'bid' && item.uuid === 'BID') {
+ _form.push(item.field + '=@BID@')
+ } else {
+ _form.push(item.field + '=@' + item.field)
+ }
})
if (this.props.card.sqlType === 'audit') {
@@ -1413,30 +1424,9 @@
const { verify, oriVerify } = this.state
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
return new Promise((resolve, reject) => {
- let msg = ''
- if (this.customForm && this.customForm.state.editItem) {
- msg = '鑷畾涔夐獙璇�'
- } else if (this.customForm && this.customForm.props.form.getFieldValue('sql') && !/^\s+$/.test(this.customForm.props.form.getFieldValue('sql'))) {
- msg = '鑷畾涔夐獙璇�'
- } else if (this.orderForm && this.orderForm.state.editItem) {
- msg = '鍗曞彿鐢熸垚'
- } else if (this.scriptsForm && this.scriptsForm.state.editItem) {
- msg = '鑷畾涔夎剼鏈�'
- } else if (this.scriptsForm && this.scriptsForm.props.form.getFieldValue('sql') && !/^\s+$/.test(this.scriptsForm.props.form.getFieldValue('sql'))) {
- msg = '鑷畾涔夎剼鏈�'
- }
-
if (!is(fromJS(verify), fromJS(oriVerify))) {
confirm({
content: '楠岃瘉淇℃伅宸蹭慨鏀癸紝纭畾鍙栨秷鍚楋紵',
- onOk() {
- resolve()
- },
- onCancel() {}
- })
- } else if (msg) {
- confirm({
- content: msg + '鏈繚瀛橈紝纭畾鍙栨秷鍚楋紵',
onOk() {
resolve()
},
@@ -1474,7 +1464,12 @@
return (
<div id="verify-card-box-tab">
<Tabs defaultActiveKey="1" className="verify-card-box">
- {card.intertype === 'system' || (card.intertype === 'custom' && card.procMode === 'system') ? <TabPane tab="鍩虹楠岃瘉" key="1">
+ {card.intertype === 'system' || (card.intertype === 'custom' && card.procMode === 'system') ? <TabPane tab={
+ <span>
+ 鍩虹楠岃瘉
+ {verify.default === 'false' ? <span className="count-tip"><ExclamationOutlined style={{color: 'orange'}}/></span> : null}
+ </span>
+ } key="1">
<Form {...formItemLayout}>
<Row gutter={24}>
{this.props.card.sqlType !== 'custom' ? <Col span={8}>
--
Gitblit v1.8.0