From 88290b40164b2e153a59751445b1879b06a9f170 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 02 一月 2025 16:04:08 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/templates/zshare/verifycard/billcodeform/index.jsx |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/templates/zshare/verifycard/billcodeform/index.jsx b/src/templates/zshare/verifycard/billcodeform/index.jsx
index cff8a6f..bf5c929 100644
--- a/src/templates/zshare/verifycard/billcodeform/index.jsx
+++ b/src/templates/zshare/verifycard/billcodeform/index.jsx
@@ -91,6 +91,7 @@
       }, () => {
         this.props.form.setFieldsValue({
           field: record.field,
+          Type: record.Type || 4,
           TypeCharOne: record.TypeCharOne,
           ModularCode: record.ModularCode,
           ModularDetailCode: _modularDetailCode,
@@ -174,7 +175,7 @@
 
           // 璁剧疆娴佹按鍙蜂綅鏁�
           let _detail = this.state.modularDetail.filter(item => item.ModularDetailCode === values.ModularDetailCode)[0]
-          values.Type = _detail.Type
+          values.Type = values.Type || _detail.Type
         } else {
           let _billField = billFields.filter(item => item.field === values.linkField)[0]
           values.linkFieldName = _billField ? _billField.label : ''
@@ -231,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>
@@ -240,7 +241,7 @@
             </Form.Item>
           </Col>
           <Col span={7}>
-            <Form.Item label={'绫诲瀷'}>
+            <Form.Item label="绫诲瀷">
               {getFieldDecorator('TypeCharOne', {
                 initialValue: 'Lp',
                 rules: [
@@ -260,7 +261,7 @@
             </Form.Item>
           </Col>
           {type === '1' ? <Col span={7}>
-            <Form.Item label={'鍏宠仈瀛楁'}>
+            <Form.Item label="鍏宠仈瀛楁">
               {getFieldDecorator('linkField', {
                 initialValue: '',
                 rules: [
@@ -270,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>
@@ -281,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: [
@@ -297,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>
                   )}
@@ -310,7 +311,7 @@
               淇濆瓨
             </Button>
           </Col>
-          {type === '1' ? <Col span={7}>
+          <Col span={7}>
             <Form.Item label="浣嶆暟">
               {getFieldDecorator('Type', {
                 initialValue: 4,
@@ -322,7 +323,7 @@
                 ]
               })(<InputNumber min={1} max={10} precision={0} onPressEnter={this.handleConfirm}/>)}
             </Form.Item>
-          </Col> : null}
+          </Col>
           {type === '2' ? <Col span={7}>
             <Form.Item label="鍑瘉鏍囪瘑">
               {getFieldDecorator('ModularDetailCode', {
@@ -339,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