From a24beb36feaa46f39cbb26ce5277e84f91241ce8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 26 三月 2020 01:30:05 +0800
Subject: [PATCH] 2020-03-26
---
src/templates/zshare/verifycardprint/index.jsx | 68 ++++++++++++++++++++++++++++++----
1 files changed, 60 insertions(+), 8 deletions(-)
diff --git a/src/templates/zshare/verifycardprint/index.jsx b/src/templates/zshare/verifycardprint/index.jsx
index c5e21b4..9c9cb76 100644
--- a/src/templates/zshare/verifycardprint/index.jsx
+++ b/src/templates/zshare/verifycardprint/index.jsx
@@ -7,6 +7,7 @@
import Api from '@/api'
import Utils from '@/utils/utils.js'
+import EditTable from './editable'
import 'codemirror/lib/codemirror.css'
// import 'codemirror/theme/solarized.css'
@@ -15,7 +16,7 @@
import './index.scss'
const { TabPane } = Tabs
-let _printFunc = null
+let _printFunc = null // antd 鏃犳硶鑾峰彇 codemirror 鍐呭锛屾墜鍔ㄦ帶鍒�
class VerifyCard extends Component {
static propTpyes = {
@@ -37,14 +38,16 @@
UNSAFE_componentWillMount() {
let _verify = this.props.card.verify || {}
+ _verify.Template = _verify.Template || ''
+ _verify.printerTypeList = _verify.printerTypeList || []
+ _verify.linkType = _verify.linkType || 'system'
+ _verify.printMode = _verify.printMode || 'normal'
+
this.setState({
- verify: {
- ..._verify,
- Template: _verify.Template || ''
- },
- linkType: _verify.linkType || 'system',
- printMode: _verify.printMode || 'normal',
- printFunc: _verify.printFunc || '// Function(socket, data, printer, notification) socket-WebSocket 瀵硅薄锛宒ata-鎵撳嵃鏁版嵁鍒楄〃锛宲rinter-鎵撳嵃鏈猴紝notification-淇℃伅鎻愮ず鎺т欢'
+ verify: _verify,
+ linkType: _verify.linkType,
+ printMode: _verify.printMode,
+ printFunc: _verify.printFunc || '// Function(data, form, printer, notification) data-鎵撳嵃鏁版嵁鍒楄〃锛宖orm-琛ㄥ崟淇℃伅锛堜笉瀛樺湪鏃朵负{}锛夛紝printer-鎵撳嵃璁剧疆锛宯otification-淇℃伅鎻愮ず鎺т欢'
})
_printFunc = _verify.printFunc || ''
@@ -166,6 +169,40 @@
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
let _verify = {...verify, ...values, printFunc: _printFunc}
+
+ if (this.refs.editTable && this.refs.editTable.state) {
+ let printTypes = this.refs.editTable.state.dataSource
+
+ let emptys = printTypes.filter(item => !item.Value || !item.Text)
+ let valMap = new Map()
+ let isvalid = true
+
+ printTypes.forEach(item => {
+ if (valMap.has(item.Value)) {
+ isvalid = false
+ } else {
+ valMap.set(item.Value, item.Text)
+ }
+ })
+
+ if (emptys.length > 0) {
+ notification.warning({
+ top: 92,
+ message: '鎵撳嵃绫诲瀷琛ㄦ牸涓璙alue銆乀ext瀛楁涓嶅彲涓虹┖!',
+ duration: 10
+ })
+ return
+ } else if (!isvalid) {
+ notification.warning({
+ top: 92,
+ message: '鎵撳嵃绫诲瀷琛ㄦ牸涓璙alue瀛楁涓嶅彲閲嶅!',
+ duration: 10
+ })
+ return
+ }
+
+ _verify.printerTypeList = printTypes
+ }
resolve(_verify)
} else {
@@ -313,6 +350,21 @@
</Row>
</Form>
</TabPane>
+ <TabPane tab="鎵撳嵃绫诲瀷" key="2">
+ <Form {...formItemLayout}>
+ <Row gutter={24}>
+ <Col span={24} className="print-tip">
+ <Form.Item label={'鎻愮ず'}>
+ 濡傛灉姝ゆ寜閽殑鎵撳嵃鍔熻兘娑夊強澶氱鎵撳嵃绫诲瀷锛屼笖涓嶅悓绫诲瀷闇�瑕佽缃笉鍚岀殑鎵撳嵃鏈烘椂锛屽彲浠ユ坊鍔犳墦鍗扮被鍨嬫帶鍒朵俊鎭紝
+ 璁剧疆瀹屾垚鍚庯紝鐢ㄦ埛鍙拡瀵逛笉鍚岀殑绫诲瀷璁剧疆瀵瑰簲鐨勬墦鍗版満銆傛敞锛氬湪杩斿洖鏁版嵁椤跺眰缁撴瀯涓坊鍔� printType銆乸rintCount銆乼emplateID 瀛楁锛屽彲鍒嗗埆鎺у埗鎵撳嵃绫诲瀷銆佹墦鍗版暟閲忓拰鎵撳嵃妯℃澘銆�
+ </Form.Item>
+ </Col>
+ <Col span={24}>
+ <EditTable data={verify.printerTypeList} dict={this.props.dict} ref="editTable"/>
+ </Col>
+ </Row>
+ </Form>
+ </TabPane>
<TabPane tab="淇℃伅鎻愮ず" key="7">
<Form {...formItemLayout}>
<Row gutter={24}>
--
Gitblit v1.8.0