Commit 7adca95b by zenghuan

Merge remote-tracking branch 'origin/develop' into develop

parents 59cd969b 644b6d60
...@@ -4,45 +4,46 @@ export default class Fxdgrp { ...@@ -4,45 +4,46 @@ export default class Fxdgrp {
constructor() { constructor() {
this.data = { this.data = {
rec: { rec: {
ownref: "", // 结售汇业务参考号 .fxtp.fxdgrp.rec.ownref ownref: "", // 结售汇业务参考号 fxdgrp.rec.ownref
nam: "", // 名称 .fxtp.fxdgrp.rec.nam nam: "", // 名称 fxdgrp.rec.nam
fxtyp: "", // 结售汇类型 .fxtp.fxdgrp.rec.fxtyp fxtyp: "", // 结售汇类型 fxdgrp.rec.fxtyp
opndat: "", // 登记日期 .fxtp.fxdgrp.rec.opndat opndat: "", // 登记日期 fxdgrp.rec.opndat
valdat: "", // 起息日 .fxtp.fxdgrp.rec.valdat valdat: "", // 起息日 fxdgrp.rec.valdat
rat: "", // 对外牌价 .fxtp.fxdgrp.rec.rat rat: 0.000000, // 对外牌价 fxdgrp.rec.rat
midrat: "", // 中间价 .fxtp.fxdgrp.rec.midrat midrat: 0.000000, // 中间价 fxdgrp.rec.midrat
quoref: "", // 询价编号 .fxtp.fxdgrp.rec.quoref quoref: "", // 询价编号 fxdgrp.rec.quoref
fudref: "", // 资金部编号 .fxtp.fxdgrp.rec.fudref fudref: "", // 资金部编号 fxdgrp.rec.fudref
setdat: "", // 远期交割日 .fxtp.fxdgrp.rec.setdat setdat: "", // 远期交割日 fxdgrp.rec.setdat
setdatfrm: "", // 择期交割起始日 .fxtp.fxdgrp.rec.setdatfrm setdatfrm: "", // 择期交割起始日 fxdgrp.rec.setdatfrm
setdatto: "", // 择期交割截止日 .fxtp.fxdgrp.rec.setdatto setdatto: "", // 择期交割截止日 fxdgrp.rec.setdatto
trnman: "", // 交易主体 .fxtp.fxdgrp.rec.trnman trnman: "", // 交易主体 fxdgrp.rec.trnman
trdint: "", // 结售汇类型 .fxtp.fxdgrp.rec.trdint trdint: "", // 结售汇类型 fxdgrp.rec.trdint
trdout: "", // 结售汇类型 .fxtp.fxdgrp.rec.trdout trdout: "", // 结售汇类型 fxdgrp.rec.trdout
acc: "", // 外币结算账号 .fxtp.fxdgrp.rec.acc acc: "", // 外币结算账号 fxdgrp.rec.acc
acc2: "", // 本币结算账号 .fxtp.fxdgrp.rec.acc2 acc2: "", // 本币结算账号 fxdgrp.rec.acc2
dsp: "", // 外币结算账号 .fxtp.fxdgrp.rec.dsp dsp: "", // 外币结算账号 fxdgrp.rec.dsp
dsp2: "", // 本币结算账号 .fxtp.fxdgrp.rec.dsp2 dsp2: "", // 本币结算账号 fxdgrp.rec.dsp2
usr: "", // 业务经办人 fxdgrp.rec.usr
}, },
blk: { blk: {
remark: "", // 备注 .fxtp.fxdgrp.blk.remark remark: "", // 备注 fxdgrp.blk.remark
}, },
cbs: { cbs: {
max: { max: {
cur: "", // Currency .fxtp.fxdgrp.cbs.max.cur cur: "", // Currency fxdgrp.cbs.max.cur
amt: "", // Balance .fxtp.fxdgrp.cbs.max.amt amt: 0.00, // Balance fxdgrp.cbs.max.amt
}, },
nom1: { nom1: {
cur: "", // Currency .fxtp.fxdgrp.cbs.nom1.cur cur: "", // Currency fxdgrp.cbs.nom1.cur
amt: "", // Balance .fxtp.fxdgrp.cbs.nom1.amt amt: 0.00, // Balance fxdgrp.cbs.nom1.amt
}, },
opn1: { opn1: {
cur: "", // Currency .fxtp.fxdgrp.cbs.nom1.cur cur: "", // Currency fxdgrp.cbs.nom1.cur
amt: "", // Balance .fxtp.fxdgrp.cbs.nom1.amt amt: 0.00, // Balance fxdgrp.cbs.nom1.amt
}, },
opn2: { opn2: {
cur: "", // Currency .fxtp.fxdgrp.cbs.nom1.cur cur: "", // Currency fxdgrp.cbs.nom1.cur
amt: "", // Balance .fxtp.fxdgrp.cbs.nom1.amt amt: 0.00, // Balance fxdgrp.cbs.nom1.amt
}, },
}, },
apl: { apl: {
......
...@@ -24,7 +24,7 @@ export default { ...@@ -24,7 +24,7 @@ export default {
this.load = true; this.load = true;
let rtnmsg = await Api.post("/gjzf/msgsel/query", { let rtnmsg = await Api.post("/gjzf/msgsel/query", {
...this.model.rcvp, ...this.model.rcvp,
dir: "<", dir: ">",
pageNum: this.pagination.pageNum, pageNum: this.pagination.pageNum,
pageSize: this.pagination.pageSize, pageSize: this.pagination.pageSize,
rcvdatsta: moment(rcvdatsta).format("YYYY-MM-DD"), rcvdatsta: moment(rcvdatsta).format("YYYY-MM-DD"),
......
...@@ -24,7 +24,7 @@ export default { ...@@ -24,7 +24,7 @@ export default {
this.load = true; this.load = true;
let rtnmsg = await Api.post("/gjzf/msgsel/query", { let rtnmsg = await Api.post("/gjzf/msgsel/query", {
...this.model.sndp, ...this.model.sndp,
dir: ">", dir: "<",
pageNum: this.pagination.pageNum, pageNum: this.pagination.pageNum,
pageSize: this.pagination.pageSize, pageSize: this.pagination.pageSize,
rcvdatsta: moment(rcvdatsta).format("YYYY-MM-DD"), rcvdatsta: moment(rcvdatsta).format("YYYY-MM-DD"),
......
...@@ -21,16 +21,16 @@ export default { ...@@ -21,16 +21,16 @@ export default {
}; };
}, },
buildCommonData(model, trnName) { buildCommonData(model, trnName) {
let ptsptaList = Utils.formatPtspta(model.fxtp.fxdgrp, this.buildPtspta); let ptsptaList = Utils.formatPtspta(model.fxdgrp, this.buildPtspta);
return { return {
rec: { rec: {
objtyp: "FXT", objtyp: "FXT",
objinr: model.fxtp.fxdgrp.rec.inr, objinr: model.fxdgrp.rec.inr,
ownref: model.fxtp.fxdgrp.rec.ownref, ownref: model.fxdgrp.rec.ownref,
}, },
cbsMap: { cbsMap: {
MAX: model.fxtp.fxdgrp.cbs.max, MAX: model.fxdgrp.cbs.max,
NOM1: model.fxtp.fxdgrp.cbs.nom1, NOM1: model.fxdgrp.cbs.nom1,
}, },
ptsList: ptsptaList, ptsList: ptsptaList,
transName: trnName, transName: trnName,
......
...@@ -5,7 +5,45 @@ export default { ...@@ -5,7 +5,45 @@ export default {
mixins: [commonFunctions], mixins: [commonFunctions],
methods: { methods: {
async getOwnref() { async getOwnref() {
if (this.model.fxdgrp.rec.fxtyp == "") {
this.$notify.warning({
title: '提示',
message: '请先选择结售汇类型!'
});
return;
}
const loading = this.loading();
let res = await Api.post(`/${this.moduleRouter()}/fxtssb/getRef`, this.model);
loading.close();
if (res.respCode !== SUCCESS) {
this.$message.error(res.respMsg);
return;
}
this.model.fxdgrp.rec.ownref = res.data;
},
async defaultAccountsN1000() {
if (this.model.fxdgrp.rec.fxtyp == "") {
return;
}
if (this.model.fxdgrp.cbs.max.cur == "") {
return;
}
if (this.model.fxdgrp.apl.pts.ptyinr == "") {
return;
}
const loading = this.loading();
let res = await Api.post(`/${this.moduleRouter()}/fxtssb/defaultAccountsN1000`, this.model);
loading.close();
if (res.respCode !== SUCCESS) {
this.$message.error(res.respMsg);
return;
} }
// this.updateValueSet(res.codeSet);
this.model.accLst = res.codeSet['accLst'];
this.model.accLst2 = res.codeSet['acc2Lst'];
this.model.fxdgrp.rec.acc = res.data.fxdgrp.rec.acc;
this.model.fxdgrp.rec.acc2 = res.data.fxdgrp.rec.acc2;
},
} }
} }
\ No newline at end of file
export default { export default {
"fxtp.fxdgrp.rec.ownref":[ "fxdgrp.rec.ownref": [
{type: "string", required: false, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 16,message:"长度不能超过16"} {max: 16, message: "长度不能超过16"}
], ],
"fxdgrp.rec.nam": [
"fxtp.fxdgrp.rec.nam":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 40,message:"长度不能超过40"} {max: 40, message: "长度不能超过40"}
], ],
"fxtp.fxdgrp.apl.pts.ref":[ "fxdgrp.apl.pts.ref": [
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 20,message:"长度不能超过20"} {max: 20, message: "长度不能超过20"}
], ],
"fxtp.usrget.usr.extkey":[ "fxdgrp.rec.usr": [
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 8,message:"长度不能超过8"} {max: 8, message: "长度不能超过8"}
], ],
"fxtp.usrget.sdamod.seainf":[ "fxdgrp.apl.pts.extkey": [
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"} {max: 16, message: "长度不能超过16"}
], ],
"fxtp.aplp.ptsget.sdamod.dadsnd":[ "fxdgrp.apl.pts.adrblk": [
{type: "string", required: false, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 16,message:"长度不能超过16"} {max: 35, message: "长度不能超过35"}
], ],
"fxtp.aplp.ptspta.pts.extkey":[ "fxdgrp.cbs.max.amt": [
{type: "string", required: false, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 16,message:"长度不能超过16"} {max: 18, message: "整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位"}
], ],
"fxtp.aplp.ptsget.sdamod.seainf":[ "fxdgrp.cbs.nom1.amt": [
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"} {max: 18, message: "整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位"}
], ],
"fxdgrp.rec.rat": [
"fxtp.aplp.ptspta.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"fxtp.aplp.ptspta.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"fxtp.fxdgrp.cbs.max.amt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"fxtp.fxdgrp.cbs.nom1.amt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"fxtp.fxdgrp.rec.rat":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 12,message:"长度不能超过12"} {max: 12, message: "长度不能超过12"}
], ],
"fxtp.fxdgrp.rec.quoref":[ "fxdgrp.rec.quoref": [
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"} {max: 16, message: "长度不能超过16"}
], ],
"fxtp.fxdgrp.rec.midrat":[ "fxdgrp.rec.midrat": [
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 12,message:"长度不能超过12"} {max: 12, message: "长度不能超过12"}
], ],
"fxdgrp.rec.fudref": [
"fxtp.fxdgrp.rec.fudref":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"} {max: 16, message: "长度不能超过16"}
], ],
"fxtp.fxdgrp.rec.opndat":[ "fxdgrp.rec.opndat": [
{type: "date", required: false, message: "输入正确的日期"} {type: "date", required: true, message: "输入正确的日期"}
], ],
"fxtp.fxdgrp.rec.valdat":[ "fxdgrp.rec.valdat": [
{type: "date", required: false, message: "输入正确的日期"} {type: "date", required: true, message: "输入正确的日期"}
], ],
"fxtp.fxdgrp.rec.setdat":[ "fxdgrp.rec.setdat": [
{type: "date", required: false, message: "输入正确的日期"} {type: "date", required: false, message: "输入正确的日期"}
], ],
"fxtp.fxdgrp.rec.setdatto":[ "fxdgrp.rec.setdatto": [
{type: "date", required: false, message: "输入正确的日期"} {type: "date", required: false, message: "输入正确的日期"}
], ],
"fxtp.fxdgrp.rec.setdatfrm":[ "fxdgrp.rec.setdatfrm": [
{type: "date", required: false, message: "输入正确的日期"} {type: "date", required: false, message: "输入正确的日期"}
], ],
"fxtp.fxdgrp.blk.remark":[ "fxdgrp.blk.remark": [
{type: "string", required: false, message: "必输项"},
{max: 35, message: "长度不能超过35"}
],
"fxdgrp.rec.dsp": [
{type: "string", required: true, message: "必输项"},
{max: 2, message: "长度不能超过2"}
],
"fxdgrp.rec.dsp2": [
{type: "string", required: true, message: "必输项"},
{max: 2, message: "长度不能超过2"}
],
"fxdgrp.rec.acc": [
{type: "string", required: true, message: "必输项"},
{max: 21, message: "长度不能超过21"}
],
"fxdgrp.rec.acc2": [
{type: "string", required: true, message: "必输项"},
{max: 21, message: "长度不能超过21"}
],
"fxdgrp.rec.trnman": [
{type: "string", required: true, message: "必输项"},
{max: 2, message: "长度不能超过2"}
],
"fxdgrp.rec.trdint": [
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 3, message: "长度不能超过3"}
], ],
} }
\ No newline at end of file
import Api from "~/service/Api"
import Pts from "~/page/Model/Common/Pts"
import Pub from "~/components/business/commonModel/index.js"; import Pub from "~/components/business/commonModel/index.js";
import Fxdgrp from '~/components/business/commonModel/fxdgrp';
export default class Fxtssb { export default class Fxtssb {
constructor() { constructor() {
this.data = { this.data = {
fxtp: { fxtp: {
fxdgrp: {
rec: {
ownref: "", // 结售汇业务参考号 .fxtp.fxdgrp.rec.ownref
nam: "", // 名称 .fxtp.fxdgrp.rec.nam
fxtyp: "", // 结售汇类型 .fxtp.fxdgrp.rec.fxtyp
opndat: "", // 登记日期 .fxtp.fxdgrp.rec.opndat
valdat: "", // 起息日 .fxtp.fxdgrp.rec.valdat
rat: "", // 对外牌价 .fxtp.fxdgrp.rec.rat
midrat: "", // 中间价 .fxtp.fxdgrp.rec.midrat
quoref: "", // 询价编号 .fxtp.fxdgrp.rec.quoref
fudref: "", // 资金部编号 .fxtp.fxdgrp.rec.fudref
setdat: "", // 远期交割日 .fxtp.fxdgrp.rec.setdat
setdatfrm: "", // 择期交割起始日 .fxtp.fxdgrp.rec.setdatfrm
setdatto: "", // 择期交割截止日 .fxtp.fxdgrp.rec.setdatto
trnman: "", // 交易主体 .fxtp.fxdgrp.rec.trnman
trdint: "", // 结售汇类型 .fxtp.fxdgrp.rec.trdint
trdout: "", // 结售汇类型 .fxtp.fxdgrp.rec.trdout
acc: "", // 外币结算账号 .fxtp.fxdgrp.rec.acc
acc2: "", // 本币结算账号 .fxtp.fxdgrp.rec.acc2
dsp: "", // 外币结算账号 .fxtp.fxdgrp.rec.dsp
dsp2: "", // 本币结算账号 .fxtp.fxdgrp.rec.dsp2
},
cbs: {
max: {
cur: "", // Currency .fxtp.fxdgrp.cbs.max.cur
amt: "", // Balance .fxtp.fxdgrp.cbs.max.amt
},
nom1: {
cur: "", // Currency .fxtp.fxdgrp.cbs.nom1.cur
amt: "", // Balance .fxtp.fxdgrp.cbs.nom1.amt
},
},
apl: {
pts: new Pts().data,
},
blk: {
remark: "", // 备注 .fxtp.fxdgrp.blk.remark
},
},
amtlab: "", // Amount Label .fxtp.amtlab amtlab: "", // Amount Label .fxtp.amtlab
cnylab: "", // Amount LabelCNY .fxtp.cnylab cnylab: "", // Amount LabelCNY .fxtp.cnylab
frgchk: "", // 外币 .fxtp.frgchk frgchk: "", // 外币 .fxtp.frgchk
cnychk: "", // 人民币 .fxtp.cnychk cnychk: "", // 人民币 .fxtp.cnychk
aplp: {
ptspta: {
pts: new Pts().data,
dbfadrblkcn: "", // Chinese address .fxtp.aplp.ptspta.dbfadrblkcn
},
ptsget: {
sdamod: {
seainf: "", // .fxtp.aplp.ptsget.sdamod.seainf
dadsnd: "", // Drag Drop Sender .fxtp.aplp.ptsget.sdamod.dadsnd
},
},
},
cshflg: "", // 钞汇标志 .fxtp.cshflg cshflg: "", // 钞汇标志 .fxtp.cshflg
usrget: {
sdamod: {
seainf: "", // .fxtp.usrget.sdamod.seainf
},
usr: {
extkey: "", // User ID .fxtp.usrget.usr.extkey
},
},
},
fxdgrp: {
apl: {
pts: new Pts().data,
},
}, },
fxdgrp: new Fxdgrp().data,
setmod: new Pub().data.Setmod, setmod: new Pub().data.Setmod,
docpan: new Pub().data.Docpan, docpan: new Pub().data.Docpan,
trndia: new Pub().data.Trndia, trndia: new Pub().data.Trndia,
......
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