Commit 047dfa94 by snail

更新T17R,T22A,T32F,调整index。js域顺序 以大小排序

parent ea84be7f
...@@ -38,7 +38,7 @@ export default class T17R extends Component { ...@@ -38,7 +38,7 @@ export default class T17R extends Component {
help={errmsg.s1} help={errmsg.s1}
validateStatus={errmsg.s1 ? 'error' : null} validateStatus={errmsg.s1 ? 'error' : null}
> >
<Select allowClear={true} value={value.s1} style={{ width: "100%" }} placeholder="N/Y" onChange={(val) => this.onChange(1, val)}> <Select allowClear={true} value={value.s1} style={{ width: "100%" }} placeholder="B/L" onChange={(val) => this.onChange(1, val)}>
<Option value="B">B</Option> <Option value="B">B</Option>
<Option value="L">L</Option> <Option value="L">L</Option>
</Select> </Select>
......
...@@ -18,7 +18,7 @@ export default class T22A extends Component ...@@ -18,7 +18,7 @@ export default class T22A extends Component
onChange=(val)=>{ onChange=(val)=>{
this.props.onValue([{s1:val},val]) this.props.onValue([{s1:val},val])
} }
render() render()
{ {
let value =this.props.value let value =this.props.value
...@@ -27,6 +27,13 @@ export default class T22A extends Component ...@@ -27,6 +27,13 @@ export default class T22A extends Component
let errmsg = value && value.length==3?value[2]:{} let errmsg = value && value.length==3?value[2]:{}
value = value && value.length? value[0] : {} value = value && value.length? value[0] : {}
let Purpose = ['ACNF','ADVI','ISSU']
if(this.props.mty == 'mt300')
Purpose = ['AMND','CANC','DUPL','EXOP','NEWT']
if(this.props.mty == 'mt306')
Purpose = ['AMND','CANC','NEWT']
if(this.props.mty == 'mt320' || this.props.mty == 'mt360' || this.props.mty == 'mt620')
Purpose = ['AMND','CANC','DUPL','NEWT']
return (<Row> return (<Row>
<Col span={5}> <Col span={5}>
<FormItem <FormItem
...@@ -41,10 +48,11 @@ export default class T22A extends Component ...@@ -41,10 +48,11 @@ export default class T22A extends Component
optionFilterProp="children" optionFilterProp="children"
notFoundContent="Wrong Code" notFoundContent="Wrong Code"
style={{ width: "100%" }} value={value.s1} onChange={val=>this.onChange(val)} > style={{ width: "100%" }} value={value.s1} onChange={val=>this.onChange(val)} >
<Option value="ACNF">ACNF</Option> {
<Option value="ADVI">ADVI</Option> Purpose.map(function (item) {
<Option value="ISSU">ISSU</Option> return <Option value={item} key={item}>{item}</Option>
})
}
</Select> </Select>
</FormItem> </FormItem>
</Col> </Col>
......
...@@ -30,7 +30,8 @@ export default class T32F extends Component { ...@@ -30,7 +30,8 @@ export default class T32F extends Component {
this.keys.forEach(i => { this.keys.forEach(i => {
obj['s' + i] = objtemp['s' + i] obj['s' + i] = objtemp['s' + i]
}); });
let mval = `${obj.s1 || ''}${obj.s2 || ''}` let temp = FormatAmount(obj.s2);
let mval = `${obj.s1 || ''}${temp || ''}`
this.props.onValue([obj, mval]) this.props.onValue([obj, mval])
} }
...@@ -41,6 +42,7 @@ export default class T32F extends Component { ...@@ -41,6 +42,7 @@ export default class T32F extends Component {
let errmsg = value && value.length == 3 ? value[2] : {} let errmsg = value && value.length == 3 ? value[2] : {}
value = value && value.length ? value[0] : {} value = value && value.length ? value[0] : {}
return (<Row> return (<Row>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment