Skip to content

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

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

parents f40fe4c9 afa9122c
Showing with 442 additions and 126 deletions
src/page/Frontend/Fxdsdb/views/addDialog.vue
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<el-upload action="/webapi/frontend/fxdsdb/upload" :before-upload="handleBeforeUpload" :on-success="handleSuccess" :limit="1" :show-file-list="false" accept=".xml"> <el-upload action="/webapi/frontend/fxdsdb/upload" :before-upload="handleBeforeUpload" :on-success="handleSuccess" :limit="1" :show-file-list="false" accept=".xml">
<c-button slot="trigger" size="small" type="primary">导入</c-button> <c-button slot="trigger" size="small" type="primary">导入</c-button>
</el-upload> </el-upload>
<el-table :data="stmData.data" :columns="stmData.columns" v-loading="load" style="width: 100%;margin-top: 10px;" <el-table v-if="isDispaly" :data="stmData.data" :columns="stmData.columns" v-loading="load" style="width: 100%;margin-top: 10px;"
size="small" :border="true" size="small" :border="true"
:highlight-current-row="true"> :highlight-current-row="true">
<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"
...@@ -36,15 +36,263 @@ export default { ...@@ -36,15 +36,263 @@ export default {
isDispaly: false, isDispaly: false,
load: false, load: false,
stmData: { stmData: {
columns: [ columns: [],
{
label: "导入日期",
prop: "credat",
width: "120px"
},
],
data: [] data: []
} },
fxdcomlstHead:[
{
label: "公共数据代码",
prop: "comcod",
width: "100px"
},
{
label: "公共数据中文名称",
prop: "comnam",
width: "100px"
},
{
label: "公共数据值",
prop: "val",
width: "100px"
},
{
label: "生效类型",
prop: "typ",
width: "100px"
},
{
label: "生效日期",
prop: "effdat",
width: "100px"
},
{
label: "公共数据类型",
prop: "comtyp",
width: "100px"
},
{
label: "公共参数英文名称",
prop: "comengnam",
width: "100px"
},
{
label: "变更类型",
prop: "chgtyp",
width: "100px"
},
{
label: "变更期数",
prop: "changeterm",
width: "100px"
},
],
fxdriglstHead:[
{
label: "参与者机构号",
prop: "bic",
width: "100px"
},
{
label: "报文类型",
prop: "msgtyp",
width: "100px"
},
{
label: "业务方向",
prop: "sndtyp",
width: "100px"
},
],
fxdtyplstHead:[
{
label: "报文类型",
prop: "typ",
width: "100px"
},
{
label: "bizdtltyp",
prop: "msgtyp",
width: "100px"
},
],
fxdsuelstHead:[
{
label: "参与者变更期数",
prop: "issueno",
width: "100px"
},
{
label: "公共参数变更期数",
prop: "comissueno",
width: "100px"
},
{
label: "直间参关系变更期数",
prop: "bdrissueno",
width: "100px"
},
],
fxdpatlstHead:[
{
label: "参与者机构代码",
prop: "cod",
width: "100px"
},
{
label: "参与者机构中文名称",
prop: "chnnam",
width: "100px"
},
{
label: "参与者英文名称",
prop: "engnam",
width: "100px"
},
{
label: "国别",
prop: "cty",
width: "100px"
},
{
label: "境内外标识",
prop: "cbtype",
width: "100px"
},
{
label: "参与者资格标识",
prop: "bakcat",
width: "100px"
},
{
label: "所属资金托管行",
prop: "ctdbak",
width: "100px"
},
{
label: "法人机构识别编码",
prop: "lei",
width: "100px"
},
{
label: "有效标识",
prop: "valflg",
width: "100px"
},
{
label: "生效日期",
prop: "effdat",
width: "100px"
},
{
label: "联系人姓名",
prop: "nam",
width: "100px"
},
{
label: "联系人电话",
prop: "tel",
width: "100px"
},
{
label: "联系人邮件地址",
prop: "mal",
width: "100px"
},
{
label: "联系人地址",
prop: "address",
width: "100px"
},
{
label: "联系人邮编",
prop: "zipcod",
width: "100px"
},
{
label: "前一次更新状态",
prop: "presta",
width: "100px"
},
{
label: "当前更新状态",
prop: "sta",
width: "100px"
},
{
label: "变更期数",
prop: "issueno",
width: "100px"
},
{
label: "办理业务状态",
prop: "bizsta",
width: "100px"
},
],
fxdrellstHead:[
{
label: "参与者机构",
prop: "cod",
width: "100px"
},
{
label: "所属直接参与机构号",
prop: "drbankcod",
width: "100px"
},
{
label: "生效日期",
prop: "effdat",
width: "100px"
},
{
label: "上次更新类型",
prop: "preupdtyp",
width: "100px"
},
{
label: "变更期数",
prop: "issueno",
width: "100px"
},
{
label: "更新类型",
prop: "updtyp",
width: "100px"
},
],
fxddcflstHead:[
{
label: "参与者机构",
prop: "cod",
width: "100px"
},
{
label: "证书DN",
prop: "dn",
width: "100px"
},
{
label: "证书SN",
prop: "sn",
width: "100px"
},
{
label: "证书有效期起始日期",
prop: "stadat",
width: "100px"
},
{
label: "证书有效期结束日期",
prop: "enddat",
width: "100px"
},
{
label: "数字证书内容",
prop: "binmsgbdy",
width: "100px"
},
],
}; };
}, },
watch: { watch: {
...@@ -64,6 +312,36 @@ export default { ...@@ -64,6 +312,36 @@ export default {
}, },
handleSuccess(res, file) { handleSuccess(res, file) {
console.log('=====', res) console.log('=====', res)
if(res.respCode == SUCCESS){
if(res.data.filtyp=='9' || res.data.filtyp=='10'){
this.stmData.columns=this.fxdcomlstHead;
this.stmData.data = res.data.cpsfxdgrp.fxdcomlst
}
if(res.data.filtyp=='11'){
this.stmData.columns=this.fxdtyplstHead;
this.stmData.data = res.data.cpsfxdgrp.fxdtyplst
}
if(res.data.filtyp=='12'){
this.stmData.columns=this.fxdsuelstHead;
this.stmData.data = res.data.cpsfxdgrp.fxdsuelst
}
if(res.data.filtyp=='13' || res.data.filtyp=='14' || res.data.filtyp=='15'){
this.stmData.columns=this.fxdcomlstHead;
this.stmData.data = res.data.cpsfxdgrp.fxdcomlst
}
if(res.data.filtyp=='16' || res.data.filtyp=='17'){
this.stmData.columns=this.fxdcomlstHead;
this.stmData.data = res.data.cpsfxdgrp.fxdcomlst
}
if(res.data.filtyp=='18'){
this.stmData.columns=this.fxddcflstHead;
this.stmData.data = res.data.cpsfxdgrp.fxddcflst
}
if(res.data.filtyp=='19'){
this.stmData.columns=this.fxdriglstHead;
this.stmData.data = res.data.cpsfxdgrp.fxdriglst
}
}
this.load = false; this.load = false;
this.isDispaly = true; this.isDispaly = true;
}, },
......
src/page/Frontend/Qrtmgs/event/index.js
...@@ -24,7 +24,7 @@ export default { ...@@ -24,7 +24,7 @@ export default {
this.load = true; this.load = true;
let rtnmsg = await Api.post("/frontend/case/query", { let rtnmsg = await Api.post("/frontend/case/query", {
...this.model, ...this.model,
pageNum: this.pagination.pageNum, pageNumber: this.pagination.pageNum,
pageSize: this.pagination.pageSize, pageSize: this.pagination.pageSize,
dts: moment(dts).format("YYYY-MM-DD"), dts: moment(dts).format("YYYY-MM-DD"),
dte: moment(dte).format("YYYY-MM-DD"), dte: moment(dte).format("YYYY-MM-DD"),
...@@ -32,17 +32,18 @@ export default { ...@@ -32,17 +32,18 @@ export default {
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
this.load = false; this.load = false;
this.stmData.data = []; this.stmData.data = [];
const {list} = rtnmsg.data; this.stmData.data=rtnmsg.data.list;
const {codes:{sta1}} = this; // const {list} = rtnmsg.data;
// const {codes:{sta1}} = this;
list.forEach(v=>{ //
for(let i in sta1){ // list.forEach(v=>{
if(sta1[i].value == v.sta){ // for(let i in sta1){
v.sta = sta1[i].label; // if(sta1[i].value == v.sta){
} // v.sta = sta1[i].label;
} // }
}) // }
this.stmData.data = list; // })
// this.stmData.data = list;
this.pagination = { this.pagination = {
pageNum: rtnmsg.data.pageNum || 1, pageNum: rtnmsg.data.pageNum || 1,
pageSize: rtnmsg.data.pageSize || 10, pageSize: rtnmsg.data.pageSize || 10,
......
src/page/Funds/Fxtfcn/event/buildCommons.js 0 → 100644
import Utils from "~/utils";
export default {
methods: {
buildPtspta(ptsptaObj) {
let pts = ptsptaObj.pts;
return {
rol: pts.rol,
name: pts.nam,
ptyinr: pts.ptyinr,
ptainr: pts.ptainr,
extkey: pts.extkey,
dftdsp: pts.dftdsp,
dftcur: pts.dftcur,
dftact: pts.dftact,
dftfeecur: pts.dftfeecur,
dftactptainr: pts.dftactptainr,
glggrpflg: pts.glggrpflg,
adrblk: pts.adrblk,
pts,
};
},
buildCommonData(model, trnName) {
let ptsptaList = Utils.formatPtspta(model.fxdgrp, this.buildPtspta);
return {
rec: {
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,
},
ptsList: ptsptaList,
transName: trnName,
userId: window.sessionStorage.userId ? window.sessionStorage.userId : "ZL",
};
},
},
};
src/page/Funds/Fxtfcn/event/index.js 0 → 100644
import commonFunctions from '~/mixin/commonFunctions.js';
import Api from '~/service/Api';
export default {
mixins: [commonFunctions],
methods: {
async getOwnref() {
}
}
}
\ No newline at end of file
src/page/Funds/Fxtfcn/model/Check.js
import Utils from "~/utils" export default {
"fxtfcn.canamt":[
/** {type: "number", required: false, message: "必输项"},
* Fxtfcn Check规则 {max: 18,message:"整数位不能超过14位"},
*/ {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
let checkObj = { ],
"canamt" :null,
"fxdgrp.apl.pts.adrblk" :null,
"fxtp.usr.extkey" :null,
"fxdgrp.cbs.opn2.amt" :null,
"fxdgrp.act.pts.adrblk" :null,
"fxdgrp.act.pts.extkey" :null,
"fxdgrp.rec.ownref" :null,
"fxdgrp.apl.pts.extkey" :null,
"mtabut.clsflg" :null,
}
for (const key in checkObj) {
if (Object.hasOwnProperty.call(checkObj, key)) {
checkObj[key] = checkObj[key] ? checkObj[key] : Utils.reflectCheck(key)
}
}
export default checkObj
}
\ No newline at end of file
src/page/Funds/Fxtfcn/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 Fxdgrp from '~/components/business/commonModel/fxdgrp';
export default class Fxtfcn{ export default class Fxtfcn{
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 cancur:"",
opndat:"", // 平盘日期 .fxdgrp.rec.opndat canamt:0,
valdat:"", // 起息日 .fxdgrp.rec.valdat oldactinr:"",
}, relcur:"",
apl:{ relamt:0,
pts:new Pts().data, f21:"",
dbfadrblkcn:"", // Chinese address .fxdgrp.apl.dbfadrblkcn acc2:"", // APLACC's Account .acc2
}, acc1:"",
blk:{ cancuruse:"",
remark:"", // 备注 .fxdgrp.blk.remark canamtuse:0,
},
cbs:{ aplacc:{
opn2:{ pts:new Pts().data,
cur:"", // Orig.Amount .fxdgrp.cbs.opn2.cur },
amt:"", // Balance .fxdgrp.cbs.opn2.amt setmod: new Pub().data.Setmod,
}, docpan: new Pub().data.Docpan,
nom1:{ trndia: new Pub().data.Trndia,
amt:"", // Balance .fxdgrp.cbs.nom1.amt }
cur:"", // 待销账金额 .fxdgrp.cbs.nom1.cur
},
},
act:{
pts:new Pts().data,
dbfadrblkcn:"", // Chinese address .fxdgrp.act.dbfadrblkcn
},
},
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
}
} }
} }
\ No newline at end of file
src/page/Funds/Fxtfcn/views/index.vue
<template> <template>
<div class="eContainer"> <div class="eContainer">
<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">
<!--fxtfcn PD000001 Cancellation --> <!--fxtfcn PD000001 Cancellation -->
<el-tab-pane :label="$t('fxtfcn.PD000001')" name="canp"> <el-tab-pane label="业务信息" name="canp">
<c-content>
<m-canp :model="model" :codes="codes"/> <m-canp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="费用/账务" name="setpan">
<c-content>
<m-setpan :codes="codes" :model="model" />
</c-content>
</el-tab-pane>
<el-tab-pane label="报文/面函" name="docpan">
<c-content>
<m-docpan :codes="codes" :model="model" />
</c-content>
</el-tab-pane>
</c-tabs> </c-tabs>
</el-form> </el-form>
<c-function-btn
:handleCheck="handleCheck"
:handleStash="handleStash"
:handleSubmit="handleSubmit"
@handleSureWarning="handleSureWarning"
ref="commonBtn"
></c-function-btn>
</c-page>
</div> </div>
</template> </template>
<script> <script>
...@@ -15,6 +39,13 @@ import Api from "~/service/Api" ...@@ -15,6 +39,13 @@ import Api from "~/service/Api"
import CodeTable from "~/config/CodeTable" import CodeTable from "~/config/CodeTable"
import Fxtfcn from "../model" import Fxtfcn from "../model"
import commonProcess from "~/mixin/commonProcess" import commonProcess from "~/mixin/commonProcess"
import Setpan from "~/components/business/setmod/views";
import Docpan from "~/components/business/docpan/views";
import buildFn from "../event/buildCommons.js";
import operationFunc from "~/mixin/operationFunc";
import commonDepend from "~/mixin/commonDepend";
import event from "../event";
import Check from "../model/Check" import Check from "../model/Check"
import Default from "../model/Default" import Default from "../model/Default"
import Pattern from "../model/Pattern" import Pattern from "../model/Pattern"
...@@ -25,24 +56,26 @@ export default { ...@@ -25,24 +56,26 @@ export default {
name: "Fxtfcn", name: "Fxtfcn",
components:{ components:{
"m-canp" : Canp, "m-canp" : Canp,
"m-setpan": Setpan,
"m-docpan": Docpan,
}, },
provide() { provide() {
return { return {
root: this root: this
} }
}, },
mixins: [commonProcess], // 里面包含了Default、Check等的公共处理 mixins: [commonProcess,operationFunc,commonDepend,event,buildFn], // 里面包含了Default、Check等的公共处理
data(){ data(){
return { return {
tabVal: "canp", tabVal: "canp",
trnName: "fxtfcn", trnName: "fxtfcn",
trnType: "", trnType: "",
model: new Fxtfcn().data, model: new Fxtfcn().data,
checkRules: Check, // checkRules: Check,
defaultRules: Default, // defaultRules: Default,
pattern: Pattern, // pattern: Pattern,
rules: null, rules: Check,
codes: { codes: {...CodeTable
}, },
} }
}, },
...@@ -55,18 +88,16 @@ export default { ...@@ -55,18 +88,16 @@ export default {
} }
}, },
created:async function(){ created:async function(){
console.log("进入fxtfcn交易"); console.log("进入fxtfcn交易.."+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>
......
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