Commit 20ddd33d by nanrui

infcld优化

parent 13bc2da9
...@@ -27,21 +27,21 @@ export default { ...@@ -27,21 +27,21 @@ export default {
} }
}, },
async handleReset() { async handleReset() {
this.model.infcon.seaownref = "" this.model.infcon.seaownref = ""
this.model.infcon.opndatfrom = new Date(); this.model.infcon.opndatfrom = new Date();
this.model.infcon.opndatto = new Date(); this.model.infcon.opndatto = new Date();
this.model.infcon.nam = "",
this.model.infcon.searef = ""; this.model.infcon.searef = "";
this.model.infcon.pty.extkey = ""; this.model.infcon.pty.extkey = "";
this.model.infcon.usr.extkey = ""; this.model.infcon.usr.extkey = "";
this.model.infcon.searol = ""; this.model.infcon.searol = "";
this.model.infcon.pty.nam = ""; this.model.infcon.pty.nam = "";
this.model.infcon.seapty = ""; this.model.infcon.seapty = "";
this.model.infcon.curtxt1 = ""; this.model.infcon.seacur = "";
this.model.infcon.nam = "";
this.model.infcon.seaamtfr = ""; this.model.infcon.seaamtfr = "";
this.model.infcon.seaamtto = ""; this.model.infcon.seaamtto = "";
this.model.infcon.seasta = ""; this.model.infcon.seasta = "";
this.model.infcon.doctypcod = ""; this.model.seadoctypcod = "";
}, },
async onInfbutSearow() { async onInfbutSearow() {
let rtnmsg = await this.executeRule("infbut.searow") let rtnmsg = await this.executeRule("infbut.searow")
......
...@@ -6,6 +6,30 @@ export default class Infcld { ...@@ -6,6 +6,30 @@ export default class Infcld {
constructor() { constructor() {
this.data = { this.data = {
infcon: { infcon: {
objinr:"",
cldgrp: {
rec: {
ownref: "", // Reference .cldgrp.rec.ownref
nam: "", // Name of CC contract .cldgrp.rec.nam
colref: "", // Coll.bank ref. .cldgrp.rec.colref
colptynam: "", // Col.bank name .cldgrp.rec.colptynam
credat: "", // Date of creation .cldgrp.rec.credat
count: "", // Item Count .cldgrp.rec.count
chktyp: "", // Type of Draft .cldgrp.rec.chktyp
colflg: "", // Payemnt Disposition .cldgrp.rec.colflg
inr: "",
},
cbs: {
max: {
amt: "", // Document Amount .cldgrp.cbs.max.amt
cur: "", // Document Amount .cldgrp.cbs.max.cur
},
opn1: {
cur: "", // Open Amount .cldgrp.cbs.opn1.cur
amt: "", // Open Amount .cldgrp.cbs.opn1.amt
},
},
},
seaownref: "", // Own Reference .infcon.seaownref seaownref: "", // Own Reference .infcon.seaownref
nam: "", // Name .infcon.nam nam: "", // Name .infcon.nam
searef: "", // Party Reference .infcon.searef searef: "", // Party Reference .infcon.searef
......
...@@ -49,7 +49,6 @@ ...@@ -49,7 +49,6 @@
<el-form-item label="Party Name" prop="infcon.pty.nam" style="width: 100%"> <el-form-item label="Party Name" prop="infcon.pty.nam" style="width: 100%">
<c-input v-model="model.infcon.pty.nam" maxlength="40" placeholder="请输入Party Name"> <c-input v-model="model.infcon.pty.nam" maxlength="40" placeholder="请输入Party Name">
</c-input> </c-input>
</c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="8"> <c-col :span="8">
...@@ -134,11 +133,47 @@ ...@@ -134,11 +133,47 @@
</el-form> </el-form>
</template> </template>
</c-list-search> </c-list-search>
<c-row> <c-col :span="24" style="margin-top: 10px">
<c-istream-table :list="stmData.data" :columns="stmData.columns"> <c-button class="medium_bcs" size="medium" style="margin-left: 0px" type="primary" @click="toCltdav">开立
</c-button>
</c-col>
<c-col :span="24">
<c-istream-table :list="stmData.data" :columns="stmData.columns">
<el-table-column fixed="right" prop="op" label="操作" width="150px">
<template slot="header">
<c-col :span="11" style="text-align: left"><span>操作</span></c-col>
<c-col :span="12" style="text-align: right">
<c-button icon="el-icon-s-tools"></c-button>
</c-col>
</template>
<template slot-scope="scope">
<el-popover placement="top-start" title="历史信息" width="800" trigger="click"
:ref="'popover_' + scope.row.IDX">
<div style=" text-align: right; margin-top: -30px; margin-right: 5px; font-size: 16px;">
<span class="el-icon-close" @click="closeTrn('popover_' + scope.row.IDX)" />
</div>
<c-istream-table :list="trnData.data" :columns="trnData.columns">
<el-table-column prop="op" label="操作" width="0">
<template slot-scope="scope">
<c-button style="margin-left: 0" size="small"
@click="display(scope.row['INR'])">详情</c-button>
</template>
</el-table-column>
</c-istream-table>
<c-button style="margin-left: 0" size="small" @click="getTrnInfo(scope.$index, scope.row)"
slot="reference">详情</c-button>
</el-popover>
<c-button style="margin-left: 0" size="small" type="primary"
@click="getButtons(scope.row['Reference'])">处理
</c-button>
</template>
</el-table-column>
</c-istream-table> </c-istream-table>
</c-row> </c-col>
<m-busbtn ref="childs" :ownref="ownref" :model="CltselModel" ownrefPath="cldgrp" trnCode="cltsel"
@onChoose="onChoose">11</m-busbtn>
...@@ -151,12 +186,18 @@ import commonProcess from "~/mixin/commonProcess"; ...@@ -151,12 +186,18 @@ import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable" import CodeTable from "~/config/CodeTable"
import Event from "~/model/Infcld/Event" import Event from "~/model/Infcld/Event"
import CltselModel from "~/model/Cltsel"
import BusNavbar from "~/views/Public/BusNavbar";
export default { export default {
inject: ['root'], inject: ['root'],
props: ["model", "codes"], props: ["model", "codes"],
mixins: [commonProcess], mixins: [commonProcess],
components: { "m-busbtn": BusNavbar },
data() { data() {
return { return {
CltselModel: new CltselModel().data,
ownref: "",
initdialog: false, initdialog: false,
transactionStatus: { transactionStatus: {
busiNo: "", busiNo: "",
...@@ -166,6 +207,19 @@ export default { ...@@ -166,6 +207,19 @@ export default {
earnCount: 0, earnCount: 0,
earnAmt: 0 earnAmt: 0
}, },
trnData: {
columns: [
'1 1 "编号" 200',
'2 2 "交易名称" 120',
// '3 3 "日期" 200',
{ index: 3, position: 3, width: 110, pattern: 'date', label: '日期' },
// '4 4 "状态" 50',
{ index: 4, position: 4, width: 100, pattern: 'code', label: '状态', code: this.codes.relstaEN },
'5 5 "币种" 80',
'6 6 "金额" 110',
],
data: [],
},
stmData: { stmData: {
columns: [ columns: [
"1 1 \"Reference\" 150", "1 1 \"Reference\" 150",
...@@ -184,7 +238,65 @@ export default { ...@@ -184,7 +238,65 @@ export default {
} }
} }
}, },
methods: { ...Event }, methods: {
...Event,
async getButtons(ownref) {
this.$refs.childs.initdialog = true
this.ownref = ownref
console.log("ownref:" + ownref);
},
async onChoose(code) {
//跳转交易
this.$router.history.push("/business/" + code)
this.$refs.childs.initdialog = false
},
closeTrn(refId) {
this.$refs[refId].doClose();
},
async getTrnInfo(idx, row) {
this.model.infcon.objinr = row["INR"];
this.model.infcon.cldgrp.rec.inr = row["INR"];
this.model.infcon.chksubcon = "X";
let rtnmsg = await this.executeDefault("infcon.chksubcon");
if ((rtnmsg.respCode = SUCCESS)) {
this.trnData.data = rtnmsg.data.infcon_trnstm.rows;
console.log(this.trnData.data);
}
},
async getDitSelInfo(idx, row) {
//TD中选中行触发
var params = { selDst: "infbut.dspstm", selIds: [idx + 1] }
let rtnmsg = await this.executeRule("infbut.dspstm", params);
if (rtnmsg.respCode = SUCCESS) {
this.updateModel(rtnmsg.data);
// Utils.copyValueFromVO(this.model, rtnmsg.data);
//TD中点击display时触发
params = { selDst: "infbut.dsp", selIds: [idx + 1] }
let rtnmsgNew = await this.executeRule("infbut.dsp", params);
if (rtnmsgNew.respCode = SUCCESS) {
console.log(rtnmsgNew);
this.updateModel(rtnmsgNew.data);
let rtnmsgOitset = await this.executeDefault("mtabut.coninf.oitset.oit");
if (rtnmsgOitset.respCode = SUCCESS) {
Utils.copyValueFromVO(this.model, rtnmsgOitset.data);
}
}
}
//触发父组件中updateShowPanel 事件,修改index中showPanel ,控制 index中组件的显示和隐藏
this.$emit('updateShowPanel', true)
},
toCltdav() {
this.$router.history.push("/business/cltdav")
}
},
created: function () { created: function () {
} }
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<c-checkbox v-model="model.infcon.chktrnsta">only active transactions</c-checkbox> <c-checkbox v-model="model.infcon.chktrnsta">only active transactions</c-checkbox>
</c-col> </c-col>
<c-col :span="12"> <!-- <c-col :span="12">
<el-form-item label="stream for TRN to selected contract" prop="infcon.trnstm"> <el-form-item label="stream for TRN to selected contract" prop="infcon.trnstm">
<c-input v-model="model.infcon.trnstm" placeholder="请输入stream for TRN to selected contract"></c-input> <c-input v-model="model.infcon.trnstm" placeholder="请输入stream for TRN to selected contract"></c-input>
</el-form-item> </el-form-item>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<c-button size="small" type="primary" @click="onInfconButshw"> <c-button size="small" type="primary" @click="onInfconButshw">
Display Display
</c-button> </c-button>
</c-col> </c-col> -->
</div> </div>
</template> </template>
<script> <script>
......
<template> <template>
<div class="eContainer"> <div class="eContainer">
<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"
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick"> :validate-on-rule-change="false">
<!--PD000006 -->
<!--PD000006 --> <c-content>
<el-tab-pane label="Selection" name="infsea"> <m-infsea v-show="!showPanel" :model="model" :codes="codes" ref="infsea" />
<m-infsea :model="model" :codes="codes"/> </c-content>
</el-tab-pane>
<c-tabs v-model="tabVal" v-show="showPanel" ref="elment" type="card" @tab-click="tabClick">
<!--PD000001 --> <!--PD000006 -->
<el-tab-pane label="Completion" name="coninfp"> <el-tab-pane label="Selection" name="infsea">
<m-coninfp :model="model" :codes="codes"/> <m-infsea :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--PD000013 --> <!--PD000001 -->
<el-tab-pane label="Transactions" name="trnpan"> <el-tab-pane label="Completion" name="coninfp">
<m-trnpan :model="model" :codes="codes"/> <m-coninfp :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--PD000019 --> <!--PD000013 -->
<el-tab-pane label="CBS Info" name="cbsinfp"> <el-tab-pane label="Transactions" name="trnpan">
<m-cbsinfp :model="model" :codes="codes"/> <m-trnpan :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--PD000028 --> <!--PD000019 -->
<el-tab-pane label="CBE Info" name="cbeinfp"> <el-tab-pane label="CBS Info" name="cbsinfp">
<m-cbeinfp :model="model" :codes="codes"/> <m-cbsinfp :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--PD000111 --> <!--PD000028 -->
<el-tab-pane label="FEP/FCP Info" name="fepinfp"> <el-tab-pane label="CBE Info" name="cbeinfp">
<m-fepinfp :model="model" :codes="codes"/> <m-cbeinfp :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--PD000162 --> <!--PD000111 -->
<el-tab-pane label="SEP Info" name="sepinfp"> <el-tab-pane label="FEP/FCP Info" name="fepinfp">
<m-sepinfp :model="model" :codes="codes"/> <m-fepinfp :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--PD000177 --> <!--PD000162 -->
<el-tab-pane label="GLE Bookings" name="gleinfp"> <el-tab-pane label="SEP Info" name="sepinfp">
<m-gleinfp :model="model" :codes="codes"/> <m-sepinfp :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--PD000119 --> <!--PD000177 -->
<el-tab-pane label="SMH Info" name="smhinfp"> <el-tab-pane label="GLE Bookings" name="gleinfp">
<m-smhinfp :model="model" :codes="codes"/> <m-gleinfp :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--PD000130 --> <!--PD000119 -->
<el-tab-pane label="SPT/DIA Info" name="peninfp"> <el-tab-pane label="SMH Info" name="smhinfp">
<m-peninfp :model="model" :codes="codes"/> <m-smhinfp :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--PD000147 --> <!--PD000130 -->
<el-tab-pane label="Engagement" name="liainfp"> <el-tab-pane label="SPT/DIA Info" name="peninfp">
<m-liainfp :model="model" :codes="codes"/> <m-peninfp :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--PD000005 --> <!--PD000147 -->
<el-tab-pane label="Print" name="prtpan"> <el-tab-pane label="Engagement" name="liainfp">
<m-prtpan :model="model" :codes="codes"/> <m-liainfp :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--PD000185 --> <!--PD000005 -->
<el-tab-pane label="Order" name="ordpan"> <el-tab-pane label="Print" name="prtpan">
<m-ordpan :model="model" :codes="codes"/> <m-prtpan :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--PD000029 --> <!--PD000185 -->
<el-tab-pane label="Order" name="ordp0"> <el-tab-pane label="Order" name="ordpan">
<m-ordp0 :model="model" :codes="codes"/> <m-ordpan :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--PD000029 -->
<!--PD000001 --> <el-tab-pane label="Order" name="ordp0">
<el-tab-pane label="DTA Fields" name="dtetag"> <m-ordp0 :model="model" :codes="codes" />
<m-dtetag :model="model" :codes="codes"/> </el-tab-pane>
</el-tab-pane>
<!--PD000001 --> <!--PD000001 -->
<el-tab-pane label="Fee Conditions" name="fecp"> <el-tab-pane label="DTA Fields" name="dtetag">
<m-fecp :model="model" :codes="codes"/> <m-dtetag :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--PD000204 --> <!--PD000001 -->
<el-tab-pane label="CIPS" name="cips"> <el-tab-pane label="Fee Conditions" name="fecp">
<m-cips :model="model" :codes="codes"/> <m-fecp :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--PD000449 --> <!--PD000204 -->
<el-tab-pane label="CIPS2.0" name="cips2"> <el-tab-pane label="CIPS" name="cips">
<m-cips2 :model="model" :codes="codes"/> <m-cips :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--PD000450 --> <!--PD000449 -->
<el-tab-pane label="CIPS2.0" name="cips3"> <el-tab-pane label="CIPS2.0" name="cips2">
<m-cips3 :model="model" :codes="codes"/> <m-cips2 :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
</c-tabs>
</el-form> <!--PD000450 -->
</div> <el-tab-pane label="CIPS2.0" name="cips3">
<m-cips3 :model="model" :codes="codes" />
</el-tab-pane>
</c-tabs>
</el-form>
</div>
</template> </template>
<script> <script>
import Api from "~/service/Api" import Api from "~/service/Api"
...@@ -133,68 +138,66 @@ import Coninfp from "~/views/Public/Coninfp" ...@@ -133,68 +138,66 @@ import Coninfp from "~/views/Public/Coninfp"
export default { export default {
name: "Infcld", name: "Infcld",
components:{ components: {
"m-infsea" : Infsea, "m-infsea": Infsea,
"m-coninfp": Coninfp, "m-coninfp": Coninfp,
"m-trnpan" : Trnpan, "m-trnpan": Trnpan,
"m-cbsinfp" : Cbsinfp, "m-cbsinfp": Cbsinfp,
"m-cbeinfp" : Cbeinfp, "m-cbeinfp": Cbeinfp,
"m-fepinfp" : Fepinfp, "m-fepinfp": Fepinfp,
"m-sepinfp" : Sepinfp, "m-sepinfp": Sepinfp,
"m-sepp0" : Sepp0, "m-sepp0": Sepp0,
"m-gleinfp" : Gleinfp, "m-gleinfp": Gleinfp,
"m-smhinfp" : Smhinfp, "m-smhinfp": Smhinfp,
"m-peninfp" : Peninfp, "m-peninfp": Peninfp,
"m-liainfp" : Liainfp, "m-liainfp": Liainfp,
"m-prtpan" : Prtpan, "m-prtpan": Prtpan,
"m-ordpan" : Ordpan, "m-ordpan": Ordpan,
"m-ordp0" : Ordp0, "m-ordp0": Ordp0,
"m-dtetag" : Dtetag, "m-dtetag": Dtetag,
"m-fecp" : Fecp, "m-fecp": Fecp,
"m-cips" : Cips, "m-cips": Cips,
"m-cips2" : Cips2, "m-cips2": Cips2,
"m-cips3" : Cips3, "m-cips3": Cips3,
}, },
provide() { provide() {
return { return {
root: this root: this
} }
}, },
mixins: [commonProcess], // 里面包含了Default、Check等的公共处理 mixins: [commonProcess], // 里面包含了Default、Check等的公共处理
data(){ data() {
return { return {
tabVal: "infsea", tabVal: "infsea",
trnName: "infcld", trnName: "infcld",
model: new Infcld().data, model: new Infcld().data,
checkRules: Check, checkRules: Check,
defaultRules: Default, defaultRules: Default,
pattern: Pattern, pattern: Pattern,
rules: null, rules: null,
codes: { showPanel: false,
...CodeTable codes: {
}, ...CodeTable
} },
}, }
methods:{ },
tabClick(){ methods: {
} tabClick() {
}, }
created:async function(){ },
console.log("进入infcld交易"); created: async function () {
let rtnmsg = await this.init({}) console.log("进入infcld交易");
if(rtnmsg.respCode == SUCCESS) let rtnmsg = await this.init({})
{ if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
} }
else else {
{ this.$notify.error({ title: '错误', message: '服务请求失败!' });
this.$notify.error({title: '错误',message: '服务请求失败!'}); }
} }
}
} }
</script> </script>
<style> <style>
</style> </style>
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