From ac1d52c46ff9019fcc93cf3d5e7ab17cf850824e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 10 八月 2023 16:05:24 +0800
Subject: [PATCH] 2023-08-10
---
src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx | 93 +++++++++++++++++++++++++++-------------------
1 files changed, 54 insertions(+), 39 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
index 46f1560..99a32d2 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
@@ -135,7 +135,7 @@
width: '10%',
editable: true,
inputType: 'radio',
- render: (text, record) => record.required === 'true' ? '鏄�' : '鍚�',
+ render: (text, record) => record.required === 'true' ? <span style={{color: 'red'}}>鏄�</span> : '鍚�',
options: [
{value: 'true', text: '鏄�'},
{value: 'false', text: '鍚�'}
@@ -160,20 +160,20 @@
)
}
},
- {
- title: '鎵ц浣嶇疆',
- dataIndex: 'position',
- width: '10%',
- render: (text, record) => {
- if (record.position === 'init') {
- return <span style={{color: 'orange'}}>鍒濆鍖�</span>
- } else if (record.position === 'front') {
- return <span style={{color: '#26C281'}}>sql鍓�</span>
- } else {
- return <span style={{color: '#1890ff'}}>sql鍚�</span>
- }
- }
- },
+ // {
+ // title: '鎵ц浣嶇疆',
+ // dataIndex: 'position',
+ // width: '10%',
+ // render: (text, record) => {
+ // if (record.position === 'init') {
+ // return <span style={{color: 'orange'}}>鍒濆鍖�</span>
+ // } else if (record.position === 'front') {
+ // return <span style={{color: '#26C281'}}>sql鍓�</span>
+ // } else {
+ // return <span style={{color: '#1890ff'}}>sql鍚�</span>
+ // }
+ // }
+ // },
{
title: '鐘舵��',
dataIndex: 'status',
@@ -731,7 +731,7 @@
}
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${param.timestamp}'`)
+ param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id|datam)@/ig, `'${param.timestamp}'`)
param.LText = param.LText.replace(/\n/g, ' ')
param.LText = Utils.formatOptions(param.LText)
@@ -975,7 +975,7 @@
}
}
- scriptsChange = (values, callback) => {
+ scriptsChange = (values, callback, skip) => {
let verify = JSON.parse(JSON.stringify(this.state.verify))
if (values.uuid) {
@@ -991,20 +991,27 @@
verify.scripts.push(values)
}
- this.setState({loading: true})
-
- this.sqlverify(() => { // 楠岃瘉鎴愬姛
+ if (skip) {
this.setState({
- loading: false,
verify: verify
})
callback(true)
- }, () => { // 楠岃瘉澶辫触
- this.setState({
- loading: false
- })
- callback(false)
- }, verify.scripts)
+ } else {
+ this.setState({loading: true})
+
+ this.sqlverify(() => { // 楠岃瘉鎴愬姛
+ this.setState({
+ loading: false,
+ verify: verify
+ })
+ callback(true)
+ }, () => { // 楠岃瘉澶辫触
+ this.setState({
+ loading: false
+ })
+ callback(false)
+ }, verify.scripts)
+ }
}
sqlverify = (_resolve, _reject, scripts) => {
@@ -1157,7 +1164,7 @@
<Form {...formItemLayout}>
<Row gutter={24}>
<Col offset={6} span={6}>
- <Form.Item label={'鎻愮ず缂栫爜'}>
+ <Form.Item label="鎻愮ず缂栫爜">
<span className="errorval"> S </span>
<Button onClick={() => {this.showError('S')}} type="primary" size="small">
鏌ョ湅
@@ -1165,14 +1172,14 @@
</Form.Item>
</Col>
<Col span={8}>
- <Form.Item label={'鍋滅暀鏃堕棿'}>
+ <Form.Item label="鍋滅暀鏃堕棿">
<InputNumber defaultValue={verify.stime || 2} min={1} max={10000} precision={0} onChange={(val) => {this.timeChange(val, 'stime')}} />
</Form.Item>
</Col>
</Row>
<Row gutter={24}>
<Col offset={6} span={6}>
- <Form.Item label={'鎻愮ず缂栫爜'}>
+ <Form.Item label="鎻愮ず缂栫爜">
<span className="errorval"> Y </span>
<Button onClick={() => {this.showError('Y')}} type="primary" size="small">
鏌ョ湅
@@ -1182,7 +1189,15 @@
</Row>
<Row gutter={24}>
<Col offset={6} span={6}>
- <Form.Item label={'鎻愮ず缂栫爜'}>
+ <Form.Item label="鎻愮ず缂栫爜">
+ <span className="errorval"> -1 </span>
+ 鎵ц鎴愬姛鏃犳彁绀恒��
+ </Form.Item>
+ </Col>
+ </Row>
+ <Row gutter={24}>
+ <Col offset={6} span={6}>
+ <Form.Item label="鎻愮ず缂栫爜">
<span className="errorval"> N </span>
<Button onClick={() => {this.showError('N')}} type="primary" size="small">
鏌ョ湅
@@ -1190,14 +1205,14 @@
</Form.Item>
</Col>
<Col span={8}>
- <Form.Item label={'鍋滅暀鏃堕棿'}>
+ <Form.Item label="鍋滅暀鏃堕棿">
<InputNumber defaultValue={verify.ntime || 10} min={1} max={10000} precision={0} onChange={(val) => {this.timeChange(val, 'ntime')}} />
</Form.Item>
</Col>
</Row>
<Row gutter={24}>
<Col offset={6} span={6}>
- <Form.Item label={'鎻愮ず缂栫爜'}>
+ <Form.Item label="鎻愮ず缂栫爜">
<span className="errorval"> F </span>
<Button onClick={() => {this.showError('F')}} type="primary" size="small">
鏌ョ湅
@@ -1205,14 +1220,14 @@
</Form.Item>
</Col>
<Col span={8}>
- <Form.Item label={'鍋滅暀鏃堕棿'}>
+ <Form.Item label="鍋滅暀鏃堕棿">
<InputNumber defaultValue={verify.ftime || 10} min={1} max={10000} precision={0} onChange={(val) => {this.timeChange(val, 'ftime')}} />
</Form.Item>
</Col>
</Row>
<Row gutter={24}>
<Col offset={6} span={6}>
- <Form.Item label={'鎻愮ず缂栫爜'}>
+ <Form.Item label="鎻愮ず缂栫爜">
<span className="errorval"> E </span>
<Button onClick={() => {this.showError('E')}} type="primary" size="small">
鏌ョ湅
@@ -1222,7 +1237,7 @@
</Row>
<Row gutter={24}>
<Col offset={6} span={6}>
- <Form.Item label={'鎻愮ず缂栫爜'}>
+ <Form.Item label="鎻愮ず缂栫爜">
<span className="errorval"> NM </span>
<Button onClick={() => {this.showError('NM')}} type="primary" size="small">
鏌ョ湅
@@ -1232,9 +1247,9 @@
</Row>
<Row gutter={24}>
<Col offset={6} span={6}>
- <Form.Item label={'鎻愮ず缂栫爜'}>
- <span className="errorval"> -1 </span>
- 涓嶆彁绀�
+ <Form.Item label="鎻愮ず缂栫爜">
+ <span className="errorval"> -2 </span>
+ 鎵ц澶辫触鏃犳彁绀�
</Form.Item>
</Col>
</Row>
--
Gitblit v1.8.0