更新T23域

src/swift/Tags/T23/T23_305.js

+import React,{Component} from 'react'
+
+import { Form, Input, DatePicker,Row, Col,Button,Icon ,Select,TimePicker} from 'antd';
+import {InputSize,Currency,FormatAmount} from "../Utils"
+
+const FormItem = Form.Item;
+const Option = Select.Option
+export default class T23 extends Component
+{
+
+    name='23'
+    desp = "(Code 1)(Code 2)(Code 3)(Currency)"
+    pattern = "4a/4a/1!a/3!a"
+    tno = -1
+    keys = [1,2,3,4]
+
+
+    onChange=(index,value)=>
+    {
+        let obj = {};
+        if(!value)
+            value = ""
+        let objtemp =this.props.value
+        
+        objtemp = objtemp && objtemp.length? objtemp[0] : {}
+
+        objtemp["s"+index] = value;
+
+        this.keys.forEach(i=>{
+            obj['s'+i] = objtemp['s'+i]
+        });
+        let mval = `${obj.s1||''}${obj.s2||''}${obj.s3||''}${obj.s4||''}`
+        this.props.onValue([obj,mval])
+    }
+
+    render()
+    {
+        let value =this.props.value
+
+        let mval = value && value.length? value[1] : ''
+        let errmsg = value && value.length==3?value[2]:{}
+
+        value = value && value.length? value[0] : {}
+
+        return (<Row>
+            {/*<Col span={1} style={{textAlign:'center'}}><h3 style={{display:'inline-block'}}>/</h3></Col>*/}
+            <Col style={{"minWidth":'100px'}} span={3}>
+                <FormItem
+                    label="Code 1" 
+                    required={this.props.status=='M' || mval?'required':null}
+                    help={errmsg.s1} 
+                    validateStatus={errmsg.s1?'error':null}
+                >
+                        <Select allowClear={true} ref="s1" value={value.s1}  placeholder="Code" style={{ width: "100%" }} onChange={val=>this.onChange(1,val)}>
+                                        <Option  value="BUY">BUY</Option>
+                                        <Option  value="SELL">SELL</Option>
+
+                        </Select>
+                </FormItem>
+            </Col>
+            {/*<Col span={1} style={{textAlign:'center'}}><h3 style={{display:'inline-block'}}>/</h3></Col>*/}
+            <Col style={{"minWidth":'100px'}} span={3}>
+                <FormItem
+                    label="Code 2" 
+                    required={this.props.status=='M' || mval?'required':null}
+                    help={errmsg.s2}
+                    validateStatus={errmsg.s2?'error':null}
+                >
+                        <Select allowClear={true} ref="s1" value={value.s2}  placeholder="Code" style={{ width: "100%" }} onChange={val=>this.onChange(2,val)}>
+                                        <Option  value="CALL">CALL</Option>
+                                        <Option  value="PUT">PUT</Option>
+
+                        </Select>               
+                         </FormItem>
+            </Col>
+            <Col style={{"minWidth":'80px'}} span={3}>
+                <FormItem
+                    label="Code 3" 
+                    required={this.props.status=='M' || mval?'required':null}
+                    help={errmsg.s3}
+                    validateStatus={errmsg.s3?'error':null}
+                >
+                                    <Select allowClear={true} ref="s3" value={value.s3}  placeholder="Sign" style={{ width: "100%" }} onChange={val=>this.onChange(3,val)}>
+                                        <Option  value="A">A</Option>
+                                        <Option  value="E">E</Option>
+                                    </Select>
+                </FormItem>
+            </Col>
+            <Col style={{"minWidth":'100px'}} span={6}>
+                <FormItem
+                    label="Currency" 
+                    required={this.props.status=='M' || mval?'required':null}
+                    help={errmsg.s4}
+                    validateStatus={errmsg.s4?'error':null}
+                >
+                         <Select  
+                           placeholder="Currency"
+                           showSearch
+                           
+                           allowClear={true}
+                            optionFilterProp="children"
+                            notFoundContent="Wrong Code"
+                            style={{ width: "100%" }} value={value.s4} onChange={val=>this.onChange(4,val)} >
+                                {
+                                   Currency.map(cur=><Option key={cur} value={cur}>{cur}</Option>) 
+                                }
+                            </Select>               
+                             </FormItem>
+            </Col>
+        </Row>)
+    }
+}
\ No newline at end of file

src/swift/Tags/T23/index.js

@@ -2,12 +2,14 @@ import React,{Component} from 'react'
 
 import T23_d from './T23'
 import T23_1 from './T23_1'
+import T23_305 from './T23_305'
 
 const mtys1 = ['mt752']
 const code1 = ["ACCEPT","DEBIT","NEGOTIATE","REIMBURSE","REMITTED","SEE79Z"]
 
 const mtys2 = ['mt760','mt767']
 const code2 = ["ISSUE","REQUEST"]
+const code3 = ["DELIVERY","TRANSFER"]
 
 export default function(props)
 {
@@ -16,5 +18,9 @@ export default function(props)
         return <T23_1 {...props} SELCode={code1} />
     if(mty== 'mt760' || mty == 'mt767')
         return <T23_1 {...props} SELCode={code2} />
+    if(mty== 'mt305')
+        return <T23_305 {...props}  />
+        if(mty== 'mt605')
+        return <T23_1 {...props} SELCode={code3} />
     return <T23_d {...props} />
 } 
\ No newline at end of file

src/swift/Tags/T34R.js

@@ -32,9 +32,9 @@ export default class T34R extends Component
         this.keys.forEach(i=>{
             obj['s'+i] = objtemp['s'+i]
         });
-        let temp = FormatAmount(obj.s2);
+        let temp = FormatAmount(obj.s3);
         
-        let mval = `${obj.s1}${temp}${obj.s3}`.replace(/\//g,'')
+        let mval = `${obj.s1}${obj.s2}${temp}`.replace(/\//g,'')
         this.props.onValue([obj,mval])
     }