Skip to content

P
psbc_remit
Commit 387690f8 by qianyuheng
Options

xiugai

parent 8db4a15a
Showing with 176 additions and 47 deletions
src/service/api/index.js
......@@ -3,8 +3,9 @@ import {withRouter,Link} from 'react-router-dom';
import {Button,Modal,Table,Icon} from 'antd';
import '../../../mock';
//const BASE_URI = "/eIBS/service/"
export const BASE_HOST = "/psbcfront/"
export const BASE_URI=BASE_HOST+"service/";
//export const BASE_HOST = "/psbcfront/"
//export const BASE_URI=BASE_HOST+"service/";
export const BASE_URI="/psbcfront/service/";
export default class Api
......
src/views/Business/Cptadv/views/Basic.js
......@@ -402,8 +402,19 @@ export default class CptadvBasicScreen extends Page {
</Row>
{/*第七行*/}
{/* 四个查询 用public中的组件 */}
<Row>
<Col span={12}>
<Ptspta model={this.model} argArr={{ desc: "收款人", prefix: 'pts', url: 'cptadv/pyep_ptysel', flg: 'C', datakey: '\\cptp\\pyep\\ptslst' }} formBlur={this.formBlur}/>
{/*this.loadPtspta({desc:"收款人",prefix:'pts5',url:'cptopn/pyep_ptysel',flg:'C',datakey:'\\setmod\\msgmod\\pyep\\ptslst'})*/}
</Col>
<Col span={12}>
<Ptspta model={this.model} argArr={{ desc: "汇款人", prefix: 'pts', url: 'cptadv/orcp_ptysel', flg: 'C', datakey: '\\cptp\\orcp\\ptslst' }} formBlur={this.formBlur}/>
</Col>
</Row>
{/*
<Row>
{/* 收款人 */}
<Ptspta
// ref={ref => {
// this.orcp = ref
......@@ -416,7 +427,6 @@ export default class CptadvBasicScreen extends Page {
flg: 'C',
datakey: '\\cptp\\pyep\\ptslst'
}} />
{/* 汇款人 pts1_extkey*/}
<Ptspta
// ref={ref => {
// this.orcp = ref
......@@ -429,7 +439,7 @@ export default class CptadvBasicScreen extends Page {
flg: 'C',
datakey: '\\cptp\\orcp\\ptslst'
}} />
</Row>
</Row>*/}
{/*第八行*/}
<Row >
<Col span={12}>
......@@ -459,9 +469,17 @@ export default class CptadvBasicScreen extends Page {
<Col span={12}>
</Col>
</Row>
{/*第九行*/}
<Row>
<Col span={12}>
<Ptspta model={this.model} argArr={{ desc: "我行账户行", prefix: 'pts', url: 'cptadv/pybp_ptysel', flg: 'B', datakey: '\\cptp\\pybp\\ptslst' }} formBlur={this.formBlur}/>
</Col>
<Col span={12}>
<Ptspta model={this.model} argArr={{ desc: "汇款人账户行", prefix: 'pts', url: 'cptadv/orip_ptysel', flg: 'B', datakey: '\\cptp\\orip\\ptslst' }} formBlur={this.formBlur}/>
</Col>
</Row>
{/*第九行*
<Row>
{/* 我行账户行 pts2_extkey */}
<Ptspta
// ref={ref => {
// this.orcp = ref
......@@ -474,7 +492,6 @@ export default class CptadvBasicScreen extends Page {
flg: 'B',
datakey: '\\cptp\\orip\\ptslst'
}} />
{/* 汇款人账户行 pts3_extkey*/}
<Ptspta
// ref={ref => {
// this.orcp = ref
......@@ -488,6 +505,7 @@ export default class CptadvBasicScreen extends Page {
datakey: '\\cptp\\pybp\\ptslst'
}} />
</Row>
*/}
<Row type="flex" justify="center">
<Col>
<div className='button2'>
......
src/views/Business/Cptopn/descriptor/index.js
......@@ -191,7 +191,7 @@ export default fieldSet = {
],
dcl_tc1amt:[
{type:'string',max:22,message:'长度不能超过22个字符'},
{required:true,message:'请输入相应金额'} // \bopmod\dbbgrp\dcl\tc1amt 相应金额1
// \bopmod\dbbgrp\dcl\tc1amt 相应金额1
],
// dcl_tc2amt:[
// {type:'string',max:22,message:'长度不能超过22个字符'},
......@@ -256,7 +256,7 @@ export default fieldSet = {
// ],
vrf_rptdate:[
// {type:'string',max:12,message:'长度不能超过12个字符'},
{required:true,message:'请选择申报日期'}// \bopmod\dbbgrp\vrf\rptdate 申报日期
// {required:true,message:'请选择申报日期'}// \bopmod\dbbgrp\vrf\rptdate 申报日期
],
vrf_rptno:[
{type:'string',max:22,message:'长度不能超过22个字符'}, // \bopmod\dbbgrp\vrf\rptno 申报号码
......@@ -559,14 +559,14 @@ vrf1_regno:[
],
vrf1_rptdate:[
// {type:'string',max:12,message:'长度不能超过12个字符'},
{required:true,message:'请选择申报日期'} // \bopmod\dbbgrp\dcl\rptdate 申报日期
// {required:true,message:'请选择申报日期'} // \bopmod\dbbgrp\dcl\rptdate 申报日期
],
vrf1_rptno:[
{type:'string',max:22,message:'长度不能超过22个字符'}, // \bopmod\dbbgrp\dcl\rptno 申报号码
],
vrf1_tc1amt:[
{type:'string',max:22,message:'长度不能超过22个字符'},
{required:true,message:'请输入相应金额'} // \bopmod\dbbgrp\dcl\tc1amt 相应金额1
// {required:true,message:'请输入相应金额'} // \bopmod\dbbgrp\dcl\tc1amt 相应金额1
],
vrf1_tc2amt:[
{type:'string',max:22,message:'长度不能超过22个字符'},
......
src/views/Business/Cptopn/model/index.js
......@@ -6,6 +6,12 @@ import {modelWrapper} from '@/components/RunTime'
class Cptopn {
@observable
pts9_extkey="" // \setmod\msgmod\snd\pts\extkey 客户编号
@observable
pts9_adrblk="" // \setmod\msgmod\snd\pts\adrblk SWIFT地址
@observable
pts7_extkey="" // \setmod\msgmod\snd\pts\extkey 客户编号
@observable
......@@ -676,6 +682,12 @@ class Cptopn {
@observable
pts_adrblk="" // \cpdgrp\orc\pts\adrblk SWIFT地址
@observable
pts_namcn="" // \cpdgrp\orc\pts\extkey 客户编号
@observable
pts_adrcn="" // \cpdgrp\orc\pts\adrblk SWIFT地址
@observable
orcacc="" // \cpdgrp\rec\orcacc 付款人账号
......@@ -699,6 +711,8 @@ class Cptopn {
{
this.pts7_extkey=""
this.pts7_adrblk=""
this.pts9_extkey=""
this.pts9_adrblk=""
this.pts3_extkey=""
this.pts3_adrblk=""
this.pts1_extkey=""
......@@ -921,6 +935,8 @@ class Cptopn {
this.f36=""
this.pts_extkey=""
this.pts_adrblk=""
this.pts_namcn=""
this.pts_adrcn=""
this.orcacc=""
this.stacty=""
this.ownbch=""
......
src/views/Business/Cptopn/views/Basic.js
......@@ -12,6 +12,7 @@ import { Row, Col, Popconfirm, Modal ,Spin} from 'antd';
import { PtyPicker } from '@/components/Business-Library'
import { Link, withRouter } from 'react-router-dom'
import Ptspta from '@/views/Public/Ptspta'
import Ptspta1 from '@/views/Public/Ptspta1'
import Business from '@/views/Public/Business'
const { Pre, Next, StepWrapper } = Steps
......@@ -157,6 +158,26 @@ export default class CptopnBasicScreen extends Page {
this.props.steps.go(1)
})
}
onCNYFMT = () => {
switch (this.model.liqtyp) {
case 'FMT':
case 'CIP':
case 'CMT':
return (<Ptspta1 model={this.model} argArr={{ desc: "汇款人", prefix: 'pts', url: 'cptopn/orcp_ptysel', flg: 'C', datakey: '\\cptp\\orcp\\ptslst' }} formBlur={this.formBlur}/>
)
break;
case 'SWT':
case 'ZZT':
return (<Ptspta model={this.model} argArr={{ desc: "汇款人", prefix: 'pts', url: 'cptopn/orcp_ptysel', flg: 'C', datakey: '\\cptp\\orcp\\ptslst' }} formBlur={this.formBlur}/>
)
break;
default:
return (<Ptspta model={this.model} argArr={{ desc: "汇款人", prefix: 'pts', url: 'cptopn/orcp_ptysel', flg: 'C', datakey: '\\cptp\\orcp\\ptslst' }} formBlur={this.formBlur}/>
)
break;
}
}
//交易内实现
renderPage() {
......@@ -345,8 +366,9 @@ export default class CptopnBasicScreen extends Page {
{/* 第八行 */}
<Row>
<Col span={12}>
<Ptspta model={this.model} argArr={{ desc: "汇款人", prefix: 'pts', url: 'cptopn/orcp_ptysel', flg: 'C', datakey: '\\cptp\\orcp\\ptslst' }} formBlur={this.formBlur}/>
{/*this.loadPtspta({desc:"收款人",prefix:'pts5',url:'cptopn/pyep_ptysel',flg:'C',datakey:'\\setmod\\msgmod\\pyep\\ptslst'})*/}
{this.onCNYFMT()}
{/*<Ptspta model={this.model} argArr={{ desc: "汇款人", prefix: 'pts', url: 'cptopn/orcp_ptysel', flg: 'C', datakey: '\\cptp\\orcp\\ptslst' }} formBlur={this.formBlur}/>
this.loadPtspta({desc:"收款人",prefix:'pts5',url:'cptopn/pyep_ptysel',flg:'C',datakey:'\\setmod\\msgmod\\pyep\\ptslst'})*/}
</Col>
<Col span={12}>
<Row className="row">
......
src/views/Business/Cptopn/views/ShenBao.js
......@@ -75,6 +75,7 @@ export default class ShenBaoScreen extends Page {
//人民币申报类型事件
onRmbFlg = async () => {
/*
const rtnmsg = await Api.post(this.props.extra.inifrm + '/rmbmod_rmbflg', { data: this.model })
if (rtnmsg.retcod == SUCCESS) {
// Notification.success({ message: 'cptopn/mtabut/getref数据提交成功!' })
......@@ -89,7 +90,7 @@ export default class ShenBaoScreen extends Page {
}
else {
Notification.error({ message: this.props.extra.inifrm + '/rmbmod_rmbflg服务端请求失败!' })
}
}*/
}
loading = false;
......
src/views/Business/Fetopn/views/Basic.js
......@@ -202,7 +202,9 @@ export default class FetopnBasicScreen extends Page {
<div style={{ position: 'relative' }}>
{/*第一行*/}
<Row >
<Col span={12}>
<Ptspta model={this.model} argArr={{ desc: "结售汇申请人", prefix: 'pts', url: 'fetopn/aplp_ptysel', flg: 'C', datakey: '\\fetp\\aplp\\ptslst' }} />
</Col>
</Row>
{/*第二行*/}
<Row >
......
src/views/Business/Trnrel/views/index2.js
......@@ -258,14 +258,14 @@ export default class TrnrelScreen2 extends Page {
}
else {
if(cortyp == 'SWT')
if(cortyp == 'SWT' || cortyp == 'FMT' || cortyp == 'CMT')
{
let viewurl="/reactremit"+row.docpth;
let viewurl="/psbcfront"+row.docpth;
window.open(viewurl, 'newwindow', 'height=1200,width=800,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
else{
let url = "/reactremit" + row.docpth ;
let viewurl = "/reactremit/pdfjs/web/viewer.html";
let url = "/psbcfront" + row.docpth ;
let viewurl = "/psbcfront/pdfjs/web/viewer.html";
viewurl += "?file=" + url;
window.open(viewurl, 'newwindow', 'height=1200,width=800,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
......
src/views/Home/views/index.js
......@@ -245,6 +245,7 @@ export default class OfficeScreen extends Page {
this.props.UserContext.bchnam = this.model.bch_namcn
this.props.UserContext.usrnam = this.model.usr_dspnam
let bchsta_loginsta = [{ label: "", value: "" },]
if(this.model.syssta_sysdat){
let syssta_sysdat = moment(this.model.syssta_sysdat).format('YYYY-MM-DD')
this.props.UserContext.syssta_sysdat = syssta_sysdat //当前系统日期
......@@ -252,7 +253,7 @@ export default class OfficeScreen extends Page {
if(this.model.bchsta_loginsta!==null){
let bchsta_loginsta = this.logtyp.find(item=>item.value==this.model.bchsta_loginsta)
this.props.UserContext.bchsta_loginsta = bchsta_loginsta.label //机构登陆状态
//this.props.UserContext.bchsta_loginsta = bchsta_loginsta.label //机构登陆状态
}
else
{
......
src/views/Layout/Header.js
......@@ -44,6 +44,10 @@ export default class Header extends Component {
render()
{
return <div>
<div style={{width:700,position:'absolute',fontSize:'1.8em',left:'20px',top:'0.0rem',color:"#fff"}}>
<span>邮储银行国结系统</span>
</div>
{/*
<img src="img/title2.png" style={{width:'12em',position:'relative',left:'-35px' }} />
<div style={{width:700,position:'absolute',left:'300px',top:'0.1rem',color:"#fff"}}>
{this.props.UserContext.bchsta_loginsta!==null ?<span> <span>机构登陆状态：</span><span style={{marginLeft:5}}>{this.props.UserContext.bchsta_loginsta}</span> </span>:null}
......@@ -51,6 +55,7 @@ export default class Header extends Component {
<span style={{marginLeft:30}}>当前系统日期：</span><span style={{marginLeft:5}}>{this.props.UserContext.syssta_sysdat}</span>
<span style={{marginLeft:30}}>当前系统状态：</span><span style={{marginLeft:5}}>{this.props.UserContext.syssta_syssta}</span>
</div>
*/}
<div style={{position:'absolute',right:'2rem',top:'1.3rem',fontSize:'0.9em',color:'#efefef',letterSpacing: "1px"}}>
<span>欢迎您，</span>
<span>{this.props.UserContext.usrnam}</span>
......
src/views/Public/Fmt100.js
......@@ -11,7 +11,7 @@ import { action, observable } from 'mobx'
import { Row, Col, Popconfirm, Modal } from 'antd';
import {Link,withRouter} from 'react-router-dom'
import {PtyPicker} from '@/components/Business-Library'
import Ptspta from '@/views/Public/Ptspta'
import Ptspta1 from '@/views/Public/Ptspta1'
import Business from '@/views/Public/Business'
const {Pre,Next,StepWrapper} = Steps
......@@ -60,11 +60,37 @@ export default class Cmt100Screen extends Page {
return (
<div style={{ position: 'relative' }}>
<Business wrappedComponentRef={ref => (this.com = ref)} steps={this.props.steps} extra={this.props.extra} model={this.model} />
<Row>
<Ptspta ref="pybp" model={this.model} argArr={{desc:"收款人开户行",prefix:'pts4',url:'cptopn/pybp_ptysel',flg:'B',datakey:'\\setmod\\msgmod\\pybp\\ptslst'}} />
<Ptspta ref="pybp" model={this.model} argArr={{desc:"收款人",prefix:'pts5',url:'cptopn/pyep_ptysel',flg:'C',datakey:'\\setmod\\msgmod\\pyep\\ptslst'}} />
</Row>
<Row>
<Row>
<Col span={12}>
<Row className="row">
<Ptspta1 ref="rmtp" model={this.model} argArr={{desc:"接收行",prefix:'pts6',url:'cptopn/rmtp_ptysel',flg:'B',datakey:'\\setmod\\msgmod\\rmtp\\ptslst'}} />
</Row>
</Col>
<Col span={12}>
<Row className="row">
<Ptspta1 ref="pybp" model={this.model} argArr={{desc:"收款人",prefix:'pts5',url:'cptopn/pyep_ptysel',flg:'C',datakey:'\\setmod\\msgmod\\pyep\\ptslst'}} />
</Row>
</Col>
</Row>
<Row>
<Col span={12}>
<Row className="row">
<Ptspta1 ref="pybp" model={this.model} argArr={{desc:"收款人开户行",prefix:'pts4',url:'cptopn/pybp_ptysel',flg:'B',datakey:'\\setmod\\msgmod\\pybp\\ptslst'}} />
</Row>
</Col>
<Col span={12}>
<Row className="row">
<Col span={5} offset={2}>
<Label value="收款人账号" />
</Col>
<Col span={13}>
<InputItem InputProps={bind("pts5_extact")} />
</Col>
</Row>
</Col>
</Row>
<Row>
<Col span={12}>
<Row className="row">
<Col span={5} offset={2}>
......@@ -148,7 +174,7 @@ export default class Cmt100Screen extends Page {
</div>
<div className='button2'>
{/* 检核按钮 */}
<Button onClick={this.onChk}>
<Button type="primary" onClick={this.onChk}>
<Label i18nId="MTABUT_BT000180" />
</Button>
</div>
......
src/views/Public/Mt103.js
......@@ -224,7 +224,7 @@ export default class Mt103Screen extends Page {
</Row>
</Col>
</Row>
{/*
<Row>
<Col span={12}>
<Row className="row">
......@@ -238,6 +238,7 @@ export default class Mt103Screen extends Page {
</Col>
</Row>
*/}
<br />
<Row type="flex" justify="center">
<Col>
......
src/views/Public/Mt202.js
......@@ -60,9 +60,31 @@ export default class Mt202Screen extends Page {
<div style={{ position: 'relative' }}>
<Business wrappedComponentRef={ref => (this.com = ref)} extra={this.props.extra} model={this.model} />
{/* 表格 */}
<Row>
<Ptspta ref="rmtp" model={this.model} argArr={{desc:"收款行账户行（56A）",prefix:'pts6',url:'cptopn/rmtp_ptysel',flg:'B',datakey:'\\setmod\\msgmod\\rmtp\\ptslst'}} />
<Ptspta ref="pybp" model={this.model} argArr={{desc:"收款人开户行（57A）",prefix:'pts4',url:'cptopn/pybp_ptysel',flg:'B',datakey:'\\setmod\\msgmod\\pybp\\ptslst'}} />
<Col span={12}>
<Row className="row">
<Ptspta ref="orip" model={this.model} argArr={{desc:"收报行（我行账户行）",prefix:'pts3',url:'cptopn/orip_ptysel',flg:'B',datakey:'\\setmod\\msgmod\\orip\\ptslst'}} />
</Row>
</Col>
<Col span={12}>
<Row className="row">
<Ptspta ref="medp" model={this.model} argArr={{desc:"收款行（58A）",prefix:'pts2',url:'cptopn/medp_ptysel',flg:'B',datakey:'\\setmod\\msgmod\\medp\\ptslst'}} />
</Row>
</Col>
</Row>
<Row>
<Col span={12}>
<Row className="row">
<Ptspta ref="rmtp" model={this.model} argArr={{desc:"中间行（56A）",prefix:'pts6',url:'cptopn/rmtp_ptysel',flg:'B',datakey:'\\setmod\\msgmod\\rmtp\\ptslst'}} />
</Row>
</Col>
<Col span={12}>
<Row className="row">
<Ptspta ref="pybp" model={this.model} argArr={{desc:"收款行账户行(57A)",prefix:'pts4',url:'cptopn/pybp_ptysel',flg:'B',datakey:'\\setmod\\msgmod\\pybp\\ptslst'}} />
</Row>
</Col>
</Row>
<Row>
......@@ -71,7 +93,7 @@ export default class Mt202Screen extends Page {
<Col span={5} offset={2}>
<Label value="账号" />
</Col>
<Col span={14}>
<Col span={13}>
<InputItem InputProps={bind("pts6_extact")} />
</Col>
</Row>
......@@ -81,22 +103,28 @@ export default class Mt202Screen extends Page {
<Col span={5} offset={2}>
<Label value="账号" />
</Col>
<Col span={14}>
<Col span={13}>
<InputItem InputProps={bind("pts4_extact")} />
</Col>
</Row>
</Col>
</Row>
<Row>
<Ptspta ref="orip" model={this.model} argArr={{desc:"发报行代理行（53A）",prefix:'pts3',url:'cptopn/orip_ptysel',flg:'B',datakey:'\\setmod\\msgmod\\orip\\ptslst'}} />
<Ptspta ref="sndp" model={this.model} argArr={{desc:"收报行",prefix:'pts7',url:'cptopn/sndp_ptysel',flg:'B',datakey:'\\setmod\\msgmod\\sndp\\ptslst'}} />
</Row>
{/*
<Row>
<Ptspta ref="acsp" model={this.model} argArr={{desc:"收报行代理行（54A）",prefix:'pts1',url:'cptopn/acsp_ptysel',flg:'B',datakey:'\\setmod\\msgmod\\acsp\\ptslst'}} />
<Ptspta ref="pyep" model={this.model} argArr={{desc:"收款人（59）",prefix:'pts5',url:'cptopn/pyep_ptysel',flg:'C',datakey:'\\setmod\\msgmod\\pyep\\ptslst'}} />
<Row>
<Col span={12}>
<Row className="row">
<Ptspta ref="acsp" model={this.model} argArr={{desc:"收报行代理行（54A）",prefix:'pts1',url:'cptopn/acsp_ptysel',flg:'B',datakey:'\\setmod\\msgmod\\acsp\\ptslst'}} />
</Row>
</Col>
<Col span={12}>
<Row className="row">
<Ptspta ref="pyep" model={this.model} argArr={{desc:"收款人（59）",prefix:'pts5',url:'cptopn/pyep_ptysel',flg:'C',datakey:'\\setmod\\msgmod\\pyep\\ptslst'}} />
</Row>
</Col>
</Row>
<Row>
<Col span={12}>
<Row className="row">
......@@ -119,19 +147,27 @@ export default class Mt202Screen extends Page {
</Row>
</Col>
</Row>
*/}
<Row>
<Col span={12}>
</Col>
<Col span={12}>
<Row className="row">
<Col span={5} offset={2}>
<Label value="报文附言(72)" />
</Col>
<Col span={14}>
<TextAreaItem rows={4} style={{resize:"none"}} InputProps={bind("msgmod_contag72")} desp="Content of TAG 72" path="/setmod/msgmod/contag72"/>
<Col span={13}>
<TextAreaItem rows={4} style={{resize:"none"}} InputProps={bind("msgmod_tag20272")} desp="Content of TAG 72" path="/setmod/msgmod/msgmod_tag20272"/>
</Col>
</Row>
</Col>
<Col span={12}>
<Row className="row">
<Col span={5} offset={2}>
<Label value="收款行账号" />
</Col>
<Col span={13}>
<InputItem InputProps={bind("pts2_extact")} />
</Col>
</Row>
</Col>
......
src/views/Public/Papper.js
......@@ -51,7 +51,7 @@ export default class PaperScreen extends Page {
// if(errors)
// return
let cortyp = row.cortyp
if (cortyp == 'SWT') {
if (cortyp == 'SWT'|| cortyp == 'FMT' || cortyp == 'CMT') {
this.model.msgmod_doccod = row.id
rtnmsg = await Api.post(this.props.extra.inifrm + '/msgmod_butshw', { data: this.model })
} else {
......@@ -61,7 +61,7 @@ export default class PaperScreen extends Page {
}
if (rtnmsg.retcod == SUCCESS) {
if (cortyp == 'SWT') {
if (cortyp == 'SWT' || cortyp == 'FMT' || cortyp == 'CMT') {
let viewurl = "/psbcfront" + rtnmsg.data.msgmod_docpth;
window.open(viewurl, 'newwindow', 'height=1200,width=800,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
......
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