Commit 1070165f by wangyanjiao

botdav 跨境人民币事件增加、字段增加、页面引用

parent cd39a669
...@@ -35,7 +35,7 @@ export default { ...@@ -35,7 +35,7 @@ export default {
"bodgrp.drr.pts.adrblk" :Utils.defaultFunction, "bodgrp.drr.pts.adrblk" :Utils.defaultFunction,
"bodgrp.cbs.max.amt" :Utils.defaultFunction, "bodgrp.cbs.max.amt" :Utils.defaultFunction,
"bodgrp.rec.doctypcod" :Utils.defaultFunction, "bodgrp.rec.doctypcod" :Utils.defaultFunction,
"bodgrp.cbs.max.cur" :Utils.defaultFunction, // "bodgrp.cbs.max.cur" :Utils.defaultFunction,
"bodgrp.rec.shpdat" :Utils.defaultFunction, "bodgrp.rec.shpdat" :Utils.defaultFunction,
"bodgrp.rec.matpercnt" :Utils.defaultFunction, "bodgrp.rec.matpercnt" :Utils.defaultFunction,
"bodgrp.rec.matperbeg" :Utils.defaultFunction, "bodgrp.rec.matperbeg" :Utils.defaultFunction,
......
...@@ -3,142 +3,142 @@ import Api from "~/service/Api" ...@@ -3,142 +3,142 @@ import Api from "~/service/Api"
import Pts from "../Common/Pts" import Pts from "../Common/Pts"
import Pub from "../Public" import Pub from "../Public"
export default class Botdav{ export default class Botdav {
constructor () { constructor() {
this.data = { this.data = {
botcoll3blk:"", botcoll3blk: "",
botcoll1blk:"", botcoll1blk: "",
botdrrl1blk:"", botdrrl1blk: "",
botcoll4blk:"", botcoll4blk: "",
liaall: new Pub().data.Liaall, liaall: new Pub().data.Liaall,
bodgrp:{ bodgrp: {
rec:{ rec: {
matpertyp:"", // Days/Months or Years for Maturity Period .bodgrp.rec.matpertyp matpertyp: "", // Days/Months or Years for Maturity Period .bodgrp.rec.matpertyp
ownref:"", // Reference .bodgrp.rec.ownref ownref: "", // Reference .bodgrp.rec.ownref
nam:"", // Name .bodgrp.rec.nam nam: "", // Name .bodgrp.rec.nam
dircolflg:"", // Direct Collection .bodgrp.rec.dircolflg dircolflg: "", // Direct Collection .bodgrp.rec.dircolflg
resflg:"", // Reservated Contract .bodgrp.rec.resflg resflg: "", // Reservated Contract .bodgrp.rec.resflg
rcvdat:"", // Order Date .bodgrp.rec.rcvdat rcvdat: "", // Order Date .bodgrp.rec.rcvdat
shpdat:"", // Shipment date .bodgrp.rec.shpdat shpdat: "", // Shipment date .bodgrp.rec.shpdat
predat:"", // Presentation Date .bodgrp.rec.predat predat: "", // Presentation Date .bodgrp.rec.predat
advdat:"", // Dispatched on .bodgrp.rec.advdat advdat: "", // Dispatched on .bodgrp.rec.advdat
doctypcod:"", // Collection Condition .bodgrp.rec.doctypcod doctypcod: "", // Collection Condition .bodgrp.rec.doctypcod
matdat:"", // Maturity Date .bodgrp.rec.matdat matdat: "", // Maturity Date .bodgrp.rec.matdat
matpercnt:"", // Tenor Specification .bodgrp.rec.matpercnt matpercnt: "", // Tenor Specification .bodgrp.rec.matpercnt
matperbeg:"", // Starting from .bodgrp.rec.matperbeg matperbeg: "", // Starting from .bodgrp.rec.matperbeg
stacty:"", // Country Code Risk Country! .bodgrp.rec.stacty stacty: "", // Country Code Risk Country! .bodgrp.rec.stacty
stagod:"", // Goods Code .bodgrp.rec.stagod stagod: "", // Goods Code .bodgrp.rec.stagod
invtyp:"", // Maturity Date .bodgrp.rec.invtyp invtyp: "", // Maturity Date .bodgrp.rec.invtyp
paydoctyp:"", // Financial Document .bodgrp.rec.paydoctyp paydoctyp: "", // Financial Document .bodgrp.rec.paydoctyp
paydocnum:"", // Document Number .bodgrp.rec.paydocnum paydocnum: "", // Document Number .bodgrp.rec.paydocnum
issdat:"", // Issued on .bodgrp.rec.issdat issdat: "", // Issued on .bodgrp.rec.issdat
ccdndrflg:"", // Truncation - Physical Document Kept w OWN .bodgrp.rec.ccdndrflg ccdndrflg: "", // Truncation - Physical Document Kept w OWN .bodgrp.rec.ccdndrflg
ccdpurflg:"", // Payment Under Reserve .bodgrp.rec.ccdpurflg ccdpurflg: "", // Payment Under Reserve .bodgrp.rec.ccdpurflg
chato:"", // Our Charges to .bodgrp.rec.chato chato: "", // Our Charges to .bodgrp.rec.chato
focflg:"", // Free of Payment .bodgrp.rec.focflg focflg: "", // Free of Payment .bodgrp.rec.focflg
waicolcod:"", // Protest Instructions .bodgrp.rec.waicolcod waicolcod: "", // Protest Instructions .bodgrp.rec.waicolcod
wairmtcod:"", // Waive Remitting Bank Charges .bodgrp.rec.wairmtcod wairmtcod: "", // Waive Remitting Bank Charges .bodgrp.rec.wairmtcod
othins:"", // Defer Payment until .bodgrp.rec.othins othins: "", // Defer Payment until .bodgrp.rec.othins
lescom:"", // Warehouse/Insurance .bodgrp.rec.lescom lescom: "", // Warehouse/Insurance .bodgrp.rec.lescom
shpfro:"", // Shipment from .bodgrp.rec.shpfro shpfro: "", // Shipment from .bodgrp.rec.shpfro
shpto:"", // For Transportation to .bodgrp.rec.shpto shpto: "", // For Transportation to .bodgrp.rec.shpto
}, },
cbs:{ cbs: {
max:{ max: {
cur:"", // Document Amount .bodgrp.cbs.max.cur cur: "", // Document Amount .bodgrp.cbs.max.cur
amt:"", // Document Amount .bodgrp.cbs.max.amt amt: "", // Document Amount .bodgrp.cbs.max.amt
}, },
opn1:{ opn1: {
cur:"", // Warehouse/Insurance .bodgrp.cbs.opn1.cur cur: "", // Warehouse/Insurance .bodgrp.cbs.opn1.cur
amt:"", // Open Amount .bodgrp.cbs.opn1.amt amt: "", // Open Amount .bodgrp.cbs.opn1.amt
}, },
}, },
blk:{ blk: {
docpre:"", // bodgrp.blk.docpre docpre: "", // bodgrp.blk.docpre
bogdet:"", // Tenor Details Text .bodgrp.blk.bogdet bogdet: "", // Tenor Details Text .bodgrp.blk.bogdet
cctinsrcv:"", // Instructions Received .bodgrp.blk.cctinsrcv cctinsrcv: "", // Instructions Received .bodgrp.blk.cctinsrcv
cctinscol:"", // Collection Instruction .bodgrp.blk.cctinscol cctinscol: "", // Collection Instruction .bodgrp.blk.cctinscol
colins:"", // Collection Instructions .bodgrp.blk.colins colins: "", // Collection Instructions .bodgrp.blk.colins
colinsflg:"", // Collection instructions modified .bodgrp.blk.colinsflg colinsflg: "", // Collection instructions modified .bodgrp.blk.colinsflg
dftins:"", // Draft Instructions .bodgrp.blk.dftins dftins: "", // Draft Instructions .bodgrp.blk.dftins
proins:"", // Protest Instructions .bodgrp.blk.proins proins: "", // Protest Instructions .bodgrp.blk.proins
othins:"", // Other Instructions .bodgrp.blk.othins othins: "", // Other Instructions .bodgrp.blk.othins
chgtxt:"", // Charges Text .bodgrp.blk.chgtxt chgtxt: "", // Charges Text .bodgrp.blk.chgtxt
delins:"", // Delivery instructions .bodgrp.blk.delins delins: "", // Delivery instructions .bodgrp.blk.delins
intins:"", // Interest Instructions .bodgrp.blk.intins intins: "", // Interest Instructions .bodgrp.blk.intins
setinsbo:"", // Settlement insrtrctions .bodgrp.blk.setinsbo setinsbo: "", // Settlement insrtrctions .bodgrp.blk.setinsbo
agtaut:"", // Authority of Agent .bodgrp.blk.agtaut agtaut: "", // Authority of Agent .bodgrp.blk.agtaut
goddes:"", // Description of Goods .bodgrp.blk.goddes goddes: "", // Description of Goods .bodgrp.blk.goddes
}, },
drr:{ drr: {
pts:new Pts().data, pts: new Pts().data,
namelc:"", // 名称 .bodgrp.drr.namelc namelc: "", // 名称 .bodgrp.drr.namelc
adrelc:"", // 地址 .bodgrp.drr.adrelc adrelc: "", // 地址 .bodgrp.drr.adrelc
dbfadrblkcn:"", // Chinese address .bodgrp.drr.dbfadrblkcn dbfadrblkcn: "", // Chinese address .bodgrp.drr.dbfadrblkcn
}, },
col:{ col: {
pts:new Pts().data, pts: new Pts().data,
namelc:"", // 名称 .bodgrp.col.namelc namelc: "", // 名称 .bodgrp.col.namelc
adrelc:"", // 地址 .bodgrp.col.adrelc adrelc: "", // 地址 .bodgrp.col.adrelc
dbfadrblkcn:"", // Chinese address .bodgrp.col.dbfadrblkcn dbfadrblkcn: "", // Chinese address .bodgrp.col.dbfadrblkcn
}, },
dre:{ dre: {
pts:new Pts().data, pts: new Pts().data,
namelc:"", // 名称 .bodgrp.dre.namelc namelc: "", // 名称 .bodgrp.dre.namelc
adrelc:"", // 地址 .bodgrp.dre.adrelc adrelc: "", // 地址 .bodgrp.dre.adrelc
dbfadrblkcn:"", // Chinese address .bodgrp.dre.dbfadrblkcn dbfadrblkcn: "", // Chinese address .bodgrp.dre.dbfadrblkcn
}, },
srm:{ srm: {
djuusr:"", // 单据出具人 .bodgrp.srm.djuusr djuusr: "", // 单据出具人 .bodgrp.srm.djuusr
djudat:"", // 单据出具日期 .bodgrp.srm.djudat djudat: "", // 单据出具日期 .bodgrp.srm.djudat
djuref:"", // 货权单据编号 .bodgrp.srm.djuref djuref: "", // 货权单据编号 .bodgrp.srm.djuref
djutyp:"", // 单据类型 .bodgrp.srm.djutyp djutyp: "", // 单据类型 .bodgrp.srm.djutyp
}, },
}, },
botp:{ botp: {
ptsaddp:{ ptsaddp: {
ptsaddg: [], ptsaddg: [],
}, },
recget:{ recget: {
sdamod:{ sdamod: {
seainf:"", // .botp.recget.sdamod.seainf seainf: "", // .botp.recget.sdamod.seainf
dadsnd:"", // Drag Drop Sender .botp.recget.sdamod.dadsnd dadsnd: "", // Drag Drop Sender .botp.recget.sdamod.dadsnd
}, },
}, },
usr:{ usr: {
extkey:"", // Responsible User .botp.usr.extkey extkey: "", // Responsible User .botp.usr.extkey
}, },
usrget:{ usrget: {
sdamod:{ sdamod: {
seainf:"", // .botp.usrget.sdamod.seainf seainf: "", // .botp.usrget.sdamod.seainf
}, },
}, },
docgrdm:{ docgrdm: {
docgrd:"", docgrd: "",
docdsclab:"", // Label of document description .botp.docgrdm.docdsclab docdsclab: "", // Label of document description .botp.docgrdm.docdsclab
}, },
drrp:{ drrp: {
ptsget:{ ptsget: {
sdamod:{ sdamod: {
seainf:"", // .botp.drrp.ptsget.sdamod.seainf seainf: "", // .botp.drrp.ptsget.sdamod.seainf
dadsnd:"", // Drag Drop Sender .botp.drrp.ptsget.sdamod.dadsnd dadsnd: "", // Drag Drop Sender .botp.drrp.ptsget.sdamod.dadsnd
}, },
}, },
}, },
colp:{ colp: {
ptsget:{ ptsget: {
sdamod:{ sdamod: {
seainf:"", // .botp.colp.ptsget.sdamod.seainf seainf: "", // .botp.colp.ptsget.sdamod.seainf
dadsnd:"", // Drag Drop Sender .botp.colp.ptsget.sdamod.dadsnd dadsnd: "", // Drag Drop Sender .botp.colp.ptsget.sdamod.dadsnd
}, },
}, },
}, },
drep:{ drep: {
ptsget:{ ptsget: {
sdamod:{ sdamod: {
seainf:"", // .botp.drep.ptsget.sdamod.seainf seainf: "", // .botp.drep.ptsget.sdamod.seainf
dadsnd:"", // Drag Drop Sender .botp.drep.ptsget.sdamod.dadsnd dadsnd: "", // Drag Drop Sender .botp.drep.ptsget.sdamod.dadsnd
}, },
}, },
}, },
...@@ -168,25 +168,25 @@ export default class Botdav{ ...@@ -168,25 +168,25 @@ export default class Botdav{
// } // }
// }, // },
setmod: new Pub().data.Setmod, setmod: new Pub().data.Setmod,
mtabut:{ mtabut: {
coninf:{ coninf: {
oitinf:{ oitinf: {
labinftxt:"", // Label for INFTXT .mtabut.coninf.oitinf.labinftxt labinftxt: "", // Label for INFTXT .mtabut.coninf.oitinf.labinftxt
oit:{ oit: {
inftxt:"", // Infotext .mtabut.coninf.oitinf.oit.inftxt inftxt: "", // Infotext .mtabut.coninf.oitinf.oit.inftxt
inflev:"", // Infotext Level .mtabut.coninf.oitinf.oit.inflev inflev: "", // Infotext Level .mtabut.coninf.oitinf.oit.inflev
}, },
}, },
oitset:{ oitset: {
labinftxt:"", // Label for INFTXT .mtabut.coninf.oitset.labinftxt labinftxt: "", // Label for INFTXT .mtabut.coninf.oitset.labinftxt
oit:{ oit: {
inftxt:"", // Infotext .mtabut.coninf.oitset.oit.inftxt inftxt: "", // Infotext .mtabut.coninf.oitset.oit.inftxt
inflev:"", // Infotext Level .mtabut.coninf.oitset.oit.inflev inflev: "", // Infotext Level .mtabut.coninf.oitset.oit.inflev
}, },
}, },
conexedat:"", // 执行日期 .mtabut.coninf.conexedat conexedat: "", // 执行日期 .mtabut.coninf.conexedat
usr:{ usr: {
extkey:"", // User ID .mtabut.coninf.usr.extkey extkey: "", // User ID .mtabut.coninf.usr.extkey
}, },
}, },
}, },
...@@ -209,12 +209,35 @@ export default class Botdav{ ...@@ -209,12 +209,35 @@ export default class Botdav{
// }, // },
// }, // },
trnmod: new Pub().data.Trnmod, trnmod: new Pub().data.Trnmod,
cnybop:{ cnybop: {
cnyflg:"", // 是否报送跨境人民币2101表 .cnybop.cnyflg cnyflg: "", // 是否报送跨境人民币2101表 .cnybop.cnyflg
traflg:"", // 是否报送跨境人民币2107表 .cnybop.traflg traflg: "", // 是否报送跨境人民币2107表 .cnybop.traflg
outflg:"", // 是否报送跨境人民币2111表 .cnybop.outflg outflg: "", // 是否报送跨境人民币2111表 .cnybop.outflg
libflg:"", // 是否报送跨境人民币2106表 .cnybop.libflg libflg: "", // 是否报送跨境人民币2106表 .cnybop.libflg
vouflg:"", // 是否报送跨境人民币2122表 .cnybop.vouflg vouflg: "", // 是否报送跨境人民币2122表 .cnybop.vouflg
cnylib: {
spk: "", // 业务主键 .cnybop.cnylib.spk
sbankorgcode: "", // 银行机构代码 .cnybop.cnylib.sbankorgcode
stransattr: "", // 业务属性 .cnybop.cnylib.stransattr
stranstype: "", // 业务类型 .cnybop.cnylib.stranstype
sforbankswiftbic: "", // 境外对手行代码 .cnybop.cnylib.sforbankswiftbic
sorgcode: "", // 境内企业机构代码 .cnybop.cnylib.sorgcode
sforeigncountrycode: "", // 境外企业国别地区代码 .cnybop.cnylib.sforeigncountrycode
doccurdate: "", // 业务发生日期 .cnybop.cnylib.doccurdate
denddate: "", // 业务到期日 .cnybop.cnylib.denddate
dcreditenddate: "", // 信用证到期日 .cnybop.cnylib.dcreditenddate
famt: "", // 金额 .cnybop.cnylib.famt
dexchangedate: "", // 承兑日期 .cnybop.cnylib.dexchangedate
dexchangeenddate: "", // 承兑到期日 .cnybop.cnylib.dexchangeenddate
sbanktrano: "", // 银行业务编号 .cnybop.cnylib.sbanktrano
stermtype: "", // 期限条件 .cnybop.cnylib.stermtype
currencycode: "", // 币种 .cnybop.cnylib.currencycode
},
sorgname: "", // 境内企业名称 .cnybop.sorgname
sforeignorgname: "", // 境外企业名称 .cnybop.sforeignorgname
saddwordlib: "", // 交易附言 .cnybop.saddwordlib
sbankname: "", // 银行机构名称 .cnybop.sbankname
fexchangeamt: "", // 承兑金额 .cnybop.fexchangeamt
}, },
pageId: "" // ctx的key pageId: "" // ctx的key
} }
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="" prop="bodgrp.blk.colinsflg"> <el-form-item label="" prop="bodgrp.blk.colinsflg">
<c-checkbox v-model="colinsflg">Collection instructions modified</c-checkbox> <c-checkbox v-model="colinsflg">Delivery of Documents Instructions modified</c-checkbox>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<el-form-item label="Document Amount" prop="bodgrp.cbs.max.cur"> <el-form-item label="Document Amount" prop="bodgrp.cbs.max.cur">
<c-select v-model="model.bodgrp.cbs.max.cur" style="width: 100%" placeholder="请选择Currency"> <c-select v-model="model.bodgrp.cbs.max.cur" style="width: 100%" placeholder="请选择Currency" @change="changeCur">
<el-option v-for="item in codes.currencycode" :key="item.value" :label="item.label" :value="item.value"> <el-option v-for="item in codes.currencycode" :key="item.value" :label="item.label" :value="item.value">
</el-option> </el-option>
</c-select> </c-select>
...@@ -322,6 +322,13 @@ ...@@ -322,6 +322,13 @@
}, },
methods: { methods: {
...Event, ...Event,
changeCur(){
this.executeDefault("bodgrp.cbs.max.cur").then((res) => {
if ((res.respCode == SUCCESS)) {
Utils.copyValueFromVO(this.model, res.data);
}
});
},
addTableValue(index) { addTableValue(index) {
var newTableValue = Object.assign({}, this.newValue); var newTableValue = Object.assign({}, this.newValue);
const serial = Utils.generateUUID(); const serial = Utils.generateUUID();
......
...@@ -77,10 +77,17 @@ ...@@ -77,10 +77,17 @@
</el-tab-pane> </el-tab-pane>
<!--跨境人民币申报 --> <!--跨境人民币申报 -->
<el-tab-pane label="跨境人民币申报" name="cnyp"> <el-tab-pane label="跨境人民币申报" name="cnyp" >
<m-cnyp :model="model" :codes="codes" /> <m-cnyp :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="2106银行跟单结算及表外融资" name="libp" v-if="model.cnybop.libflg ==='1'">
<c-content>
<m-libp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--货权单据 --> <!--货权单据 -->
<el-tab-pane label="货权单据" name="srmp"> <el-tab-pane label="货权单据" name="srmp">
<m-srmp :model="model" :codes="codes" /> <m-srmp :model="model" :codes="codes" />
...@@ -117,6 +124,7 @@ ...@@ -117,6 +124,7 @@
import Engp from "~/views/Public/Engp" import Engp from "~/views/Public/Engp"
import Glepan from "~/views/Public/Glepan" import Glepan from "~/views/Public/Glepan"
import Doctre from "~/views/Public/Doctre" import Doctre from "~/views/Public/Doctre"
import Libp from '../Betsnd/Libp'
export default { export default {
...@@ -133,6 +141,7 @@ ...@@ -133,6 +141,7 @@
"m-cnyp": Cnyp, "m-cnyp": Cnyp,
"m-srmp": Srmp, "m-srmp": Srmp,
"m-engp": Engp, "m-engp": Engp,
'm-libp': Libp,
"m-glepan": Glepan, "m-glepan": Glepan,
}, },
......
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