Skip to content

S
swifteditor
Commit 7b41f3fa by gq777
Options

Merge branch 'ncb' of https://gitee.com/zeng_hui/swifteditor into ncb

parents f298680e 9ece67fc
Showing with 196 additions and 128 deletions
src/swift/LeadPage.js
......@@ -105,7 +105,7 @@ export class LeadPage extends Component
render:(text,record)=>{
return <a href="javascript:void(0);" onClick={()=>{
this.props.actions.initSwiftMessageTree(null) //清空
this.props.history.push(`swift/edit/${record.mty}`)
this.props.history.push(`swift/edit/${this.props.params.mctid?this.props.params.mctid+'/':''}${record.mty}`)
}
}>Create {record.desp}</a>
}
......
src/swift/MT/MT1000.js
......@@ -9,6 +9,7 @@ const Tags=[
{tag:'26C',status:0,tno:6,letter:[],label:"TEST"},
{tag:'71C',status:0,tno:7,letter:[],label:"TEST"},
{tag:'32F',status:0,tno:8,letter:[],label:"TEST"},
{tag:'37G',status:0,tno:9,letter:[],label:"TEST"},
]
const Title="TEST"
......
src/swift/Result.js
......@@ -37,7 +37,7 @@ const Step = Steps.Step;
// sndkey:this.props.rcv_bic
// }
// }
`smhinr=${this.props.extra.smhinr?this.props.extra.smhinr:''}&sf2msg=${encodeURIComponent(this.props.swift_message)}&datas=${encodeURIComponent(JSON.stringify(datas))}`
`smhinr=${this.props.extra.smhinr?this.props.extra.smhinr:''}&user=${this.props.extra.mctid||"NONE" }&sf2msg=${encodeURIComponent(this.props.swift_message)}`
).then(data=>{
if(typeof data=='string')
{
......
src/swift/SWFPage2.js
......@@ -144,7 +144,7 @@ export class SWFPage extends Component
{
mty='202'
//s119=':119:COV\r\n' 锦州
s119 = '{:119:COV}'
s119 = '{119:COV}'
header3 = `{3:${s119}}`
}
//锦州 message = `:MT:${mty}\r\n:IO:${this.props.rcv_bic_info.rcv_bic}\r\n:II:${this.props.snd_bic_info.snd_bic}\r\n:MP:N\r\n${s119}${gpistr}:EOH:\r\n${message}\r\n-\r\n`
......@@ -403,7 +403,7 @@ export class SWFPage extends Component
:null
}
<TempSaver getTemplateJSON={this.saveTemp} mty={mty} style={{marginRight:'1em',width:'8em'}}/>
<TempSaver getTemplateJSON={this.saveTemp} mty={mty} mctid={this.props.extra.mctid} style={{marginRight:'1em',width:'8em'}}/>
<br/>
<br/>
......@@ -436,7 +436,7 @@ export class SWFPage extends Component
</Col>
<Col span={1} style={{textAlign:'center'}}><span style={{fontWeight:'bolder'}}>{"NO."}</span></Col>
</Row>
<SWFMessage action={this.props.params.action} extra={this.props.extra} enLock={this.props.params.action=='redit'} updateTreeValue={this.props.actions.updateTreeValue} pattern={tags} ref={ref=>this.swfmsg = ref} mty={mty}/>
<SWFMessage action={this.props.params.action} extra={this.props.extra} enLock={false} updateTreeValue={this.props.actions.updateTreeValue} pattern={tags} ref={ref=>this.swfmsg = ref} mty={mty}/>
</Col>
<Col span={3}></Col>
......
src/swift/Tags/T17R.js
......@@ -38,7 +38,7 @@ export default class T17R extends Component {
help={errmsg.s1}
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="L">L</Option>
</Select>
......
src/swift/Tags/T22.js
......@@ -32,7 +32,7 @@ export default class T22 extends Component {
});
let mval = `${obj.s1}${obj.s2}`
let mval = `${obj.s1}/${obj.s2}`
this.props.onValue([obj, mval])
}
......
src/swift/Tags/T22A.js
......@@ -18,7 +18,7 @@ export default class T22A extends Component
onChange=(val)=>{
this.props.onValue([{s1:val},val])
}
render()
{
let value =this.props.value
......@@ -27,6 +27,13 @@ export default class T22A extends Component
let errmsg = value && value.length==3?value[2]:{}
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>
<Col span={5}>
<FormItem
......@@ -41,10 +48,11 @@ export default class T22A extends Component
optionFilterProp="children"
notFoundContent="Wrong Code"
style={{ width: "100%" }} value={value.s1} onChange={val=>this.onChange(val)} >
<Option value="ACNF">ACNF</Option>
<Option value="ADVI">ADVI</Option>
<Option value="ISSU">ISSU</Option>
{
Purpose.map(function (item) {
return <Option value={item} key={item}>{item}</Option>
})
}
</Select>
</FormItem>
</Col>
......
src/swift/Tags/T22B.js
import React,{Component} from 'react'
import React, { Component } from 'react'
import { Form, Input, DatePicker,Row, Col,Button,Icon ,Select} from 'antd';
import { Form, Input, DatePicker, Row, Col, Button, Icon, Select } from 'antd';
import {InputSize,Currency,FormatAmount} from "./Utils"
import { InputSize, Currency, FormatAmount } from "./Utils"
const FormItem = Form.Item;
const Option = Select.Option
export default class T22B extends Component
{
export default class T22B extends Component {
name='22B'
name = '22B'
desp = "Type of Event"
pattern = ""
pattern = " 4!c"
tno = -1
onChange=(val)=>{
this.props.onValue([{s1:val},val])
onChange = (val) => {
this.props.onValue([{ s1: val }, val])
}
render()
{
let value =this.props.value
render() {
let value = this.props.value
let mval = value && value.length? value[1] : ''
let errmsg = value && value.length==3?value[2]:{}
let mval = value && value.length ? value[1] : ''
let errmsg = value && value.length == 3 ? value[2] : {}
value = value && value.length? value[0] : {}
value = value && value.length ? value[0] : {}
let codes = ['ARBA', 'ATVI', 'AUME', 'AUSY', 'BEBR', 'BRSP', 'CAMO', 'CATO', 'CHGE', 'CHZU', 'CLSA', 'CNBE', 'CZPR', 'DECB', 'DEFR', 'DKCO', 'EETA', 'ESMA', 'EUTA', 'FIHE', 'FRPA', 'GBLO', 'GRAT', 'HKHK', 'HUBU', 'IDJA', 'IEDU', 'ILTA', 'INMU', 'ITMI', 'ITRO', 'JPTO', 'KRSE', 'LBBE', 'LKCO', 'LULU', 'MXMC', 'MYKL', 'NLAM', 'NOOS', 'NYFD', 'NYSE', 'NZAU', 'NZWE', 'PAPC', 'PHMA', 'PKKA', 'PLWA', 'PTLI', 'ROBU', 'RUMO', 'SARI', 'SEST', 'SGSI', 'SKBR', 'THBA', 'TRAN', 'TRIS', 'TWTA', 'USCH', 'USGS', 'USLA', 'USNY', 'VNHA', 'ZAJO']
if (this.props.mty == 'mt320' || this.props.mty == 'mt620')
codes = ['CONF', 'MATU', 'ROLL']
return (<Row>
<Col span={5}>
<Col span={5}>
<FormItem
help={errmsg.s1}
validateStatus={errmsg.s1?'error':null}
validateStatus={errmsg.s1 ? 'error' : null}
>
<Select size={InputSize}
placeholder={this.props.desp}
showSearch
allowClear={true}
optionFilterProp="children"
notFoundContent="Wrong Code"
style={{ width: "100%" }} value={value.s1} onChange={val=>this.onChange(val)} >
<Option value="CONF">CONF</Option>
<Option value="MATU">MATU</Option>
<Option value="ROLL">ROLL</Option>
</Select>
<Select size={InputSize}
placeholder={this.props.desp}
showSearch
allowClear={true}
optionFilterProp="children"
notFoundContent="Wrong Code"
style={{ width: "100%" }} value={value.s1} onChange={val => this.onChange(val)} >
{codes.map(function (item) {
return <Option value={item} key={item}>{item}</Option>
})}
</Select>
</FormItem>
</Col>
</Row>)
......
src/swift/Tags/T23/T23_305.js 0 → 100644
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/T23A.js
......@@ -78,7 +78,7 @@ export default class T23A extends Component {
placeholder="Settlement Method"
allowClear={true}
style={{ width: "100%" }} value={value.s2} onChange={val => this.onChange(2, val)} >
<Option value="CROSS">CROSS</Option>
<Option value="GROSS">GROSS</Option>
<Option value="NET">NET</Option>
</Select>
......
src/swift/Tags/T31G.js
......@@ -33,7 +33,7 @@ export default class T31G extends Component {
let mval = "";
mval = `${obj.s1 || ''}${obj.s2 ? `/${obj.s2}` : ''}${obj.s3 ? `/${obj.s3}` : ''}`
this.props.onValue([obj, mval])
}
......@@ -65,85 +65,20 @@ export default class T31G extends Component {
validateStatus={errmsg.s2 ? 'error' : null}
>
<TimePicker defaultValue="" format="HHmm" value={value.s2} onChange={(date, dateString) => this.onChange(2, dateString)} />
<TimePicker defaultValue="" format="HHmm" value={value.s2} onChange={(date, dateString) => this.onChange(2, dateString)} />
</FormItem>
</Col>
<Col span={4}>
<Col span={5}>
<FormItem
label="Location"
required={this.props.status == 'M' || mval ? 'required' : null}
help={errmsg.s3}
validateStatus={errmsg.s3 ? 'error' : null}
>
<Select allowClear={true} value={value.s3} style={{ width: "100%" }} placeholder="Location" onChange={(val) => this.onChange(3, val)}>
<Option value="ARBA">ARBA</Option>
<Option value="ATVI">ATVI</Option>
<Option value="AUME">AUME</Option>
<Option value="AUSY">AUSY</Option>
<Option value="BEBR">BEBR</Option>
<Option value="BRSP">BRSP</Option>
<Option value="CAMO">CAMO</Option>
<Option value="CATO">CATO</Option>
<Option value="CHGE">CHGE</Option>
<Option value="CHZU">CHZU</Option>
<Option value="CLSA">CLSA</Option>
<Option value="CNBE">CNBE</Option>
<Option value="CZPR">CZPR</Option>
<Option value="DECB">DECB</Option>
<Option value="DEFR">DEFR</Option>
<Option value="DKCO">DKCO</Option>
<Option value="EETA">EETA</Option>
<Option value="ESMA">ESMA</Option>
<Option value="EUTA">EUTA</Option>
<Option value="FIHE">FIHE</Option>
<Option value="FRPA">FRPA</Option>
<Option value="GBLO">GBLO</Option>
<Option value="GRAT">GRAT</Option>
<Option value="HKHK">HKHK</Option>
<Option value="HUBU">HUBU</Option>
<Option value="IDJA">IDJA</Option>
<Option value="IEDU">IEDU</Option>
<Option value="ILTA">ILTA</Option>
<Option value="INMU">INMU</Option>
<Option value="ITMI">ITMI</Option>
<Option value="ITRO">ITRO</Option>
<Option value="JPTO">JPTO</Option>
<Option value="KRSE">KRSE</Option>
<Option value="LBBE">LBBE</Option>
<Option value="LKCO">LKCO</Option>
<Option value="LULU">LULU</Option>
<Option value="MXMC">MXMC</Option>
<Option value="MYKL">MYKL</Option>
<Option value="NLAM">NLAM</Option>
<Option value="NOOS">NOOS</Option>
<Option value="NYFD">NYFD</Option>
<Option value="NYSE">NYSE</Option>
<Option value="NZAU">NZAU</Option>
<Option value="NZWE">NZWE</Option>
<Option value="PAPC">PAPC</Option>
<Option value="PHMA">PHMA</Option>
<Option value="PLWA">PLWA</Option>
<Option value="PTLI">PTLI</Option>
<Option value="ROBU">ROBU</Option>
<Option value="RUMO">RUMO</Option>
<Option value="SARI">SARI</Option>
<Option value="SEST">SEST</Option>
<Option value="SGSI">SGSI</Option>
<Option value="SKBR">SKBR</Option>
<Option value="THBA">THBA</Option>
<Option value="TRAN">TRAN</Option>
<Option value="TRIS">TRIS</Option>
<Option value="TWTA">TWTA</Option>
<Option value="USCH">USCH</Option>
<Option value="USGS">USGS</Option>
<Option value="USLA">USLA</Option>
<Option value="USNY">USNY</Option>
<Option value="VNHA">VNHA</Option>
<Option value="ZAJO">ZAJO</Option>
</Select>
<Input value={value.s3} onChange={e => this.onChange(3, e.target.value)} maxLength={12} style={{ imeMode: 'disabled' }} placeholder="Location" />
</FormItem>
</Col>
</Row>)
......
src/swift/Tags/T32F.js
......@@ -30,7 +30,8 @@ export default class T32F extends Component {
this.keys.forEach(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])
}
......@@ -41,6 +42,7 @@ export default class T32F extends Component {
let errmsg = value && value.length == 3 ? value[2] : {}
value = value && value.length ? value[0] : {}
return (<Row>
......@@ -52,7 +54,7 @@ export default class T32F extends Component {
validateStatus={errmsg.s1 ? 'error' : null}
>
<Select allowClear={true} value={value.s1} style={{ width: "100%" }} placeholder="D/C" onChange={(val) => this.onChange(1, val)}>
<Select allowClear={true} value={value.s1} style={{ width: "100%" }} placeholder="Unit" onChange={(val) => this.onChange(1, val)}>
<Option value="FOZ">FOZ</Option>
<Option value="GOZ">GOZ</Option>
<Option value="GRM">GRM</Option>
......
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])
}
......
src/swift/Tags/T37G.js
......@@ -31,9 +31,10 @@ export default class T37G extends Component {
obj['s' + i] = objtemp['s' + i]
});
let mval = `${obj.s1}`
if (obj.s2)
mval = obj.s2 + mval
let temp = FormatAmount(obj.s1);
let mval = `${obj.s2||''}${temp||''}`
this.props.onValue([obj, mval])
}
......
src/swift/Tags/T37M.js
......@@ -31,7 +31,7 @@ export default class T37M extends Component {
obj['s' + i] = objtemp['s' + i]
});
let mval = `${obj.s1}`
let mval = FormatAmount(obj.s1);
if (obj.s2)
mval = obj.s2 + mval
this.props.onValue([obj, mval])
......
src/swift/Tags/T38J.js
......@@ -31,7 +31,7 @@ export default class T38J extends Component {
obj['s' + i] = objtemp['s' + i]
});
let mval = `${obj.s1}${obj.s2}`
let mval = `${obj.s1 || ''}${obj.s|| ''}`
this.props.onValue([obj, mval])
......@@ -68,7 +68,7 @@ export default class T38J extends Component {
help={errmsg.s2}
validateStatus={errmsg.s2 ? 'error' : null}
>
<Input value={value.s1} onChange={e => this.onChange(2, e.target.value)} maxLength={3} style={{ imeMode: 'disabled' }} placeholder="Number" />
<Input value={value.s2} onChange={e => this.onChange(2, e.target.value)} maxLength={3} style={{ imeMode: 'disabled' }} placeholder="Number" />
</FormItem>
</Col>
......
src/swift/Tags/T39M.js
......@@ -28,7 +28,6 @@ export default class T39M extends Component {
return (<Row>
<Col style={{"minWidth":'100px'}} span={5}>
<FormItem
label="Country Code"
required
>
<Select placeholder="Country Code"
......
src/swift/Tags/T61.js
......@@ -73,7 +73,7 @@ export default class T61 extends Component
validateStatus={errmsg.s2?'error':null}
>
<DatePicker defaultValue="" format="yyMM" value={value.s2} onChange={(date, dateString)=>this.onChange(2,dateString)} />
<DatePicker defaultValue="" format="MMdd" value={value.s2} onChange={(date, dateString)=>this.onChange(2,dateString)} />
</FormItem>
</Col>
<Col style={{"minWidth":'100px'}} span={3}>
......
src/swift/TemplateSave.js
......@@ -43,7 +43,7 @@ export default class TemplateSaver extends Component{
this.setState({ loading: true });
//调用模板保存API
let tempJsn = this.props.getTemplateJSON()
let json = {...vals,sf2temp:tempJsn,mty:this.props.mty}
let json = {...vals,sf2temp:tempJsn,mty:this.props.mty,user:this.props.mctid||'NONE'}
console.log(json)
ServiceAPI.saveTemplate(json).then(data=>{
if(typeof data=='string')
......
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