Commit 4b6e5ade by xiameng

infact 功能实现

inffee调整布局等
parent 2315eeeb
...@@ -2426,6 +2426,7 @@ const CodeTable = { ...@@ -2426,6 +2426,7 @@ const CodeTable = {
{ label: "N/A(仅限汇总填报时使用)", value: "N/A" }, { label: "N/A(仅限汇总填报时使用)", value: "N/A" },
{ label: "瑞典克朗", value: "SEK" }, { label: "瑞典克朗", value: "SEK" },
{ label: "新西兰元", value: "NZD" }, { label: "新西兰元", value: "NZD" },
], ],
curcod: [ curcod: [
{ label: "GHC - 加纳塞地", value: "GHC" }, { label: "GHC - 加纳塞地", value: "GHC" },
...@@ -7410,5 +7411,24 @@ const CodeTable = { ...@@ -7410,5 +7411,24 @@ const CodeTable = {
{ label: "国内证包买单据", value: "G" }, { label: "国内证包买单据", value: "G" },
{ label: "国内证第三方风险参贷", value: "V" }, { label: "国内证第三方风险参贷", value: "V" },
], ],
recgrptyp: [
{ label: "AR 暂收款项帐", value: "AR" },
{ label: "AS 应收款项帐", value: "AS" },
{ label: "BF 国结融资过渡帐", value: "BF" },
{ label: "CC 客户保证金帐", value: "CC" },
{ label: "CI 清算汇入帐", value: "CI" },
{ label: "CO 清算汇出帐", value: "CO" },
{ label: "FI 金融机构存款", value: "FI" },
{ label: "FX 外汇买卖类款", value: "FX" },
{ label: "IN 利息收入帐", value: "IN" },
{ label: "LA 应付款项帐", value: "LA" },
{ label: "LO 客户往来账", value: "LO" },
{ label: "NO 存放上级/国外账", value: "NO" },
{ label: "OB 表外类款", value: "OB" },
{ label: "PL 损益类账", value: "PL" },
{ label: "SC 其他客户保证金帐", value: "SC" },
{ label: "SP 国结专户", value: "SP" },
{ label: "TP 国际结算临时帐", value: "TP" },
],
} }
export default CodeTable; export default CodeTable;
...@@ -7,6 +7,7 @@ export default { ...@@ -7,6 +7,7 @@ export default {
if(rtnmsg.respCode == SUCCESS) if(rtnmsg.respCode == SUCCESS)
{ {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
this.updateModel(rtnmsg.data);
 this.stmData.data = rtnmsg.data.infbut_dspstm.rows;  this.stmData.data = rtnmsg.data.infbut_dspstm.rows;
} }
else else
...@@ -14,7 +15,7 @@ export default { ...@@ -14,7 +15,7 @@ export default {
this.$notify.error({title: '错误',message: '服务请求失败!'}); this.$notify.error({title: '错误',message: '服务请求失败!'});
} }
}, },
async onInfbutDsp(index,row){ async onInfbutDsp(idx,row){
const selIds= [idx + 1]; const selIds= [idx + 1];
const selDst= "dspstm";//dspstm是数据流 const selDst= "dspstm";//dspstm是数据流
let params = {selIds,selDst}; let params = {selIds,selDst};
...@@ -24,7 +25,7 @@ export default { ...@@ -24,7 +25,7 @@ export default {
{ {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
this.updateModel(rtnmsg.data); this.updateModel(rtnmsg.data);
this.tabVal = "actp0" this.root.tabVal = "actp0"
} }
else else
{ {
......
...@@ -14,6 +14,7 @@ export default class Infact{ ...@@ -14,6 +14,7 @@ export default class Infact{
cur:"", // Currency .cur cur:"", // Currency .cur
infbut:{ infbut:{
dspstm:"", // display stream .infbut.dspstm dspstm:"", // display stream .infbut.dspstm
selrow: 0,
}, },
recpan:{ recpan:{
pty:{ pty:{
......
...@@ -7,7 +7,8 @@ export default { ...@@ -7,7 +7,8 @@ export default {
if(rtnmsg.respCode == SUCCESS) if(rtnmsg.respCode == SUCCESS)
{ {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
 this.stmData.data = rtnmsg.data.infbut_dspstm.rows; this.updateModel(rtnmsg.data);
this.stmData.data = rtnmsg.data.infbut_dspstm.rows;
} }
else else
{ {
...@@ -73,5 +74,31 @@ export default { ...@@ -73,5 +74,31 @@ export default {
this.$notify.error({title: '错误',message: '服务请求失败!'}); this.$notify.error({title: '错误',message: '服务请求失败!'});
} }
}, },
// async pre(idx){
// const selIds= [idx + 1];
// const selDst= "dspstm";
// let params = {selIds,selDst};
// this.model.infbut.selrow = idx ;
// let rtnmsg = await this.executeRule("infbut.dsp", params)
// //TODO 处理数据逻辑
// //console.log(selrow)
// this.updateModel(rtnmsg.data);
// },
// async next(idx){
// const selIds= this.model.infbut.selrow;
// const selDst= "dspstm";
// let params = {selIds,selDst};
// this.model.infbut.selrow = idx+2 ;
// let rtnmsg = await this.executeRule("infbut.dsp", params)
// //TODO 处理数据逻辑
// //console.log(selrow)
// this.updateModel(rtnmsg.data);
// },
} }
\ No newline at end of file
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
<!-- SF000036 : Type --> <!-- SF000036 : Type -->
<c-col :span="8"> <c-col :span="8">
<el-form-item label=" Type" prop="recgrp.typ"> <el-form-item label=" Type" prop="typ">
<c-select v-model="model.recgrp.typ" style="width:100%" :placeholder="'Type'"> <c-select v-model="model.recgrp.rec.typ" style="width:100%" :placeholder="'Type'">
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
<!-- SF000034 : Currency --> <!-- SF000034 : Currency -->
<c-col :span="12"> <c-col :span="12">
<el-form-item label="Account Currency" prop="recgrp.cur"> <el-form-item label="Currency" prop="cur">
<c-select v-model="model.recgrp.cur" style="width:100%" :placeholder="'Account Currency'"> <c-select v-model="model.recgrp.rec.cur" style="width:100%" :placeholder="'Account Currency'">
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
<template> <template>
<div class="eibs-tab"> <div class="eibs-tab">
<c-content>
<template > <c-col :span="11">
<el-form <c-col :span="24">
class="m-table-search-form" <el-form-item label="Account No." prop="extkey">
ref="paramsForm" <c-input
:inline="true" v-model="model.extkey"
label-position="left" placeholder="请输入Account No">
label-width="110px" </c-input>
size="small"> </el-form-item>
<c-col :span="12">
<c-form-item :label="'Account No.'" prop="extkey">
<c-input v-model="model.extkey" maxlength="24" :placeholder="'请输入Account No'"></c-input>
</c-form-item>
</c-col>
<!-- SF000048 : Name of Account Owner -->
<c-col :span="12">
<c-form-item :label="'Name of Act. Owner'" prop="nam">
<c-input v-model="model.nam" maxlength="100" :placeholder="'请输入Name of Act. Owner'"></c-input>
</c-form-item>
</c-col> </c-col>
<!-- SF000045 : Holding Party --> <!-- SF000045 : Holding Party -->
<c-col :span="12"> <c-col :span="24">
<c-form-item :label="'Holding Party'" prop="hdlpty.extkey"> <el-form-item label="Holding Party" prop="hdlpty.extkey">
<c-input v-model="model.hdlpty.extkey" maxlength="24" :placeholder="'请输入 Holding Party'"></c-input> <c-input
</c-form-item> v-model="model.hdlpty.extkey"
</c-col> placeholder="请输入 Holding Party">
</c-input>
<!-- SF000050 : IBAN --> </el-form-item>
<c-col :span="12">
<c-form-item :label="'IBAN'" prop="iban">
<c-input v-model="model.iban" maxlength="40" :placeholder="'请输入IBAN'"></c-input>
</c-form-item>
</c-col> </c-col>
<!-- SF000042 : Type --> <!-- SF000042 : Type -->
<c-col :span="12"> <c-col :span="24">
<el-form-item :label="'type'" prop="typ"> <el-form-item label="Type" prop="typ">
<c-select v-model="model.typ" style="width:100%" :placeholder="'请输入type'"> <c-select
<el-option v-for="item in codes.typ" :key="item.value" :label="item.label" v-model="model.typ"
style="width:100%"
placeholder="请输入type">
<el-option
v-for="item in codes.recgrptyp"
:key="item.value"
:label="item.label"
:value="item.value"> :value="item.value">
</el-option> </el-option>
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col>
<c-col :span="12" :offset="1">
<!-- SF000048 : Name of Account Owner -->
<c-col :span="24">
<el-form-item
label="Name of Act. Owner"
prop="nam">
<c-input
v-model="model.nam"
placeholder="请输入Name of Act. Owner">
</c-input>
</el-form-item>
</c-col>
<!-- SF000050 : IBAN -->
<c-col :span="24">
<c-form-item label="IBAN" prop="iban">
<c-input
v-model="model.iban"
placeholder="请输入IBAN"></c-input>
</c-form-item>
</c-col>
<!-- SF000043 : Currency --> <!-- SF000043 : Currency -->
<c-col :span="12"> <c-col :span="24">
<el-form-item :label="'Currency'" prop="cur"> <el-form-item :label="'Currency'" prop="cur">
<c-select v-model="model.cur" style="width:100%" :placeholder="'请输入Currency'"> <c-select
<el-option v-for="item in codes.cur" :key="item.value" :label="item.label" v-model="model.cur"
style="width:100%"
:placeholder="'请输入Currency'">
<el-option
v-for="item in codes.curtxt1"
:key="item.value"
:label="item.label"
:value="item.value"> :value="item.value">
</el-option> </el-option>
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col>
<!--
<c-col :span="12">
<c-form-item label="display stream" prop="infbut.dspstm">
<c-input v-model="model.infbut.dspstm" :placeholder="$t('other.please_enter')+'display stream'"></c-input>
</c-form-item>
</c-col> -->
<c-col :span="24" style="text-align: right; height: 36.8px"> <c-col :span="24" style="text-align: right; height: 36.8px">
<el-button size="small" @click="handleReset">重置</el-button> <el-button size="small" @click="handleReset">重置</el-button>
...@@ -72,7 +88,7 @@ ...@@ -72,7 +88,7 @@
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
size="small" size="small"
@click="onInfbutSearow" @click="onInfbutSearow()"
>查询 >查询
</el-button> </el-button>
</c-col> </c-col>
...@@ -92,27 +108,22 @@ ...@@ -92,27 +108,22 @@
</c-button> </c-button>
</c-col> </c-col>
</el-form>
</template>
<c-col :span="24" > <c-col :span="24" >
<c-istream-table <c-istream-table
:list="stmData.data" :list="stmData.data"
:columns="stmData.columns" :columns="stmData.columns"
:showButtonFlg="true"> :showButtonFlg="false">
<c-table-column fixed="right" prop="op" label="详情" width="165px"> <c-table-column fixed="right" prop="op" label="操作" width="160px">
<template slot-scope="{ scope }"> <template slot-scope="{ scope }">
<c-button style="margin-left: 0" size="small" @click="onInfbutDsp(scope.$index, scope.row)">详情 </c-button> <c-button style="margin-left: 0" size="small" @click="onInfbutDsp(scope.$index, scope.row)">详情 </c-button>
</template> </template>
</c-table-column> </c-table-column>
</c-istream-table> </c-istream-table>
</c-col> </c-col>
</c-content>
</div> </div>
</template> </template>
...@@ -132,14 +143,14 @@ export default { ...@@ -132,14 +143,14 @@ export default {
stmData: { stmData: {
columns: [ columns: [
"1 1 \"Account Owner\" 180 ", "8 1 \"Account Owner\" 180 ",
"1 2\"Typ\" 150", "3 2\"Typ\" 160",
"2 3 \"Cur\" 150", "4 3 \"Cur\" 160",
"3 4 \"Account No.\" 180", "5 4 \"Account No.\" 180",
"4 5 \" Owner Number\" 150 ", "6 5 \" Owner Number\" 180 ",
"5 6 \"Servicing Party \" 150",
"6 7 \"Servicing Number\" 150",
"9 6 \"Servicing Party \" 160",
"10 7 \"Servicing Number\" 160",
], ],
data: [ ] data: [ ]
...@@ -160,7 +171,12 @@ return this.model.infbut.dspstm.rows; ...@@ -160,7 +171,12 @@ return this.model.infbut.dspstm.rows;
} */ } */
}, },
methods:{...Event}, methods:{
chooseRowEvent(row) {
this.model.infbut.selrow = row.IDX + 1;
},
...Event},
created:function(){ created:function(){
} }
......
...@@ -4,15 +4,15 @@ ...@@ -4,15 +4,15 @@
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick"> <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<!--infact PD000041 Search Panel --> <!--infact PD000041 Search Panel -->
<el-tab-pane :label="'查询页面'" name="infsea"> <el-tab-pane :label="'查询页面'" name="infsea">
<m-infsea :model="model" :codes="codes"/> <m-infsea :model="model" :codes="codes" ref="infsea"/>
</el-tab-pane> </el-tab-pane>
<!--actp PD000000 Accounts --> <!--actp PD000000 Accounts -->
<el-tab-pane :label="'详情'" name="actp0"> <el-tab-pane :label="'详情'" name="actp0">
<m-actp0 :model="model" :codes="codes"/> <m-actp0 :model="model" :codes="codes" ref="actp0"/>
</el-tab-pane> </el-tab-pane>
<!--actp PD000700 Info and Stoptext --> <!--actp PD000700 Info and Stoptext -->
<el-tab-pane :label="'Info and Stoptext'" name="oitpan"> <el-tab-pane :label="'Info and Stoptext'" name="oitpan">
<m-oitpan :model="model" :codes="codes"/> <m-oitpan :model="model" :codes="codes" ref="oitpan"/>
</el-tab-pane> </el-tab-pane>
......
<template> <template>
<div class="eibs-tab"> <div class="eibs-tab">
<c-col :span="24" style="text-align:right; height:36.8px"> <!-- <c-col :span="24" style="text-align:right; height:36.8px">
<el-button-group> <el-button-group>
<el-button type="primary" icon="el-icon-arrow-left">上一页</el-button> <el-button type="primary" icon="el-icon-arrow-left" @click="pre(idx)">上一页</el-button>
<el-button type="primary">下一页<i class="el-icon-arrow-right el-icon--right"></i></el-button> <el-button type="primary" @click="next(idx)">下一页<i class="el-icon-arrow-right el-icon--right"></i></el-button>
</el-button-group> </el-button-group>
</c-col> </c-col> -->
<!-- <c-col :span="12"> <!-- <c-col :span="12">
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
<c-col :span="12"> <c-col :span="12">
<el-form-item label="Fee Code" prop="rec.cod"> <el-form-item label="Fee Code" prop="rec.cod">
<c-input v-model="model.cod" maxlength="6" placeholder="请输入Fee Code"></c-input> <c-input v-model="model.rec.cod" maxlength="6" placeholder="请输入Fee Code"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12" > <c-col :span="12" >
<el-form-item label="Description" prop="rec.nam"> <el-form-item label="Description" prop="nam">
<c-input v-model="model.nam" maxlength="32" placeholder="请输入Description"></c-input> <c-input v-model="model.nam" maxlength="32" placeholder="请输入Description"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
...@@ -4,22 +4,27 @@ ...@@ -4,22 +4,27 @@
<c-col :span="11"> <c-col :span="11">
<c-col :span="24" > <c-col :span="24" >
<el-form-item label="FeeCode" prop="rec.cod"> <el-form-item label="FeeCode" prop="rec.cod">
<c-input v-model="model.cod" maxlength="20" placeholder="请输入FeeCode"></c-input> <c-input
v-model="model.cod"
placeholder="请输入FeeCode"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col>
<c-col :span="12" > <c-col :span="12" :offset="1">
<c-col :span="24" >
<el-form-item label="Description" prop="rec.nam"> <el-form-item label="Description" prop="rec.nam">
<c-input v-model="model.nam" maxlength="20" placeholder="请输入Description"></c-input> <c-input v-model="model.nam" placeholder="请输入Description"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col>
<!--重置--> <!--重置-->
<c-col :span="24" style="text-align: right; height: 36.8px" > <c-col :span="24" style="text-align: right; height: 36.8px" >
<el-button size="small" @click="onInfbutClr">重置</el-button> <el-button size="small" @click="onInfbutClr">重置</el-button>
<el-button type="primary" icon="el-icon-search" size="small" @click="onInfbutSearow()" >查询</el-button > <el-button type="primary" icon="el-icon-search" size="small" @click="onInfbutSearow()">查询</el-button >
</c-col> </c-col>
</el-row>
<div style="margin-top:20px;"> <div style="margin-top:20px;">
<!-- EXCEL导出 <!-- EXCEL导出
...@@ -41,12 +46,13 @@ ...@@ -41,12 +46,13 @@
</div> </div>
<el-row> <c-col :span="24" >
<c-istream-table <c-istream-table
:list="stmData.data" :list="stmData.data"
:columns="stmData.columns" :columns="stmData.columns"
:showButtonFlg="true"> v-on:chooseRowEvent="chooseRowEvent"
<c-table-column fixed="right" prop="op" label="操作" width="150px"> :showButtonFlg="false">
<c-table-column fixed="right" prop="op" label="操作" width="160px">
<template slot-scope="{ scope }"> <template slot-scope="{ scope }">
<c-button size="small" type="primary" @click="onInfbutDsp(scope.$index, scope.row)">详情 </c-button> <c-button size="small" type="primary" @click="onInfbutDsp(scope.$index, scope.row)">详情 </c-button>
...@@ -70,20 +76,15 @@ ...@@ -70,20 +76,15 @@
</template> </template>
</c-table-column> </c-table-column>
</c-istream-table> </c-istream-table>
</el-row> </c-col>
<!-- <c-col :span="12">
<el-form-item label="display stream" prop="infbut.dspstm">
<c-input v-model="model.infbut.dspstm" placeholder="请输入display stream"></c-input>
</el-form-item>
</c-col> -->
<c-function-btn <!-- <c-function-btn
:handleSubmit="handleSubmit" :handleSubmit="handleSubmit"
:handleCheck="handleCheck" :handleCheck="handleCheck"
:handleStash="handleStash" :handleStash="handleStash"
> >
</c-function-btn> </c-function-btn> -->
</c-content> </c-content>
</div> </div>
...@@ -110,9 +111,9 @@ export default { ...@@ -110,9 +111,9 @@ export default {
stmData: { stmData: {
columns: [ columns: [
"1 1 \"Fee Cod\" 160 ", "1 1 \"Fee Cod\" 160 ",
{ index: 1, position: 2, width: 190, pattern: 'code', label: 'description',"code":"fepfeecod"}, { index: 1, position: 2, width: 200, pattern: 'code', label: 'description',"code":"fepfeecod"},
// "1 2\"Description\" 160 ", // "1 2\"Description\" 160 ",
"2 3 \"Relevant Amount\" 160", "2 3 \"Relevant Amount\" 180",
"3 4 \"SWIFT / DTA Code\" 180", "3 4 \"SWIFT / DTA Code\" 180",
"4 5 \" Booking Type\" 160 ", "4 5 \" Booking Type\" 160 ",
"5 6 \" Fee Payer (Default) \" 180", "5 6 \" Fee Payer (Default) \" 180",
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</el-tab-pane> </el-tab-pane>
<!--PD000119 --> <!--PD000119 -->
<el-tab-pane label="费用详情" name="feep"> <el-tab-pane label="费用详情" name="feep">
<m-feep :model="model" :codes="codes"/> <m-feep :model="model" :codes="codes" ref="feep"/>
</el-tab-pane> </el-tab-pane>
</c-tabs> </c-tabs>
</el-form> </el-form>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="eibs"> <div class="eibs">
<c-col :span="11"> <c-col :span="11">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Special Payment Conditions for Beneficiary" prop="lidgrp.blk.spcben"> <el-form-item label="受益人的特殊付款条款" prop="lidgrp.blk.spcben">
<c-input <c-input
:rows="12" :rows="12"
:disabled="this.flag1" :disabled="this.flag1"
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<c-col :span="11"> <c-col :span="11">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="仅适用于银行的特殊付款条" prop="lidgrp.blk.spcrcb"> <el-form-item label="仅适用于银行的特殊付款条" prop="lidgrp.blk.spcrcb">
<c-input <c-input
:rows="12" :rows="12"
:disabled="this.flag1" :disabled="this.flag1"
......
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