修改传参

src/swift/Result.js

@@ -29,7 +29,7 @@ const Step = Steps.Step;
             datas.F21=tags[1].tagValue[1]
         let tempStr = JSON.stringify(window.templateObject)
         let argdata = {
-            smhinr:this.props.extra.smhinr||'',
+            mpsinr:this.props.extra.smhinr||'',
             user:this.props.extra.mctid||"NONE",
             sf2msg:this.props.swift_message,
             msgtre:tempStr,

src/swift/SWFPage2.js

@@ -28,7 +28,7 @@ const Option = Select.Option;
 
 const Step = Steps.Step;
 
-const random = new Random(); 
+const random = new Random();
 
 const formItemLayout = {
       labelCol: { span: 6 },
@@ -37,14 +37,14 @@ const formItemLayout = {
 
 export  class SWFPage extends Component
 {
-    
+
     constructor(props)
     {
         super(props)
         this.state = {rcv_bic:props.rcv_bic,rcv_bic_msg:''}
     }
-    
-    
+
+
     onSave=()=>{
         let msg = []
         this.swfmsg.getValue(msg)
@@ -76,7 +76,7 @@ export  class SWFPage extends Component
                     //     })
                     // }
                 }
-                
+
             }else if(item.cyclist)
             {
                 for(let cyc of item.cycs)
@@ -124,14 +124,14 @@ export  class SWFPage extends Component
                     obj.scrollIntoView()
                 }
             },100)
-            return 
+            return
         }
         //做整体关联检查
         let wholeErrorMessage = MessageValidater(this.props.extra.msgtyp,swift_message_tree)
         if(wholeErrorMessage)
         {
             notification.error({description:'There is an error in the input, please check according to the prompt!',message:wholeErrorMessage})
-            return 
+            return
         }
         this.joinMessage(tags,arr)
         let message = arr.join('\r\n').replace(/[\r\n]{1,2}/g,'\r\n')
@@ -165,14 +165,14 @@ export  class SWFPage extends Component
              header3 = `{3:${s119}{108:${ref}}}`
          }else{
             header3 = `{3:{108:${ref}}}`
-         }   
+         }
         //锦州  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${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)
-        
+
         let flag = (this.props.params.rcvbic && this.props.params.rcvbic!='NONE') || this.props.params.action=='redit'
 
         // if(this.props.extra.countMap)
@@ -183,7 +183,7 @@ export  class SWFPage extends Component
 
         if(flag)
             this.props.history.push("preview/0")
-        else 
+        else
             this.props.history.push("preview/1")
     }
     sendToArxan(){
@@ -210,7 +210,7 @@ export  class SWFPage extends Component
                         arr.push(`:${item.tag}:`)
                     }
                 }
-                
+
                 if(!item.tagValue)
                     continue
                 if(typeof item.tagValue =='string' && item.tagValue)
@@ -234,7 +234,7 @@ export  class SWFPage extends Component
     }
     reload =(flag)=>{
 
-            
+
             let tempinr = this.props.params.key
             ServiceAPI.getTemplate(tempinr).then(data=>{
                 if(typeof data=='string')
@@ -242,7 +242,7 @@ export  class SWFPage extends Component
                     data = JSON.parse(data)
                 }
                 if(data.errorCode !== '0000')
-                    return 
+                    return
                 data = data.data
                 if(typeof data=='string')
                 {
@@ -252,7 +252,7 @@ export  class SWFPage extends Component
                 this.props.extra.msgtyp="mt"+this.mty
                 if(data.txt)
                     data = data.txt
-                
+
                 if(typeof data=='string')
                 {
                     data = JSON.parse(data)
@@ -264,6 +264,7 @@ export  class SWFPage extends Component
                     tree = JSON.parse(tree)
                     tree = JSON.parse(tree.sf2temp).swift_message_tree
                 }
+                this.props.extra.smhinr=tempinr
                 this.props.actions.initSwiftMessageTree(tree);
             }).catch(err=>{
                 console.log(err)
@@ -271,13 +272,13 @@ export  class SWFPage extends Component
 
 
             // ServiceAPI.getSMH(smhinr).then(data=>{
-                
+
             //     if(typeof data=='string')
             //     {
             //         data = JSON.parse(data)
             //     }
             //     if(data.errorCode !== '0000')
-            //         return 
+            //         return
             //     data = data.data
             //     if(typeof data=='string')
             //     {
@@ -310,7 +311,7 @@ export  class SWFPage extends Component
     }
     componentWillMount()
     {
-        
+
         let action = this.props.params.action
         let mctid  = this.props.params.mctid
         this.props.extra.mctid = mctid
@@ -324,8 +325,8 @@ export  class SWFPage extends Component
 
         if(action == 'edit')
         {
-            
-            
+
+
             let mty = this.props.params.key;
             mty = mty.toLowerCase()
             if(mty.substring(0,2)!='mt')
@@ -345,14 +346,14 @@ export  class SWFPage extends Component
                 this.isdirect= true;
                 if(!this.props.swift_message_tree)
                     this.props.actions.updateRcvBic({rcv_bic:rcvbic})
-                
+
             }
             let sndbic = this.props.params.sndbic
             if(!sndbic || sndbic != 'NONE')
             {
                 if(!this.props.swift_message_tree)
                     this.props.actions.updateSndBic({snd_bic:sndbic})
-                
+
             }
             this.isdirect = false
         }
@@ -364,11 +365,11 @@ export  class SWFPage extends Component
                 return ; //已经拥有编辑树
             this.reload(1)
         }
-        
-        
+
+
     }
     render()
-    {   
+    {
         const {swift_message,rcv_bic_info,snd_bic_info,swift_message_tree} = this.props
         if(!swift_message_tree)
         {
@@ -405,7 +406,7 @@ export  class SWFPage extends Component
                         <Col span={3}>
                         </Col>
                         <Col span={8}>
-                       
+
                         <SNDBIC  flag={false} snd_bic={snd_bic_info.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>
@@ -441,11 +442,11 @@ export  class SWFPage extends Component
                                     </div>
                                     :null
                                     }
-                                    
-                                        {/* <TempSaver getTemplateJSON={this.saveTemp} mty={mty} mctid={this.props.extra.mctid} style={{marginRight:'1em',width:'8em'}}/> 
+
+                                        {/* <TempSaver getTemplateJSON={this.saveTemp} mty={mty} mctid={this.props.extra.mctid} style={{marginRight:'1em',width:'8em'}}/>
                                         <br/>
                                         <br/> */}
-                                   
+
                                     {
                                     !this.isdirect?
                                     <Popconfirm placement="topLeft" title={"The edited content will be lost. Are you sure to return?"} onConfirm={()=>this.props.history.goBack()}>
@@ -517,7 +518,7 @@ function validateRCV_BIC(val)
     let err_msg = ""
         if(!val)
             err_msg ='Please fill in the BIC of the receiving bank'
-        else if(!/^[A-Z]{4}[A-Z]{2}[A-Z0-9]{2}([A-Z0-9]{3})?$/.test(val)) 
+        else if(!/^[A-Z]{4}[A-Z]{2}[A-Z0-9]{2}([A-Z0-9]{3})?$/.test(val))
         {
             err_msg ='Please fill in the correct BIC'
         }
@@ -532,9 +533,9 @@ class SNDBIC extends Component{
     }
     onChange = val=>{
         if((!val && !this.state.snd_bic) || val == this.state.snd_bic)
-            return 
+            return
         let err_msg = validateRCV_BIC(val)
-        
+
         this.props.onChange(val,err_msg)
         this.setState({snd_bic:val,err_msg})
     }
@@ -544,7 +545,7 @@ class SNDBIC extends Component{
     }
     render()
     {
-       return (<FormItem 
+       return (<FormItem
         help={this.state.err_msg}
         validateStatus={this.state.err_msg?'error':null}
        label="Sending bank BIC" required {...formItemLayout}>
@@ -559,7 +560,7 @@ class SNDBIC extends Component{
 }
 
 class RCVBIC extends Component{
-    
+
     constructor(props)
     {
         super(props)
@@ -567,9 +568,9 @@ class RCVBIC extends Component{
     }
     onChange = val=>{
         if((!val && !this.state.rcv_bic) || val == this.state.rcv_bic)
-            return 
+            return
         let err_msg = validateRCV_BIC(val)
-        
+
         this.props.onChange(val,err_msg)
         this.setState({rcv_bic:val,err_msg})
     }
@@ -579,7 +580,7 @@ class RCVBIC extends Component{
     }
     render()
     {
-       return (<FormItem 
+       return (<FormItem
         help={this.state.err_msg}
         validateStatus={this.state.err_msg?'error':null}
        label="Receiving bank BIC" required {...formItemLayout}>
@@ -599,17 +600,17 @@ export  class MessageArea extends Component{
     isEnd=false
     name = ""
     cells=[]
-    
+
     constructor(props)
     {
         super(props)
     }
-    
+
     output(buff)
     {
        // this.cells=[] //清空成员
         const fields = this.props.pattern
-        return ( 
+        return (
            <div>
                {
                     fields.map((item,index)=>{
@@ -664,7 +665,7 @@ export  class SWFMessage extends MessageArea
         this.type = MESSAGE
     }
 
-    
+
     render()
     {
         return this.output()
@@ -685,7 +686,7 @@ export  class CYCList extends MessageArea
     addItem=()=>{
         let subtree = this.props.pattern
         let obj = this.clonePO(subtree.pattern)
-        subtree.cycs.push(obj) 
+        subtree.cycs.push(obj)
         //subtree.cycs = [...subtree.cycs]
         //通知刷新
         this.props.updateTreeValue()
@@ -703,7 +704,7 @@ export  class CYCList extends MessageArea
     }
     getValue(arr)
     {
-        
+
         for(let cell of this.cells)
             cell.getValue(arr)
     }
@@ -717,7 +718,7 @@ export  class CYCList extends MessageArea
                             <Button onClick={this.addItem} size="small" type="primary"  shape="circle" icon="retweet" title="Add Cycle"/>
                         </Col>
                         <Col>
-                            <p><span style={{fontWeight:'bolder',fontSize:'1.5em'}}>-----></span></p> 
+                            <p><span style={{fontWeight:'bolder',fontSize:'1.5em'}}>-----></span></p>
                         </Col>
                     </Row>
                     {
@@ -739,11 +740,11 @@ export  class CYCList extends MessageArea
                     </Row>
                 </div>
         )
-    } 
+    }
     render()
     {
         return this.output()
-    }   
+    }
 }
 
 export  class Cyc extends MessageArea
@@ -753,16 +754,16 @@ export  class Cyc extends MessageArea
         super(props)
         this.type = CYC
     }
-    
+
     output()
     {
         return (
                 <div>
-                   
+
                     {
                         super.output()
                     }
-                    
+
                 </div>
         )
     }
@@ -784,11 +785,11 @@ export  class Seq extends MessageArea
     {
         return (
                 <div>
-                   
+
                     {
                         super.output()
                     }
-                    
+
                 </div>
         )
     }
@@ -796,7 +797,7 @@ export  class Seq extends MessageArea
     {
         return this.output()
     }
-    
+
 }
 
 export  class SEQList extends MessageArea
@@ -810,12 +811,12 @@ export  class SEQList extends MessageArea
     addItem=()=>{
         let subtree = this.props.pattern
         let obj = this.clonePO(subtree.pattern)
-        subtree.seqs.push(obj) 
-        
+        subtree.seqs.push(obj)
+
         this.props.updateTreeValue()
     }
     removeItem=(index)=>{
-        
+
         let subtree = this.props.pattern
         subtree.seqs.splice(index,1)
         //通知刷新
@@ -824,7 +825,7 @@ export  class SEQList extends MessageArea
     }
     getValue(arr)
     {
-        
+
         for(let cell of this.cells)
             cell.getValue(arr)
     }
@@ -845,7 +846,7 @@ export  class SEQList extends MessageArea
                         <Col>
                             <p style={{fontWeight:'bolder',fontSize:'1.5em'}}>
                                <span>{subtree.desp}</span>
-                            </p> 
+                            </p>
                         </Col>
                     </Row>
                     {
@@ -867,11 +868,11 @@ export  class SEQList extends MessageArea
                     </Row>
                 </div>
         )
-    } 
+    }
     render()
     {
         return this.output()
-    }   
+    }
 }
 
 
@@ -971,7 +972,7 @@ export  class Tag extends MessageArea
                                countMap[key]++
                        }
                    }
-                  
+
                 }
 
                 TagV("T"+this.props.pattern.tag,status,val,this.props.pattern.tno,this.props.mty,this.props.seqlist,this.props.extra.countMap)
@@ -981,7 +982,7 @@ export  class Tag extends MessageArea
             )
         if(!comp)
             return null;
-        
+
         return comp
     }
     render()
@@ -993,7 +994,7 @@ export  class Tag extends MessageArea
                 {/*<Col span={2} style={{marginTop:'0.6em'}}><span style={{fontWeight:'bolder'}}>{pattern.status}</span></Col>*/}
                 <Col span={3} style={{marginTop:'0.6em',position:'relative'}}>
                        {
-                       pattern.status=='M'?    
+                       pattern.status=='M'?
                        <h3 style={{color:'#fc561f',position:'absolute',left :'-0.5em'}}>*</h3>
                        :null
                        }
@@ -1028,4 +1029,4 @@ export  class Tag extends MessageArea
         obj.value = this.tagValue;
         arr.push(obj)
     }
-}
+}
\ No newline at end of file