Commit ca4a071d by liyixun

gitpop bug(860) 及bttset页面布局

parent 0beebc02
...@@ -127,11 +127,11 @@ export default class Bttrcl{ ...@@ -127,11 +127,11 @@ export default class Bttrcl{
utlamt2:"", // Add. Amount utilized/settled .aamset.utlamt2 utlamt2:"", // Add. Amount utilized/settled .aamset.utlamt2
utlamt:"", // Doc. Amount utilized/settled .aamset.utlamt utlamt:"", // Doc. Amount utilized/settled .aamset.utlamt
}, },
trnmod:{ // trnmod:{
trndoc:{ // trndoc:{
nar754:"", // Narrative :77A: .trnmod.trndoc.nar754 // nar754:"", // Narrative :77A: .trnmod.trndoc.nar754
}, // },
}, // },
setmod:new Pub().data.Setmod, setmod:new Pub().data.Setmod,
mtabut:new Pub().data.Mtabut, mtabut:new Pub().data.Mtabut,
trnmod:new Pub().data.Trnmod, trnmod:new Pub().data.Trnmod,
......
<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"> <c-function-btn
:handleSubmit="handleSubmit"
:handleCheck="handleCheck"
:handleStash="handleStash"
>
<el-button size="small">流程附言</el-button>
<el-button size="small">交易历史</el-button>
<el-button size="small">备忘录</el-button>
<el-button size="small">影像信息</el-button>
<!-- <el-button size="small">保存模板</el-button> -->
<!-- <el-button size="small">使用模板</el-button> -->
<el-button size="small">制裁信息</el-button>
<!-- <el-button size="small">拆分报文</el-button> -->
<el-button size="small">智能提示</el-button>
</c-function-btn>
<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">
<!--bttset PD000034 Funds Settlement --> <!--bttset PD000034 Funds Settlement -->
<el-tab-pane :label="$t('bttset.PD000034')" name="setp"> <el-tab-pane label="Funds Settlement" name="setp">
<m-setp :model="model" :codes="codes"/> <c-content>
<m-setp :model="model" :codes="codes" />
</c-content>
</el-tab-pane> </el-tab-pane>
<!--lendoc PD000001 收账通知 --> <!--lendoc PD000001 收账通知 -->
<el-tab-pane :label="$t('lendoc.PD000001')" name="docpan"> <el-tab-pane label="$t('lendoc.PD000001')" name="docpan">
<m-docpan :model="model" :codes="codes"/> <m-docpan :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--bopgat PD000006 外管信息 --> <!--bopgat PD000006 外管信息 -->
<el-tab-pane :label="$t('bopgat.PD000006')" name="wg"> <el-tab-pane label="$t('bopgat.PD000006')" name="wg">
<m-wg :model="model" :codes="codes"/> <m-wg :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--dbdp PD000000 境内收入申报单-基础信息 --> <!--dbdp PD000000 境内收入申报单-基础信息 -->
<el-tab-pane :label="$t('dbdp.PD000000')" name="basp"> <el-tab-pane label="$t('dbdp.PD000000')" name="basp">
<m-basp :model="model" :codes="codes"/> <m-basp :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--dbap PD000000 涉外收入申报单-基础信息 --> <!--dbap PD000000 涉外收入申报单-基础信息 -->
<el-tab-pane :label="$t('dbap.PD000000')" name="basp"> <!-- <el-tab-pane label="$t('dbap.PD000000')" name="basp">
<m-basp :model="model" :codes="codes"/> <m-basp :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane> -->
<!--cnybop PD000002 跨境人民币申报 --> <!--cnybop PD000002 跨境人民币申报 -->
<el-tab-pane :label="$t('cnybop.PD000002')" name="cnyp"> <el-tab-pane label="$t('cnybop.PD000002')" name="cnyp">
<m-cnyp :model="model" :codes="codes"/> <m-cnyp :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--cnybop PD000001 2101跨境收入信息 --> <!--cnybop PD000001 2101跨境收入信息 -->
<el-tab-pane :label="$t('cnybop.PD000001')" name="incp"> <el-tab-pane label="$t('cnybop.PD000001')" name="incp">
<m-incp :model="model" :codes="codes"/> <m-incp :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--limmod PD001139 试算结果 --> <!--limmod PD001139 试算结果 -->
<el-tab-pane :label="$t('limmod.PD001139')" name="shisuan"> <el-tab-pane label="$t('limmod.PD001139')" name="shisuan">
<m-shisuan :model="model" :codes="codes"/> <m-shisuan :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
</c-tabs> </c-tabs>
</el-form> </el-form>
</div> </div>
</template> </template>
<script> <script>
import Api from "~/service/Api" import Api from "~/service/Api";
import CodeTable from "~/config/CodeTable" import CodeTable from "~/config/CodeTable";
import Bttset from "~/model/Bttset" import Bttset from "~/model/Bttset";
import commonProcess from "~/mixin/commonProcess" import commonProcess from "~/mixin/commonProcess";
import Check from "~/model/Bttset/Check" import commonFuncs from "~/mixin/commonFuncs";
import Default from "~/model/Bttset/Default" import Check from "~/model/Bttset/Check";
import Pattern from "~/model/Bttset/Pattern" import Default from "~/model/Bttset/Default";
import Setp from "./Setp" import Pattern from "~/model/Bttset/Pattern";
import Docpan from "./Docpan" import Setp from "./Setp";
import Wg from "./Wg" import Docpan from "./Docpan";
import Basp from "./Basp" import Wg from "./Wg";
import Cnyp from "./Cnyp" import Basp from "./Basp";
import Incp from "./Incp" import Cnyp from "./Cnyp";
import Shisuan from "./Shisuan" import Incp from "./Incp";
import Shisuan from "./Shisuan";
export default { export default {
name: "Bttset", name: "Bttset",
components:{ components: {
"m-setp" : Setp, "m-setp": Setp,
"m-docpan" : Docpan, "m-docpan": Docpan,
"m-wg" : Wg, "m-wg": Wg,
"m-basp" : Basp, "m-basp": Basp,
"m-cnyp" : Cnyp, "m-cnyp": Cnyp,
"m-incp" : Incp, "m-incp": Incp,
"m-shisuan" : Shisuan, "m-shisuan": Shisuan,
}, },
provide() { provide() {
return { return {
root: this root: this,
} };
}, },
mixins: [commonProcess], // 里面包含了Default、Check等的公共处理 mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理
data(){ data() {
return { return {
tabVal: "", tabVal: "setp",
trnName: "bttset", trnName: "bttset",
trnType: "", trnType: "",
model: new Bttset().data, model: new Bttset().data,
...@@ -83,33 +108,29 @@ export default { ...@@ -83,33 +108,29 @@ export default {
pattern: Pattern, pattern: Pattern,
rules: null, rules: null,
codes: { codes: {
...CodeTable,
}, },
} };
}, },
methods:{ methods: {
myTabClick(tab){ myTabClick(tab) {
this.tabClick(tab) this.tabClick(tab);
/** /**
* do it yourself * do it yourself
**/ **/
}
}, },
created:async function(){ },
created: async function () {
console.log("进入bttset交易"); console.log("进入bttset交易");
let rtnmsg = await this.init({}) let rtnmsg = await this.init({});
if(rtnmsg.respCode == SUCCESS) if (rtnmsg.respCode == SUCCESS) {
{ this.updateModel(rtnmsg.data);
this.updateModel(rtnmsg.data)
//TODO 处理数据逻辑 //TODO 处理数据逻辑
} else {
} this.$notify.error({ title: "错误", message: "服务请求失败!" });
else
{
this.$notify.error({title: '错误',message: '服务请求失败!'});
}
} }
} },
};
</script> </script>
<style> <style>
</style> </style>
...@@ -215,7 +215,27 @@ ...@@ -215,7 +215,27 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Handling Type" prop="gidgrp.rec.hndtyp"> <el-form-item
v-if="model.gitp.swiftflg == ''"
label="Handling Type"
prop="gidgrp.rec.hndtyp"
>
<c-select
v-model="model.gidgrp.rec.hndtyp"
style="width: 100%"
placeholder="请选择Handling Type"
:code="codes.hndtyp2"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item
v-if="model.gitp.swiftflg == 'N'"
label="Handling Type"
prop="gidgrp.rec.hndtyp"
>
<c-select <c-select
v-model="model.gidgrp.rec.hndtyp" v-model="model.gidgrp.rec.hndtyp"
style="width: 100%" style="width: 100%"
...@@ -233,6 +253,78 @@ ...@@ -233,6 +253,78 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item
v-if="model.gitp.swiftflg == 'Y' && model.gidgrp.rec.purpos == ''"
label="Handling Type"
prop="gidgrp.rec.hndtyp"
>
<c-select
v-model="model.gidgrp.rec.hndtyp"
style="width: 100%"
placeholder="请选择Handling Type"
>
<el-option
v-for="item in codes.hndtyp2"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item
v-if="
model.gitp.swiftflg == 'Y' && model.gidgrp.rec.purpos == 'ISSU'
"
label="Handling Type"
prop="gidgrp.rec.hndtyp"
>
<c-select
v-model="model.gidgrp.rec.hndtyp"
style="width: 100%"
placeholder="请选择Handling Type"
>
<el-option
v-for="item in codes.hndtyp3"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item
v-if="
model.gitp.swiftflg == 'Y' &&
(model.gidgrp.rec.purpos == 'ISCO' ||
model.gidgrp.rec.purpos == 'ICCO')
"
label="Handling Type"
prop="gidgrp.rec.hndtyp"
>
<c-select
v-model="model.gidgrp.rec.hndtyp"
style="width: 100%"
placeholder="请选择Handling Type"
>
<el-option
v-for="item in codes.hndtyp4"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Type of Undertaking" prop="gidgrp.rec.gartyp"> <el-form-item label="Type of Undertaking" prop="gidgrp.rec.gartyp">
<c-select <c-select
v-model="model.gidgrp.rec.gartyp" v-model="model.gidgrp.rec.gartyp"
...@@ -1233,7 +1325,9 @@ ...@@ -1233,7 +1325,9 @@
<c-col :span="24"> <c-col :span="24">
<c-col :span="20"> <c-col :span="20">
<el-form-item <el-form-item
v-show="model.gitp.swiftflg == 'Y'&&model.gitp.exptxtmodflg == ''" v-show="
model.gitp.swiftflg == 'Y' && model.gitp.exptxtmodflg == ''
"
label="Expiry Condition/ Evt." label="Expiry Condition/ Evt."
prop="gidgrp.blk.exptxt" prop="gidgrp.blk.exptxt"
> >
...@@ -1248,7 +1342,9 @@ ...@@ -1248,7 +1342,9 @@
></c-input> ></c-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
v-show="model.gitp.swiftflg == 'Y'&&model.gitp.exptxtmodflg == 'X'" v-show="
model.gitp.swiftflg == 'Y' && model.gitp.exptxtmodflg == 'X'
"
label="Expiry Condition/ Evt." label="Expiry Condition/ Evt."
prop="gidgrp.blk.atxexptxt" prop="gidgrp.blk.atxexptxt"
> >
......
...@@ -46,17 +46,60 @@ ...@@ -46,17 +46,60 @@
</c-col> </c-col>
<c-col :span="11" :offset="1"> <c-col :span="11" :offset="1">
<c-col :span="24"> <c-col :span="24">
<c-ptap <el-form-item label="Issuing Bnak's Ref." prop="gidgrp.iss.pts.ref">
:model="model" <c-input
:argadr="{ v-model="model.gidgrp.iss.pts.ref"
title: 'Issuing Bank', maxlength="16"
grp: 'gidgrp', placeholder="请输入Issuing Bnak's Ref."
rol: 'iss', ></c-input>
}" </el-form-item>
:disabled="true" </c-col>
@onAplpDet="onCtcpDet" <c-col :span="24">
<el-form-item label="Issuing Bank" prop="gidgrp.iss.pts.extkey">
<c-fullbox>
<c-input
v-model="model.gidgrp.iss.pts.extkey"
maxlength="16"
placeholder="请输入External Key of Address"
@keyup.enter.native="
showGridPromptDialog(`gidgrp.iss.pts.extkey`)
"
@blur="issBlur"
></c-input>
<template slot="footer">
<c-button
style="margin: 0 10px 0 10px; padding: 0 12px"
size="small"
type="primary"
> >
</c-ptap> <span style="font-family: '宋体'; font-weight: bold"
>i</span
>
</c-button>
<c-button
:disabled="model.gidgrp.iss.pts.adrblk == ''"
size="small"
type="primary"
@click="onIsspDet"
>
Details
</c-button>
</template>
</c-fullbox>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="地址名称" prop="gidgrp.iss.pts.adrblk">
<c-input
:disabled="model.gidgrp.iss.pts.adrblk != ''"
rows="4"
type="textarea"
v-model="model.gidgrp.iss.pts.adrblk"
maxlength="140"
show-word-limit
placeholder="请输入地址名称"
></c-input>
</el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
...@@ -137,6 +180,7 @@ import commonFuncs from "~/mixin/commonFuncs"; ...@@ -137,6 +180,7 @@ import commonFuncs from "~/mixin/commonFuncs";
import CodeTable from "~/config/CodeTable"; import CodeTable from "~/config/CodeTable";
import Event from "~/model/Gitpop/Event"; import Event from "~/model/Gitpop/Event";
import Ptap from "~/views/Public/Ptap"; import Ptap from "~/views/Public/Ptap";
import Utils from "~/utils";
export default { export default {
components: { "c-ptap": Ptap }, components: { "c-ptap": Ptap },
...@@ -148,6 +192,12 @@ export default { ...@@ -148,6 +192,12 @@ export default {
}, },
methods: { methods: {
...Event, ...Event,
async issBlur() {
let rtnmsg = await this.executeDefault("gidgrp.rec.sndto");
if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
},
}, },
created: function () {}, created: function () {},
}; };
......
...@@ -319,9 +319,18 @@ export default { ...@@ -319,9 +319,18 @@ export default {
methods: { methods: {
myTabClick(tab) { myTabClick(tab) {
this.tabClick(tab); this.tabClick(tab);
/** let name = tab.name;
* do it yourself let rulePath;
**/ if (name === "ptypc"){
rulePath = "gitp.ptypc"
}
if (!!rulePath) {
this.executeRule(rulePath).then((res) => {
if (res.respCode == SUCCESS) {
this.updateModel(res.data);
}
});
}
}, },
}, },
......
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