Skip to content

I
isc-web-vue
Commit 45bf0ea6 by 李少勇
Options

Merge branch 'develop' of http://114.115.138.98:8900/isc-v3.1/isc-web-vue into develop

parents 8eae094b 0844be95
Showing with 376 additions and 387 deletions
src/page/Frontend/Batdis/event/index.js
......@@ -5,32 +5,36 @@ export default {
mixins: [commonFunctions],
methods: {
// 双击
async dbClickRow(row) {
let rtnmsg = await Api.post("/frontend/oftsel/dblclick", {
async dbClickRow (row) {
let rtnmsg = await Api.post("/frontend/batdis/dblclick", {
objtyp: row.objtyp,
smdinr: row.objinr,
objinr: row.objinr,
});
console.log(rtnmsg)
if (rtnmsg.respCode == SUCCESS) {
this.routerPush({
path: '/business/msgdtl',
query: {
mpsinr: rtnmsg.mpsinr
mpsinr: rtnmsg.data.mpsinr
}
})
}
},
// 详情
async toDetails(row) {
let rtnmsg = await Api.post("/frontend/oftsel/display", {
inr: row.inr
async toDetails () {
console.log(this.model.batgrp.dotlst)
console.log(this.model.batgrp.dotlst[0].inr)
let rtnmsg = await Api.post("/frontend/batdis/display", {
inr: this.model.batgrp.dotlst[0].inr
});
if (rtnmsg.respCode == SUCCESS) {
this.detailsInfo = rtnmsg.data;
this.detailsInfo = rtnmsg.data.batgrp.doelst;
this.$refs.infoShow.visible = true;
}
},
// 取消关联
toCancelRelate(row) {
toCancelRelate (row) {
console.log(row)
if (row.objtyp == 'smd') {
this.$notify.error({
title: '错误',
......@@ -45,6 +49,7 @@ export default {
});
return;
}
console.log("row:" + row.inr)
this.routerPush({
path: '/business/offrel',
query: {
......
src/page/Frontend/Batdis/views/Batdis.vue
......@@ -40,17 +40,17 @@
<c-col :span="12" style="padding-left: 20px">
<c-col :span="24">
<el-form-item label="状态" prop="batgrp.dot.sta">
<c-input type="text" v-model="model.batgrp.dot.sta"></c-input>
<c-select type="text" v-model="model.batgrp.dot.sta" :code="codes.zfqzsta"></c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="记帐状态" prop="batgrp.dot.recsta">
<c-input type="text" v-model="model.batgrp.dot.recsta"></c-input>
<c-select type="text" v-model="model.batgrp.dot.recsta" :code="codes.recsta"></c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="勾销标志" prop="batgrp.dot.offsta">
<c-input type="text" v-model="model.batgrp.dot.offsta"></c-input>
<c-select type="text" v-model="model.batgrp.dot.offsta" :code="codes.offsta"></c-select>
</el-form-item>
</c-col>
<c-col :span="24">
......@@ -66,6 +66,10 @@
</c-col>
</c-col>
<el-col :span="24" style="margin-top: 2px;margin-bottom: 1px;">
<c-button style="margin-left: 0" type='primary' size="medium" @click="toDetails()">详情</c-button>
</el-col>
<c-col :span="24">
<div class="e-table-wrapper">
<el-table
......@@ -131,7 +135,7 @@
</el-table-column>
<el-table-column fixed="right" label="操作" width="240px">
<template slot-scope="scope">
<c-button style="margin-left: 0" type='text' size="small" @click="toDetails(scope.row)">详情</c-button>
<!-- <c-button style="margin-left: 0" type='text' size="small" @click="toDetails(scope.row)">详情</c-button> -->
<c-button style="margin-left: 0" type='text' size="small" @click="toCancelRelate(scope.row)">取消关联</c-button>
</template>
</el-table-column>
......
src/page/Frontend/Batdis/views/index.vue
......@@ -60,16 +60,19 @@ export default {
traname1: ''
};
const rtnmsg = await Api.post(`/${this.moduleRouter()}/${this.trnName}/init`, params);
console.log(rtnmsg);
console.log(rtnmsg.respCode === SUCCESS);
if (rtnmsg.respCode === SUCCESS) {
Utils.copyValueFromVoData(this.model.batgrp, rtnmsg.data);
Utils.copyValueFromVoData(this.model.batgrp, rtnmsg.data.batgrp);
console.log(this.model.batgrp)
}
this.model.batgrp.dotlst = [
{
rsptim: '1',
valdat: '1',
ownref: '1',
}
]
// this.model.batgrp.dotlst = [
// {
// rsptim: '1',
// valdat: '1',
// ownref: '1',
// }
// ]
}
}
</script>
......
src/page/Frontend/Offrel/event/index.js
......@@ -4,8 +4,8 @@ import Api from '~/service/Api';
export default {
mixins: [commonFunctions],
methods: {
async toSubmit() {
let rtnmsg = await Api.post("/frontend/oftsel/sav", this.model);
async toSubmit () {
let rtnmsg = await Api.post("/frontend/offrel/sav", this.model);
if (rtnmsg.respCode == SUCCESS) {
this.$notify.success({
title: '成功',
......
src/page/Frontend/Offrel/views/Offrel.vue
......@@ -37,12 +37,12 @@
</c-col>
<c-col :span="24">
<el-form-item label="状态" prop="oftgrp.dot.sta">
<c-input type="text" v-model="model.oftgrp.dot.sta"></c-input>
<c-select type="text" v-model="model.oftgrp.dot.sta" :code="codes.zfqzsta"></c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="勾销标志" prop="oftgrp.dot.offsta">
<c-input type="text" v-model="model.oftgrp.dot.offsta"></c-input>
<c-select type="text" v-model="model.oftgrp.dot.offsta" :code="codes.offsta" ></c-select>
</el-form-item>
</c-col>
</c-col>
......@@ -55,12 +55,12 @@
</c-col>
<c-col :span="24">
<el-form-item label="关联类型" prop="oftgrp.dot.objtyp">
<c-input type="text" v-model="model.oftgrp.dot.objtyp"></c-input>
<c-select type="text" v-model="model.oftgrp.dot.objtyp" :code="codes.dottyp"></c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="记帐状态" prop="oftgrp.dot.recsta">
<c-input type="text" v-model="model.oftgrp.dot.recsta"></c-input>
<c-select type="text" v-model="model.oftgrp.dot.recsta" :code="codes.recsta"></c-select>
</el-form-item>
</c-col>
<c-col :span="24">
......
src/page/Frontend/Offrel/views/index.vue
......@@ -64,11 +64,13 @@ export default {
created: async function () {
console.log("进入offrel交易");
let params = {
inr: this.$route.query.inr || "",
dotinr: this.$route.query.inr || "",
};
console.log(params)
const rtnmsg = await Api.post(`/${this.moduleRouter()}/${this.trnName}/init`, params);
console.log(rtnmsg)
if (rtnmsg.respCode === SUCCESS) {
Utils.copyValueFromVoData(this.model.oftgrp, rtnmsg.data);
Utils.copyValueFromVoData(this.model.oftgrp, rtnmsg.data.oftgrp);
}
}
}
......
src/page/Frontend/Oftdtl/model/index.js
import Api from "~/service/Api"
import Pts from "~/page/Model/Common/Pts"
export default class Oftopn {
export default class Oftdtl {
constructor() {
this.data = {
oftp: {
......
src/page/Frontend/Oftsel/event/index.js
......@@ -53,24 +53,25 @@ export default {
async handleReset () {
this.model = new Oftsel().data;
},
async dbClickRow(row) {
// let rtnmsg = await Api.post("/frontend/oftsel/storeDate", {
// inr: row.inr
// });
// if (rtnmsg.respCode == SUCCESS) {
// this.routerPush({
// path: '/business/batdis',
// query: {
// inr: rtnmsg.data
// }
// })
// }
async dbClickRow (row) {
let rtnmsg = await Api.post("/frontend/oftsel/storeDate", {
inr: row.inr
});
if (rtnmsg.respCode == SUCCESS) {
this.routerPush({
path: '/business/batdis',
query: {
inr: '0000000000001594'
inr: rtnmsg.data.dotinr,
traname1: rtnmsg.data.traname1
}
})
}
// this.routerPush({
// path: '/business/batdis',
// query: {
// inr: '0000000000001594'
// }
// })
},
// pageSize改变
......
src/page/Funds/Fxtfcm/event/index.js
import commonFunctions from '~/mixin/commonFunctions.js';
import Api from '~/service/Api';
import Utils from "~/utils";
export default {
mixins: [commonFunctions],
methods: {
async getOwnref() {
}
},
async onAccChange(){
console.log("~~~~~~~~~");
console.log(this.model.fxdgrp);
Utils.copyValueFromVoData(this.model.aplacc, this.model.fxdgrp.acc, ignoreModFlg);
// this.model.aplacc=this.model.fxdgrp.acc;
console.log("~~~~~~~~~");
console.log(this.model.fxdgrp);
},
}
}
\ No newline at end of file
src/page/Funds/Fxtfcm/views/Cnfp.vue
......@@ -138,6 +138,7 @@
<el-card class="box-card">
<c-ptap :model="model" :requiredExtkey="true" :disabledExtkey="false" :disabled="true" :isAdrblk="true" :haveAdrLabel="true"
:isShowCard="false"
@handleChange="onAccChange"
:argadr="{title: '平盘对手账户行', grp: 'fxdgrp', rol: 'acc',}"
:label="{labelExtkey:'平盘对手账户行',labelNam:'名称',labelAdrblk:'地址',}"
ptytyp="B">
......
src/page/Funds/Fxtfcn/event/index.js
import commonFunctions from '~/mixin/commonFunctions.js';
import Api from '~/service/Api';
import Utils from "~/utils";
export default {
mixins: [commonFunctions],
methods: {
async getOwnref() {
}
},
async onAccChange(){
console.log("~~~~~~~~~");
console.log(this.model.fxdgrp);
Utils.copyValueFromVoData(this.model.aplacc, this.model.fxdgrp.acc, ignoreModFlg);
// this.model.aplacc=this.model.fxdgrp.acc;
console.log("~~~~~~~~~");
console.log(this.model.fxdgrp);
},
}
}
\ No newline at end of file
src/page/Funds/Fxtlcm/event/buildCommons.js
......@@ -28,14 +28,15 @@ export default {
objinr: model.fxdgrp.rec.inr,
ownref: model.fxdgrp.rec.ownref,
fxtyp:model.fxdgrp.rec.fxtyp,
acc: model.fxdgrp.rec.acc,
acc2: model.fxdgrp.rec.acc2,
dsp: model.fxdgrp.rec.dsp,
dsp2: model.fxdgrp.rec.dsp2,
trdint: model.fxdgrp.rec.trdint,
trdout: model.fxdgrp.rec.trdout,
trnman: model.fxdgrp.rec.trnman,
rat: model.fxdgrp.rec.rat,
swtflg: model.swtflg,
acc1:model.acc1,
acc2:model.acc2,
},
cbsMap: {
MAX: model.fxdgrp.cbs.max,
......
src/page/Funds/Fxtlcm/event/index.js
import commonFunctions from '~/mixin/commonFunctions.js';
import Api from '~/service/Api';
import Utils from "~/utils";
export default {
mixins: [commonFunctions],
methods: {
async onAccChange(){
console.log("~~~~~~~~~");
console.log(this.model.fxdgrp);
Utils.copyValueFromVoData(this.model.aplacc, this.model.fxdgrp.acc, ignoreModFlg);
// this.model.aplacc=this.model.fxdgrp.acc;
console.log("~~~~~~~~~");
console.log(this.model.fxdgrp);
},
}
}
\ No newline at end of file
src/page/Funds/Fxtlcm/model/index.js
import Api from "~/service/Api"
import Pts from "~/page/Model/Common/Pts"
import Pub from "../../../../components/business/commonModel/index.js";
import Api from "~/service/Api";
import Pts from "~/page/Model/Common/Pts";
import Pub from "~/components/business/commonModel/index.js";
import Fxdgrp from '~/components/business/commonModel/fxdgrp';
export default class Fxtlcm{
constructor () {
export default class Fxtlop {
constructor() {
this.data = {
// fxdgrp:{
// rec:{
// ownref:"", // 平盘业务参考号 .fxdgrp.rec.ownref
// nam:"", // 名称 .fxdgrp.rec.nam
// fxtyp:"", // 平盘类型 .fxdgrp.rec.fxtyp
// opndat:"", // 平盘日期 .fxdgrp.rec.opndat
// valdat:"", // 起息日 .fxdgrp.rec.valdat
// rat:"", // 平盘牌价 .fxdgrp.rec.rat
// midrat:"", // 中间价 .fxdgrp.rec.midrat
// ownusr:"", // 资金部负责人 .fxdgrp.rec.ownusr
// usr:"", // 清算中心负责人 .fxdgrp.rec.usr
// },
// apl:{
// pts:new Pts().data,
// dbfadrblkcn:"", // Chinese address .fxdgrp.apl.dbfadrblkcn
// },
// blk:{
// remark:"", // 备注 .fxdgrp.blk.remark
// },
// cbs:{
// max:{
// cur:"", // Currency .fxdgrp.cbs.max.cur
// amt:"", // Balance .fxdgrp.cbs.max.amt
// },
// nom1:{
// cur:"", // Currency .fxdgrp.cbs.nom1.cur
// amt:"", // Balance .fxdgrp.cbs.nom1.amt
// },
// },
// act:{
// pts:new Pts().data,
// },
// },
setmod: new Pub().data.Setmod,
docpan: new Pub().data.Docpan,
trndia: new Pub().data.Trndia,
fxdgrp: new Fxdgrp().data,
fxtp:{
amtlab:"", // Amount Label .fxtp.amtlab
cnylab:"", // Amount LabelCNY .fxtp.cnylab
frgchk:"", // 外币 .fxtp.frgchk
cnychk:"", // 人民币 .fxtp.cnychk
aplp:{
ptsget:{
sdamod:{
seainf:"", // .fxtp.aplp.ptsget.sdamod.seainf
dadsnd:"", // Drag Drop Sender .fxtp.aplp.ptsget.sdamod.dadsnd
},
},
},
usrget:{
sdamod:{
seainf:"", // .fxtp.usrget.sdamod.seainf
},
},
usr:{
extkey:"", // User ID .fxtp.usr.extkey
},
actp:{
ptsget:{
sdamod:{
dadsnd:"", // Drag Drop Sender .fxtp.actp.ptsget.sdamod.dadsnd
seainf:"", // .fxtp.actp.ptsget.sdamod.seainf
},
},
},
},
aplacc:{
pts:new Pts().data,
},
aplaccp:{
ptsget:{
sdamod:{
dadsnd:"", // Drag Drop Sender .aplaccp.ptsget.sdamod.dadsnd
seainf:"", // .aplaccp.ptsget.sdamod.seainf
},
fxtp: {
amtlab: "", // Amount Label .fxtp.amtlab
cnylab: "", // Amount LabelCNY .fxtp.cnylab
frgchk: "", // 外币 .fxtp.frgchk
cnychk: "", // 人民币 .fxtp.cnychk
},
swtflg: "",
acc1:"",
acc2:"",
aplacc: {
pts: new Pts().data,
},
acc2:"", // APLACC's Account .acc2
acc1:"", // OWNACC's Account .acc1
swtflg:"", // 发送MT300 .swtflg
mt30m:{
s22a:"", // Typeof Operation(:22A) .mt30m.s22a
s94a:"", // Scope of Operation(:94A) .mt30m.s94a
conref:"", // MT300 22C - 共同参号 .mt30m.conref
s17t:"", // Block Trade Indicator(:17T) .mt30m.s17t
s17u:"", // MT300 17U - 分笔结算指示 .mt30m.s17u
a53act:"", // Delivery Agent Account .mt30m.a53act
a53:{
pts:new Pts().data,
},
a53p:{
ptsget:{
sdamod:{
dadsnd:"", // Drag Drop Sender .mt30m.a53p.ptsget.sdamod.dadsnd
seainf:"", // .mt30m.a53p.ptsget.sdamod.seainf
},
},
},
iniact:"", // Intermediary Account .mt30m.iniact
ini:{
pts:new Pts().data,
},
inip:{
ptsget:{
sdamod:{
dadsnd:"", // Drag Drop Sender .mt30m.inip.ptsget.sdamod.dadsnd
seainf:"", // .mt30m.inip.ptsget.sdamod.seainf
},
},
},
rbcact:"", // Receiving Agent Account .mt30m.rbcact
rbc:{
pts:new Pts().data,
},
rbcp:{
ptsget:{
sdamod:{
dadsnd:"", // Drag Drop Sender .mt30m.rbcp.ptsget.sdamod.dadsnd
seainf:"", // .mt30m.rbcp.ptsget.sdamod.seainf
},
},
},
b53act:"", // Delivery Agent Account .mt30m.b53act
b53:{
pts:new Pts().data,
},
b53p:{
ptsget:{
sdamod:{
dadsnd:"", // Drag Drop Sender .mt30m.b53p.ptsget.sdamod.dadsnd
seainf:"", // .mt30m.b53p.ptsget.sdamod.seainf
},
},
},
b56act:"", // Intermediary Account .mt30m.b56act
b56:{
pts:new Pts().data,
},
b56p:{
ptsget:{
sdamod:{
dadsnd:"", // Drag Drop Sender .mt30m.b56p.ptsget.sdamod.dadsnd
seainf:"", // .mt30m.b56p.ptsget.sdamod.seainf
},
},
},
owcact:"", // Receiving Agent Account .mt30m.owcact
owc:{
pts:new Pts().data,
},
owcp:{
ptsget:{
sdamod:{
dadsnd:"", // Drag Drop Sender .mt30m.owcp.ptsget.sdamod.dadsnd
seainf:"", // .mt30m.owcp.ptsget.sdamod.seainf
},
},
},
b58act:"", // Beneficiary Institution Account .mt30m.b58act
b58:{
pts:new Pts().data,
},
b58p:{
ptsget:{
sdamod:{
dadsnd:"", // Drag Drop Sender .mt30m.b58p.ptsget.sdamod.dadsnd
seainf:"", // .mt30m.b58p.ptsget.sdamod.seainf
},
},
},
coninf:"", // Contact Information .mt30m.coninf
deamet:"", // Dealing Method .mt30m.deamet
deamettxt:"", // Dealing Method Text .mt30m.deamettxt
c84:{
pts:new Pts().data,
},
c84p:{
ptsget:{
sdamod:{
dadsnd:"", // Drag Drop Sender .mt30m.c84p.ptsget.sdamod.dadsnd
seainf:"", // .mt30m.c84p.ptsget.sdamod.seainf
},
},
},
c88:{
pts:new Pts().data,
},
c88p:{
ptsget:{
sdamod:{
dadsnd:"", // Drag Drop Sender .mt30m.c88p.ptsget.sdamod.dadsnd
seainf:"", // .mt30m.c88p.ptsget.sdamod.seainf
},
},
},
c85:{
pts:new Pts().data,
},
c85p:{
ptsget:{
sdamod:{
dadsnd:"", // Drag Drop Sender .mt30m.c85p.ptsget.sdamod.dadsnd
seainf:"", // .mt30m.c85p.ptsget.sdamod.seainf
},
},
},
s24d:"",
comcur:"", // Broker's Commission Cur. .mt30m.comcur
comamt:"", // Broker's Commission Amount .mt30m.comamt
comamt:0, // Broker's Commission Amount .mt30m.comamt
ctpref:"", // Counterparty's Reference .mt30m.ctpref
c88ref:"", // Broker's Reference .mt30m.c88ref
str300:"", // Sender to Receiver Information .mt30m.str300
enttyp:"", // Event Type .mt30m.enttyp
sndref:"", // Reference .mt30m.sndref
unlref:"", // Underlying Liability Reference .mt30m.unlref
plsdat:"", // Profit and Loss Srttlement Date .mt30m.plsdat
plsamt:"", // Profit and Loss Settlement Amount .mt30m.plsamt
plscur:"", // Profit and Loss Settlement Amount CUR .mt30m.plscur
ouscur:"", // Outstanding Settlement Amount CUR .mt30m.ouscur
ousamt:"", // Outstanding Settlement Amount .mt30m.ousamt
str300:"",
enttyp:"",
sndref:"",
unlref:"",
plsdat:"",
plscur:"",
plsamt:0,
ouscur:"",
ousamt:0,
b58:{pts:new Pts().data,},
b53:{pts:new Pts().data,},
a53:{pts:new Pts().data,},
b56:{pts:new Pts().data,},
owc:{pts:new Pts().data,},
ini:{pts:new Pts().data,},
rbc:{pts:new Pts().data,},
a53:{pts:new Pts().data,},
c84:{pts:new Pts().data,},
c88:{pts:new Pts().data,},
c85:{pts:new Pts().data,},
// Sender to Receiver Information .mt30m.str300
},
fxt300l1blk:"", // XMLPanel fxt300l1的内置block .fxt300l1blk
pageId: "", // ctx的key
setmod: new Pub().data.Setmod,
docpan: new Pub().data.Docpan,
liaccv: new Pub().data.Liaccv,
trndia: new Pub().data.Trndia,
}
}
}
src/page/Funds/Fxtlcm/views/Cnfp.vue
......@@ -15,11 +15,11 @@
</c-input>
<template slot="footer">
<c-button
style="margin: 0 0"
style="margin: 0 5px"
size="small"
type="primary"
disabled
@click="getOwnref"
>
获取
</c-button>
......@@ -30,13 +30,28 @@
<!-- 资金部负责人 -->
<c-col :span="24">
<c-form-item :label="$t('fxtlcm.资金部负责人')" prop="fxdgrp.rec.ownusr">
<c-fullbox>
<c-input v-model="model.fxdgrp.rec.ownusr" maxlength="8"></c-input>
<template slot="footer">
<c-button style="margin: 0 5px" size="small" type="primary">
i
</c-button>
</template>
</c-fullbox>
</c-form-item>
</c-col>
<!-- 清算中心负责人 -->
<c-col :span="24">
<c-form-item :label="$t('fxtlcm.清算中心负责人')" prop="fxdgrp.rec.usr">
<c-fullbox>
<c-input v-model="model.fxdgrp.rec.usr" maxlength="8"></c-input>
<template slot="footer">
<c-button style="margin: 0 5px" size="small" type="primary">
i
</c-button>
</template>
</c-fullbox>
</c-form-item>
</c-col>
<!-- 平盘类型 -->
......@@ -106,6 +121,10 @@
</c-form-item>
</c-col>
<c-col :span="24">
<c-checkbox true-label="X" v-model="model.swtflg">发送MT300</c-checkbox>
</c-col>
</c-col>
<!-- ==============================右边============================== -->
......@@ -138,54 +157,94 @@
</el-card>
</c-col>
<!-- 平盘对手账号 对应model下面的aplacc ，优化时需要修改grp 和rol -->
<c-col :span="24">
<el-card class="box-card">
<c-ptap
:model="model"
:requiredExtkey="true"
:disabled="false"
:isAdrblk="true"
:haveAdrLabel="true"
<c-ptap :model="model" :requiredExtkey="true" :disabledExtkey="false" :disabled="true" :isAdrblk="true" :haveAdrLabel="true"
:isShowCard="false"
:argadr="{ title: '平盘对手账号', grp: 'fxdgrp', rol: 'acc' }"
ptytyp="B"
>
@handleChange="onAccChange"
:argadr="{title: '平盘对手账户行', grp: 'fxdgrp', rol: 'acc',}"
:label="{labelExtkey:'平盘对手账户行',labelNam:'名称',labelAdrblk:'地址',}"
ptytyp="B">
</c-ptap>
</el-card>
</c-col>
<c-col :span="24">
<el-form-item label="Account" prop="acc2">
<el-select
v-model="model.acc2" clearablex
placeholder="请选择账号"
>
<el-option v-for="item in acc2List" :key="item" :label="item"
:value="item">
<span style="float: left">{{ item }}</span>
</el-option>
</el-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-card class="box-card">
<c-ptap
:model="model"
:requiredExtkey="true"
:disabled="false"
:isAdrblk="true"
:haveAdrLabel="true"
<c-ptap :model="model" :requiredExtkey="true" :disabledExtkey="false" :disabled="true" :isAdrblk="true" :haveAdrLabel="true"
:isShowCard="false"
:argadr="{ title: '我行账户行', grp: 'fxdgrp', rol: 'act' }"
ptytyp="B"
>
:argadr="{title: '我行账户行', grp: 'fxdgrp', rol: 'act',}"
:label="{labelExtkey:'我行账户行',labelNam:'名称',labelAdrblk:'地址',}"
ptytyp="B">
</c-ptap>
</el-card>
</c-col>
<c-col :span="24">
<el-form-item label="Account" prop="acc1">
<el-select
v-model="model.acc1" clearablex
placeholder="请选择账号"
>
<el-option v-for="item in acc1List" :key="item" :label="item"
:value="item">
<span style="float: left">{{ item }}</span>
</el-option>
</el-select>
</el-form-item>
</c-col>
</c-col>
</div>
</template>
<script>
import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "../event"
export default {
inject: ['root'],
props:["model","codes"],
mixins: [commonProcess],
mixins: [Event,commonProcess],
data(){
return {}
return {
acc1List:['1111120209999','1111120209998'],
acc2List:['2222220209999','2222220209998'],
}
},
methods:{},
created:function(){}
methods:{...Event},
created:function(){},
watch: {
// "model.fxdgrp.acc.pts.ptainr": {
// immediate: true,
// handler(val, oldval) {
// console.log("~~~~~~~");
// if (val !== oldval){
// this.model.aplacc=this.model.fxdgrp.acc;
// console.log("~~~~~~~");
// console.log(this.model);
// }},
// },
}
}
</script>
<style>
......
src/page/Funds/Fxtlcm/views/Fxt300l1.vue
......@@ -12,7 +12,6 @@
import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "../model/Event"
export default {
inject: ['root'],
......
src/page/Funds/Fxtlcm/views/Mt3001.vue
......@@ -62,7 +62,7 @@
import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "../model/Event"
import Event from "../model/event"
export default {
inject: ['root'],
......
src/page/Funds/Fxtlcm/views/Ovwp.vue 0 → 100644
<template>
<div class="eibs-tab">
<c-collapse v-model="activeNames">
<el-collapse-item title="平盘确认信息" name="cnfp" >
<m-cnfp :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="Mt300报文信息" name="mt300" v-if="model.swtflg=='X'">
<m-mt300 :model="model" :codes="codes" ref="mt300" />
</el-collapse-item>
</c-collapse>
</div>
</template>
<script>
import Api from "~/service/Api";
import CodeTable from "~/config/CodeTable";
import Event from "../event";
import Cnfp from "./Cnfp";
import Mt300 from "./Mt300";
export default {
components: {
"m-cnfp": Cnfp,
"m-mt300": Mt300,
},
inject: ["root"],
props: ["model", "codes"],
mixins: [Event],
data() {
return {
activeNames: ["cnfp", "mt300"],
};
},
methods: {
handleChange(val) {
console.log(val);
},
},
created: function () {},
};
</script>
<style>
.marginLable {
padding-left: 160px;
}
</style>
src/page/Funds/Fxtlcm/views/index.vue
......@@ -4,8 +4,8 @@
<el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right" size="small" :validate-on-rule-change="false">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<!--fxtlcm PD000001 Confirmation -->
<el-tab-pane :label="$t('fxtlcm.Confirmation')" name="cnfp">
<m-cnfp :model="model" :codes="codes"/>
<el-tab-pane :label="$t('fxtlcm.业务信息')" name="ovwp">
<m-ovwp :model="model" :codes="codes"/>
</el-tab-pane>
<el-tab-pane :label="$t('commonModels.费用/账务')" name="setpan">
......@@ -36,18 +36,20 @@ import Api from "~/service/Api"
import CodeTable from "~/config/CodeTable"
import Fxtlcm from "../model"
import operationFunc from "~/mixin/operationFunc"
import Cnfp from "./Cnfp"
import Ovwp from "./Ovwp"
import Setpan from "~/components/business/setmod/views";
import Docpan from "~/components/business/docpan/views";
import event from "../event";
import Check from "../model/Check"
import commonDepend from "~/mixin/commonDepend";
import buildFn from "../event/buildCommons.js";
import commonProcess from "~/mixin/commonProcess"
export default {
name: "Fxtlcm",
components:{
"m-cnfp" : Cnfp,
"m-ovwp" : Ovwp,
"m-setpan": Setpan,
"m-docpan": Docpan
},
......@@ -56,15 +58,15 @@ export default {
root: this
}
},
mixins: [operationFunc, event, commonDepend, buildFn],
mixins: [operationFunc, event, commonDepend, buildFn,commonProcess],
data(){
return {
tabVal: "cnfp",
tabVal: "ovwp",
trnName: "fxtlcm",
trnType: "",
model: new Fxtlcm().data,
codes: { ...CodeTable },
rules: {},
rules: Check,
}
},
methods:{
......
src/page/Funds/Inffxd/event/index.js
......@@ -4,9 +4,6 @@ import moment from "moment";
export default {
methods: {
async handleSearch() {
console.log("serach......");
console.log(this.activeTab )
let opndatfrom = this.model.infcon.opndatfrom;
if (!opndatfrom || opndatfrom == "") {
this.$notify.error({
......@@ -25,29 +22,25 @@ export default {
}
this.load = true;
let rtnmsg = await Api.post("/funds/fxtsel/list"+this.activeTab , {
let rtnmsg = await Api.post("/funds/fxtsel/list" + this.activeTab, {
...this.model.infcon,
pageNumber: this.pagination.pageNumber<=0?1:this.pagination.pageNumber,
pageSize: this.pagination.pageSize <=0?10: this.pagination.pageSize,
pageNumber: this.pagination.pageNumber <= 0 ? 1 : this.pagination.pageNumber,
pageSize: this.pagination.pageSize <= 0 ? 10 : this.pagination.pageSize,
opndatfrom: moment(opndatfrom).format("YYYY-MM-DD"),
opndatto: moment(opndatto).format("YYYY-MM-DD"),
});
if (rtnmsg.respCode == SUCCESS) {
this.load = false;
this.stmData.data = [];
if (this.activeTab==="jsh"){
if (this.activeTab === "jsh") {
this.stmData.data = rtnmsg.data.list;
}
else if(this.activeTab==="dhpp"){
} else if (this.activeTab === "dhpp") {
this.stmDataDh.data = rtnmsg.data.list;
}
else if(this.activeTab==="jshpp"){
} else if (this.activeTab === "jshpp") {
this.stmDatajshpp.data = rtnmsg.data.list;
}
this.pagination.total = rtnmsg.data.total;
} else {
this.$notify.error({
title: this.$t("financing.错误"),
......@@ -82,54 +75,49 @@ export default {
},
//首字母大写
toTitleCase(str){
return str.charAt(0).toUpperCase() + str.slice(1).toLowerCase()
toTitleCase(str) {
return str.charAt(0).toUpperCase() + str.slice(1).toLowerCase();
},
// 处理
async handler(row) {
this.handleModel = row;
this.trnUrl = 'funds';
this.inifrm = 'fxtsel';
this.trnUrl = "funds";
this.inifrm = "fxtsel";
this.initdialog = true;
},
//双击表格数据
async TableDblRow(row) {
this.handler(row)
this.handler(row);
},
//点击页签
async handleClickTab(){
switch (this.activeTab){
case 'jsh':
this.titleNam = "结售汇交易列表"
async handleClickTab() {
switch (this.activeTab) {
case "jsh":
this.titleNam = "结售汇交易列表";
break;
case 'dhpp':
this.titleNam = "外币兑换平盘交易列表"
case "dhpp":
this.titleNam = "外币兑换平盘交易列表";
break;
default:
this.titleNam = "交易列表"
this.titleNam = "交易列表";
break;
}
},
//单击表格数据
TableRowClick(row) {
this['selectedModel' + this.toTitleCase(this.activeTab)] = row
this["selectedModel" + this.toTitleCase(this.activeTab)] = row;
},
changeOwnref() {},
changeOwnref(){
},
async handleClick (btn,row) {
async handleClick(btn, row) {
this.routerPush({
path: "/business/" + btn.code.toLowerCase(),
query: { inr: row.inr,pntinr: row.pntinr }
query: { inr: row.inr, pntinr: row.pntinr },
});
this.initdialog = false;
},
......@@ -147,73 +135,74 @@ export default {
},
//进入即期结汇交易
toFxtssb() {
toFxtssb() {
this.routerPush({
path: '/business/fxtssb',
path: "/business/fxtssb",
});
},
//进入即期售汇交易
toFxtsss() {
},
//进入即期售汇交易
toFxtsss() {
this.routerPush({
path: '/business/fxtsss',
path: "/business/fxtsss",
});
},
//进入结售汇平盘登记交易
toFxtlop() {
},
//进入结售汇平盘登记交易
toFxtlop() {
this.routerPush({
path: '/business/fxtlop',
path: "/business/fxtlop",
});
},
//进入外币兑换平盘登记交易
toFxtfop() {
},
//进入外币兑换平盘登记交易
toFxtfop() {
this.routerPush({
path: '/business/fxtfop',
path: "/business/fxtfop",
});
},
},
// 详情
async details(row) {
const params = {
ownref: row.ownref,
shgref: row.shgref ? row.shgref.trim() : '',
shgref: row.shgref ? row.shgref.trim() : "",
};
const res = await Api.post('/manager/trn/getTrnListByOwnref', params);
const res = await Api.post("/manager/trn/getTrnListByOwnref", params);
if (res.respCode === SUCCESS) {
if (res.data.length === 1) {
if(this.oldRefId && this.$refs[this.oldRefId]){
if (this.oldRefId && this.$refs[this.oldRefId]) {
this.$refs[this.oldRefId].showPopper = false;
}
this.display(res.data[0])
}else{
this.display(res.data[0]);
} else {
this.trnData.data = res.data;
this.oldRefId = 'popover_' + row.inr
this.oldRefId = "popover_" + row.inr;
this.$refs[this.oldRefId].showPopper = true;
}
}
},
closeDisplayDialog(){
if(this.oldRefId && this.$refs[this.oldRefId]){
closeDisplayDialog() {
if (this.oldRefId && this.$refs[this.oldRefId]) {
this.$refs[this.oldRefId].showPopper = false;
}
},
//Info
toInfo(row,objtyp,subobjtyp){
toInfo(row, objtyp, subobjtyp) {
this.routerPush({
path: "/business/fxdinf",
query: { inr: row.inr,objtyp:objtyp,pntinr:row.pntinr,subobjtyp:subobjtyp}
query: {
inr: row.inr,
objtyp: objtyp,
pntinr: row.pntinr,
subobjtyp: subobjtyp,
},
});
},
// 关闭详情弹框
closeDetailsDialog(refId) {
if(refId && this.$refs[refId]){
if (refId && this.$refs[refId]) {
this.$refs[refId].showPopper = false;
}
},
// 关闭处理弹框
......@@ -221,89 +210,88 @@ toFxtfop() {
this.initdialog = false;
},
/**
* 打开详情页面
* @param row
*/
display(row) {
if(this.oldRefId && this.$refs[this.oldRefId]){
if (this.oldRefId && this.$refs[this.oldRefId]) {
this.$refs[this.oldRefId].showPopper = false;
}
// 历史快照
if (row.inr.length == 8) {
this.routerPush({
path: '/business/HistoryRecord',
path: "/business/HistoryRecord",
query: {
businessInr: row.inr,
businessType: 'TRN',
type:'view'
}
})
businessType: "TRN",
type: "view",
},
});
} else if (row.inr.length == 16) {
this.routerPush({
path: `/display/${row.inifrm.toLowerCase()}`,
query: {
businessInr: row.inr,
businessType: 'TRN'
}
businessType: "TRN",
},
});
}
},
checkData(row){
checkData(row) {
this.routerPush({
path: '/business-new/litdck',
path: "/business-new/litdck",
query: {
inr: this.handleModel.inr,brdinr:row.inr
}
inr: this.handleModel.inr,
brdinr: row.inr,
},
});
this.litdckdialog = false
this.litdckdialog = false;
this.$options.methods.closeHandlerDialog.call(this);
},
//修改弹窗状态
changeBtn(isVisible){
changeBtn(isVisible) {
this.initdialog = isVisible;
},
//获取码表数据
getCodeTable(tbl,uil,value){
if(uil){
uil='EN'
//获取码表数据
getCodeTable(tbl, uil, value) {
if (uil) {
uil = "EN";
}
let localCodes = localStorage.getItem('localCodes');
let localCodes = localStorage.getItem("localCodes");
if (localCodes) {
let codeobj = JSON.parse(localCodes)[tbl + '_' + uil + '_COD'];
if(codeobj){
let codeobj = codeobj.filter(m => m.value === value);
let codeobj = JSON.parse(localCodes)[tbl + "_" + uil + "_COD"];
if (codeobj) {
let codeobj = codeobj.filter((m) => m.value === value);
return codeobj ? codeobj.label : value;
}else{
} else {
return value;
}
}else{
} else {
return value;
}
},
//获取码表数据
getCodelabel(value,codenam) {
const codeobj = this.model.dbCodes[codenam].find(obj => obj.value === value)
getCodelabel(value, codenam) {
const codeobj = this.model.dbCodes[codenam].find(
(obj) => obj.value === value
);
return codeobj ? codeobj.label : value;
},
async getdbCode(codeType, uil, codeNam) {
let params = {
codeType: codeType,
uil: uil ? uil : 'EN'
}
let rtnmsg = await Api.post("/manager/dic/listDicInfo", params)
uil: uil ? uil : "EN",
};
let rtnmsg = await Api.post("/manager/dic/listDicInfo", params);
if (rtnmsg.respCode === SUCCESS) {
let curList = rtnmsg.data.map(item => ({
let curList = rtnmsg.data.map((item) => ({
value: item.codeValue,
label: item.codeName
label: item.codeName,
}));
this.model.dbCodes[codeNam] = curList
this.model.dbCodes[codeNam] = curList;
}
},
},
};
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