Skip to content

I
isc-web-vue
Commit e6b262ba by 李少勇
Options

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

parents 9ab0b747 59f68643
Showing with 678 additions and 400 deletions
src/components/business/FunctionBtn/index.vue
...@@ -70,7 +70,7 @@ import { Promise } from 'q'; ...@@ -70,7 +70,7 @@ import { Promise } from 'q';
<el-badge class="item el-dropdown-link" :value="root.model.warnList ? root.model.warnList.length : 0" :max="99" :hidden="root.model.warnList && root.model.warnList.length == 0"> <el-badge class="item el-dropdown-link" :value="root.model.warnList ? root.model.warnList.length : 0" :max="99" :hidden="root.model.warnList && root.model.warnList.length == 0">
<el-button size="mini" type="primary" @click="handleShowWarning" class="el-icon-warning-outline"> <el-button size="mini" type="primary" @click="handleShowWarning" class="el-icon-warning-outline">
<span style="margin-left: 5px;position: relative;">Warning <span style="margin-left: 5px;position: relative;">Warning
<div v-if="root.model.warnFlg == 'Y'" @click.stop style="width：15px;padding: 10px;border-radius: 3px;position: absolute;top: 15px;left: -84px;color: red;"> <div v-if="root.model.warnFlg == 'Y'" @click.stop style="width:15px;padding: 10px;border-radius: 3px;position: absolute;top: 15px;left: -84px;color: red;">
警告信息有变化，请查看 警告信息有变化，请查看
</div> </div>
</span> </span>
......
src/page/Frontend/Msgdtlblk/views/Msgdtlp.vue
...@@ -9,6 +9,12 @@ ...@@ -9,6 +9,12 @@
<c-button class="medium_bcs" size="medium" style="margin-left: 40px" type="primary" @click="handleReject"> <c-button class="medium_bcs" size="medium" style="margin-left: 40px" type="primary" @click="handleReject">
丢弃 丢弃
</c-button> </c-button>
<c-button class="medium_bcs" size="medium" style="margin-left: 40px" type="primary" @click="handleSkip">
忽略
</c-button>
<c-button class="medium_bcs" size="medium" style="margin-left: 40px" type="primary" @click="handleReSkip">
取消忽略
</c-button>
<p style="margin-top: 20px;border: 1px solid #333333;padding-10px;width: 100%;min-height: 500px;" v-html="model.msgdtll"></p> <p style="margin-top: 20px;border: 1px solid #333333;padding-10px;width: 100%;min-height: 500px;" v-html="model.msgdtll"></p>
<el-dialog v-if="visible" v-dialogDrag :visible="visible" :modal-append-to-body="false" :close-on-click-modal="true" <el-dialog v-if="visible" v-dialogDrag :visible="visible" :modal-append-to-body="false" :close-on-click-modal="true"
......
src/page/Frontend/Msgdtlrtm/views/Msgdtlp.vue
...@@ -4,11 +4,12 @@ ...@@ -4,11 +4,12 @@
历史记录 历史记录
</c-button> </c-button>
<c-button class="medium_bcs" size="medium" style="margin-left: 40px" type="primary" @click="handleCheck"> <c-button class="medium_bcs" size="medium" style="margin-left: 40px" type="primary" @click="handleCheck">
放行 人工清分
</c-button> </c-button>
<c-button class="medium_bcs" size="medium" style="margin-left: 40px" type="primary" @click="handleReject"> <!-- <c-button class="medium_bcs" size="medium" style="margin-left: 40px" type="primary" @click="handleReject">
丢弃 丢弃
</c-button> </c-button> -->
<p style="margin-top: 20px;border: 1px solid #333333;padding-10px;width: 100%;min-height: 500px;" v-html="model.msgdtll"></p> <p style="margin-top: 20px;border: 1px solid #333333;padding-10px;width: 100%;min-height: 500px;" v-html="model.msgdtll"></p>
<el-dialog v-if="visible" v-dialogDrag :visible="visible" :modal-append-to-body="false" :close-on-click-modal="true" <el-dialog v-if="visible" v-dialogDrag :visible="visible" :modal-append-to-body="false" :close-on-click-modal="true"
...@@ -64,7 +65,7 @@ export default { ...@@ -64,7 +65,7 @@ export default {
methods: { methods: {
async handleCheck() { async handleCheck() {
this.$confirm("确定放行该报文？", "提示", { this.$confirm("确定人工清分该报文？", "提示", {
confirmButtonText: "确认", confirmButtonText: "确认",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
...@@ -72,9 +73,9 @@ export default { ...@@ -72,9 +73,9 @@ export default {
let params={ let params={
mpsinr: this.$route.query.mpsinr || "", mpsinr: this.$route.query.mpsinr || "",
}; };
const rtnmsg = await Api.post(`/${this.moduleRouter()}/msgsel/check`, params); const rtnmsg = await Api.post(`/${this.moduleRouter()}/msgsel/rtmp/sav`, params);
if (rtnmsg.respCode === SUCCESS) { if (rtnmsg.respCode === SUCCESS) {
this.$notify({ title: '成功', type: 'success', message: '丢弃成功' }) this.$notify({ title: '成功', type: 'success', message: '清分成功' })
} }
}); });
}, },
......
src/page/Frontend/Msgdtlsep/views/Msgdtlp.vue
...@@ -72,9 +72,9 @@ export default { ...@@ -72,9 +72,9 @@ export default {
let params={ let params={
mpsinr: this.$route.query.mpsinr || "", mpsinr: this.$route.query.mpsinr || "",
}; };
const rtnmsg = await Api.post(`/${this.moduleRouter()}/msgsel/check`, params); const rtnmsg = await Api.post(`/${this.moduleRouter()}/msgsel/sepp/sndagn`, params);
if (rtnmsg.respCode === SUCCESS) { if (rtnmsg.respCode === SUCCESS) {
this.$notify({ title: '成功', type: 'success', message: '丢弃成功' }) this.$notify({ title: '成功', type: 'success', message: '重新发送成功' })
} }
}); });
}, },
...@@ -88,7 +88,7 @@ export default { ...@@ -88,7 +88,7 @@ export default {
let params={ let params={
mpsinr: this.$route.query.mpsinr || "", mpsinr: this.$route.query.mpsinr || "",
}; };
const rtnmsg = await Api.post(`/${this.moduleRouter()}/msgsel/reject`, params); const rtnmsg = await Api.post(`/${this.moduleRouter()}/msgsel/sepp/drp`, params);
if (rtnmsg.respCode === SUCCESS) { if (rtnmsg.respCode === SUCCESS) {
this.$notify({ title: '成功', type: 'success', message: '丢弃成功' }) this.$notify({ title: '成功', type: 'success', message: '丢弃成功' })
} }
......
src/page/Frontend/Msgrtm/views/Schpnl.vue
...@@ -146,7 +146,8 @@ ...@@ -146,7 +146,8 @@
<el-tabs v-model="activeTab" class="y-tabs"> <el-tabs v-model="activeTab" class="y-tabs">
<el-tab-pane label="发报查询" name="fb"> <el-tab-pane label="发报查询" name="fb">
<el-table :data="stmData.data" :columns="stmData.columns" v-loading="load" style="width: 100%" <el-table :data="stmData.data" :columns="stmData.columns" v-loading="load" style="width: 100%"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
@row-dblclick="dbClickRow"
size="small" :border="true" height="calc(100vh - 480px)" :highlight-current-row="true"> size="small" :border="true" height="calc(100vh - 480px)" :highlight-current-row="true">
<el-table-column type="selection" width="55"> <el-table-column type="selection" width="55">
</el-table-column> </el-table-column>
...@@ -273,7 +274,7 @@ export default { ...@@ -273,7 +274,7 @@ export default {
{ {
label: "处理时间", label: "处理时间",
prop: "sttdattim", prop: "sttdattim",
width: "150px" width: "170px"
}, },
], ],
data: [], data: [],
......
src/page/Frontend/Msgsep/views/Mainp.vue
...@@ -146,12 +146,16 @@ ...@@ -146,12 +146,16 @@
<el-tabs v-model="activeTab" class="y-tabs"> <el-tabs v-model="activeTab" class="y-tabs">
<el-tab-pane label="报文失败处理" name="fb"> <el-tab-pane label="报文失败处理" name="fb">
<el-table :data="stmData.data" :columns="stmData.columns" v-loading="load" style="width: 100%" <el-table :data="stmData.data" :columns="stmData.columns" v-loading="load" style="width: 100%"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
size="small" :border="true" height="calc(100vh - 480px)" :highlight-current-row="true"> @row-dblclick="dbClickRow"
size="small" :border="true" height="calc(100vh - 480px)" :highlight-current-row="true">
<el-table-column type="selection" width="55"> <el-table-column type="selection" width="55">
</el-table-column> </el-table-column>
<el-table-column v-for="(item, key) in stmData.columns" :key="key" :label="item.label" :prop="item.prop" <el-table-column v-for="(item, key) in stmData.columns" :key="key" :label="item.label" :prop="item.prop" :min-width="item.width">
:min-width="item.width"> <template slot-scope="scope">
<c-select-value-to-label v-if="item.prop == 'sta'" v-model="scope.row.sta" :code="codes.stacod"></c-select-value-to-label>
<span v-else>{{ scope.row[item.prop] }}</span>
</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -269,7 +273,7 @@ export default { ...@@ -269,7 +273,7 @@ export default {
{ {
label: "处理时间", label: "处理时间",
prop: "sttdattim", prop: "sttdattim",
width: "150px" width: "170px"
}, },
], ],
data: [], data: [],
...@@ -294,6 +298,14 @@ export default { ...@@ -294,6 +298,14 @@ export default {
}, },
methods: { methods: {
dbClickRow(row) {
this.routerPush({
path: '/business/msgdtlsep',
query: {
mpsinr: row.inr
}
})
}
}, },
mounted: function () { mounted: function () {
}, },
......
src/page/Frontend/Offrel/model/index.js
...@@ -7,21 +7,120 @@ export default class Offrel { ...@@ -7,21 +7,120 @@ export default class Offrel {
offrsn: "", // 勾销原因 .oftgrp.rec.offrsn offrsn: "", // 勾销原因 .oftgrp.rec.offrsn
}, },
dot: { dot: {
cur: "", // 币种 .oftgrp.dot.cur // inr: "",
amt: "", // 金额 .oftgrp.dot.amt // cur: "", // 币种 .oftgrp.dot.cur
dcflg: "", // 收支 .oftgrp.dot.dcflg // amt: "", // 金额 .oftgrp.dot.amt
ownref: "", // 业务参考号 .oftgrp.dot.ownref // dcflg: "", // 收支 .oftgrp.dot.dcflg
othref: "", // 相关参考号 .oftgrp.dot.othref // ownref: "", // 业务参考号 .oftgrp.dot.ownref
inf: "", // 详细信息 .oftgrp.dot.inf // othref: "", // 相关参考号 .oftgrp.dot.othref
sta: "", // 状态 .oftgrp.dot.sta // inf: "", // 详细信息 .oftgrp.dot.inf
offsta: "", // 勾销标志 .oftgrp.dot.offsta // sta: "", // 状态 .oftgrp.dot.sta
mty: "", // 报文类型 .oftgrp.dot.mty // offsta: "", // 勾销标志 .oftgrp.dot.offsta
recsta: "", // 记帐状态 .oftgrp.dot.recsta // mty: "", // 报文类型 .oftgrp.dot.mty
objtyp: "", // 报文关联类型 .oftgrp.dot.objtyp // recsta: "", // 记帐状态 .oftgrp.dot.recsta
actbic: "", // 账户行BIC .oftgrp.dot.actbic // objtyp: "", // 报文关联类型 .oftgrp.dot.objtyp
valdat: "", // 起息日 .oftgrp.dot.valdat // actbic: "", // 账户行BIC .oftgrp.dot.actbic
rsptim: "", // 收发日期 .oftgrp.dot.rsptim // valdat: "", // 起息日 .oftgrp.dot.valdat
// rsptim: "", // 收发日期 .oftgrp.dot.rsptim
etyinr: "",
ptyinr: "",
inr: "",
offinr: "",
objinr: "",
objtyp: "",
accpty: "",
acc: "",
cur: "",
amt: "",
valdat: "",
dcflg: "",
rsptim: "",
ownref: "",
othref: "",
busflg: "",
inf: "",
sta: "",
typ: "",
offsta: "",
credat: "",
actbic: "",
staref: "",
entdat: "",
tratic: "",
supdlt: "",
fdc: "",
revbak: "",
sedbak: "",
stanum: "",
seqnum: "",
relinr: "",
mty: "",
oppbic: "",
tradat: "",
wflsta: "",
sndnum: "",
offinf: "",
kpainf: "",
kpatyp: "",
area: "",
opsta: "",
recsta: "",
lstdat: "",
isdone: "",
dir: "",
msgtyp: "",
}, },
dotsmd: {
dot: {
etyinr: "",
ptyinr: "",
inr: "",
offinr: "",
objinr: "",
objtyp: "",
accpty: "",
acc: "",
cur: "",
amt: "",
valdat: "",
dcflg: "",
rsptim: "",
ownref: "",
othref: "",
busflg: "",
inf: "",
sta: "",
typ: "",
offsta: "",
credat: "",
actbic: "",
staref: "",
entdat: "",
tratic: "",
supdlt: "",
fdc: "",
revbak: "",
sedbak: "",
stanum: "",
seqnum: "",
relinr: "",
mty: "",
oppbic: "",
tradat: "",
wflsta: "",
sndnum: "",
offinf: "",
kpainf: "",
kpatyp: "",
area: "",
opsta: "",
recsta: "",
lstdat: "",
isdone: "",
dir: "",
msgtyp: "",
}
}
}, },
} }
} }
......
src/page/Frontend/Oftsel/event/index.js
import Api from "~/service/Api"; import Api from "~/service/Api";
import getSubtyp from '~/page/Frontend/Rcvsel/event/getSubtyp.js'; import getSubtyp from '~/page/Frontend/Rcvsel/event/getSubtyp.js';
import moment from "moment"; import moment from "moment";
import Utils from "../../../../utils";
export default { export default {
mixins: [getSubtyp], mixins: [getSubtyp],
...@@ -87,6 +88,26 @@ export default { ...@@ -87,6 +88,26 @@ export default {
}, },
handleSelectionChange (val) { handleSelectionChange (val) {
this.multipleSelection = val; this.multipleSelection = val;
} },
async handleExportClick () {
// const loading = this.loading();
let rsptims = this.model.oftp.rel.rsptims;
let rsptime = this.model.oftp.rel.rsptime;
let params = {
...this.model.oftp.rel,
rsptims: rsptims ? moment(rsptims).format("YYYY-MM-DD") + ' 00:00:00' : "",
rsptime: moment(rsptime).format("YYYY-MM-DD") + ' 23:59:59',
pageNumber: this.pagination.pageIndex,
pageSize: this.pagination.pageSize,
};
let res = await Api.post("/frontend/oftsel/exportExcel", params);
if (res.respCode == SUCCESS) {
console.log(res.data)
let name = moment(new Date()).format('yyyy-MM-DD HH:mm:ss');
Utils.exportToExcel(res.data, "已关联报文查询_" + name + ".xlsx", "已关联报文查询");
}
// loading.close();
},
}, },
}; };
src/page/Frontend/Oftsel/views/Oftp01.vue
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
<c-button :disabled="isRoutingDisable" class="medium_bcs" size="medium" style="margin-left: 20" <c-button :disabled="isRoutingDisable" class="medium_bcs" size="medium" style="margin-left: 20"
type="primary">ReRouting type="primary">ReRouting
</c-button> </c-button>
<c-button class="medium_bcs" size="medium" style="margin-left: 20" type="primary"> <c-button class="medium_bcs" size="medium" style="margin-left: 20" type="primary" @click ="handleExportClick">
{{ $t('public.导出Excel') }} {{ $t('public.导出Excel') }}
</c-button> </c-button>
</el-col> </el-col>
......
src/page/Frontend/Rcvselblk/views/Schpnl.vue
...@@ -156,7 +156,8 @@ ...@@ -156,7 +156,8 @@
<el-tab-pane label="发报查询" name="sb"> <el-tab-pane label="发报查询" name="sb">
<el-table :data="stmData.data" :columns="stmData.columns" v-loading="load" style="width: 100%" <el-table :data="stmData.data" :columns="stmData.columns" v-loading="load" style="width: 100%"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
size="small" :border="true" height="calc(100vh - 420px)" :highlight-current-row="true"> @row-dblclick="dbClickRow"
size="small" :border="true" height="calc(100vh - 480px)" :highlight-current-row="true">
<el-table-column type="selection" width="55"> <el-table-column type="selection" width="55">
</el-table-column> </el-table-column>
<el-table-column v-for="(item, key) in stmData.columns" :key="key" :label="item.label" :prop="item.prop" <el-table-column v-for="(item, key) in stmData.columns" :key="key" :label="item.label" :prop="item.prop"
...@@ -283,7 +284,7 @@ export default { ...@@ -283,7 +284,7 @@ export default {
{ {
label: "接收时间", label: "接收时间",
prop: "rcvdattim", prop: "rcvdattim",
width: "150px" width: "170px"
}, },
], ],
data: [], data: [],
......
src/page/Funds/Fttfmt/event/buildCommons.js
...@@ -27,6 +27,8 @@ export default { ...@@ -27,6 +27,8 @@ export default {
objtyp: "FTD", objtyp: "FTD",
objinr: model.ftdgrp.rec.inr, objinr: model.ftdgrp.rec.inr,
ownref: model.ftdgrp.rec.ownref, ownref: model.ftdgrp.rec.ownref,
msgtyp: model.fttp.msgtyp,
branchInr: model.fttgrp.rec.branchinr,
fttyp:model.ftdgrp.rec.fttyp, fttyp:model.ftdgrp.rec.fttyp,
}, },
cbsMap: { cbsMap: {
......
src/page/Funds/Fttfmt/event/index.js
...@@ -25,5 +25,9 @@ export default { ...@@ -25,5 +25,9 @@ export default {
} else { } else {
this.$notify.error({ title: "错误", message: "服务请求失败！" }); this.$notify.error({ title: "错误", message: "服务请求失败！" });
} }
}, // 事件 -- 报文类型
swftypChange() {
// 公共
this.model.setmod = new Pub().data.Setmod;
}, },
}; };
src/page/Funds/Fttfmt/model/Default.js 0 → 100644
import commonFunctions from "~/mixin/commonFunctions.js";
import commonDepend from "~/mixin/commonDepend";
import Api from '~/service/Api';
export default {
mixins: [commonFunctions, commonDepend],
methods: {
// 模拟调用试算费用账务
defaultBuildSetmod(e) {
this.initSetmod(this.buildCommonData(this.model, "fttfmt"));
this.model.setmod = new Pub().data.Setmod;
},
initDefaultFields() {
this.defaultBuildSetmod("1")
}
},
};
src/page/Funds/Fttfmt/model/index.js
...@@ -12,6 +12,60 @@ export default class Fttfmt{ ...@@ -12,6 +12,60 @@ export default class Fttfmt{
msgtyp: "", // 报文类型 .fttp.msgtyp msgtyp: "", // 报文类型 .fttp.msgtyp
benact: "", benact: "",
bnaktypflg: "", bnaktypflg: "",
mt32m: {
amecur: "", // Broker's Commission Cur. .mt30m.comcur
ameamt: 0,
newcur: "", // Broker's Commission Cur. .mt30m.comcur
newamt: 0,
s22a: "", // Typeof Operation(:22A) .mt30m.s22a
s94a: "",
s17r: "",
s22b: "",
s30x: "",
oldref: "",
conref: "",
conno: "", // MT300 22C - 共同参号 .mt30m.conref
a53act: "", // Delivery Agent Account .mt30m.a53act
iniact: "", // Intermediary Account .mt30m.iniact
rbcact: "", // Receiving Agent Account .mt30m.rbcact
a58act: "",
b53act: "", // Delivery Agent Account .mt30m.b53act
b56act: "", // Intermediary Account .mt30m.b56act
owcact: "", // Receiving Agent Account .mt30m.owcact
b58act: "", // Beneficiary Institution Account .mt30m.b58act
str300: "",
b58: {
pts: new Pts().data,
},
b53: {
pts: new Pts().data,
},
owc: {
pts: new Pts().data,
},
b56: {
pts: new Pts().data,
},
a58: {
pts: new Pts().data,
},
rbc: {
pts: new Pts().data,
},
ini: {
pts: new Pts().data,
},
a53: {
pts: new Pts().data,
},
},
usr:{ usr:{
extkey:"", // 资金部负责人 .fttp.usr.extkey extkey:"", // 资金部负责人 .fttp.usr.extkey
}, },
...@@ -41,10 +95,7 @@ export default class Fttfmt{ ...@@ -41,10 +95,7 @@ export default class Fttfmt{
}, },
}, },
intamt:"", // 利息金额 .intamt intamt:"", // 利息金额 .intamt
setmod:{
doccur:"", // 结算总金额 .setmod.doccur
setamt:"", // Reduced Amount to settle .setmod.setamt
},
mtabut:{ mtabut:{
clsflg:"", // Close Flag .mtabut.clsflg clsflg:"", // Close Flag .mtabut.clsflg
}, },
......
src/page/Funds/Fttfmt/views/Matp.vue
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item :label="$t('fttfmt.定存拆借类型')" prop="ftdgrp.rec.fttyp"> <el-form-item :label="$t('fttfmt.定存拆借类型')" prop="ftdgrp.rec.fttyp">
<c-select v-model="model.ftdgrp.rec.fttyp" :code="codes.ffttyp" style="width:100%" <c-select v-model="model.ftdgrp.rec.fttyp" :code="codes.fttyp" disabled style="width:100%"
:placeholder="$t('other.请输入') + $t('fttfmt.定存拆借类型')"> :placeholder="$t('other.请输入') + $t('fttfmt.定存拆借类型')">
</c-select> </c-select>
</el-form-item> </el-form-item>
...@@ -86,8 +86,8 @@ ...@@ -86,8 +86,8 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12" class="pl8"> <c-col :span="12" class="pl8">
<c-form-item label-width="0" prop="setmod.setamt"> <c-form-item label-width="0" prop="ftdgrp.cbs.opn2.amt">
<c-input v-model="model.setmod.setamt" disabled></c-input> <c-input v-model="model.ftdgrp.cbs.opn2.amt" disabled></c-input>
</c-form-item> </c-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-card class="box-card"> <el-card class="box-card">
<c-ptap :model="model" :requiredExtkey="true" :disabled="true":disabledExtkey="true" :isAdrblk="true" <c-ptap :model="model" :requiredExtkey="true" :disabled="true" :isAdrblk="true"
:haveAdrLabel="true" :isShowCard="false" :haveAdrLabel="true" :isShowCard="false"
:argadr="{ title: '资金拆入行', grp: 'ftdgrp', rol: 'tri' }" ptytyp="B"> :argadr="{ title: '资金拆入行', grp: 'ftdgrp', rol: 'tri' }" ptytyp="B">
</c-ptap> </c-ptap>
......
src/page/Funds/Fttfmt/views/Ovwp.vue 0 → 100644
<template>
<div class="eibs-tab" >
<c-collapse v-model="activeNames">
<el-collapse-item title="资金定存拆借到期" name="matp">
<m-matp :model="model" :codes="codes" ref="matp"/>
</el-collapse-item>
<el-collapse-item title="Mt202报文信息" name="mt202" v-if="model.ftdgrp.rec.fttyp=='LI' || model.ftdgrp.rec.fttyp=='DI'">
<m-mt202 :model="model" :codes="codes" ref="mt202" :idx = "1" />
</el-collapse-item>
</c-collapse>
</div>
</template>
<script>
import Api from "~/service/Api";
import CodeTable from "~/config/CodeTable";
import Event from "../event";
import Matp from "./Matp";
import Mt202 from "~/components/business/setmod/views/MT202.vue";
import Default from "../model/Default.js";
export default {
components: {
"m-matp": Matp,
"m-mt202": Mt202,
},
inject: ["root"],
props: ["model", "codes"],
mixins: [Event,Default],
data() {
return {
activeNames: ["matp", "mt202"],
};
},
methods: {
handleChange(val) {
console.log(val);
},
},
created: function () {},
};
</script>
<style>
.marginLable {
padding-left: 160px;
}
</style>
src/page/Funds/Fttfmt/views/index.vue
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
size="small" :validate-on-rule-change="false"> size="small" :validate-on-rule-change="false">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick"> <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<!--fttfmt PD000001 Maturity --> <!--fttfmt PD000001 Maturity -->
<el-tab-pane label="到期处理" name="matp"> <el-tab-pane label="到期处理" name="ovwp">
<c-content> <c-content>
<m-matp :model="model" :codes="codes" /> <m-ovwp :model="model" :codes="codes" />
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="费用/账务" name="setpan"> <el-tab-pane label="费用/账务" name="setpan">
...@@ -35,18 +35,20 @@ import Matp from "./Matp" ...@@ -35,18 +35,20 @@ import Matp from "./Matp"
import commonProcess from "~/mixin/commonProcess" import commonProcess from "~/mixin/commonProcess"
import Setpan from "~/components/business/setmod/views"; import Setpan from "~/components/business/setmod/views";
import Docpan from "~/components/business/docpan/views"; import Docpan from "~/components/business/docpan/views";
import Setmod from "~/components/business/setmod/views";
import Ovwp from "./Ovwp"
import operationFunc from "~/mixin/operationFunc"; import operationFunc from "~/mixin/operationFunc";
import commonDepend from "~/mixin/commonDepend"; import commonDepend from "~/mixin/commonDepend";
import event from "../event"; import event from "../event";
import buildFn from "../event/buildCommons.js"; import buildFn from "../event/buildCommons.js";
import Check from "../model/Check.js"; import Check from "../model/Check.js";
import Default from "../model/Default";
export default { export default {
name: "Fttfmt", name: "Fttfmt",
components: { components: {
"m-matp": Matp, "m-setmod": Setmod,
"m-ovwp" : Ovwp,
"m-setpan": Setpan, "m-setpan": Setpan,
"m-docpan": Docpan, "m-docpan": Docpan,
}, },
...@@ -55,10 +57,10 @@ export default { ...@@ -55,10 +57,10 @@ export default {
root: this root: this
} }
}, },
mixins: [operationFunc, commonDepend, event, buildFn,commonProcess], // 里面包含了Default、Check等的公共处理 mixins: [operationFunc, commonDepend, event, buildFn,commonProcess,Default], // 里面包含了Default、Check等的公共处理
data() { data() {
return { return {
tabVal: "matp", tabVal: "ovwp",
trnName: "fttfmt", trnName: "fttfmt",
trnType: "", trnType: "",
model: new Fttfmt().data, model: new Fttfmt().data,
......
src/page/Funds/Fttpcm/event/buildCommons.js
...@@ -27,6 +27,7 @@ export default { ...@@ -27,6 +27,7 @@ export default {
objtyp: "FTD", objtyp: "FTD",
objinr: model.ftdgrp.rec.inr, objinr: model.ftdgrp.rec.inr,
ownref: model.ftdgrp.rec.ownref, ownref: model.ftdgrp.rec.ownref,
msgtyp: model.fttp.msgtyp,
fttyp:model.ftdgrp.rec.fttyp, fttyp:model.ftdgrp.rec.fttyp,
}, },
cbsMap: { cbsMap: {
......
src/page/Funds/Fttpcm/event/index.js
import commonFunctions from '~/mixin/commonFunctions.js'; import commonFunctions from '~/mixin/commonFunctions.js';
import Pub from '../../../../components/business/commonModel/index.js';
import Api from '~/service/Api'; import Api from '~/service/Api';
export default { export default {
...@@ -61,5 +62,10 @@ export default { ...@@ -61,5 +62,10 @@ export default {
this.$notify.error({ title: '错误', message: '服务请求失败！' }); this.$notify.error({ title: '错误', message: '服务请求失败！' });
} }
}, },
// 事件 -- 报文类型
swftypChange() {
// 公共
// this.model.setmod = new Pub().data.Setmod;
}
} }
} }
\ No newline at end of file
src/page/Funds/Fttpcm/model/Default.js
import commonFunctions from "~/mixin/commonFunctions.js"; import commonFunctions from "~/mixin/commonFunctions.js";
import commonDepend from "~/mixin/commonDepend"; import commonDepend from "~/mixin/commonDepend";
import Api from '~/service/Api';
export default { export default {
mixins: [commonFunctions, commonDepend], mixins: [commonFunctions, commonDepend],
methods: { methods: {
// 模拟调用试算费用账务
defaultBuildSetmod(e) {
this.initSetmod(this.buildCommonData(this.model, "fttpcm"));
},
initDefaultFields() {
this.defaultBuildSetmod("1")
}
}, },
}; };
src/page/Funds/Fttpcm/model/index.js
...@@ -7,22 +7,6 @@ export default class Fttpcm{ ...@@ -7,22 +7,6 @@ export default class Fttpcm{
this.data = { this.data = {
ftdgrp: new Ftdgrp().data, ftdgrp: new Ftdgrp().data,
fttp:{ fttp:{
trop:{
ptsget:{
sdamod:{
seainf:"", // .fttp.trop.ptsget.sdamod.seainf
dadsnd:"", // Drag Drop Sender .fttp.trop.ptsget.sdamod.dadsnd
},
},
},
trip:{
ptsget:{
sdamod:{
seainf:"", // .fttp.trip.ptsget.sdamod.seainf
dadsnd:"", // Drag Drop Sender .fttp.trip.ptsget.sdamod.dadsnd
},
},
},
troact:"", // Trade-out Account .fttp.troact troact:"", // Trade-out Account .fttp.troact
triact:"", // Trade-in Account .fttp.triact triact:"", // Trade-in Account .fttp.triact
usr:{ usr:{
...@@ -42,12 +26,68 @@ export default class Fttpcm{ ...@@ -42,12 +26,68 @@ export default class Fttpcm{
}, },
}, },
msgtyp:"", // 报文类型 .fttp.msgtyp msgtyp:"", // 报文类型 .fttp.msgtyp
benact:"", // Ben Trade-in Account .fttp.benact benact:"",
mt32m: {
amecur: "", // Broker's Commission Cur. .mt30m.comcur
ameamt: 0,
newcur: "", // Broker's Commission Cur. .mt30m.comcur
newamt: 0,
s22a: "", // Typeof Operation(:22A) .mt30m.s22a
s94a: "",
s17r: "",
s22b: "",
s30x: "",
oldref: "",
conref: "",
conno: "", // MT300 22C - 共同参号 .mt30m.conref
a53act: "", // Delivery Agent Account .mt30m.a53act
iniact: "", // Intermediary Account .mt30m.iniact
rbcact: "", // Receiving Agent Account .mt30m.rbcact
a58act: "",
b53act: "", // Delivery Agent Account .mt30m.b53act
b56act: "", // Intermediary Account .mt30m.b56act
owcact: "", // Receiving Agent Account .mt30m.owcact
b58act: "", // Beneficiary Institution Account .mt30m.b58act
str300: "",
b58: {
pts: new Pts().data,
},
b53: {
pts: new Pts().data,
},
owc: {
pts: new Pts().data,
},
b56: {
pts: new Pts().data,
},
a58: {
pts: new Pts().data,
},
rbc: {
pts: new Pts().data,
},
ini: {
pts: new Pts().data,
},
a53: {
pts: new Pts().data,
},
}, // Ben Trade-in Account .fttp.benact
}, },
narblk:"", // Narrative .narblk narblk:"", // Narrative .narblk
relref:"", // Related Reference .relref relref:"", // Related Reference .relref
ftt199l1blk:"", // XMLPanel ftt199l1的内置block .ftt199l1blk ftt199l1blk:"", // XMLPanel ftt199l1的内置block .ftt199l1blk
pageId: "", // ctx的key pageId: "", // ctx的key
forexmod: new Pub().data.Forexmod,
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,
......
src/page/Funds/Fttpcm/views/Cnfp.vue
...@@ -131,27 +131,7 @@ ...@@ -131,27 +131,7 @@
</c-ptap> </c-ptap>
</el-card> </el-card>
</c-col> </c-col>
<!-- <c-col :span="24">
<c-form-item
:label="$t('fttp.受益人')"
prop="ftdgrp.ben.pts.extkey"
>
<c-fullbox>
<c-input
v-model="model.ftdgrp.ben.pts.extkey"
maxlength="34"
></c-input>
<template slot="footer">
<c-button size="small" style="margin-left: 5px" type="primary">
i
</c-button>
<c-button size="small" style="margin-left: 5px" type="primary">
详情
</c-button>
</template>
</c-fullbox>
</c-form-item>
</c-col> -->
<c-col :span="24"> <c-col :span="24">
<c-form-item prop="ftdgrp.ben.pts.nam"> <c-form-item prop="ftdgrp.ben.pts.nam">
<c-input <c-input
...@@ -165,8 +145,10 @@ ...@@ -165,8 +145,10 @@
<c-form-item :label="$t('fttp.报文类型')" prop="fttp.msgtyp"> <c-form-item :label="$t('fttp.报文类型')" prop="fttp.msgtyp">
<c-select <c-select
v-model="model.fttp.msgtyp" v-model="model.fttp.msgtyp"
:code="codes.swftyp1" :code="codes.msgtyp4"
:filterKey="['103', '202']"
style="width: 100%" style="width: 100%"
@change="swftypChange()"
> >
</c-select> </c-select>
</c-form-item> </c-form-item>
...@@ -176,48 +158,6 @@ ...@@ -176,48 +158,6 @@
<c-col :span="12"> <c-col :span="12">
<!-- ==================右边================ --> <!-- ==================右边================ -->
<!-- <c-col :span="24">
<c-form-item
:label="$t('fttp.头寸调出行')"
prop="ftdgrp.tro.pts.ref"
>
<c-input
v-model="model.ftdgrp.tro.pts.ref"
maxlength="20"
></c-input>
</c-form-item>
</c-col>
<c-col :span="24">
<c-form-item label="" prop="ftdgrp.tro.pts.extkey">
<c-fullbox>
<c-input
v-model="model.ftdgrp.tro.pts.extkey"
maxlength="8"
></c-input>
<template slot="footer">
<c-button size="small" style="margin-left: 5px" type="primary">
i
</c-button>
<c-button size="small" style="margin-left: 5px" type="primary">
详情
</c-button>
</template>
</c-fullbox>
</c-form-item>
</c-col>
<c-col :span="24">
<c-form-item label="" prop="ftdgrp.tro.pts.adrblk">
<c-input
type="textarea"
v-model="model.ftdgrp.tro.pts.adrblk"
:rows="3"
maxlength="35"
show-word-limit
></c-input>
</c-form-item>
</c-col> -->
<!-- S0000078 : 头寸调出行 --> <!-- S0000078 : 头寸调出行 -->
<c-col :span="24"> <c-col :span="24">
<el-card class="box-card"> <el-card class="box-card">
...@@ -254,45 +194,6 @@ ...@@ -254,45 +194,6 @@
</el-card> </el-card>
</c-col> </c-col>
<!-- <c-col :span="24">
<c-form-item
label="头寸调入行"
prop="fttp.trop.ptsget.sdamod.dadsnd"
>
<c-input v-model="model.fttp.trop.ptsget.sdamod.dadsnd"></c-input>
</c-form-item>
</c-col>
<c-col :span="24">
<c-form-item prop="ftdgrp.tri.pts.extkey">
<c-fullbox>
<c-input
v-model="model.ftdgrp.tri.pts.extkey"
maxlength="16"
></c-input>
<template slot="footer">
<c-button size="small" style="margin-left: 5px" type="primary">
i
</c-button>
<c-button size="small" style="margin-left: 5px" type="primary">
详情
</c-button>
</template>
</c-fullbox>
</c-form-item>
</c-col>
<c-col :span="24">
<c-form-item prop="ftdgrp.tri.pts.adrblk">
<c-input
type="textarea"
v-model="model.ftdgrp.tri.pts.adrblk"
:rows="3"
maxlength="35"
show-word-limit
></c-input>
</c-form-item>
</c-col> -->
<c-col :span="24"> <c-col :span="24">
<c-form-item prop="fttp.triact"> <c-form-item prop="fttp.triact">
<c-select <c-select
......
src/page/Funds/Fttpcm/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" ref="cnfp"/>
</el-collapse-item>
<el-collapse-item title="Mt103报文信息" name="mt103" v-if="model.fttp.msgtyp=='103'">
<m-mt103 :model="model" :codes="codes" ref="mt103" :idx = "1"/>
</el-collapse-item>
<el-collapse-item title="Mt202报文信息" name="mt202" v-if="model.fttp.msgtyp=='202'">
<m-mt202 :model="model" :codes="codes" ref="mt202" :idx = "1" />
</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 MT103 from "~/components/business/setmod/views/MT103.vue";
import Mt202 from "~/components/business/setmod/views/MT202.vue";
import Default from "../model/Default.js";
export default {
components: {
"m-cnfp": Cnfp,
"m-mt103": MT103,
"m-mt202": Mt202,
},
inject: ["root"],
props: ["model", "codes"],
mixins: [Event,Default],
data() {
return {
activeNames: ["cnfp", "mt103", "mt202"],
};
},
methods: {
handleChange(val) {
console.log(val);
},
},
created: function () {},
};
</script>
<style>
.marginLable {
padding-left: 160px;
}
</style>
\ No newline at end of file
src/page/Funds/Fttpcm/views/index.vue
...@@ -4,8 +4,10 @@ ...@@ -4,8 +4,10 @@
<el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right" <el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right"
size="small" :validate-on-rule-change="false"> size="small" :validate-on-rule-change="false">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick"> <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<el-tab-pane label="概要" name="cnfp"> <el-tab-pane label="概要" name="ovwp">
<m-cnfp :model="model" :codes="codes" /> <c-content>
<m-ovwp :model="model" :codes="codes" />
</c-content>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="费用/账务" name="setpan"> <el-tab-pane label="费用/账务" name="setpan">
<c-content> <c-content>
...@@ -47,19 +49,19 @@ import commonDepend from "~/mixin/commonDepend"; ...@@ -47,19 +49,19 @@ import commonDepend from "~/mixin/commonDepend";
import buildFn from "../event/buildCommons.js"; import buildFn from "../event/buildCommons.js";
import commonProcess from "~/mixin/commonProcess" import commonProcess from "~/mixin/commonProcess"
import Check from "../model/check.js"; import Check from "../model/check.js";
import Setmod from "~/components/business/setmod/views";
import Cnfp from "./Cnfp" import Ovwp from "./Ovwp"
import Mt199 from "./Mt199" import Mt199 from "./Mt199"
import Ftt199l1 from "./Ftt199l1" import Ftt199l1 from "./Ftt199l1"
import Setpan from "~/components/business/setmod/views"; import Setpan from "~/components/business/setmod/views";
import Docpan from "~/components/business/docpan/views"; import Docpan from "~/components/business/docpan/views";
import check from "../model/check.js"; import Default from "../model/Default";
export default { export default {
name: "Fttpcm", name: "Fttpcm",
components:{ components:{
"m-cnfp" : Cnfp, "m-setmod": Setmod,
"m-ovwp" : Ovwp,
"m-mt199" : Mt199, "m-mt199" : Mt199,
"m-ftt199l1" : Ftt199l1, "m-ftt199l1" : Ftt199l1,
"m-setpan": Setpan, "m-setpan": Setpan,
...@@ -70,10 +72,10 @@ export default { ...@@ -70,10 +72,10 @@ export default {
root: this root: this
} }
}, },
mixins: [operationFunc, commonDepend, event, buildFn,commonProcess], mixins: [Default,operationFunc, commonDepend, event, buildFn,commonProcess],
data(){ data(){
return { return {
tabVal: "cnfp", tabVal: "ovwp",
trnName: "fttpcm", trnName: "fttpcm",
trnType: "", trnType: "",
model: new Fttpcm().data, model: new Fttpcm().data,
......
src/page/Funds/Fxtfcm/event/index.js
...@@ -13,10 +13,59 @@ export default { ...@@ -13,10 +13,59 @@ export default {
console.log("~~~~~~~~~"); console.log("~~~~~~~~~");
console.log(this.model.fxdgrp); console.log(this.model.fxdgrp);
Utils.copyValueFromVoData(this.model.aplacc, this.model.fxdgrp.acc, ignoreModFlg); Utils.copyValueFromVoData(this.model.aplacc, this.model.fxdgrp.acc, true);
// this.model.aplacc=this.model.fxdgrp.acc; // this.model.aplacc=this.model.fxdgrp.acc;
console.log("~~~~~~~~~"); console.log("~~~~~~~~~");
console.log(this.model.fxdgrp); console.log(this.model.fxdgrp);
this.defaultAcc2N1000();
}, },
async onActChange(){
debugger
this.defaultAcc1N1000();
},
async defaultAcc2N1000(){
if (this.model.aplacc.pts.ptainr == ""||this.model.aplacc.pts.ptainr == undefined) {
return;
}
if (this.model.fxdgrp.cbs.max.cur == ""||this.model.fxdgrp.cbs.max.cur == undefined) {
return;
}
const loading = this.loading();
let res = await Api.post(`/${this.moduleRouter()}/fxtfcm/defaultAcc2N1000`, this.model);
loading.close();
if (res.respCode !== SUCCESS) {
this.$message.error(res.respMsg);
return;
}
this.acc2List=res.data;
if(this.acc2List.length>0 && (this.model.acc2 ==""||this.model.acc2 ==undefined)){
this.model.acc2=acc2List[0];
}
},
async defaultAcc1N1000(){
if (this.model.fxdgrp.act.pts.ptainr == ""||this.model.fxdgrp.act.pts.ptainr == undefined) {
return;
}
if (this.model.fxdgrp.cbs.max.cur == ""||this.model.fxdgrp.cbs.max.cur == undefined) {
return;
}
const loading = this.loading();
let res = await Api.post(`/${this.moduleRouter()}/fxtfcm/defaultAcc1N1000`, this.model);
loading.close();
if (res.respCode !== SUCCESS) {
this.$message.error(res.respMsg);
return;
}
this.acc1List=res.data;
if(this.acc1List.length>0 && (this.model.acc1 ==""||this.model.acc1 ==undefined)){
this.model.acc1=acc1List[0];
}
},
} }
} }
\ No newline at end of file
src/page/Funds/Fxtfcm/views/Cnfp.vue
...@@ -147,10 +147,24 @@ ...@@ -147,10 +147,24 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item prop="acc2"> <!-- <el-form-item prop="acc2">
<c-select v-model="model.acc2" style="width:100%"> <c-select v-model="model.acc2" style="width:100%">
</c-select> </c-select>
</el-form-item> </el-form-item> -->
<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>
...@@ -158,6 +172,7 @@ ...@@ -158,6 +172,7 @@
<el-card class="box-card"> <el-card class="box-card">
<c-ptap :model="model" :requiredExtkey="true" :disabledExtkey="false" :disabled="true" :isAdrblk="true" :haveAdrLabel="true" <c-ptap :model="model" :requiredExtkey="true" :disabledExtkey="false" :disabled="true" :isAdrblk="true" :haveAdrLabel="true"
:isShowCard="false" :isShowCard="false"
@handleChange="onActChange"
:argadr="{title: '我行账户行', grp: 'fxdgrp', rol: 'act',}" :argadr="{title: '我行账户行', grp: 'fxdgrp', rol: 'act',}"
:label="{labelExtkey:'我行账户行',labelNam:'名称',labelAdrblk:'地址',}" :label="{labelExtkey:'我行账户行',labelNam:'名称',labelAdrblk:'地址',}"
ptytyp="B"> ptytyp="B">
...@@ -166,10 +181,25 @@ ...@@ -166,10 +181,25 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item prop="acc1"> <!-- <el-form-item prop="acc1">
<c-select v-model="model.acc1" style="width:100%"> <c-select v-model="model.acc1" style="width:100%">
</c-select> </c-select>
</el-form-item> </el-form-item> -->
<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>
</c-col> </c-col>
...@@ -178,20 +208,20 @@ ...@@ -178,20 +208,20 @@
</template> </template>
<script> <script>
import Api from "~/service/Api" import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess"; import Event from "../event"
import CodeTable from "~/config/CodeTable"
import Event from "../model/Event"
export default { export default {
inject: ['root'], inject: ['root'],
props:["model","codes"], props:["model","codes"],
mixins: [Event,commonProcess], mixins: [Event],
data(){ data(){
return { return {
acc1List:['1111120209999','1111120209998'],
acc2List:['2222220209999','2222220209998'],
} }
}, },
methods:{...Event}, methods:{},
created:function(){ created:function(){
} }
......
src/page/Funds/Fxtfcm/views/Mt300.vue
...@@ -324,17 +324,17 @@ ...@@ -324,17 +324,17 @@
import Api from "~/service/Api"; import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess"; import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"; import CodeTable from "~/config/CodeTable";
import Event from "../model/Event"; import Event from "../event";
export default { export default {
inject: ["root"], inject: ["root"],
props: ["model", "codes"], props: ["model", "codes"],
mixins: [commonProcess], mixins: [Event],
data() { data() {
return {}; return {};
}, },
methods: { methods: {
...Event
}, },
created: function () {}, created: function () {},
}; };
......
src/page/Funds/Fxtfcm/views/index.vue
...@@ -76,7 +76,7 @@ export default { ...@@ -76,7 +76,7 @@ export default {
root: this root: this
} }
}, },
mixins: [commonProcess,operationFunc,commonDepend,event,buildFn], // 里面包含了Default、Check等的公共处理 mixins: [operationFunc,commonDepend,event,buildFn], // 里面包含了Default、Check等的公共处理
data(){ data(){
return { return {
tabVal: "ovwp", tabVal: "ovwp",
......
src/page/Funds/Fxtfcn/event/index.js
...@@ -8,12 +8,12 @@ export default { ...@@ -8,12 +8,12 @@ export default {
async getOwnref() { async getOwnref() {
}, },
async onAccChange(){ onAccChange(){
console.log("~~~~~~~~~"); console.log("~~~~~~~~~");
console.log(this.model.fxdgrp); console.log(this.model.fxdgrp);
Utils.copyValueFromVoData(this.model.aplacc, this.model.fxdgrp.acc, ignoreModFlg); Utils.copyValueFromVoData(this.model.aplacc, this.model.fxdgrp.acc, true);
// this.model.aplacc=this.model.fxdgrp.acc; // this.model.aplacc=this.model.fxdgrp.acc;
console.log("~~~~~~~~~"); console.log("~~~~~~~~~");
console.log(this.model.fxdgrp); console.log(this.model.fxdgrp);
......
src/page/Funds/Fxtfcn/views/Canp.vue
...@@ -142,7 +142,7 @@ export default { ...@@ -142,7 +142,7 @@ export default {
} }
}, },
methods:{...Event}, methods:{},
created:function(){ created:function(){
} }
......
src/page/Funds/Fxtlcm/event/index.js
...@@ -9,11 +9,60 @@ export default { ...@@ -9,11 +9,60 @@ export default {
console.log("~~~~~~~~~"); console.log("~~~~~~~~~");
console.log(this.model.fxdgrp); console.log(this.model);
Utils.copyValueFromVoData(this.model.aplacc, this.model.fxdgrp.acc, ignoreModFlg); Utils.copyValueFromVoData(this.model.aplacc, this.model.fxdgrp.acc, true);
// this.model.aplacc=this.model.fxdgrp.acc; // this.model.aplacc=this.model.fxdgrp.acc;
console.log("~~~~~~~~~"); console.log("~~~~~~~~~");
console.log(this.model.fxdgrp); console.log(this.model);
this.defaultAcc2N1000();
}, },
async onActChange(){
this.defaultAcc1N1000();
},
async defaultAcc2N1000(){
if (this.model.aplacc.pts.ptainr == ""||this.model.aplacc.pts.ptainr == undefined) {
return;
}
if (this.model.fxdgrp.cbs.max.cur == ""||this.model.fxdgrp.cbs.max.cur == undefined) {
return;
}
const loading = this.loading();
let res = await Api.post(`/${this.moduleRouter()}/fxtlcm/defaultAcc2N1000`, this.model);
loading.close();
if (res.respCode !== SUCCESS) {
this.$message.error(res.respMsg);
return;
}
this.acc2List=res.data;
if(this.acc2List.length>0 && (this.model.acc2 ==""||this.model.acc2 ==undefined)){
this.model.acc2=acc2List[0];
}
},
async defaultAcc1N1000(){
if (this.model.fxdgrp.act.pts.ptainr == ""||this.model.fxdgrp.act.pts.ptainr == undefined) {
return;
}
if (this.model.fxdgrp.cbs.max.cur == ""||this.model.fxdgrp.cbs.max.cur == undefined) {
return;
}
const loading = this.loading();
let res = await Api.post(`/${this.moduleRouter()}/fxtlcm/defaultAcc1N1000`, this.model);
loading.close();
if (res.respCode !== SUCCESS) {
this.$message.error(res.respMsg);
return;
}
this.acc1List=res.data;
if(this.acc1List.length>0 && (this.model.acc1 ==""||this.model.acc1 ==undefined)){
this.model.acc1=acc1List[0];
}
},
} }
} }
\ No newline at end of file
src/page/Funds/Fxtlcm/views/Cnfp.vue
...@@ -188,6 +188,7 @@ ...@@ -188,6 +188,7 @@
<el-card class="box-card"> <el-card class="box-card">
<c-ptap :model="model" :requiredExtkey="true" :disabledExtkey="false" :disabled="true" :isAdrblk="true" :haveAdrLabel="true" <c-ptap :model="model" :requiredExtkey="true" :disabledExtkey="false" :disabled="true" :isAdrblk="true" :haveAdrLabel="true"
:isShowCard="false" :isShowCard="false"
@handleChange="onActChange"
:argadr="{title: '我行账户行', grp: 'fxdgrp', rol: 'act',}" :argadr="{title: '我行账户行', grp: 'fxdgrp', rol: 'act',}"
:label="{labelExtkey:'我行账户行',labelNam:'名称',labelAdrblk:'地址',}" :label="{labelExtkey:'我行账户行',labelNam:'名称',labelAdrblk:'地址',}"
ptytyp="B"> ptytyp="B">
...@@ -216,21 +217,19 @@ ...@@ -216,21 +217,19 @@
</template> </template>
<script> <script>
import Api from "~/service/Api" import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "../event" import Event from "../event"
export default { export default {
inject: ['root'], inject: ['root'],
props:["model","codes"], props:["model","codes"],
mixins: [Event,commonProcess], mixins: [Event],
data(){ data(){
return { return {
acc1List:['1111120209999','1111120209998'], acc1List:['1111120209999','1111120209998'],
acc2List:['2222220209999','2222220209998'], acc2List:['2222220209999','2222220209998'],
} }
}, },
methods:{...Event}, methods:{},
created:function(){}, created:function(){},
watch: { watch: {
......
src/page/Funds/Fxtlcm/views/index.vue
...@@ -58,7 +58,7 @@ export default { ...@@ -58,7 +58,7 @@ export default {
root: this root: this
} }
}, },
mixins: [operationFunc, event, commonDepend, buildFn,commonProcess], mixins: [operationFunc, event, commonDepend, buildFn],
data(){ data(){
return { return {
tabVal: "ovwp", tabVal: "ovwp",
......
src/page/Funds/Fxtlcn/event/buildCommons.js
...@@ -24,9 +24,18 @@ export default { ...@@ -24,9 +24,18 @@ export default {
let ptsptaList = []; let ptsptaList = [];
return { return {
rec: { rec: {
objtyp: "FXT", objtyp: "FXD",
objinr: model.fxdgrp.rec.inr,
ownref: model.fxdgrp.rec.ownref,
fxtyp:model.fxdgrp.rec.fxtyp,
swtflg:model.swtflg,
cancur:model.cancur,
canamt:model.canamt,
},
cbsMap: {
MAX: model.fxdgrp.cbs.max,
NOM1: model.fxdgrp.cbs.nom1,
}, },
cbsMap: {},
ptsList: ptsptaList, ptsList: ptsptaList,
transName: trnName, transName: trnName,
userId: window.sessionStorage.userId ? window.sessionStorage.userId : "ZL", userId: window.sessionStorage.userId ? window.sessionStorage.userId : "ZL",
......
src/page/Funds/Fxtlcn/event/index.js
...@@ -4,25 +4,7 @@ import Api from '~/service/Api'; ...@@ -4,25 +4,7 @@ import Api from '~/service/Api';
export default { export default {
mixins: [commonFunctions], mixins: [commonFunctions],
methods: { methods: {
async onAplpDet() {
let rtnmsg = await this.executeRule("aplp.det")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败！' });
}
},
async onActpDet() {
let rtnmsg = await this.executeRule("actp.det")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败！' });
}
},
} }
} }
\ No newline at end of file
src/page/Funds/Fxtlcn/model/check.js
import Utils from "~/utils"
/**
* Fxtlcn Check规则
*/
export default { export default {
"fxdgrp.rec.ownref": [ "fxtlcn.canamt":[
{ type: "string", required: false, message: "必输项" }, {type: "number", required: false, message: "必输项"},
{ max: 16, message: "长度不能超过16" } {max: 18,message:"整数位不能超过14位"},
], {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
"fxdgrp.rec.nam": [ ],
{ type: "string", required: false, message: "必输项" },
{ max: 40, message: "长度不能超过40" }
],
"fxdgrp.apl.pts.ref": [
{ type: "string", required: false, message: "必输项" },
{ max: 20, message: "长度不能超过20" }
],
"fxtp.usr.extkey": [
{ type: "string", required: false, message: "必输项" },
{ max: 8, message: "长度不能超过8" }
],
"fxtp.usrget.sdamod.seainf": [
{ type: "string", required: false, message: "必输项" },
{ max: 3, message: "长度不能超过3" }
],
"fxtp.aplp.ptsget.sdamod.dadsnd": [
{ type: "string", required: false, message: "必输项" },
{ max: 16, message: "长度不能超过16" }
],
"fxdgrp.apl.pts.extkey": [
{ type: "string", required: false, message: "必输项" },
{ max: 16, message: "长度不能超过16" }
],
"fxtp.aplp.ptsget.sdamod.seainf": [
{ type: "string", required: false, message: "必输项" },
{ max: 3, message: "长度不能超过3" }
],
"fxdgrp.apl.pts.adrblk": [
{ type: "string", required: true, message: "必输项" },
{ max: 35, message: "长度不能超过35" }
],
"fxdgrp.apl.dbfadrblkcn": [
{ type: "string", required: true, message: "必输项" },
{ max: 35, message: "长度不能超过35" }
],
"fxdgrp.cbs.opn2.cur": [
{ type: "string", required: false, message: "必输项" },
{ max: 3, message: "长度不能超过3" }
],
"fxdgrp.cbs.opn2.amt": [
{ type: "number", required: false, message: "必输项" },
{ max: 18, message: "整数位不能超过14位" },
{ pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"cancur": [
{ type: "string", required: false, message: "必输项" },
{ max: 3, message: "长度不能超过3" }
],
"canamt": [
{ type: "number", required: false, message: "必输项" },
{ max: 18, message: "整数位不能超过14位" },
{ pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"fxdgrp.rec.opndat": [
{ type: "date", required: false, message: "输入正确的日期" }
],
"fxtp.actp.ptsget.sdamod.dadsnd": [
{ type: "string", required: false, message: "必输项" },
{ max: 16, message: "长度不能超过16" }
],
"fxdgrp.rec.valdat": [
{ type: "date", required: false, message: "输入正确的日期" }
],
"fxdgrp.act.pts.extkey": [
{ type: "string", required: false, message: "必输项" },
{ max: 16, message: "长度不能超过16" }
],
"fxtp.actp.ptsget.sdamod.seainf": [
{ type: "string", required: false, message: "必输项" },
{ max: 3, message: "长度不能超过3" }
],
"fxdgrp.act.pts.adrblk": [
{ type: "string", required: true, message: "必输项" },
{ max: 35, message: "长度不能超过35" }
],
"fxdgrp.act.dbfadrblkcn": [
{ type: "string", required: true, message: "必输项" },
{ max: 35, message: "长度不能超过35" }
],
"fxdgrp.blk.remark": [
{ type: "string", required: true, message: "必输项" },
{ max: 35, message: "长度不能超过35" }
]
}
}
\ No newline at end of file
src/page/Funds/Fxtlcn/model/index.js
import Api from "~/service/Api" import Api from "~/service/Api"
import Pts from "~/page/Model/Common/Pts" 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 Fxtlcn{ export default class Fxtlcn{
constructor () { constructor () {
this.data = { this.data = {
fxdgrp:{ fxdgrp: new Fxdgrp().data,
rec:{ fxtp:{
ownref:"", // 平盘业务参考号 .fxdgrp.rec.ownref frgchk:"X"
nam:"", // 名称 .fxdgrp.rec.nam },
fxtyp:"", // 平盘类型 .fxdgrp.rec.fxtyp mtabut:{
opndat:"", // 平盘日期 .fxdgrp.rec.opndat clsflg:"", // Close Flag .mtabut.clsflg
valdat:"", // 起息日 .fxdgrp.rec.valdat },
},
apl:{ cancur:"",
pts:new Pts().data, canamt:0,
dbfadrblkcn:"", // Chinese address .fxdgrp.apl.dbfadrblkcn oldactinr:"",
}, relcur:"",
blk:{ relamt:0,
remark:"", // 备注 .fxdgrp.blk.remark f21:"",
}, acc2:"", // APLACC's Account .acc2
cbs:{ acc1:"",
opn2:{
cur:"", // 待销账金额 .fxdgrp.cbs.opn2.cur aplacc:{
amt:"", // Balance .fxdgrp.cbs.opn2.amt pts:new Pts().data,
}, },
},
act:{ setmod: new Pub().data.Setmod,
pts:new Pts().data, docpan: new Pub().data.Docpan,
dbfadrblkcn:"", // Chinese address .fxdgrp.act.dbfadrblkcn trndia: new Pub().data.Trndia
},
},
fxtp:{
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:"", // 资金部负责人 .fxtp.usr.extkey
},
actp:{
ptsget:{
sdamod:{
seainf:"", // .fxtp.actp.ptsget.sdamod.seainf
dadsnd:"", // Drag Drop Sender .fxtp.actp.ptsget.sdamod.dadsnd
},
},
},
},
mtabut:{
clsflg:"", // Close Flag .mtabut.clsflg
},
canamt:"", // Cancel Amount .canamt
cancur:"", // 实际销账金额 .cancur
pageId: "", // ctx的key
setmod: new Pub().data.Setmod,
docpan: new Pub().data.Docpan,
trndia: new Pub().data.Trndia
} }
} }
} }
\ No newline at end of file
src/page/Funds/Fxtlcn/views/index.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<c-page title="结售汇平盘销账"> <c-page title="结售汇平盘销账">
<el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right" size="small" :validate-on-rule-change="false"> <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"> <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<el-tab-pane label="概要" name="canp"> <el-tab-pane label="业务信息" name="canp">
<m-canp :model="model" :codes="codes"/> <m-canp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="费用/账务" name="setpan"> <el-tab-pane label="费用/账务" name="setpan">
...@@ -74,18 +74,16 @@ export default { ...@@ -74,18 +74,16 @@ export default {
} }
}, },
created:async function(){ created:async function(){
console.log("进入fxtlcn交易"); console.log("进入fxtlcn交易.."+this.trnName);
let rtnmsg = {}; // await this.init({}) let params = {
if(rtnmsg.respCode == SUCCESS) transName: this.trnName,
{ fxdgrp: {
this.updateModel(rtnmsg.data) rec: {
//TODO 处理数据逻辑 inr: this.$route.query.inr || "",
},
} },
else };
{ this.init(params)
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
} }
} }
</script> </script>
......
src/page/Funds/Inffxd/views/Infsea.vue
...@@ -960,8 +960,8 @@ export default { ...@@ -960,8 +960,8 @@ export default {
methods: {}, methods: {},
mounted () { mounted () {
this.getdbCode('lcrtyp','EN','lcrtyp'); // this.getdbCode('lcrtyp','EN','lcrtyp');
this.getdbCode('avbby0','EN','avbby'); // this.getdbCode('avbby0','EN','avbby');
}, },
created: function() {} created: function() {}
}; };
......
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