Commit 6df058de by taojinrui

临时提交

parent 664734fa
...@@ -91,11 +91,11 @@ ...@@ -91,11 +91,11 @@
:showButtonFlg="true" :showButtonFlg="true"
> >
<el-table-column fixed="right" prop="op" label="操作" width="200px"> <el-table-column fixed="right" prop="op" label="操作" width="200px">
<template slot="header"> <!-- <template slot="header">
<c-col :span="11" style="text-align: left"><span>操作</span></c-col> <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> --> <!-- <c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col> -->
</template> <!-- </template>-->
</el-table-column> </el-table-column>
</c-istream-table> </c-istream-table>
</c-col> </c-col>
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
:disabled="model.bopmod.szflg==='3' ||model.bopmod.szflg===''" :disabled="model.bopmod.szflg==='3' ||model.bopmod.szflg===''"
> >
<el-option <el-option
v-for="item in codes.ownextkey" v-for="item in codes.ownextkey1"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
......
...@@ -12,24 +12,22 @@ ...@@ -12,24 +12,22 @@
<c-col :span="24"> <c-col :span="24">
<c-col :span="8"> <c-col :span="8">
<c-fullbox> <c-fullbox>
<el-form-item <el-form-item
label="Selection of User" label="Selection of User"
prop="trncorco.usfmod.flt" prop="trncorco.usfmod.flt"
style="width: 100%" style="width: 100%"
>
<c-col :span="16">
<c-input
v-model="model.trncorco.usfmod.flt"
maxlength="16"
placeholder="请输入Selection of User"
>
</c-input>
</c-col>
<c-button size="small" type="primary"
>Show_Set</c-button
> >
</el-form-item> <c-col :span="16">
<c-input
v-model="model.trncorco.usfmod.flt"
maxlength="16"
placeholder="请输入Selection of User"
>
</c-input>
</c-col>
<c-button size="small" type="primary">Show_Set</c-button>
</el-form-item>
</c-fullbox> </c-fullbox>
</c-col> </c-col>
...@@ -122,11 +120,7 @@ ...@@ -122,11 +120,7 @@
</c-col> </c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item <el-form-item label="Amount between" prop="" style="width: 100%">
label="Amount between"
prop=""
style="width: 100%"
>
<c-col :span="11"> <c-col :span="11">
<c-input-currency <c-input-currency
v-model="model.amt1" v-model="model.amt1"
...@@ -189,16 +183,11 @@ ...@@ -189,16 +183,11 @@
</c-col> </c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item <el-form-item label="branch" prop="branch" style="width: 100%">
label="branch"
prop="branch"
style="width: 100%"
>
<c-input <c-input
v-model="model.branch" v-model="model.branch"
maxlength="24" maxlength="24"
placeholder="请输入Select Single Party" placeholder="请输入Select Single Party"
> >
</c-input> </c-input>
</el-form-item> </el-form-item>
...@@ -237,12 +226,50 @@ ...@@ -237,12 +226,50 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-istream-table :list="stmData.data" :columns="stmData.columns" :showButtonFlg="true"> <c-istream-table
<el-table-column fixed="right" prop="op" label="操作" width="140px"> :list="stmData.data"
:columns="stmData.columns"
:showButtonFlg="true"
>
<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> </el-table-column>
</c-istream-table> </c-istream-table>
</c-col> </c-col>
<m-busbtn ref="childs" :ownref="ownref" trnCode="cptsel" :model="CptselModel" ownrefPath="cpdgrp" @onChoose="onChoose" >11</m-busbtn>
<!-- ======================================原码=================================================== --> <!-- ======================================原码=================================================== -->
<!-- <c-col :span="12"> <!-- <c-col :span="12">
...@@ -459,13 +486,18 @@ import Api from "~/service/Api"; ...@@ -459,13 +486,18 @@ 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/Cptrel/Event"; import Event from "~/model/Cptrel/Event";
import BusNavbar from "~/views/Public/BusNavbar";
import CptselModel from "~/model/Cptsel"
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 {
CptselModel: new CptselModel().data,
ownref: "",
stmData: { stmData: {
columns: [ columns: [
// '0 1 "业务编号" 110', // '0 1 "业务编号" 110',
...@@ -476,50 +508,78 @@ export default { ...@@ -476,50 +508,78 @@ export default {
// '5 6 "业务发生日期" 150 20 30 1', // '5 6 "业务发生日期" 150 20 30 1',
// '6 7 "复核状态" 120 1 0:0 1 RELSTA', // '6 7 "复核状态" 120 1 0:0 1 RELSTA',
// "10 1 \"TRN\" 50 1 0:0 3 ATPTXT", '10 1 "TRN" 100 1 0:0 3 ATPTXT',
// "11 2:1 \"Own Reference\" 186", '11 2 "Own Reference" 186',
// "17 2:2 \"Message Type\" 186", '17 3 "Message Type" 186',
// "12 3 \"Cur\" 137", '12 4 "Cur" 137',
// "13 4 \"Relevant Amount\" 80 2 8:1 2 5", '13 5 "Relevant Amount" 80 2 8:1 2 5',
// "14 5 \"Entry\" 104 20 30 1", '14 6 "Entry" 104 20 30 1',
// "9 6:1 \"Req\" 135", '9 7 "Req" 135',
// "2 6:2 \"Sig\" 135", '2 8 "Sig" 135',
// "6 8:1 \"Rq0\" 135", '6 9 "Rq0" 135',
// "3 8:2 \"Rel0\" 135", '3 10 "Rel0" 135',
// "7 9:1 \"Rq1\" 135", '7 11 "Rq1" 135',
// "4 9:2 \"Rel1\" 135", '4 12 "Rel1" 135',
// "8 10:1 \"Rq2\" 135", '8 13 "Rq2" 135',
// "5 10:2 \"Rel2\" 135", '5 14 "Rel2" 135',
// "16 11:1 \"User\" 160", '16 15 "User" 160',
// "18 11:2 \"\" 60", '18 16 "" 60',
// "0 12 \"Status\" 54 1 0:0 1 RELSTA", '0 17 "Status" 54 1 0:0 1 RELSTA',
// "15 13 \"Branch\" 142", '15 18 "Branch" 142',
"10 1 \"TRN\" 100 1 0:0 3 ATPTXT",
"11 2 \"Own Reference\" 186",
"17 3 \"Message Type\" 186",
"12 4 \"Cur\" 137",
"13 5 \"Relevant Amount\" 80 2 8:1 2 5",
"14 6 \"Entry\" 104 20 30 1",
"9 7 \"Req\" 135",
"2 8 \"Sig\" 135",
"6 9 \"Rq0\" 135",
"3 10 \"Rel0\" 135",
"7 11 \"Rq1\" 135",
"4 12 \"Rel1\" 135",
"8 13 \"Rq2\" 135",
"5 14 \"Rel2\" 135",
"16 15 \"User\" 160",
"18 16 \"\" 60",
"0 17 \"Status\" 54 1 0:0 1 RELSTA",
"15 18 \"Branch\" 142",
], ],
data: [], data: [],
}, },
searchToggle: true trnData: {
columns: [
'1 1 "编号" 200',
'2 2 "交易名称" 130',
// '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 "金额" 100',
],
data: [],
},
searchToggle: true,
}; };
}, },
methods: { ...Event }, methods: {
...Event,
async getTrnInfo(idx, row) {
this.model.objinr = row["INR"];
this.model.inr = row["INR"];
this.model.infcon.chksubcon = "X";
this.dialogTableVisible = true;
let rtnmsg = await this.executeDefault("infcon.chksubcon");
if ((rtnmsg.respCode = SUCCESS)) {
this.trnData.data = rtnmsg.data.infcon_trnstm.rows;
}
},
closeTrn(refId) {
this.$refs[refId].doClose();
},
async getButtons(ownref) {
this.ownref = ownref;
this.$refs.childs.initdialog = true;
console.log("ownref:" + ownref);
},
async onChoose(code) {
//跳转交易
this.$router.history.push("/business/" + code);
this.$refs.childs.initdialog = false;
},
},
created: function () {}, created: function () {},
}; };
</script> </script>
......
<template>
<div class="eContainer">
<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">
<!--cptsel PD000125 Menu -->
<el-tab-pane :label="$t('cptsel.PD000125')" name="sel">
<m-sel :model="model" :codes="codes"/>
</el-tab-pane>
</c-tabs>
</el-form>
</div>
</template>
<script>
import Api from "~/service/Api"
import CodeTable from "~/config/CodeTable"
import Cptsel from "~/model/Cptsel"
import commonProcess from "~/mixin/commonProcess"
import Check from "~/model/Cptsel/Check"
import Default from "~/model/Cptsel/Default"
import Pattern from "~/model/Cptsel/Pattern"
import Sel from "./Sel"
export default {
name: "Cptsel",
components:{
"m-sel" : Sel,
},
provide() {
return {
root: this
}
},
mixins: [commonProcess], // 里面包含了Default、Check等的公共处理
data(){
return {
tabVal: "",
trnName: "cptsel",
trnType: "",
model: new Cptsel().data,
checkRules: Check,
defaultRules: Default,
pattern: Pattern,
rules: null,
codes: {
},
}
},
methods:{
myTabClick(tab){
this.tabClick(tab)
/**
* do it yourself
**/
}
},
created:async function(){
console.log("进入cptsel交易");
let rtnmsg = await this.init({})
if(rtnmsg.respCode == SUCCESS)
{
this.updateModel(rtnmsg.data)
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败!'});
}
}
}
</script>
<style>
</style>
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
v-model="model.infcon.pty.extkey" v-model="model.infcon.pty.extkey"
maxlength="24" maxlength="24"
placeholder="请输入Select Single Party" placeholder="请输入Select Single Party"
:disabled=this.flag1 :disabled="this.flag1"
> >
</c-input> </c-input>
</el-form-item> </el-form-item>
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
v-model="model.infcon.seapty" v-model="model.infcon.seapty"
maxlength="24" maxlength="24"
placeholder="请输入Party Name/BIC" placeholder="请输入Party Name/BIC"
:disabled=this.flag2 :disabled="this.flag2"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -193,7 +193,11 @@ ...@@ -193,7 +193,11 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item label="Currency" prop="infcon.seacur" style="width: 100%" > <el-form-item
label="Currency"
prop="infcon.seacur"
style="width: 100%"
>
<c-select <c-select
v-model="model.infcon.seacur" v-model="model.infcon.seacur"
style="width: 100%" style="width: 100%"
...@@ -305,19 +309,43 @@ ...@@ -305,19 +309,43 @@
<!-- </c-infsearch-group> --> <!-- </c-infsearch-group> -->
<c-col style="margin-top: 10px"> <c-col style="margin-top: 10px">
<c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 0" <c-button
@click="toCptopn">swift汇入</c-button class="medium_bcs"
size="medium"
type="primary"
style="margin-left: 0"
@click="toCptopn"
>swift汇入</c-button
> >
<c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 0" <c-button
@click="toCptadv">swift汇出</c-button class="medium_bcs"
size="medium"
type="primary"
style="margin-left: 0"
@click="toCptadv"
>swift汇出</c-button
> >
<c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 0" <c-button
@click="toCptati">境内外币汇入</c-button class="medium_bcs"
size="medium"
type="primary"
style="margin-left: 0"
@click="toCptati"
>境内外币汇入</c-button
> >
<c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 0" <c-button
@click="toCptato">境内外币汇出</c-button class="medium_bcs"
size="medium"
type="primary"
style="margin-left: 0"
@click="toCptato"
>境内外币汇出</c-button
> >
<c-button class="medium_bcs" size="medium" type="primary" style="float:right;margin-right:10px;" <c-button
class="medium_bcs"
size="medium"
type="primary"
style="float: right; margin-right: 10px"
>导Excel</c-button >导Excel</c-button
> >
<!-- <c-button size="small" type="primary" style="margin-left: 0" <!-- <c-button size="small" type="primary" style="margin-left: 0"
...@@ -329,7 +357,11 @@ ...@@ -329,7 +357,11 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-istream-table :list="stmData.data" :columns="stmData.columns" :showButtonFlg="true"> <c-istream-table
:list="stmData.data"
:columns="stmData.columns"
:showButtonFlg="true"
>
<el-table-column fixed="right" prop="op" label="操作" width="140px"> <el-table-column fixed="right" prop="op" label="操作" width="140px">
<!-- <template slot="header"> <!-- <template slot="header">
<c-col :span="11" style="text-align: left"> <c-col :span="11" style="text-align: left">
...@@ -406,8 +438,15 @@ ...@@ -406,8 +438,15 @@
</c-istream-table> </c-istream-table>
</c-col> </c-col>
<m-busbtn ref="childs" :ownref="ownref" trnCode="cptsel" :model="cptselModel" ownrefPath="cpdgrp" @onChoose="onChoose" >11</m-busbtn> <m-busbtn
ref="childs"
:ownref="ownref"
trnCode="cptsel"
:model="cptselModel"
ownrefPath="cpdgrp"
@onChoose="onChoose"
>11</m-busbtn
>
</div> </div>
</template> </template>
<script> <script>
...@@ -416,8 +455,7 @@ import commonProcess from "~/mixin/commonProcess"; ...@@ -416,8 +455,7 @@ import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"; import CodeTable from "~/config/CodeTable";
import Event from "~/model/Infcpd/Event"; import Event from "~/model/Infcpd/Event";
import BusNavbar from "~/views/Public/BusNavbar"; import BusNavbar from "~/views/Public/BusNavbar";
import CptselModel from "~/model/Cptsel" import CptselModel from "~/model/Cptsel";
export default { export default {
inject: ["root"], inject: ["root"],
...@@ -426,22 +464,22 @@ export default { ...@@ -426,22 +464,22 @@ export default {
components: { "m-busbtn": BusNavbar }, components: { "m-busbtn": BusNavbar },
data() { data() {
return { return {
flag1:false, flag1: false,
flag2:false, flag2: false,
searol:[ searol: [
{ label: "Ordering Customer", value: "ORC" }, { label: "Ordering Customer", value: "ORC" },
{ label: "Ordering Institution", value: "ORI" }, { label: "Ordering Institution", value: "ORI" },
{ label: "Paying Bank", value: "PYB" }, { label: "Paying Bank", value: "PYB" },
{ label: "Payee", value: "PYE" }, { label: "Payee", value: "PYE" },
{ label: "Reimb. Bank Transfer", value: "RMT" }, { label: "Reimb. Bank Transfer", value: "RMT" },
], ],
swftyp:[ swftyp: [
{ label: "MT103", value: "103" }, { label: "MT103", value: "103" },
{ label: "MT202", value: "202" }, { label: "MT202", value: "202" },
{ label: "MT910", value: "910" }, { label: "MT910", value: "910" },
{ label: "CMT100", value: "CMT" }, { label: "CMT100", value: "CMT" },
{ label: "境内外币清算", value: "100" }, { label: "境内外币清算", value: "100" },
{ label: "Other", value: "OTH" }, { label: "Other", value: "OTH" },
], ],
cptselModel: new CptselModel().data, cptselModel: new CptselModel().data,
searchToggle: true, searchToggle: true,
...@@ -516,24 +554,23 @@ export default { ...@@ -516,24 +554,23 @@ export default {
}, },
}; };
}, },
watch:{ watch: {
"model.infcon.seapty": function () { "model.infcon.seapty": function () {
if (this.model.infcon.seapty == '') { if (this.model.infcon.seapty == "") {
this.flag1 = false; this.flag1 = false;
} else { } else {
this.flag1 = true; this.flag1 = true;
this.model.infcon.pty.extkey=""; this.model.infcon.pty.extkey = "";
} }
}, },
"model.infcon.pty.extkey":function(){ "model.infcon.pty.extkey": function () {
if(this.model.infcon.pty.extkey == ''){ if (this.model.infcon.pty.extkey == "") {
this.flag2 = false; this.flag2 = false;
} else { } else {
this.flag2 = true; this.flag2 = true;
this.model.infcon.seapty=""; this.model.infcon.seapty = "";
} }
},
}
}, },
methods: { methods: {
...Event, ...Event,
...@@ -547,48 +584,48 @@ export default { ...@@ -547,48 +584,48 @@ export default {
callback(); callback();
}, 1000); }, 1000);
}, */ }, */
async getButtons(ownref){ async getButtons(ownref) {
this.ownref = ownref this.ownref = ownref;
this.$refs.childs.initdialog = true this.$refs.childs.initdialog = true;
console.log("ownref:" +ownref); console.log("ownref:" + ownref);
}, },
async onChoose(code){ async onChoose(code) {
//跳转交易 //跳转交易
this.$router.history.push("/business/" + code) this.$router.history.push("/business/" + code);
this.$refs.childs.initdialog = false this.$refs.childs.initdialog = false;
} , },
async getDitSelInfo(code){ async getDitSelInfo(code) {
//跳转交易 //跳转交易
this.$router.history.push("/business/" + code) this.$router.history.push("/business/" + code);
this.$refs.childs.initdialog = false this.$refs.childs.initdialog = false;
}, },
async getTrnInfo(idx, row) { async getTrnInfo(idx, row) {
this.model.infcon.objinr = row["INR"]; this.model.infcon.objinr = row["INR"];
this.model.cpdgrp.rec.inr = row["INR"]; this.model.cpdgrp.rec.inr = row["INR"];
this.model.infcon.chksubcon = "X"; this.model.infcon.chksubcon = "X";
this.dialogTableVisible = true; this.dialogTableVisible = true;
let rtnmsg = await this.executeDefault("infcon.chksubcon"); let rtnmsg = await this.executeDefault("infcon.chksubcon");
if ((rtnmsg.respCode = SUCCESS)) { if ((rtnmsg.respCode = SUCCESS)) {
this.trnData.data = rtnmsg.data.infcon_trnstm.rows; this.trnData.data = rtnmsg.data.infcon_trnstm.rows;
} }
}, },
closeTrn(refId){ closeTrn(refId) {
this.$refs[refId].doClose(); this.$refs[refId].doClose();
}, },
toCptopn(){ toCptopn() {
this.$router.history.push("/business/cptopn") this.$router.history.push("/business/cptopn");
},
toCptadv() {
this.$router.history.push("/business/cptadv");
}, },
toCptadv(){ toCptati() {
this.$router.history.push("/business/cptadv") this.$router.history.push("/business/cptati");
}, },
toCptati(){ toCptato() {
this.$router.history.push("/business/cptati") this.$router.history.push("/business/cptato");
}, },
toCptato(){
this.$router.history.push("/business/cptato")
}
}, },
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