diff --git a/src/swift/SWFPage2.js b/src/swift/SWFPage2.js index 1dde889..ff73b96 100644 --- a/src/swift/SWFPage2.js +++ b/src/swift/SWFPage2.js @@ -64,13 +64,13 @@ export class SWFPage extends Component console.log(item.tag) console.log(item.tagValue) }else{ - if("20" == item.tag && item.tagValue[1] && (/\d9\d/g.test(mty))){ - ServiceAPI.checkOwnref(item.tagValue[1]).then(rtnmsg=>{ - if(rtnmsg.errorCode != "0000"){ - notification.warn({description:'the reference does not exist,please confirm!',message:'Warn'}) - } - }) - } + // if("20" == item.tag && item.tagValue[1] && (/\d9\d/g.test(mty))){ + // ServiceAPI.checkOwnref(item.tagValue[1]).then(rtnmsg=>{ + // if(rtnmsg.errorCode != "0000"){ + // notification.warn({description:'the reference does not exist,please confirm!',message:'Warn'}) + // } + // }) + // } } }else if(item.cyclist) @@ -101,11 +101,11 @@ export class SWFPage extends Component let rcv_bic_err_msg = validateRCV_BIC(this.props.rcv_bic_info.rcv_bic) let snd_bic_err_msg = validateRCV_BIC(this.props.snd_bic_info.snd_bic) - if( rcv_bic_err_msg || crs.hasError) + if(snd_bic_err_msg|| rcv_bic_err_msg || crs.hasError) { //更新整个树 notification.error({description:'There is an error in the input, please check according to the prompt!',message:'Error'}) - this.props.actions.updateSndBic({snd_bic:this.props.snd_bic_info.snd_bic,err_msg:snd_bic_err_msg?snd_bic_err_msg.replace("收","发"):''}) + this.props.actions.updateSndBic({snd_bic:this.props.snd_bic_info.snd_bic,err_msg:snd_bic_err_msg?snd_bic_err_msg.replace("receiving","sending"):''}) this.props.actions.updateRcvBic({rcv_bic:this.props.rcv_bic_info.rcv_bic,err_msg:rcv_bic_err_msg}) this.props.actions.updateTreeValue() //滚动至第一个错误位置 @@ -157,7 +157,7 @@ export class SWFPage extends Component } //锦州 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` //南商 - message = `{1:F01${window.BANK_LOGIC_ADDRESS}0000000000}{2:I${mty}${getLogicAdress(this.props.rcv_bic_info.rcv_bic)}N}${header3}{4:\r\n${message}\r\n-}` + message = `{1:F01${getLogicAdress(this.props.snd_bic_info.snd_bic)}0000000000}{2:I${mty}${getLogicAdress(this.props.rcv_bic_info.rcv_bic)}N}${header3}{4:\r\n${message}\r\n-}` } //console.log(message) this.props.actions.updateSwiftMessage(message) @@ -395,7 +395,7 @@ export class SWFPage extends Component </Col> <Col span={8}> - <SNDBIC flag={true} snd_bic={window.BANK_BIC} err_msg={null} onChange={(val,msg)=>{snd_bic_info.snd_bic=val;snd_bic_info.err_msg=msg}}/> + <SNDBIC flag={false} snd_bic={""} err_msg={snd_bic_info.err_msg} onChange={(val,msg)=>{snd_bic_info.snd_bic=val;snd_bic_info.err_msg=msg}}/> </Col> </Row> <Row style={{}}> diff --git a/src/swift/Tags/T20.js b/src/swift/Tags/T20.js index 78a48e2..fa43385 100644 --- a/src/swift/Tags/T20.js +++ b/src/swift/Tags/T20.js @@ -25,7 +25,7 @@ export default class T20 extends Component let day = new Date() let dayWrapper = moment(day) let mty=this.props.mty.substring(2).substring(0,3) - let ref=''; + let ref="BW"+mty+dayWrapper.format("X")+random.string(1); //console.log("ref-->"+ref) if (this.props.value){