xiugai

src/service/api/index.js

@@ -3,7 +3,7 @@ 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_HOST = "/psbcfront/"
 //export const BASE_URI=BASE_HOST+"service/";
 export const BASE_URI="/psbcfront/service/";
 

src/views/Business/Cptadv/model/index.js

@@ -6,7 +6,7 @@ import {modelWrapper} from '@/components/RunTime'
 class Cptadv {
     
     @observable
-    branchinr=""           // \cpdgrp\rec\branchinr    所属机构 
+    ownbch=""           // \cpdgrp\rec\ownbch    所属机构 
 
     @observable
     cpdflg=""           // \cpdgrp\rec\cpdflg    汇款类型 

src/views/Business/Cptadv/views/index.js

@@ -42,7 +42,7 @@ export default class CptadvScreen extends Page {
 		let sptinr = '';
 		let rtnmsg = [];
 		if (this.props.location.query) {
-			sptinr = this.props.location.query.inr
+			sptinr = this.props.location.query.sptinr
 			this.extra.sptinr = sptinr
 			rtnmsg = await Api.post(this.extra.inifrm + '/init', { params: { sptinr } })
 		} else {
@@ -50,7 +50,7 @@ export default class CptadvScreen extends Page {
 		}
 		if (rtnmsg.retcod == SUCCESS) {
 			Object.assign(this.model, rtnmsg.data)
-			this.extra.bchlevelLst = rtnmsg.codetable.branchinr;
+			this.extra.bchlevelLst = rtnmsg.codetable.ownbch;
 			this.extra.stactyLst = rtnmsg.codetable.stacty;
 			this.extra.bopmod_szflg = rtnmsg.codetable.bopmod_szflg;
 			this.setState({ flag: false })

src/views/Business/Cptopn/views/Basic.js

 import React, { Component, Fragment } from 'react'
 import {
-	Page, Validator, Notification, FormItem,
+	Page, Validator, Notification, FormItem,BottomBtn,
 	InputItem, Input, Bind, SelectItem, Button, Label, DatePickerItem, Section, ConfirmButton, Steps
 } from '@/components/Common-Library'
 import Api from '@/service/api'
@@ -14,11 +14,9 @@ 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
 const CodeTable = CodeTableFactory.getInstance()
 const confirm = Modal.confirm
-
 @withRouter
 @inject('UserContext')
 @inject('i18n')
@@ -53,7 +51,7 @@ export default class CptopnBasicScreen extends Page {
 		}
 		//余下逻辑处理
 	}
-	// 退出按钮
+	/*退出按钮
 	onRtn = async () => {
 		this.com.wrappedInstance.wrappedInstance.onRtn();
 	}
@@ -66,6 +64,47 @@ export default class CptopnBasicScreen extends Page {
 		this.formBlur=true
 		this.com.wrappedInstance.wrappedInstance.onChk();
 	}
+	async onRecal() {
+		this.formBlur = true  //已触发表单提交处理
+		const rtnmsg = await Api.post(this.props.extra.inifrm + '/setmod_ast', { data: this.model })
+		if (rtnmsg.retcod == SUCCESS) {
+			this.model.fegmod_feslst = rtnmsg.data.fegmod_feslst;
+			this.model.glgmod_glslst = rtnmsg.data.glgmod_glslst;
+		}
+		else {
+			Notification.error({ message: '服务端请求失败!' })
+		}
+		//余下逻辑处理
+	}
+	async onRecal1() {
+		this.formBlur = true  //已触发表单提交处理
+		const rtnmsg = await Api.post(this.props.extra.inifrm + '/setmod_recal', { data: this.model })
+		if (rtnmsg.retcod == SUCCESS) {
+			this.model.fegmod_feslst = rtnmsg.data.fegmod_feslst;
+			this.model.glgmod_glslst = rtnmsg.data.glgmod_glslst;
+		}
+		else {
+			Notification.error({ message: '服务端请求失败!' })
+		}
+		//余下逻辑处理
+	}	
+	
+	goNext = () => {
+		this.formBlur = true  //已触发表单提交处理
+		Validator.validate(this.model, this.model.descriptor, (errors, values) => {
+			if (!errors) {
+				this.props.steps.go(1)
+				this.onRecal()
+				return
+			}
+			for (let item of errors) {
+				if (this.bindSet.has(item.field))
+					return;
+			}
+			this.props.steps.go(1)
+		})
+	}
+	*/
 	
 	//清算路径
 	onLiqtyp = () => {
@@ -91,31 +130,6 @@ export default class CptopnBasicScreen extends Page {
 		/>)
 
 	}
-
-	async onRecal() {
-		this.formBlur = true  //已触发表单提交处理
-		const rtnmsg = await Api.post(this.props.extra.inifrm + '/setmod_ast', { data: this.model })
-		if (rtnmsg.retcod == SUCCESS) {
-			this.model.fegmod_feslst = rtnmsg.data.fegmod_feslst;
-			this.model.glgmod_glslst = rtnmsg.data.glgmod_glslst;
-		}
-		else {
-			Notification.error({ message: '服务端请求失败!' })
-		}
-		//余下逻辑处理
-	}
-	async onRecal1() {
-		this.formBlur = true  //已触发表单提交处理
-		const rtnmsg = await Api.post(this.props.extra.inifrm + '/setmod_recal', { data: this.model })
-		if (rtnmsg.retcod == SUCCESS) {
-			this.model.fegmod_feslst = rtnmsg.data.fegmod_feslst;
-			this.model.glgmod_glslst = rtnmsg.data.glgmod_glslst;
-		}
-		else {
-			Notification.error({ message: '服务端请求失败!' })
-		}
-		//余下逻辑处理
-	}
 	//报文类型 
 	onSwftyp = () => {
 		const swfcod = {
@@ -142,23 +156,6 @@ export default class CptopnBasicScreen extends Page {
 			//<SelectItem InputProps={{...this.bind("swftyp"),disabled: ( !liqtyp||liqtyp=='ZZT')}}  code={swfcod[liqtyp]}   />
 		)
 	}
-
-	goNext = () => {
-		this.formBlur = true  //已触发表单提交处理
-		Validator.validate(this.model, this.model.descriptor, (errors, values) => {
-			if (!errors) {
-				this.props.steps.go(1)
-				this.onRecal()
-				return
-			}
-			for (let item of errors) {
-				if (this.bindSet.has(item.field))
-					return;
-			}
-			this.props.steps.go(1)
-		})
-	}
-	
 	onCNYFMT = () => {		
 		switch (this.model.liqtyp) {
 			case 'FMT':
@@ -382,19 +379,13 @@ export default class CptopnBasicScreen extends Page {
 						</Row>
 					</Col>
 				</Row>
-				{/* 第九行 */}
-
-
-
-				{/* 第十一行 */}
 				{/*<Row>
 				     {this.loadPtspta({desc:"我行账户行",prefix:'pts3',url:'cptopn/orip_ptysel',flg:'B',datakey:'\\setmod\\msgmod\\orip\\ptslst'})}
 					 {this.loadPtspta({desc:"收款人",    prefix:'pts4',url:'cptopn/pybp_ptysel',flg:'B',datakey:'\\setmod\\msgmod\\pybp\\ptslst'})}
-				</Row>*/}
+				</Row>
 				<Row type="flex" justify="center">
 					<Col>
-							<div className='button2'>
-								{/* 退出按钮 */}
+							<div type="primary" className='button2'>
 								<ConfirmButton
 									onOK={this.onRtn}
 									title=""
@@ -403,8 +394,7 @@ export default class CptopnBasicScreen extends Page {
 									<Label i18nId="MTABUT_BT000464" />
 								</ConfirmButton>
 							</div>
-							<div className='button2'>
-								{/* 暂存按钮 */}
+							<div type="primary" className='button2'>
 								<ConfirmButton
 									onOK={this.onPed}
 									title=""
@@ -414,13 +404,13 @@ export default class CptopnBasicScreen extends Page {
 								</ConfirmButton>
 							</div>
 							<div className='button2'>
-								{/* 检核按钮 */}
 								<Button type="primary" onClick={this.onChk}>
 									<Label i18nId="MTABUT_BT000180" />
 								</Button>
 							</div>
 					</Col>
-				</Row>
+				</Row>*/}
+				{/* */}<BottomBtn _this={this} />
 			</div >
 		)
 	}

src/views/Public/Ptspta.js

@@ -88,6 +88,24 @@ export default class PtsptaScreen extends Component {
 			this.model[this.props.argArr.prefix + '_adrblk'] = dataResult.join("\n");
 		}
 	}
+	
+	clearTxt=()=>{
+		let prefix = this.props.argArr.prefix
+		if(this.model[prefix + '_extkey']==''){
+			this.model[prefix + '_namcn']=''
+			this.model[prefix + '_adrcn']=''
+			this.model[prefix + '_adrblk']=''
+		}
+	}
+
+	childEvevnt = childData => {
+		this.child = childData;
+	}
+
+	handleClick=()=>{
+		this.child.handleClick();
+   }
+   
 	render() {
 		const bind = this.bind
 		const { argArr } = this.props
@@ -104,10 +122,12 @@ export default class PtsptaScreen extends Component {
 						<Label value={desc} />
 					</Col>
 					<Col span={11} >
-						<InputItem InputProps={bind(prefix + '_extkey')} disabled={isDisabled} />
+					    <InputItem InputProps={{...bind(prefix + '_extkey'),onAfterChange:this.clearTxt,onPressEnter:this.handleClick,formBlur:this.props.formBlur}} disabled={this.props.isDisabled} />
 					</Col>
 					<Col span={4} offset={1}>
-						<PtyPicker url={url} flg={flg} model={this.model} extkey={this.model[prefix + '_extkey']} dataKey={datakey} prefix={prefix} disabled={isDisabled} />
+					    <PtyPicker url={url} flg={flg} model={this.model} extkey={this.model[prefix + '_extkey']} dataKey={datakey} prefix={prefix} disabled={this.props.isDisabled} extkey={this.model[prefix + '_extkey']} childEvevnt={this.childEvevnt} />
+                      
+					  {/*<PtyPicker url={url} flg={flg} model={this.model} extkey={this.model[prefix + '_extkey']} dataKey={datakey} prefix={prefix} disabled={isDisabled} />*/}
 					</Col>
 				</Row>
 				<Row className="row">