From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/templates/zshare/verifycard/billcodeform/index.jsx | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/templates/zshare/verifycard/billcodeform/index.jsx b/src/templates/zshare/verifycard/billcodeform/index.jsx
index cbb058a..bf5c929 100644
--- a/src/templates/zshare/verifycard/billcodeform/index.jsx
+++ b/src/templates/zshare/verifycard/billcodeform/index.jsx
@@ -232,8 +232,8 @@
})(
<Select>
{this.state.funFields.map(option =>
- <Select.Option title={option.label} id={option.uuid} key={option.uuid} value={option.field}>
- {option.label}
+ <Select.Option key={option.uuid} value={option.field}>
+ {`${option.label}锛�${option.field}锛塦}
</Select.Option>
)}
</Select>
@@ -241,7 +241,7 @@
</Form.Item>
</Col>
<Col span={7}>
- <Form.Item label={'绫诲瀷'}>
+ <Form.Item label="绫诲瀷">
{getFieldDecorator('TypeCharOne', {
initialValue: 'Lp',
rules: [
@@ -261,7 +261,7 @@
</Form.Item>
</Col>
{type === '1' ? <Col span={7}>
- <Form.Item label={'鍏宠仈瀛楁'}>
+ <Form.Item label="鍏宠仈瀛楁">
{getFieldDecorator('linkField', {
initialValue: '',
rules: [
@@ -271,10 +271,10 @@
}
]
})(
- <Select>
+ <Select showSearch filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}>
{this.state.billFields.map(option =>
- <Select.Option title={option.label} id={option.uuid} key={option.uuid} value={option.field}>
- {option.label}
+ <Select.Option key={option.uuid} value={option.field}>
+ {`${option.label}锛�${option.field}锛塦}
</Select.Option>
)}
</Select>
@@ -282,7 +282,7 @@
</Form.Item>
</Col> : null}
{type === '2' ? <Col span={7}>
- <Form.Item label={'鍑瘉绫诲瀷'}>
+ <Form.Item label="鍑瘉绫诲瀷">
{getFieldDecorator('ModularCode', {
initialValue: this.props.modular[0] ? this.props.modular[0].ID : '',
rules: [
@@ -298,7 +298,7 @@
onChange={(value) => {this.voucherChange(value)}}
>
{this.props.modular.map(option =>
- <Select.Option title={option.NameNO} id={option.ID} key={option.ID} value={option.ID}>
+ <Select.Option key={option.ID} value={option.ID}>
{option.NameNO}
</Select.Option>
)}
@@ -340,7 +340,7 @@
filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
>
{this.state.modularDetail.map(option =>
- <Select.Option style={{whiteSpace: 'unset'}} title={option.CodeName} id={option.ModularDetailCode} key={option.ModularDetailCode} value={option.ModularDetailCode}>
+ <Select.Option style={{whiteSpace: 'unset'}} key={option.ModularDetailCode} value={option.ModularDetailCode}>
{option.CodeName}
</Select.Option>
)}
--
Gitblit v1.8.0