Commit 16be1fa0 by s_guodong

修改MT760、MT767中24G规则

parent 8fcd5b06
...@@ -352,7 +352,7 @@ T12B:{"s3":{"reg":"[A-Z0-9]{4}","line":1,"length":4,"fixed":true,"type":"c","opt ...@@ -352,7 +352,7 @@ T12B:{"s3":{"reg":"[A-Z0-9]{4}","line":1,"length":4,"fixed":true,"type":"c","opt
T23:{"s1":{"reg":"[\\w/\\-\\?:\\(\\)\\.,\u0027+\\{\\} ]{1,16}","line":1,"length":16,"fixed":false,"type":"x","option":"M"}}, T23:{"s1":{"reg":"[\\w/\\-\\?:\\(\\)\\.,\u0027+\\{\\} ]{1,16}","line":1,"length":16,"fixed":false,"type":"x","option":"M"}},
T24D:{"s1":{"reg":"[A-Z0-9]{4}","line":1,"length":4,"fixed":true,"type":"c","option":"M"},"s2":{"reg":"[\\w/\\-\\?:\\(\\)\\.,\u0027+\\{\\} ]{1,35}","line":1,"length":35,"fixed":false,"type":"x","option":"O"}}, T24D:{"s1":{"reg":"[A-Z0-9]{4}","line":1,"length":4,"fixed":true,"type":"c","option":"M"},"s2":{"reg":"[\\w/\\-\\?:\\(\\)\\.,\u0027+\\{\\} ]{1,35}","line":1,"length":35,"fixed":false,"type":"x","option":"O"}},
T24E:{"s1":{"reg":"[A-Z0-9]{4}","line":1,"length":4,"fixed":true,"type":"c","option":"M"},"s2":{"reg":"[\\w/\\-\\?:\\(\\)\\.,\u0027+\\{\\} ]{1,35}","line":1,"length":35,"fixed":false,"type":"x","option":"O"}}, T24E:{"s1":{"reg":"[A-Z0-9]{4}","line":1,"length":4,"fixed":true,"type":"c","option":"M"},"s2":{"reg":"[\\w/\\-\\?:\\(\\)\\.,\u0027+\\{\\} ]{1,35}","line":1,"length":35,"fixed":false,"type":"x","option":"O"}},
T24G:{"s1":{"reg":"[A-Z0-9]{4}","line":1,"length":4,"fixed":true,"type":"c","option":"M"},"s2":{"reg":"[\\w/\\-\\?:\\(\\)\\.,\u0027+\\{\\} ]{0,35}","line":6,"length":35,"fixed":false,"type":"x","option":"O"}}, T24G:{"s1":{"reg":"[A-Z0-9]{4}","line":1,"length":4,"fixed":true,"type":"c","option":"M"},"s2":{"reg":"[\\w\\.,\\-\\(\\)/\u003d\u0027\\+:\\?!\"%\u0026\\*\\\u003c\\\u003e;\\{\\s@#]{0,65}","line":12,"length":65,"fixed":false,"type":"z","option":"O"}},
T12C:{"s1":{"reg":"[A-Z0-9]{4}","line":1,"length":4,"fixed":true,"type":"c","option":"M"},"s2":{"reg":"[A-Z0-9]{6}","line":1,"length":6,"fixed":true,"type":"c","option":"M"}}, T12C:{"s1":{"reg":"[A-Z0-9]{4}","line":1,"length":4,"fixed":true,"type":"c","option":"M"},"s2":{"reg":"[A-Z0-9]{6}","line":1,"length":6,"fixed":true,"type":"c","option":"M"}},
T36E:{"s3":{"reg":"[\\d,]{1,15}","line":1,"length":15,"fixed":true,"type":"FUNC","content":"NUMBER","option":"M"},"s1":{"reg":"[A-Z0-9]{4}","line":1,"length":4,"fixed":true,"type":"c","option":"M"},"s2":{"reg":"[A-Z0-9]{4}","line":1,"length":4,"fixed":true,"type":"c","option":"M"}}, T36E:{"s3":{"reg":"[\\d,]{1,15}","line":1,"length":15,"fixed":true,"type":"FUNC","content":"NUMBER","option":"M"},"s1":{"reg":"[A-Z0-9]{4}","line":1,"length":4,"fixed":true,"type":"c","option":"M"},"s2":{"reg":"[A-Z0-9]{4}","line":1,"length":4,"fixed":true,"type":"c","option":"M"}},
T12D:{"s1":{"reg":"[A-Z0-9]{4}","line":1,"length":4,"fixed":true,"type":"c","option":"M"}}, T12D:{"s1":{"reg":"[A-Z0-9]{4}","line":1,"length":4,"fixed":true,"type":"c","option":"M"}},
......
...@@ -12,7 +12,7 @@ export default class T24G extends Component ...@@ -12,7 +12,7 @@ export default class T24G extends Component
name='24G' name='24G'
desp = "Delivery To/Collection By" desp = "Delivery To/Collection By"
pattern = "" pattern = ""
tno = -1 tno = -1
...@@ -24,7 +24,7 @@ export default class T24G extends Component ...@@ -24,7 +24,7 @@ export default class T24G extends Component
if(!value) if(!value)
value = "" value = ""
let objtemp =this.props.value let objtemp =this.props.value
objtemp = objtemp && objtemp.length? objtemp[0] : {} objtemp = objtemp && objtemp.length? objtemp[0] : {}
objtemp["s"+index] = value; objtemp["s"+index] = value;
...@@ -32,14 +32,14 @@ export default class T24G extends Component ...@@ -32,14 +32,14 @@ export default class T24G extends Component
this.keys.forEach(i=>{ this.keys.forEach(i=>{
obj['s'+i] = objtemp['s'+i] obj['s'+i] = objtemp['s'+i]
}); });
let mval = "" let mval = ""
if(obj.s1) if(obj.s1)
mval = obj.s1 mval = obj.s1
if(obj.s2) if(obj.s2)
mval = mval +'\r\n' + obj.s2 mval = mval +'\r\n' + obj.s2
this.props.onValue([obj,mval]) this.props.onValue([obj,mval])
} }
...@@ -64,29 +64,29 @@ export default class T24G extends Component ...@@ -64,29 +64,29 @@ export default class T24G extends Component
> >
<Col span={10}> <Col span={10}>
<Select allowClear={true} size={InputSize} defaultValue={''} style={{ width: "100%" }} placeholder="Code" value={value.s1} onChange={(val)=>this.onChange(1,val)}> <Select allowClear={true} size={InputSize} defaultValue={''} style={{ width: "100%" }} placeholder="Code" value={value.s1} onChange={(val)=>this.onChange(1,val)}>
<Option value="BENE">BENE-Beneficiary</Option> <Option value="BENE">BENE-Beneficiary</Option>
<Option value="OTHR">OTHR-Specified address</Option> <Option value="OTHR">OTHR-Specified address</Option>
</Select> </Select>
</Col> </Col>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
<Row> <Row>
<Col> <Col>
<FormItem <FormItem
label="Name and Address" label="Narrative"
help={errmsg.s2} help={errmsg.s2}
validateStatus={errmsg.s2?'error':null} validateStatus={errmsg.s2?'error':null}
> >
<TextArea rows={6} cols={35} type= "textarea" maxLength={210} style={{imeMode:'disabled'}} placeholder="Name and Address" value={value.s2} onChange={(e)=>this.onChange(2,e.target.value)}/> <TextArea rows={12} cols={65} type= "textarea" maxLength={780} style={{imeMode:'disabled'}} placeholder="Narrative" value={value.s2} onChange={(e)=>this.onChange(2,e.target.value)}/>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
</div> </div>
) )
} }
} }
\ No newline at end of file
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