Skip to content

V
vue-gjjs
Commit cf7c0ef9 by huangxin
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 40ed60aa 83479d18
Showing with 173 additions and 34 deletions
src/mixin/commonProcess.js
......@@ -140,7 +140,7 @@ export default {
if (name === "doctre") {
rulePath = "trnmod.trndoc.doctre"
}
if (name === "cips") {
if (name === "cips" || name === "cips2") {
rulePath = "trnmod.cipmod.cips"
}
if (name === "engp") {
......
src/model/Brtset/index.js
......@@ -4,6 +4,7 @@ import Pts from "../Common/Pts"
import Public from "../Public"
import Setmod from '../Public/Setmod'
import Liaall from '../Public/Liaall'
import Trnmod from "../Public/Trnmod";
export default class Brtset{
constructor () {
......@@ -144,7 +145,7 @@ export default class Brtset{
bptbckg:[], // .bptbck.bptbckg
dscbckcur:"", // currency discount paid back .bptbck.dscbckcur
},
trnmod:pub.data.Trnmod,
trnmod:new Trnmod().data,
dftcre:{
dfflag:"", // 同业代付 .dftcre.dfflag
dfdgrp:{
......
src/model/Public/Trnmod/index.js
export default class Trnmod {
constructor() {
this.data = {
reconebchnam:"", // 收款直接参与者名称 .trnmod.reconebchnam
reconebch:"", // 收款直接参与者行号 .trnmod.reconebch
commen:"", // 附言 .trnmod.commen
bustyp:"", // 业务种类 .trnmod.bustyp
swiadd: {
amedat: "", // Amendment Date .trnmod.swiadd.amedat
amenbr: "", // Amend. No Received .trnmod.swiadd.amenbr
......@@ -38,27 +42,17 @@ export default class Trnmod {
lcrgod: "", // Description of Goods amendment .trnmod.swiadd.lcrgod
lcrdoc: "", // Documents Required amendment .trnmod.swiadd.lcrdoc
//adlcnd: "", // Additional Conditions amendment .trnmod.swiadd.adlcnd
purposamein:"", // Inc. Purpose of amend. .trnmod.swiadd.purposamein
purposame:"", // Purpose of amend. .trnmod.swiadd.purposame
amedat:"", // Amendment Date .trnmod.swiadd.amedat
orddat:"", // Order from .trnmod.swiadd.orddat
amenbr:"", // Amend. No Receiv. .trnmod.swiadd.amenbr
amecur:"", // Amended .trnmod.swiadd.amecur
ameamt:"", // Amended Amount .trnmod.swiadd.ameamt
newcur:"", // Guarantee Amount .trnmod.swiadd.newcur
newamt:"", // New amount .trnmod.swiadd.newamt
ameblk:"", // Text for Amendments .trnmod.swiadd.ameblk
reqcan:"", // Cancellation Request .trnmod.swiadd.reqcan
amemsgdonflg:"", // Create Amendment Message .trnmod.swiadd.amemsgdonflg
addamtflg:"", // Add. Amount Flag .trnmod.swiadd.addamtflg
addcur:"", // Additional Currency .trnmod.swiadd.addcur
addamt:"", // Additional Amount .trnmod.swiadd.addamt
addamtcovs20:"", // Additional Amount Covered .trnmod.swiadd.addamtcovs20
redrea:"", // Reason for Reduce / Discharge .trnmod.swiadd.redrea
exptyp:"", // New Expiry Type .trnmod.swiadd.exptyp
newexpdat:"", // New Expiry Date .trnmod.swiadd.newexpdat
exptxt:"", // New Expiry Condition .trnmod.swiadd.exptxt
liatypc:"", // New Liability Type .trnmod.swiadd.liatypc
newliadat:"", // New Liability Date .trnmod.swiadd.newliadat
......@@ -75,7 +69,6 @@ export default class Trnmod {
addamtcovc:"", // Add. Amount Covered .trnmod.swiadd.addamtcovc
newexpflg:"", // Unlimited Validity .trnmod.swiadd.newexpflg
newliaflg:"", // Unlimited Liability .trnmod.swiadd.newliaflg
addamtcov:"", // Amounts Covered .trnmod.swiadd.addamtcov
},
trndoc: {
nar754: "", // Narrative :77A: .trnmod.trndoc.nar754
......@@ -102,7 +95,62 @@ export default class Trnmod {
xmldocblk:"", // XMLPanel xmldoc的内置block .trnmod.docimm.xmldocblk
prtswtpblk:"", // XMLPanel prtswtp的内置block .trnmod.docimm.prtswtpblk
},
cipmod:{
dddbsh:"", // 端到端标识号 .trnmod.cipmod.dddbsh
zjg1hh:"", // 中介机构1行号 .trnmod.cipmod.zjg1hh
zjg1mc:"", // 中介机构1名称 .trnmod.cipmod.zjg1mc
zjg2hh:"", // 中介机构2行号 .trnmod.cipmod.zjg2hh
zjg2mc:"", // 中介机构2名称 .trnmod.cipmod.zjg2mc
dafnzh:"", // 借记记账账号 .trnmod.cipmod.dafnzh
dafnmc:"", // 借记记账名称 .trnmod.cipmod.dafnmc
recsehbch:"", // 收款间接参与者行号 .trnmod.cipmod.recsehbch
staonebch:"", // 付款直接参与者行号 .trnmod.cipmod.staonebch
recsehbchnam:"", // 收款间接参与者名称 .trnmod.cipmod.recsehbchnam
staonebchnam:"", // 付款直接参与者名称 .trnmod.cipmod.staonebchnam
fuynh2:"", // 附言2 .trnmod.cipmod.fuynh2
fuynh3:"", // 附言3 .trnmod.cipmod.fuynh3
fuynh4:"", // 附言4 .trnmod.cipmod.fuynh4
skrdz2:"", // 收款人地址2 .trnmod.cipmod.skrdz2
skrdz3:"", // 收款人地址3 .trnmod.cipmod.skrdz3
skrdz4:"", // 收款人地址4 .trnmod.cipmod.skrdz4
skrdz5:"", // 收款人地址5 .trnmod.cipmod.skrdz5
fkrdz2:"", // 付款人地址2 .trnmod.cipmod.fkrdz2
fkrdz3:"", // 付款人地址3 .trnmod.cipmod.fkrdz3
fkrdz4:"", // 付款人地址4 .trnmod.cipmod.fkrdz4
fkrdz5:"", // 付款人地址5 .trnmod.cipmod.fkrdz5
pyebchkey:"", // 收款行开户行行号 .trnmod.cipmod.pyebchkey
pyebchnam:"", // 收款行开户行名称 .trnmod.cipmod.pyebchnam
stasehbch:"", // 付款间接参与者行号 .trnmod.cipmod.stasehbch
stasehbchnam:"", // 付款间接参与者名称 .trnmod.cipmod.stasehbchnam
fkrdz6:"", // 付款人地址6 .trnmod.cipmod.fkrdz6
fkrdz7:"", // 付款人地址7 .trnmod.cipmod.fkrdz7
skrdz6:"", // 收款人地址6 .trnmod.cipmod.skrdz6
skrdz7:"", // 收款人地址7 .trnmod.cipmod.skrdz7
covflg:"", // 112COV .trnmod.cipmod.covflg
fufeih:"", // 付费行号1 .trnmod.cipmod.fufeih
ffeih2:"", // 付费行号2 .trnmod.cipmod.ffeih2
fkrkhh:"", // 付款行开户行行号 .trnmod.cipmod.fkrkhh
fukrhm:"", // 付款行开户行名称 .trnmod.cipmod.fukrhm
feecod:"", // 费用承担方 .trnmod.cipmod.feecod
feiyon:"", // 费用1 .trnmod.cipmod.feiyon
feiyn2:"", // 费用2 .trnmod.cipmod.feiyn2
fuyns1:"", // 致收款人银行附言1 .trnmod.cipmod.fuyns1
fuyns2:"", // 致收款人银行附言2 .trnmod.cipmod.fuyns2
fuyns3:"", // 致收款人银行附言3 .trnmod.cipmod.fuyns3
fuyns4:"", // 致收款人银行附言4 .trnmod.cipmod.fuyns4
fyo1bz:"", // 费用1币种 .trnmod.cipmod.fyo1bz
fyo2bz:"", // 费用2币种 .trnmod.cipmod.fyo2bz
fkhkhh:"", // 付款行行号 .trnmod.cipmod.fkhkhh
fkkhmc:"", // 付款行行名 .trnmod.cipmod.fkkhmc
fkkhzh:"", // 付款行账号 .trnmod.cipmod.fkkhzh
fkhdzh:"", // 付款行地址 .trnmod.cipmod.fkhdzh
skkhhh:"", // 收款行行号 .trnmod.cipmod.skkhhh
skkhhm:"", // 收款行行名 .trnmod.cipmod.skkhhm
skkhzh:"", // 收款行账号 .trnmod.cipmod.skkhzh
skkhdz:"", // 收款行地址 .trnmod.cipmod.skkhdz
ddbhao:"", // 订单编号 .trnmod.cipmod.ddbhao
ddmisu:"", // 订单描述 .trnmod.cipmod.ddmisu
},
}
}
}
\ No newline at end of file
src/views/Business/Brtset/Cips.vue 0 → 100644
<template>
<div class="eibs-tab">
<c-col :span="24">
<c-col :span="12">
<c-col :span="24">
<el-form-item label="收款直接参与者行号" prop="trnmod.reconebch">
<c-input v-model="model.trnmod.reconebch" maxlength="35" placeholder="请输入收款直接参与者行号"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="收款直接参与者名称" prop="trnmod.reconebchnam">
<c-input type="textarea" v-model="model.trnmod.reconebchnam" maxlength="35" show-word-limit placeholder="请输入收款直接参与者名称" ></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="附言" prop="trnmod.commen">
<c-input type="textarea" v-model="model.trnmod.commen" maxlength="30" show-word-limit placeholder="请输入附言" ></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="业务种类" prop="trnmod.bustyp">
<c-select v-model="model.trnmod.bustyp" style="width:100%" placeholder="请选择业务种类" >
<el-option
v-for="item in this.bustyp"
:key="item.value"
:label="item.value + item.label"
:value="item.value">
</el-option>
</c-select>
</el-form-item>
</c-col>
</c-col>
<c-col :span="12" :offset="1">
</c-col>
</c-col>
</div>
</template>
<script>
import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "~/model/Brtset/Event"
export default {
inject: ['root'],
props:["model","codes"],
mixins: [commonProcess],
data(){
return {
bustyp:[
{ value: 'GODX', label: '货期贸易' },
{ value: 'STRX', label: '服务贸易' },
{ value: 'CTFX', label: '资本项下' },
{ value: 'FTFX', label: '金融机构头寸调拨' },
{ value: 'BDES', label: '债卷还本利息' },
{ value: 'BPRR', label: '债卷还本金' },
{ value: 'BINP', label: '债卷利息' },
{ value: 'BISF', label: '债卷发行手续费' },
{ value: 'BCAF', label: '债卷兑付手续费' },
{ value: 'CBCF', label: '附息式债卷兑付手续费' },
{ value: 'OTFX', label: '其他' },
],
}
},
methods:{...Event},
created:function(){
}
}
</script>
<style>
</style>
src/views/Business/Brtset/Utlp.vue
......@@ -213,7 +213,6 @@
style="width:100%"
placeholder="请选择跨境人民币清算模式"
:code="this.cmtflg"
@change="commonExecuteRule('trnmod.cmtflg')"
:disabled="model.brdgrp.rec.frepayflg == ''?false:true"
>
</c-select>
......
src/views/Business/Brtset/index.vue
......@@ -123,25 +123,27 @@
</el-tab-pane>
<!--PD000131 -->
<el-tab-pane :label=this.det202cvName name="det202cv" v-if="model.mtabut.clsflg =='x'">
<el-tab-pane :label=this.det202cvName name="det202cv" v-if="model.trnmod.cmtflg =='C'">
<c-content>
<m-det202cv :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-tab-pane
label="2111跨境支出信息"
name="outp"
v-if="model.cnybop.outflg == '1'"
>
<el-tab-pane label="2111跨境支出信息" name="outp" v-if="model.cnybop.outflg == '1'" >
<m-outp :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane label="CIPS" name="cips2" v-if="model.trnmod.cmtflg =='P'" >
<c-content>
<m-cips2 :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-tab-pane label="CIPS要素" name="cips" v-if="model.trnmod.cmtflg =='P'" >
<m-cips :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000001
<el-tab-pane label="Payment 756 PRB CNY 13541.00" name="det756">
<m-det756 :model="model" :codes="codes"/>
</el-tab-pane>-->
</c-tabs>
</el-form>
<c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty"></c-grid-ety-prompt-dialog>
......@@ -180,6 +182,10 @@ import Sbxx from "~/views/Public/Sbxx";
import Det756 from "./Det756";
import Det202cv from "./Det202cv";
import Outp from "./Outp";
import Cips from "./Cips";
import Cips2 from "./Cips2";
export default {
name: "Brtset",
......@@ -204,6 +210,8 @@ export default {
"m-det756": Det756,
"m-det202cv": Det202cv,
"m-outp": Outp,
"m-cips": Cips,
"m-cips2": Cips2,
},
provide() {
return {
......
src/views/Business/Cptadv/CptAdvChangePanel.vue
......@@ -409,6 +409,7 @@
@keyup.enter.native="
showGridPromptDialog('cpdgrp.pye.pts.extkey')
"
></c-input>
</el-form-item>
</c-col>
......@@ -2373,6 +2374,13 @@ export default {
handleClose(done) {
done();
},
commonExecuteNotify(){
this.executeNotify().then((res) => {
if ((res.respCode == SUCCESS)) {
Utils.copyValueFromVO(this.model, res.data);
}
});
},
},
};
</script>
......
src/views/Business/Cptadv/Incp.vue
......@@ -39,7 +39,7 @@
                size="small"
                type="primary"
                icon="el-icon-search"
                @click="showGridPromptDialog('cptp.selbut1', null, null,{TXT: 'cnybop.cnyinc.spayercountrycode'}, {TXT: false},'doxpDialog')"> </c-button>
                @click="showGridPromptDialog('cptp.selbut', null, null,{COD: 'cnybop.cnyinc.spayercountrycode'}, {TXT: false},'doxpDialog')"> </c-button>
</c-col>
</c-col>
<c-col :span="24">
......@@ -80,7 +80,7 @@
<el-form-item label="收款币种" prop="cnybop.cnyinc.spayeecny">
<c-select v-model="model.cnybop.cnyinc.spayeecny" style="width:100%" placeholder="请选择收款币种">
<el-option
v-for="item in codes.cur"
v-for="item in codes.currencycode"
:key="item.value"
:label="item.label"
:value="item.value"
......
src/views/Business/Cptadv/Opnp1.vue
......@@ -133,7 +133,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="付款人常驻国家/地区" prop="cptp.draweecountcode">
<el-form-item label="付款人常驻国家/地区代码" prop="cptp.draweecountcode">
<c-fullbox>
<c-input
v-model="model.cptp.draweecountcode"
......@@ -147,7 +147,7 @@
                size="small"
                type="primary"
                icon="el-icon-search"
                @click="showGridPromptDialog('cptp.selbut', null, null,{TXT: 'cptp.draweecountcode'}, {TXT: false},'doxpDialog')"
                @click="showGridPromptDialog('cptp.selbut', null, null,{COD: 'cptp.draweecountcode'}, {TXT: false},'doxpDialog')"
              > </c-button>
</template>
</c-fullbox>
......
src/views/Business/Cptadv/index.vue
......@@ -63,15 +63,12 @@
<!--PD000546 -->
<m-sbxx :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane
label="2101跨境收入信息"
name="incp"
v-if="model.cnybop.cnyflg === '1'"
>
<el-tab-pane label="2101跨境收入信息" name="incp" v-if="model.cnybop.cnyflg === '1'" >
<c-content>
<m-incp :model="model" :codes="codes"></m-incp>
</c-content>
</el-tab-pane>
<el-tab-pane label="报文及面函" name="docpan">
<!--PD000000 -->
<m-docpan :model="model" :codes="codes" />
......
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