Skip to content

V
vue-gjjs
Commit e5afe068 by liuxin
Options

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs… 

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
parents 8bf0f4d6 bbac7d80
Showing with 337 additions and 96 deletions
src/model/Bttrcl/index.js
......@@ -127,11 +127,11 @@ export default class Bttrcl{
utlamt2:"", // Add. Amount utilized/settled .aamset.utlamt2
utlamt:"", // Doc. Amount utilized/settled .aamset.utlamt
},
trnmod:{
trndoc:{
nar754:"", // Narrative :77A: .trnmod.trndoc.nar754
},
},
// trnmod:{
// trndoc:{
// nar754:"", // Narrative :77A: .trnmod.trndoc.nar754
// },
// },
setmod:new Pub().data.Setmod,
mtabut:new Pub().data.Mtabut,
trnmod:new Pub().data.Trnmod,
......
src/model/Gitcom/index.js
......@@ -31,6 +31,7 @@ export default class Gitcom{
liadat:"", // Liability until .gidgrp.rec.liadat
purpos:"", // Purpose of Message .gidgrp.rec.purpos
exptyp:"",
liatypc:"",
},
cbs:{
max:{
......
src/views/Business/Bttset/index.vue
<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-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">
<!--bttset PD000034 Funds Settlement -->
<el-tab-pane :label="$t('bttset.PD000034')" name="setp">
<m-setp :model="model" :codes="codes"/>
<el-tab-pane label="Funds Settlement" name="setp">
<c-content>
<m-setp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--lendoc PD000001 收账通知 -->
<el-tab-pane :label="$t('lendoc.PD000001')" name="docpan">
<m-docpan :model="model" :codes="codes"/>
<el-tab-pane label="$t('lendoc.PD000001')" name="docpan">
<m-docpan :model="model" :codes="codes" />
</el-tab-pane>
<!--bopgat PD000006 外管信息 -->
<el-tab-pane :label="$t('bopgat.PD000006')" name="wg">
<m-wg :model="model" :codes="codes"/>
<el-tab-pane label="$t('bopgat.PD000006')" name="wg">
<m-wg :model="model" :codes="codes" />
</el-tab-pane>
<!--dbdp PD000000 境内收入申报单－基础信息 -->
<el-tab-pane :label="$t('dbdp.PD000000')" name="basp">
<m-basp :model="model" :codes="codes"/>
<el-tab-pane label="$t('dbdp.PD000000')" name="basp">
<m-basp :model="model" :codes="codes" />
</el-tab-pane>
<!--dbap PD000000 涉外收入申报单－基础信息 -->
<el-tab-pane :label="$t('dbap.PD000000')" name="basp">
<m-basp :model="model" :codes="codes"/>
</el-tab-pane>
<!-- <el-tab-pane label="$t('dbap.PD000000')" name="basp">
<m-basp :model="model" :codes="codes" />
</el-tab-pane> -->
<!--cnybop PD000002 跨境人民币申报 -->
<el-tab-pane :label="$t('cnybop.PD000002')" name="cnyp">
<m-cnyp :model="model" :codes="codes"/>
<el-tab-pane label="$t('cnybop.PD000002')" name="cnyp">
<m-cnyp :model="model" :codes="codes" />
</el-tab-pane>
<!--cnybop PD000001 2101跨境收入信息 -->
<el-tab-pane :label="$t('cnybop.PD000001')" name="incp">
<m-incp :model="model" :codes="codes"/>
<el-tab-pane label="$t('cnybop.PD000001')" name="incp">
<m-incp :model="model" :codes="codes" />
</el-tab-pane>
<!--limmod PD001139 试算结果 -->
<el-tab-pane :label="$t('limmod.PD001139')" name="shisuan">
<m-shisuan :model="model" :codes="codes"/>
<el-tab-pane label="$t('limmod.PD001139')" name="shisuan">
<m-shisuan :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 Bttset from "~/model/Bttset"
import commonProcess from "~/mixin/commonProcess"
import Check from "~/model/Bttset/Check"
import Default from "~/model/Bttset/Default"
import Pattern from "~/model/Bttset/Pattern"
import Setp from "./Setp"
import Docpan from "./Docpan"
import Wg from "./Wg"
import Basp from "./Basp"
import Cnyp from "./Cnyp"
import Incp from "./Incp"
import Shisuan from "./Shisuan"
import Api from "~/service/Api";
import CodeTable from "~/config/CodeTable";
import Bttset from "~/model/Bttset";
import commonProcess from "~/mixin/commonProcess";
import commonFuncs from "~/mixin/commonFuncs";
import Check from "~/model/Bttset/Check";
import Default from "~/model/Bttset/Default";
import Pattern from "~/model/Bttset/Pattern";
import Setp from "./Setp";
import Docpan from "./Docpan";
import Wg from "./Wg";
import Basp from "./Basp";
import Cnyp from "./Cnyp";
import Incp from "./Incp";
import Shisuan from "./Shisuan";
export default {
name: "Bttset",
components:{
"m-setp" : Setp,
"m-docpan" : Docpan,
"m-wg" : Wg,
"m-basp" : Basp,
"m-cnyp" : Cnyp,
"m-incp" : Incp,
"m-shisuan" : Shisuan,
components: {
"m-setp": Setp,
"m-docpan": Docpan,
"m-wg": Wg,
"m-basp": Basp,
"m-cnyp": Cnyp,
"m-incp": Incp,
"m-shisuan": Shisuan,
},
provide() {
return {
root: this
}
root: this,
};
},
mixins: [commonProcess], // 里面包含了Default、Check等的公共处理
data(){
mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理
data() {
return {
tabVal: "",
tabVal: "setp",
trnName: "bttset",
trnType: "",
model: new Bttset().data,
......@@ -83,33 +108,29 @@ export default {
pattern: Pattern,
rules: null,
codes: {
...CodeTable,
},
}
};
},
methods:{
myTabClick(tab){
this.tabClick(tab)
methods: {
myTabClick(tab) {
this.tabClick(tab);
/**
* do it yourself
**/
}
},
created:async function(){
},
created: async function () {
console.log("进入bttset交易");
let rtnmsg = await this.init({})
if(rtnmsg.respCode == SUCCESS)
{
this.updateModel(rtnmsg.data)
let rtnmsg = await this.init({});
if (rtnmsg.respCode == SUCCESS) {
this.updateModel(rtnmsg.data);
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
} else {
this.$notify.error({ title: "错误", message: "服务请求失败！" });
}
}
},
};
</script>
<style>
</style>
src/views/Business/Gctcan/index.vue
......@@ -117,6 +117,9 @@ export default {
{
this.updateModel(rtnmsg.data)
//TODO 处理数据逻辑
if (this.isInDisplay) {
this.restoreDisplay();
}
}
else
......
src/views/Business/Getcan/index.vue
......@@ -131,7 +131,9 @@ export default {
{
this.updateModel(rtnmsg.data)
//TODO 处理数据逻辑
if (this.isInDisplay) {
this.restoreDisplay();
}
}
else
{
......
src/views/Business/Gitcan/index.vue
......@@ -165,6 +165,9 @@ export default {
if (rtnmsg.respCode == SUCCESS) {
this.updateModel(rtnmsg.data);
//TODO 处理数据逻辑
if (this.isInDisplay) {
this.restoreDisplay();
}
} else {
this.$notify.error({ title: "错误", message: "服务请求失败！" });
}
......
src/views/Business/Gitcom/Gitsetp1.vue
......@@ -71,7 +71,6 @@
</c-col>
</c-col> -->
<c-col :span="24">
<c-col :span="12">
<el-form-item label="Guarantee Amount" prop="gidgrp.cbs.max.cur">
<c-select
......@@ -115,7 +114,6 @@
>Add. Amount</c-checkbox
>
</c-col>
</c-col>
<c-col :span="12">
<el-form-item label="Open Amount" prop="gidgrp.cbs.opn1.cur">
......@@ -225,6 +223,36 @@
</el-form-item>
</c-col>
<c-col :span="13" >
<el-form-item v-show="model.gidgrp.rec.liatypc != ''" label="Liability" prop="gidgrp.rec.liadat">
<c-date-picker
disabled
type="date"
v-show="model.gidgrp.rec.liadat != ''"
v-model="model.gidgrp.rec.liadat"
style="width: 100%"
placeholder="请选择Liability"
></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="11" v-show="model.gidgrp.rec.liadat != ''">
<el-form-item
style="text-align: left"
label-width="5px"
prop="gidgrp.rec.liatypc"
>
<c-select
v-model="model.gidgrp.rec.liatypc"
style="width: 100%"
placeholder="请选择Liability Type"
:code="codes.liatypc"
disabled
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Reference Date " prop="setmod.refdat">
<c-date-picker
......
src/views/Business/Gitcrq/index.vue
......@@ -139,6 +139,9 @@ export default {
{
this.updateModel(rtnmsg.data)
//TODO 处理数据逻辑
if (this.isInDisplay) {
this.restoreDisplay();
}
}
else
......
src/views/Business/Gitpop/Ovwp.vue
......@@ -215,7 +215,27 @@
</c-col>
<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
v-model="model.gidgrp.rec.hndtyp"
style="width: 100%"
......@@ -233,6 +253,78 @@
</c-col>
<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">
<c-select
v-model="model.gidgrp.rec.gartyp"
......@@ -1233,7 +1325,9 @@
<c-col :span="24">
<c-col :span="20">
<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."
prop="gidgrp.blk.exptxt"
>
......@@ -1248,7 +1342,9 @@
></c-input>
</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."
prop="gidgrp.blk.atxexptxt"
>
......@@ -1357,13 +1453,13 @@
<c-col :span="24">
<c-col :span="20">
<el-form-item
v-show="model.gitp.swiftflg == 'Y'"
v-show="model.gitp.swiftflg == 'Y'&&model.gitp.liatxtcmodflg == ''"
label="Liability Condition"
prop="gidgrp.blk.liatxtc"
>
<c-input
type="textarea"
:disabled="model.gitp.liatxtcmodflg == ''"
disabled
rows="4"
v-model="model.gidgrp.blk.liatxtc"
maxlength="780"
......@@ -1371,6 +1467,20 @@
placeholder="请输入Liability Condition"
></c-input>
</el-form-item>
<el-form-item
v-show="model.gitp.swiftflg == 'Y'&&model.gitp.liatxtcmodflg == 'X'"
label="Liability Condition"
prop="gidgrp.blk.atxliatxtc"
>
<c-input
type="textarea"
rows="4"
v-model="model.gidgrp.blk.atxliatxtc"
maxlength="780"
show-word-limit
placeholder="请输入Liability Condition"
></c-input>
</el-form-item>
</c-col>
<c-col :span="4">
<c-checkbox
......
src/views/Business/Gitpop/Ptypc.vue
......@@ -46,17 +46,60 @@
</c-col>
<c-col :span="11" :offset="1">
<c-col :span="24">
<c-ptap
:model="model"
:argadr="{
title: 'Issuing Bank',
grp: 'gidgrp',
rol: 'iss',
}"
:disabled="true"
@onAplpDet="onCtcpDet"
<el-form-item label="Issuing Bnak's Ref." prop="gidgrp.iss.pts.ref">
<c-input
v-model="model.gidgrp.iss.pts.ref"
maxlength="16"
placeholder="请输入Issuing Bnak's Ref."
></c-input>
</el-form-item>
</c-col>
<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 :span="24">
......@@ -137,6 +180,7 @@ import commonFuncs from "~/mixin/commonFuncs";
import CodeTable from "~/config/CodeTable";
import Event from "~/model/Gitpop/Event";
import Ptap from "~/views/Public/Ptap";
import Utils from "~/utils";
export default {
components: { "c-ptap": Ptap },
......@@ -148,6 +192,12 @@ export default {
},
methods: {
...Event,
async issBlur() {
let rtnmsg = await this.executeDefault("gidgrp.rec.sndto");
if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
},
},
created: function () {},
};
......
src/views/Business/Gitpop/index.vue
......@@ -319,9 +319,18 @@ export default {
methods: {
myTabClick(tab) {
this.tabClick(tab);
/**
* do it yourself
**/
let name = tab.name;
let rulePath;
if (name === "ptypc"){
rulePath = "gitp.ptypc"
}
if (!!rulePath) {
this.executeRule(rulePath).then((res) => {
if (res.respCode == SUCCESS) {
this.updateModel(res.data);
}
});
}
},
},
......
src/views/Business/Gitset/index.vue
......@@ -312,6 +312,9 @@ export default {
//TODO 处理数据逻辑
this.updateModel(rtnmsg.data);
this.model.mtabut.clsflg="X";
if (this.isInDisplay) {
this.restoreDisplay();
}
} else {
this.$notify.error({ title: "错误", message: "服务请求失败！" });
}
......
src/views/Public/Docpan.vue
......@@ -36,6 +36,7 @@
style="width: 100%"
placeholder="请选择"
@change="executeDefault('trnmod.trndoc.doccur.docsnf')"
:disabled="suppress"
>
<el-option
v-for="item in codes.docsnf"
......@@ -55,6 +56,7 @@
"
style="width: 100%"
placeholder="请选择"
:disabled="suppress"
>
<el-option
v-for="item in codes.uiltxt"
......@@ -100,6 +102,7 @@
:readonly="true"
style="width: 100%"
placeholder="请选择"
:disabled="suppress"
>
</c-input>
</template>
......@@ -112,7 +115,7 @@
"
style="width: 100%"
placeholder="请选择"
:disabled="suppress"
>
</c-input>
</template>
......@@ -129,6 +132,7 @@
"
style="width: 100%"
placeholder="请选择"
:disabled="suppress"
>
<el-option
v-for="item in codes.swttlx"
......@@ -147,9 +151,9 @@
type="primary"
size="small"
:disabled="
scope.row
(scope.row
.pandsc == 'MT799' && model.didgrp && model.didgrp.rec &&
model.didgrp.rec.elcflg == 'Y'
model.didgrp.rec.elcflg == 'Y')||suppress
"
@click="handleDisplay(scope.row.index, scope.row, model.trnmod.trndoc.doceot[scope.row.idx])"
icon="el-icon-search"
......@@ -546,19 +550,23 @@ export default {
})
},
activateDialog() {
this.executeRule("trnmod.trndoc.doccur.butdel").then(res => {
this.executeRule(`trnmod.trndoc.doceot(${this.index + 1}).butdel`).then(res => {
if(res.respCode==SUCCESS){
//TODO
this.updateModel(res.data)
this.dialog = this.model.trnmod.trndoc.doceot[this.index]
this.suppress=false;
}else{
this.$notify.error({ title: '错误', message: '服务请求失败！' });
}
})
},
suppressDialog() {
this.executeRule("trnmod.trndoc.doccur.butdel").then(res => {
this.executeRule(`trnmod.trndoc.doceot(${this.index + 1}).butdel`).then(res => {
if(res.respCode==SUCCESS){
//TODO
this.updateModel(res.data)
this.dialog = this.model.trnmod.trndoc.doceot[this.index]
this.suppress=true;
}else{
this.$notify.error({ title: '错误', message: '服务请求失败！' });
......
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