Commit 141d2665 by lianyang

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 421a22d3 14c878c4
...@@ -53,10 +53,10 @@ export default { ...@@ -53,10 +53,10 @@ export default {
{max: 1,message:"长度不能超过1"} {max: 1,message:"长度不能超过1"}
], ],
"trnmod.swiadd.newmatpercnt":[ // "trnmod.swiadd.newmatpercnt":[
{type: "string", required: false, message: "必输项"}, // {type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"} // {max: 3,message:"长度不能超过3"}
], // ],
"oldbcdgrp.rec.matdat":[ "oldbcdgrp.rec.matdat":[
......
...@@ -16,7 +16,6 @@ export default { ...@@ -16,7 +16,6 @@ export default {
], ],
"didgrp.cbs.opn1.cur":[ "didgrp.cbs.opn1.cur":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"}
], ],
"didgrp.cbs.opn1.amt":[ "didgrp.cbs.opn1.amt":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
......
...@@ -78,5 +78,6 @@ export default { ...@@ -78,5 +78,6 @@ export default {
"mtabut.clsflg" :Utils.defaultFunction, "mtabut.clsflg" :Utils.defaultFunction,
"mtabut.coninf.conexedat" :Utils.defaultFunction, "mtabut.coninf.conexedat" :Utils.defaultFunction,
"cnybop.outflg" :Utils.defaultFunction, "cnybop.outflg" :Utils.defaultFunction,
"bodgrp.rec.docsta" :Utils.defaultFunction,
} }
//你可以添加自动default处理 //你可以添加自动default处理
...@@ -6,6 +6,7 @@ import Api from "~/service/Api"; ...@@ -6,6 +6,7 @@ import Api from "~/service/Api";
import Utils from "~/utils/index" import Utils from "~/utils/index"
export default { export default {
"bopmod.dbcgrp.bas.buscode" :Utils.defaultFunction,
"dftcre.dfdgrp.rec.dfuflg" :Utils.defaultFunction, "dftcre.dfdgrp.rec.dfuflg" :Utils.defaultFunction,
"dftcre.dfdgrp.rec.fintyp" :Utils.defaultFunction, "dftcre.dfdgrp.rec.fintyp" :Utils.defaultFunction,
"bptbck.dscbckcur" :Utils.defaultFunction, "bptbck.dscbckcur" :Utils.defaultFunction,
...@@ -18,7 +19,9 @@ export default { ...@@ -18,7 +19,9 @@ export default {
"brdgrp.prb.namelc" :Utils.defaultFunction, "brdgrp.prb.namelc" :Utils.defaultFunction,
"brdgrp.prb.dbfadrblkcn" :Utils.defaultFunction, "brdgrp.prb.dbfadrblkcn" :Utils.defaultFunction,
"brdgrp.prb.pts.adrblk" :Utils.defaultFunction, "brdgrp.prb.pts.adrblk" :Utils.defaultFunction,
"bopmod.dbcgrp.bas.rptno" :Utils.defaultFunction,
"cnybop.libflg" :Utils.defaultFunction, "cnybop.libflg" :Utils.defaultFunction,
"bopmod.dbcgrp.bas.methods" :Utils.defaultFunction,
"setmod.setamt" :Utils.defaultFunction, "setmod.setamt" :Utils.defaultFunction,
"setmod.dspflg" :Utils.defaultFunction, "setmod.dspflg" :Utils.defaultFunction,
"trnmod.trndoc.condocstm" :Utils.defaultFunction, "trnmod.trndoc.condocstm" :Utils.defaultFunction,
...@@ -57,6 +60,8 @@ export default { ...@@ -57,6 +60,8 @@ export default {
"dftcre.oricur" :Utils.defaultFunction, "dftcre.oricur" :Utils.defaultFunction,
"cfabrt.basflg" :Utils.defaultFunction, "cfabrt.basflg" :Utils.defaultFunction,
"lidgrp.rec.ownref" :Utils.defaultFunction, "lidgrp.rec.ownref" :Utils.defaultFunction,
"bopmod.dbcgrp.bas.custype" :Utils.defaultFunction,
"bopmod.dbcgrp.bas.tmpref" :Utils.defaultFunction,
"liaall.limmod.comamt" :Utils.defaultFunction, "liaall.limmod.comamt" :Utils.defaultFunction,
"liaall.limmod.ccvamt" :Utils.defaultFunction, "liaall.limmod.ccvamt" :Utils.defaultFunction,
"dftcre.dfdgrp.dff.pts.adrblk" :Utils.defaultFunction, "dftcre.dfdgrp.dff.pts.adrblk" :Utils.defaultFunction,
...@@ -82,6 +87,7 @@ export default { ...@@ -82,6 +87,7 @@ export default {
"liaall.liaccv.concur" :Utils.defaultFunction, "liaall.liaccv.concur" :Utils.defaultFunction,
"brdgrp.rec.stadat" :Utils.defaultFunction, "brdgrp.rec.stadat" :Utils.defaultFunction,
"mtabut.coninf.usr.extkey" :Utils.defaultFunction, "mtabut.coninf.usr.extkey" :Utils.defaultFunction,
"bopmod.dbcgrp.bas.ownextkey" :Utils.defaultFunction,
"bopmod.dclflg" :Utils.defaultFunction, "bopmod.dclflg" :Utils.defaultFunction,
"liaall.liaccv.addinf" :Utils.defaultFunction, "liaall.liaccv.addinf" :Utils.defaultFunction,
"dftcre.dfdgrp.rec.flttyp" :Utils.defaultFunction, "dftcre.dfdgrp.rec.flttyp" :Utils.defaultFunction,
...@@ -96,6 +102,7 @@ export default { ...@@ -96,6 +102,7 @@ export default {
"brdgrp.cbs.opn2.cur" :Utils.defaultFunction, "brdgrp.cbs.opn2.cur" :Utils.defaultFunction,
"aamset.utlamt2" :Utils.defaultFunction, "aamset.utlamt2" :Utils.defaultFunction,
"brdgrp.cbs.opn1.amt" :Utils.defaultFunction, "brdgrp.cbs.opn1.amt" :Utils.defaultFunction,
"bopmod.dbcgrp.bas.custcod" :Utils.defaultFunction,
"liaall.misamt" :Utils.defaultFunction, "liaall.misamt" :Utils.defaultFunction,
"dftcre.dfdgrp.rec.resamt" :Utils.defaultFunction, "dftcre.dfdgrp.rec.resamt" :Utils.defaultFunction,
"mtabut.coninf.oitinf.oit.inftxt" :Utils.defaultFunction, "mtabut.coninf.oitinf.oit.inftxt" :Utils.defaultFunction,
......
...@@ -243,5 +243,77 @@ export default { ...@@ -243,5 +243,77 @@ export default {
} }
}, },
async onSeainf() {}, async onSeainf() {},
async onSav(){
let rtnmsg = await this.executeRule("sav")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败!'});
}
},
async onBasppGetreftmp(){
let rtnmsg = await this.executeRule("baspp.getreftmp")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败!'});
}
},
async onBasppGetref(){
let rtnmsg = await this.executeRule("baspp.getref")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败!'});
}
},
async onCan(){
let rtnmsg = await this.executeRule("can")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败!'});
}
},
async onChk(){
let rtnmsg = await this.executeRule("chk")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败!'});
}
},
async onButpErr(){
let rtnmsg = await this.executeRule("butp.err")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败!'});
}
},
} }
\ No newline at end of file
...@@ -40,11 +40,11 @@ export default { ...@@ -40,11 +40,11 @@ export default {
{max: 40,message:"长度不能超过40"} {max: 40,message:"长度不能超过40"}
], ],
"brdgrp.cbs.max.amt":[ // "brdgrp.cbs.max.amt":[
{type: "number", required: false, message: "必输项"}, // {type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, // {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], // ],
"brdgrp.apl.pts.ref":[ "brdgrp.apl.pts.ref":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"} {max: 16,message:"长度不能超过16"}
...@@ -128,7 +128,7 @@ export default { ...@@ -128,7 +128,7 @@ export default {
"setmod.setamt":[ "setmod.setamt":[
{type: "number", required: false, message: "必输项"}, {type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d$)|(^0\.\d$)|(^\d\.\d$)/, message: "小数位不能超过3位" }
], ],
"nar754":[ "nar754":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
...@@ -602,4 +602,95 @@ export default { ...@@ -602,4 +602,95 @@ export default {
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 32,message:"长度不能超过32"} {max: 32,message:"长度不能超过32"}
], ],
"bopmod.dbcgrp.bas.rptno":[
{type: "string", required: false, message: "必输项"},
{max: 22,message:"长度不能超过22"}
],
"bopmod.dbcgrp.bas.tmpref":[
{type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"}
],
"bopmod.dbcgrp.bas.actiondesc":[
{type: "string", required: false, message: "必输项"},
{max: 32,message:"长度不能超过32"}
],
"bopmod.dbcgrp.bas.buscode":[
{type: "string", required: false, message: "必输项"},
{max: 22,message:"长度不能超过22"}
],
"bopmod.dbcgrp.bas.custcod":[
{type: "string", required: false, message: "必输项"},
{max: 18,message:"长度不能超过18"}
],
"bopmod.dbcgrp.bas.custnm":[
{type: "string", required: true, message: "必输项"},
{max: 63,message:"长度不能超过63"}
],
"bopmod.dbcgrp.bas.oppuser":[
{type: "string", required: true, message: "必输项"},
{max: 63,message:"长度不能超过63"}
],
"bopmod.dbcgrp.bas.idcode":[
{type: "string", required: false, message: "必输项"},
{max: 32,message:"长度不能超过32"}
],
"bopmod.dbcgrp.bas.exrate":[
{type: "string", required: false, message: "必输项"},
{max: 13,message:"长度不能超过13"}
],
"bopmod.dbcgrp.bas.lcyamt":[
{type: "number", required: false, message: "必输项"} ],
"bopmod.dbcgrp.bas.lcyacc":[
{type: "string", required: false, message: "必输项"},
{max: 32,message:"长度不能超过32"}
],
"bopmod.dbcgrp.bas.fcyamt":[
{type: "number", required: false, message: "必输项"} ],
"bopmod.dbcgrp.bas.fcyacc":[
{type: "string", required: false, message: "必输项"},
{max: 32,message:"长度不能超过32"}
],
"bopmod.dbcgrp.bas.othamt":[
{type: "number", required: false, message: "必输项"} ],
"bopmod.dbcgrp.bas.othacc":[
{type: "string", required: false, message: "必输项"},
{max: 32,message:"长度不能超过32"}
],
"bopmod.dbcgrp.bas.txamt":[
{type: "number", required: false, message: "必输项"} ],
"bopmod.dbcgrp.bas.outchargeamt":[
{type: "number", required: false, message: "必输项"} ],
"bopmod.dbcgrp.bas.actuamt":[
{type: "number", required: false, message: "必输项"} ],
"bopmod.dbcgrp.bas.issdate":[
{type: "date", required: false, message: "输入正确的日期"}
],
"bopmod.dbcgrp.bas.lcbgno":[
{type: "string", required: false, message: "必输项"},
{max: 20,message:"长度不能超过20"}
],
"bopmod.dbcgrp.bas.tenor":[
{type: "string", required: false, message: "必输项"},
{max: 10,message:"长度不能超过10"}
],
} }
\ No newline at end of file
...@@ -188,6 +188,50 @@ export default class Brtset{ ...@@ -188,6 +188,50 @@ export default class Brtset{
vrfflg:"", // 核销数据 .bopmod.vrfflg vrfflg:"", // 核销数据 .bopmod.vrfflg
ownextkey:"", // 地区机构号 .bopmod.ownextkey ownextkey:"", // 地区机构号 .bopmod.ownextkey
acttyp:"", // 款项去向 .bopmod.acttyp acttyp:"", // 款项去向 .bopmod.acttyp
dbcp:{
baspp:{
cusnam:"", // .bopmod.dbcp.baspp.cusnam
cornam:"", // .bopmod.dbcp.baspp.cornam
corpnam:"", // .bopmod.dbcp.baspp.corpnam
roptnam:"", // RoptNam .bopmod.dbcp.baspp.roptnam
exratelab:"", // �'�汇/结汇汇率 .bopmod.dbcp.baspp.exratelab
lcyamtlab:"", // �'�汇/结汇金额 .bopmod.dbcp.baspp.lcyamtlab
acp:"", // 确认 .bopmod.dbcp.baspp.acp
tmprefnew:"", // TMPREFLABEL .bopmod.dbcp.baspp.tmprefnew
},
},
dbcgrp:{
bas:{
tmpref:"", // �'时申报流�'号 .bopmod.dbcgrp.bas.tmpref
ownextkey:"", // 地区机构号 .bopmod.dbcgrp.bas.ownextkey
actiontype:"", // 操作类型 .bopmod.dbcgrp.bas.actiontype
rptno:"", // 申报号码 .bopmod.dbcgrp.bas.rptno
idcode:"", // 身份证件号码 .bopmod.dbcgrp.bas.idcode
lcyacc:"", // 人民币帐号/银行卡号 .bopmod.dbcgrp.bas.lcyacc
fcyamt:"", // 现汇金额 .bopmod.dbcgrp.bas.fcyamt
fcyacc:"", // 外汇帐号/银行卡号 .bopmod.dbcgrp.bas.fcyacc
othamt:"", // 其它金额 .bopmod.dbcgrp.bas.othamt
othacc:"", // 其它帐号/银行卡号 .bopmod.dbcgrp.bas.othacc
methods:"", // 结算方式 .bopmod.dbcgrp.bas.methods
buscode:"", // 银行业务编号 .bopmod.dbcgrp.bas.buscode
custype:"", // 类型 .bopmod.dbcgrp.bas.custype
actiondesc:"", // 操作类型 .bopmod.dbcgrp.bas.actiondesc
exrate:"", // �'�汇汇率 .bopmod.dbcgrp.bas.exrate
lcyamt:"", // �'�汇金额 .bopmod.dbcgrp.bas.lcyamt
custnm:"", // 付款人名称 .bopmod.dbcgrp.bas.custnm
oppuser:"", // 收款人名称 .bopmod.dbcgrp.bas.oppuser
custcod:"", // 组织机构 .bopmod.dbcgrp.bas.custcod
actuccy:"", // 实际付款币种及金额 .bopmod.dbcgrp.bas.actuccy
actuamt:"", // 实际付款币种及金额 .bopmod.dbcgrp.bas.actuamt
lcbgno:"", // 信用证/保函编号 .bopmod.dbcgrp.bas.lcbgno
issdate:"", // 开证日期 .bopmod.dbcgrp.bas.issdate
tenor:"", // 期限 .bopmod.dbcgrp.bas.tenor
txccy:"", // 付款币种及金额 .bopmod.dbcgrp.bas.txccy
txamt:"", // 付款币种及金额 .bopmod.dbcgrp.bas.txamt
outchargeccy:"", // 扣费币种及金额 .bopmod.dbcgrp.bas.outchargeccy
outchargeamt:"", // 扣费币种及金额 .bopmod.dbcgrp.bas.outchargeamt
},
},
}, },
cfadft:{ cfadft:{
cfaflg:"", // 海外代付 .cfadft.cfaflg cfaflg:"", // 海外代付 .cfadft.cfaflg
......
...@@ -6,6 +6,7 @@ export default class Infbrd{ ...@@ -6,6 +6,7 @@ export default class Infbrd{
this.data = { this.data = {
infcon:{ infcon:{
seaownref:"", // Own Reference .infcon.seaownref seaownref:"", // Own Reference .infcon.seaownref
seashgref:"", // SG Reference .infcon.seashgref
nam:"", // Name .infcon.nam nam:"", // Name .infcon.nam
searef:"", // Party Reference .infcon.searef searef:"", // Party Reference .infcon.searef
pty:{ pty:{
......
...@@ -796,11 +796,11 @@ export default { ...@@ -796,11 +796,11 @@ export default {
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
"liaall.limmod.comamt":[ // "liaall.limmod.comamt":[
{type: "number", required: false, message: "必输项"}, // {type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, // {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], // ],
"liaall.limmod.limpts.wrk.pts.nam":[ "liaall.limmod.limpts.wrk.pts.nam":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 40,message:"长度不能超过40"} {max: 40,message:"长度不能超过40"}
......
...@@ -16,11 +16,11 @@ export default { ...@@ -16,11 +16,11 @@ export default {
{max: 40,message:"长度不能超过40"} {max: 40,message:"长度不能超过40"}
], ],
"lidgrp.cbs.nom1.amt":[ // "lidgrp.cbs.nom1.amt":[
{type: "number", required: false, message: "必输项"}, // {type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, // {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], // ],
"brdgrp.apl.pts.ref":[ "brdgrp.apl.pts.ref":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"} {max: 16,message:"长度不能超过16"}
...@@ -30,11 +30,11 @@ export default { ...@@ -30,11 +30,11 @@ export default {
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
"lidgrp.cbs.opn1.amt":[ // "lidgrp.cbs.opn1.amt":[
{type: "number", required: false, message: "必输项"}, // {type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, // {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], // ],
"brdgrp.apl.pts.nam":[ "brdgrp.apl.pts.nam":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
...@@ -99,11 +99,11 @@ export default { ...@@ -99,11 +99,11 @@ export default {
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
"brdgrp.cbs.max.amt":[ // "brdgrp.cbs.max.amt":[
{type: "number", required: false, message: "必输项"}, // {type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, // {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], // ],
"brtp.prbp.ptsget.sdamod.dadsnd":[ "brtp.prbp.ptsget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
......
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Amend Condition" prop="newdoctypcod"> <el-form-item label="Amend Condition" prop="newdoctypcod">
<c-select v-model="model.newdoctypcod" style="width:100%" placeholder="Amend Condition"> <c-select v-model="model.newdoctypcod" style="width:100%" placeholder="Amend Condition">
<el-option v-for="item in codes.doctyp" :key="item.value" :label="item.label" :value="item.value"> <el-option v-for="item in codes.doctypcod" :key="item.value" :label="item.label" :value="item.value">
</el-option> </el-option>
</c-select> </c-select>
</el-form-item> </el-form-item>
......
...@@ -319,13 +319,75 @@ ...@@ -319,13 +319,75 @@
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-ptap <!-- <c-ptap
:model="model" :model="model"
:argadr="{ title: 'Drawee ', grp: 'bcdgrp', rol: 'dre' }" :argadr="{ title: 'Drawee ', grp: 'bcdgrp', rol: 'dre' }"
:disabled="true" :disabled="true"
> >
</c-ptap> </c-ptap> -->
<c-col :span="24">
<el-form-item
label="Drawee Ref."
prop="bcdgrp.dre.pts.ref"
>
<c-input
v-model="model.bcdgrp.dre.pts.ref"
maxlength="16"
style="width: 100%"
placeholder="请输入Application Ref"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Extkey" prop="bcdgrp.dre.pts.extkey">
<c-fullbox>
<c-input
disabled
v-model="model.bcdgrp.dre.pts.extkey"
maxlength="50"
placeholder="请输入External Key of Address"
@keyup.enter.native="showGridPromptDialog('bcdgrp.dre.pts.extkey')"
></c-input>
<template slot="footer">
<c-button
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
>
<span style="font-family:'宋体';font-weight:bold">i</span>
</c-button>
<c-button
style="margin:0 0"
size="small"
type="primary"
disabled
@click="onAplpDet"
>
详情
</c-button>
</template>
</c-fullbox>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Address Block" prop="bcdgrp.dre.pts.adrblk">
<c-input
type="textarea"
:rows="4"
v-model="model.bcdgrp.dre.pts.adrblk"
maxlength="50"
disabled
show-word-limit
placeholder="请输入Address Block"
></c-input>
</el-form-item>
</c-col>
<c-ptap <c-ptap
:model="model" :model="model"
......
...@@ -100,6 +100,7 @@ import Engp from "~/views/Public/Engp" ...@@ -100,6 +100,7 @@ import Engp from "~/views/Public/Engp"
export default { export default {
name:"Bctame",
components:{ components:{
"m-amep" : Amep, "m-amep" : Amep,
"m-ovwp" : Ovwp, "m-ovwp" : Ovwp,
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick"> <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
<!--PD000005 --> <!--PD000005 -->
<el-tab-pane label="Settle BC at Maturity, " name="bctsus"> <el-tab-pane label="Settle BC at Maturity" name="bctsus">
<m-bctsus :model="model" :codes="codes"/> <m-bctsus :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
......
...@@ -113,8 +113,8 @@ ...@@ -113,8 +113,8 @@
<c-col :span="12"> <c-col :span="12">
<el-form-item label="远期期限" prop="bddgrp.rec.tenmaxday"> <el-form-item label="远期期限" prop="bddgrp.rec.tenmaxday">
<c-date-picker type="date" v-model="model.bddgrp.rec.tenmaxday" style="width: 100%" <c-input v-model="model.bddgrp.rec.tenmaxday" style="width: 100%"
placeholder="远期期限" disabled></c-date-picker> placeholder="远期期限" disabled></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,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>
...@@ -78,8 +78,7 @@ ...@@ -78,8 +78,7 @@
</c-input> </c-input>
<template slot="footer"> <template slot="footer">
<c-button size="small" type="primary" icon="el-icon-search" <c-button size="small" type="primary" icon="el-icon-search"
@click="showGridPromptDialog('botp.dftins.buttxmsel', null, null,{TXT: 'bodgrp.blk.dftins'}, {TXT: false},'doxpDialog')" @click="showGridPromptDialog('botp.dftins.buttxmsel', null, null,{TXT: 'bodgrp.blk.dftins'}, {TXT: false},'doxpDialog')">
>
... ...
</c-button> </c-button>
</template> </template>
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="6"> <c-col :span="6">
<c-button size="small" type="primary" icon="el-icon-search" @click="onSetinsButtxmsel"> <c-button size="small" type="primary" icon="el-icon-search" @click="showGridPromptDialog('botp.setins.buttxmsel', null, null,{TXT: 'bodgrp.blk.setinsbo'}, {TXT: false},'doxpDialog')">
... ...
</c-button> </c-button>
</c-col> </c-col>
......
...@@ -39,19 +39,56 @@ ...@@ -39,19 +39,56 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-edit-table :model="model" v-bind="ptsaddg"> <c-table max-height="300px" style="text-align: center;" stripe :list="this.model.botp.ptsaddp.ptsaddg || []"
<el-table-column label="操作" align="center"> :paginationShow="false" :border="true">
<template slot-scope="scope"> <el-table-column label="Additional Parties">
<el-button <el-table-column label="角色" width="auto" prop="rol">
size="mini" <template slot-scope="scope">
@click="handleEdit(scope.$index, scope.row)" <c-select v-model="scope.row.rol" :code="ptyp2">
type="primary" </c-select>
>详情</el-button </template>
>
</template> </el-table-column>
</el-table-column> <el-table-column label="机构实体" width="auto" prop="ptyextkey">
</c-edit-table> <template slot-scope="scope">
</c-col> <c-input v-model="scope.row.ptyextkey" maxlength="12">
</c-input>
</template>
</el-table-column>
<el-table-column label="名称" width="auto" prop="scope.row.nam">
<template slot-scope="scope">
<c-input v-model="scope.row.nam" maxlength="12">
</c-input>
</template>
</el-table-column>
<el-table-column label="参考地址" width="auto" prop="scope.row.ref">
<template slot-scope="scope">
<c-input v-model="scope.row.ref" maxlength="12">
</c-input>
</template>
</el-table-column>
<el-table-column label="Document" prop="docnam" width="auto">
<template slot="header">
<c-row>
<c-col :span="12">
<span style="line-height: 36px;">操作</span>
</c-col>
<c-col :span="12">
<div style="float: right;">
<span class="add_del_button add_button" @click="addTableValue">+</span>
<span class="add_del_button" @click="deleteTable">-</span>
</div>
</c-col>
</c-row>
</template>
<template slot-scope="scope">
<el-button size="mini" @click="handleEdit(scope.$index, scope.row)" type="primary">详情
</el-button>
</template>
</el-table-column>
</el-table-column>
</c-table>
</c-col>
</c-row> </c-row>
</template> </template>
...@@ -70,36 +107,37 @@ export default { ...@@ -70,36 +107,37 @@ export default {
mixins: [commonProcess], mixins: [commonProcess],
data(){ data(){
return { return {
ptsaddg: { newValue: {
columns: [ rol: "",
{ ptyextkey: "",
title: "角色", nam: "",
width: "120px", ref: "",
dataIndex: "rol",
show: "select",
},
{
title: "机构实体",
width: "180px",
dataIndex: "ptyextkey",
show: "input",
},
{
title: "名称",
width: "300px",
dataIndex: "nam",
},
{
title: "参考地址",
width: "300px",
dataIndex: "ref",
}, },
ptyp2: [
{ label: "TP0 Third Party", value: "TP0" },
{ label: "TP1 1st Third Party", value: "TP1" },
{ label: "TP2 2nd Third Party", value: "TP2" },
{ label: "TP3 3rd Third Party", value: "TP3" },
{ label: "TP4 4th Third Party", value: "TP4" },
{ label: "TP5 5th Third Party", value: "TP5" },
{ label: "TP6 6th Third Party", value: "TP6" },
{ label: "TP7 7th Third Party", value: "TP7" },
{ label: "TP8 8th Third Party", value: "TP8" },
], ],
urls: "botp.ptsaddp.ptsaddg",
},
} }
}, },
methods:{...Event}, methods:{...Event,
addTableValue(index) {
var newTableValue = Object.assign({}, this.newValue);
const serial = Utils.generateUUID();
newTableValue.serialNum = serial;
this.model.botp.ptsaddp.ptsaddg.splice(index - 1, 0, newTableValue);
},
deleteTable(index) {
this.model.botp.ptsaddp.ptsaddg.splice(index, 1);
},
},
created:function(){ created:function(){
console.log(this.root); console.log(this.root);
} }
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</c-col> </c-col>
<c-col :span="11" :offset="1"> <c-col :span="11" :offset="1">
<el-form-item label="" prop="bodgrp.cbs.max.amt" label-width="0"> <el-form-item label="" prop="bodgrp.cbs.max.amt" label-width="0">
<c-input v-model="model.bodgrp.cbs.max.amt" placeholder="请输入Document Amount" disabled></c-input> <c-input v-model.number="model.bodgrp.cbs.max.amt" placeholder="请输入Document Amount" disabled></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
</c-col> </c-col>
<c-col :span="11" :offset="1"> <c-col :span="11" :offset="1">
<el-form-item label="" label-width="0" prop="bodgrp.cbs.opn1.amt"> <el-form-item label="" label-width="0" prop="bodgrp.cbs.opn1.amt">
<c-input v-model="model.bodgrp.cbs.opn1.amt" style="width:100%" placeholder="请输入Open Amount" <c-input v-model.number="model.bodgrp.cbs.opn1.amt" style="width:100%" placeholder="请输入Open Amount"
disabled></c-input> disabled></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
</c-col> </c-col>
<c-col :span="11" :offset="1"> <c-col :span="11" :offset="1">
<el-form-item label-width="0" prop="setmod.docamt"> <el-form-item label-width="0" prop="setmod.docamt">
<c-input v-model="model.setmod.docamt" placeholder="请输入document amount" disabled></c-input> <c-input v-model.number="model.setmod.docamt" placeholder="请输入document amount" disabled></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -224,7 +224,7 @@ ...@@ -224,7 +224,7 @@
</c-col> </c-col>
<c-col :span="11" :offset="1"> <c-col :span="11" :offset="1">
<el-form-item label-width="0" prop="setmod.redamt"> <el-form-item label-width="0" prop="setmod.redamt">
<c-input v-model="model.setmod.redamt" placeholder="请输入document amount" :disabled="isDisabled"> <c-input v-model.number="model.setmod.redamt" placeholder="请输入document amount" :disabled="model.bodgrp.rec.focflg? true:false">
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -354,7 +354,7 @@ export default { ...@@ -354,7 +354,7 @@ export default {
this.isDisabled = true; this.isDisabled = true;
this.model.setmod.redamt = this.model.setmod.docamt; this.model.setmod.redamt = this.model.setmod.docamt;
let rtnmsg = await this.executeDefault("liaall.tenstm"); let rtnmsg = await this.executeDefault("liaall.tenstm");
this.model.bodgrp.rec.docsta = rtnmsg.data.bodgrp_rec_matpertyp; this.model.bodgrp.rec.docsta = rtnmsg.data.bodgrp_rec_docsta;
} else { } else {
this.isDisabled = false; this.isDisabled = false;
this.model.setmod.redamt = "0.00"; this.model.setmod.redamt = "0.00";
...@@ -375,13 +375,12 @@ export default { ...@@ -375,13 +375,12 @@ export default {
selIds = []; selIds = [];
this.model.setmod.docamt = "0.000"; this.model.setmod.docamt = "0.000";
this.model.liaall.tensetstm.rows = []; this.model.liaall.tensetstm.rows = [];
this.isDisabled = false; this.model.bodgrp.rec.focflg = '';
// this.model.liaall.tenstm.rows = [] // this.model.liaall.tenstm.rows = []
} else { } else {
selIds = [selection[0] + 1]; selIds = [selection[0] + 1];
this.model.setmod.docamt = this.model.bodgrp.cbs.max.amt; this.model.setmod.docamt = this.model.bodgrp.cbs.max.amt;
this.isDisabled = true; this.model.bodgrp.rec.focflg = 'X';
} }
// //
console.log(this.model.liaall.tensetstm); console.log(this.model.liaall.tensetstm);
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,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 disabled v-model="colinsflg">Collection instructions modified</c-checkbox> <c-checkbox disabled v-model="colinsflg">Delivery of Documents instructions modified</c-checkbox>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
...@@ -288,13 +288,14 @@ ...@@ -288,13 +288,14 @@
:columns="stmData.columns" :columns="stmData.columns"
:showSelection="true" :showSelection="true"
v-on:multipleSelect="multipleSelect" v-on:multipleSelect="multipleSelect"
prop="liaall.tenstm"
> >
</c-istream-table> </c-istream-table>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<c-col :span="24"> <c-col :span="24">
<c-checkbox v-model="model.bodgrp.rec.focflg" @change="change1" <c-checkbox v-model="model.bodgrp.rec.focflg" @change="change"
>Free of Payment</c-checkbox >Free of Payment</c-checkbox
> >
</c-col> </c-col>
...@@ -334,7 +335,9 @@ ...@@ -334,7 +335,9 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-checkbox :disabled="model.setmod.docamt<=model.bodgrp.cbs.opn1.amt" v-model="model.mtabut.clsflg" @change="change1" <c-checkbox
:disabled="model.setmod.docamt <= model.bodgrp.cbs.opn1.amt"
v-model="model.mtabut.clsflg"
>Close Contract</c-checkbox >Close Contract</c-checkbox
> >
</c-col> </c-col>
...@@ -435,10 +438,10 @@ export default { ...@@ -435,10 +438,10 @@ export default {
computed: { computed: {
clsflg: { clsflg: {
get() { get() {
return this.model.mtabut.clsflg === "X"; return this.model.mtabut.clsflg === "O";
}, },
set(val) { set(val) {
this.model.mtabut.clsflg = val ? "X" : ""; this.model.mtabut.clsflg = val ? "C" : "O";
}, },
}, },
focflg: { focflg: {
...@@ -459,10 +462,40 @@ export default { ...@@ -459,10 +462,40 @@ export default {
methods: { methods: {
...Event, ...Event,
async change() {
if (this.model.bodgrp.rec.focflg === "X") {
this.model.setmod.redamt = this.model.setmod.docamt;
let rtnmsg = await this.executeDefault("setmod.redamt");
this.model.bodgrp.rec.docsta ="D"
} else {
this.model.setmod.redamt = "0.00";
let rtnmsg = await this.executeDefault("setmod.redamt");
this.model.bodgrp.rec.docsta = rtnmsg.data.bodgrp_rec_docsta;
}
},
async multipleSelect(selection) { async multipleSelect(selection) {
console.log(selection); if (selection.length > 1) {
if (selection) { this.$notify({
let selIds = selection.map((x) => x + 1); title: "error",
message: "You cannot select more than one tenor",
type: "error",
});
} else {
let selIds;
if (selection.length === 0) {
this.$notify({
title: "error",
message: "Please select at least one tenor",
type: "error",
});
selIds = [];
this.model.setmod.docamt = "0.000";
this.isDisabled = false;
} else {
selIds = [selection[0] + 1];
this.model.setmod.docamt = this.model.bodgrp.cbs.max.amt;
this.isDisabled = true;
}
let params = { selDst: "liaall.tenstm", selIds }; let params = { selDst: "liaall.tenstm", selIds };
const rtnmsg = await this.executeRule("liaall.tenstm", params); const rtnmsg = await this.executeRule("liaall.tenstm", params);
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
...@@ -472,30 +505,6 @@ export default { ...@@ -472,30 +505,6 @@ export default {
} }
} }
}, },
change1() {
// if (this.model.bodgrp.rec.focflg) {
// this.model.bodgrp.rec.docsta = "D";
// } else {
// this.model.bodgrp.rec.docsta = "B";
// }
if (this.model.mtabut.clsflg=='X' ){
this.model.bodgrp.rec.docsta="E";
}
else if(this.model.bodgrp.rec.focflg=='X' && this.model.mtabut.clsflg!='X'){
this.model.bodgrp.rec.docsta="D";
}
else if(this.model.bodgrp.rec.focflg!='X' && this.model.mtabut.clsflg!='X'){
this.model.bodgrp.rec.docsta="B";
}
if (this.model.bodgrp.rec.focflg) {
this.model.setmod.redamt = this.model.setmod.docamt;
} else {
this.model.setmod.redamt = "0.00";
}
},
}, },
created: function () {}, created: function () {},
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<c-fullbox> <c-fullbox>
<el-form-item label="申报类型" prop="bopmod.szflg"> <el-form-item label="申报类型" prop="bopmod.szflg">
<c-select <c-select
@change="change"
v-model="model.bopmod.szflg" v-model="model.bopmod.szflg"
style="width: 100%" style="width: 100%"
placeholder="请选择申报类型" placeholder="请选择申报类型"
...@@ -172,7 +173,14 @@ export default { ...@@ -172,7 +173,14 @@ export default {
}; };
}, },
methods: { ...Event }, methods: { ...Event,
async change() {
if(this.model.bopmod.szflg=="3" || this.model.bopmod.szflg==""){
this.model.lendoc.actflg=""
this.model.bopmod.ownextkey=""
}
},
},
created: function () {}, created: function () {},
}; };
</script> </script>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<!--Funds Settlement --> <!--Funds Settlement -->
<el-tab-pane label="Funds Settlement" name="setp"> <el-tab-pane label="Funds Settlement" name="setp">
<c-content> <c-content>
<m-setp :model="model" :codes="codes"/> <m-setp ref="setp" :model="model" :codes="codes"/>
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
...@@ -209,6 +209,10 @@ export default { ...@@ -209,6 +209,10 @@ export default {
{ {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
this.updateModel(rtnmsg.data) this.updateModel(rtnmsg.data)
this.$nextTick(() => {
this.$refs.setp.$refs.table.$refs.table.toggleAllSelection();
this.model.setmod.docamt = this.model.bodgrp.cbs.max.amt;
})
} }
else else
{ {
......
...@@ -113,17 +113,15 @@ export default { ...@@ -113,17 +113,15 @@ export default {
created:async function(){ created:async function(){
console.log("进入brtacp交易"); console.log("进入brtacp交易");
let rtnmsg = await this.init({}) let rtnmsg = await this.init({})
if(rtnmsg.respCode == SUCCESS) if (rtnmsg.respCode == SUCCESS) {
{ Utils.copyValueFromVO(this.model, rtnmsg.data);
this.updateModel(rtnmsg.data) if (this.isInDisplay) {
//TODO 处理数据逻辑 this.restoreDisplay();
}
} } else {
else
{
this.$notify.error({title: '错误',message: '服务请求失败!'}); this.$notify.error({title: '错误',message: '服务请求失败!'});
} }
} },
} }
</script> </script>
<style> <style>
......
...@@ -135,14 +135,16 @@ export default { ...@@ -135,14 +135,16 @@ export default {
**/ **/
// }, // },
}, },
created: async function () { created:async function(){
console.log("进入brtame交易"); console.log("进入brtame交易");
let rtnmsg = await this.init({}); let rtnmsg = await this.init({})
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
this.updateModel(rtnmsg.data); Utils.copyValueFromVO(this.model, rtnmsg.data);
//TODO 处理数据逻辑 if (this.isInDisplay) {
this.restoreDisplay();
}
} else { } else {
this.$notify.error({ title: "错误", message: "服务请求失败!" }); this.$notify.error({title: '错误',message: '服务请求失败!'});
} }
}, },
}; };
......
...@@ -151,18 +151,15 @@ export default { ...@@ -151,18 +151,15 @@ export default {
created:async function(){ created:async function(){
console.log("进入brtcan交易"); console.log("进入brtcan交易");
let rtnmsg = await this.init({}) let rtnmsg = await this.init({})
if(rtnmsg.respCode == SUCCESS) if (rtnmsg.respCode == SUCCESS) {
{ Utils.copyValueFromVO(this.model, rtnmsg.data);
//TODO 处理数据逻辑 if (this.isInDisplay) {
this.updateModel(rtnmsg.data) this.restoreDisplay();
} }
else } else {
{
this.$notify.error({title: '错误',message: '服务请求失败!'}); this.$notify.error({title: '错误',message: '服务请求失败!'});
} }
},
}
} }
</script> </script>
......
...@@ -155,17 +155,15 @@ export default { ...@@ -155,17 +155,15 @@ export default {
created:async function(){ created:async function(){
console.log("进入brtcsg交易"); console.log("进入brtcsg交易");
let rtnmsg = await this.init({}) let rtnmsg = await this.init({})
if(rtnmsg.respCode == SUCCESS) if (rtnmsg.respCode == SUCCESS) {
{ Utils.copyValueFromVO(this.model, rtnmsg.data);
this.updateModel(rtnmsg.data) if (this.isInDisplay) {
//TODO 处理数据逻辑 this.restoreDisplay();
}
} } else {
else
{
this.$notify.error({title: '错误',message: '服务请求失败!'}); this.$notify.error({title: '错误',message: '服务请求失败!'});
} }
} },
} }
</script> </script>
<style> <style>
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<el-tab-pane v-if="model.advdisflg=='X'" label="Advice of Discrepancy" name="mt750p"> <el-tab-pane v-if="model.brdgrp.rec.advtyp=='750'" label="Advice of Discrepancy" name="mt750p">
<c-content> <c-content>
<m-mt750p :model="model" :codes="codes"/> <m-mt750p :model="model" :codes="codes"/>
</c-content> </c-content>
...@@ -168,17 +168,15 @@ export default { ...@@ -168,17 +168,15 @@ export default {
created:async function(){ created:async function(){
console.log("进入brtdcr交易"); console.log("进入brtdcr交易");
let rtnmsg = await this.init({}) let rtnmsg = await this.init({})
if(rtnmsg.respCode == SUCCESS) if (rtnmsg.respCode == SUCCESS) {
{ Utils.copyValueFromVO(this.model, rtnmsg.data);
this.updateModel(rtnmsg.data) if (this.isInDisplay) {
//TODO 处理数据逻辑 this.restoreDisplay();
}
} } else {
else
{
this.$notify.error({title: '错误',message: '服务请求失败!'}); this.$notify.error({title: '错误',message: '服务请求失败!'});
} }
} },
} }
</script> </script>
<style> <style>
......
...@@ -214,17 +214,15 @@ export default { ...@@ -214,17 +214,15 @@ export default {
created:async function(){ created:async function(){
console.log("进入brtlat交易"); console.log("进入brtlat交易");
let rtnmsg = await this.init({}) let rtnmsg = await this.init({})
if(rtnmsg.respCode == SUCCESS) if (rtnmsg.respCode == SUCCESS) {
{ Utils.copyValueFromVO(this.model, rtnmsg.data);
this.updateModel(rtnmsg.data) if (this.isInDisplay) {
//TODO 处理数据逻辑 this.restoreDisplay();
}
} } else {
else
{
this.$notify.error({title: '错误',message: '服务请求失败!'}); this.$notify.error({title: '错误',message: '服务请求失败!'});
} }
} },
} }
</script> </script>
<style> <style>
......
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="单据状态" prop="brdgrp.rec.docsta"> <el-form-item label="单据状态" prop="brdgrp.rec.docsta">
<c-select v-model="model.brdgrp.rec.docsta" style="width:100%" placeholder="请选择单据状态" :code="codes.docsta" disabled> <c-select v-model="model.brdgrp.rec.docsta" style="width:100%" placeholder="请选择单据状态" :code="codes.docsta1" disabled>
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -140,6 +140,7 @@ ...@@ -140,6 +140,7 @@
<c-istream-table <c-istream-table
:list="model.liaall.tenstm.rows" :list="model.liaall.tenstm.rows"
:columns="columns" :columns="columns"
:showSelection=true
> >
</c-istream-table> </c-istream-table>
</el-form-item> </el-form-item>
...@@ -153,7 +154,7 @@ ...@@ -153,7 +154,7 @@
</c-col> </c-col>
<c-col :span="11"> <c-col :span="11">
<el-form-item label="" label-width="5px" prop="setmod.docamt"> <el-form-item label="" label-width="5px" prop="setmod.docamt">
<c-input v-model="model.setmod.docamt" placeholder="请输入document amount"></c-input> <c-input v-model="model.setmod.docamt" placeholder="请输入document amount"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -216,7 +217,7 @@ ...@@ -216,7 +217,7 @@
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<el-form-item label="Close Flag" label-width="80px" prop="setmod.docamt" style="margin-left:20px"> <el-form-item label="Close Flag" label-width="80px" prop="setmod.docamt" style="margin-left:20px">
<c-checkbox v-model="model.mtabut.clsflg" style="margin-left:20px"></c-checkbox> <c-checkbox v-model="model.mtabut.clsflg" style="margin-left:20px"></c-checkbox>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -444,12 +445,12 @@ export default { ...@@ -444,12 +445,12 @@ export default {
], ],
table1:[], table1:[],
columns:[ columns:[
"1 1 \"Type\" 40", "1 1 \"Type\" 80",
"2 2 \"Dbt\" 48", "2 2 \"Dbt\" 80",
"3 3 \"Cdt\" 48", "3 3 \"Cdt\" 80",
"4 4 \"Cur\" 48", "4 4 \"Cur\" 80",
"5 5 \"Amt\" 85 2 8 1 4", "5 5 \"Amt\" 85 2 8 1 4",
"6 6 \"Mat.Dat.\" 75 4 7 1" "6 6 \"Mat.Dat.\" 105 4 7 1"
] ]
} }
}, },
...@@ -469,15 +470,22 @@ export default { ...@@ -469,15 +470,22 @@ export default {
watch: { watch: {
declareParams() {}, declareParams() {},
"model.trnmod.cmtflg":{ "model.trnmod.cmtflg":{
immediate:true, immediate:true,
handler(val ,oldVal){ handler(val ,oldVal){
if(this.model.trnmod.cmtflg=='P'){ if(this.model.trnmod.cmtflg=='P'){
this.model.trnmod.swftyp='CIV'; this.model.trnmod.swftyp='CIV';
}else{ }else{
this.model.trnmod.swftyp=''; this.model.trnmod.swftyp='';
} }
} }
}, },
"model.setmod.docamt":{
immediate:true,
handler(val ,oldVal){
let rtnmsg = this.executeRule("setmod.docamt")
}
}
}, },
} }
</script> </script>
......
...@@ -75,20 +75,35 @@ ...@@ -75,20 +75,35 @@
<m-doctre :model="model" :codes="codes"/> <m-doctre :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000008 --> <!--PD000008
<el-tab-pane label="外管信息" name="wg"> <el-tab-pane label="外管信息" name="wg">
<m-wg :model="model" :codes="codes"/> <m-wg :model="model" :codes="codes"/>
</el-tab-pane> -->
<!--PD000002
<el-tab-pane label="跨境人民币申报" name="cnyp">
<m-cnyp :model="model" :codes="codes"/>
</el-tab-pane>-->
<!--PD000009 -->
<el-tab-pane label="申报信息" name="sbxx">
<m-sbxx :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="对外付款/承兑通知书-基础信息" name="basp" v-if="model.bopmod.basflg !='' && model.bopmod.szflg=='1'">
<m-basp :model="model" :codes="codes"/>
</el-tab-pane>
<el-tab-pane label="境内付款/承兑通知书-基础信息" name="basp" v-if="model.bopmod.basflg !='' && model.bopmod.szflg=='2'">
<m-basp :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000061 --> <!--PD000061 -->
<el-tab-pane label="资本项目" name="cfactlp"> <el-tab-pane label="资本项目" name="cfactlp">
<m-cfactlp :model="model" :codes="codes"/> <m-cfactlp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000002 -->
<el-tab-pane label="跨境人民币申报" name="cnyp">
<m-cnyp :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD001139 --> <!--PD001139 -->
<el-tab-pane label="试算结果" name="shisuan"> <el-tab-pane label="试算结果" name="shisuan">
...@@ -134,9 +149,10 @@ import Cfactlp from "./Cfactlp" ...@@ -134,9 +149,10 @@ import Cfactlp from "./Cfactlp"
import Cnyp from "./Cnyp" import Cnyp from "./Cnyp"
import Shisuan from "./Shisuan" import Shisuan from "./Shisuan"
import Namp from "./Namp" import Namp from "./Namp"
import Basp from "./Basp"
// import Dftcrep from "./Dftcrep" // import Dftcrep from "./Dftcrep"
import Limitbody from "~/views/Public/Limitbody"; import Limitbody from "~/views/Public/Limitbody";
import Sbxx from "~/views/Public/Sbxx";
export default { export default {
name: "Brtset", name: "Brtset",
...@@ -155,8 +171,8 @@ export default { ...@@ -155,8 +171,8 @@ export default {
"m-shisuan" : Shisuan, "m-shisuan" : Shisuan,
"m-namp" : Namp, "m-namp" : Namp,
"m-limitbody" : Limitbody, "m-limitbody" : Limitbody,
// "m-dftcrep" : Dftcrep, "m-sbxx": Sbxx,
"m-basp": Basp,
}, },
provide() { provide() {
return { return {
...@@ -190,19 +206,20 @@ export default { ...@@ -190,19 +206,20 @@ export default {
watch:{ watch:{
}, },
created:async function(){ created:async function(){
console.log("进入brtset交易"); console.log("进入brtset交易");
let rtnmsg = await this.init({}) let rtnmsg = await this.init({})
if(rtnmsg.respCode == SUCCESS) if (rtnmsg.respCode == SUCCESS) {
{ Utils.copyValueFromVO(this.model, rtnmsg.data);
this.updateModel(rtnmsg.data) this.model.mtabut.clsflg="X";
//TODO 处理数据逻辑 if (this.isInDisplay) {
} this.restoreDisplay();
else }
{ } else {
this.$notify.error({title: '错误',message: '服务请求失败!'}); this.$notify.error({title: '错误',message: '服务请求失败!'});
} }
} },
} }
</script> </script>
......
...@@ -182,17 +182,15 @@ export default { ...@@ -182,17 +182,15 @@ export default {
created:async function(){ created:async function(){
console.log("进入brtsnd交易"); console.log("进入brtsnd交易");
let rtnmsg = await this.init({}) let rtnmsg = await this.init({})
if(rtnmsg.respCode == SUCCESS) if (rtnmsg.respCode == SUCCESS) {
{ Utils.copyValueFromVO(this.model, rtnmsg.data);
this.updateModel(rtnmsg.data) if (this.isInDisplay) {
//TODO 处理数据逻辑 this.restoreDisplay();
}
} } else {
else
{
this.$notify.error({title: '错误',message: '服务请求失败!'}); this.$notify.error({title: '错误',message: '服务请求失败!'});
} }
} },
} }
</script> </script>
<style> <style>
......
...@@ -23,25 +23,24 @@ ...@@ -23,25 +23,24 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="付款人常驻国家/地区代码" prop="cnybop.cnyinc.spayercountrycode"> <c-col :span="21">
<c-fullbox> <el-form-item label="付款人常驻国家/地区代码" prop="cnybop.cnyinc.spayercountrycode">
<c-input <c-input
v-model="model.cnybop.cnyinc.spayercountrycode" v-model="model.cnybop.cnyinc.spayercountrycode"
maxlength="3" maxlength="3"
placeholder="请输入付款人常驻国家/地区代码" placeholder="请输入付款人常驻国家/地区代码"
style="width:100%" style="width:100%"
@keyup.enter.native="showGridPromptDialog('cnybop.cnyinc.spayercountrycode')" @keyup.enter.native="showGridPromptDialog('cnybop.cnyinc.spayercountrycode')"
></c-input> ></c-input>
<template slot="footer"> </el-form-item>
<c-button </c-col>
size="small" <c-col :span="3">
type="primary" <c-button
icon="el-icon-search"                 size="small"
style="margin-left:10px;padding: 0 10px;">                 type="primary"
</c-button>                 icon="el-icon-search"
</template>                 @click="showGridPromptDialog('cptp.selbut1', null, null,{TXT: 'cnybop.cnyinc.spayercountrycode'}, {TXT: false},'doxpDialog')"> </c-button>
</c-fullbox> </c-col>
</el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="结算方式" prop="cnybop.cnyinc.sbalancemode"> <el-form-item label="结算方式" prop="cnybop.cnyinc.sbalancemode">
......
...@@ -308,6 +308,7 @@ ...@@ -308,6 +308,7 @@
v-model="model.cpdgrp.rec.curf33b" v-model="model.cpdgrp.rec.curf33b"
style="width: 100%" style="width: 100%"
placeholder="" placeholder=""
:disabled = this.flag3
> >
<el-option <el-option
v-for="item in codes.currencycode" v-for="item in codes.currencycode"
...@@ -328,7 +329,7 @@ ...@@ -328,7 +329,7 @@
<c-input <c-input
v-model="model.cpdgrp.rec.amtf33b" v-model="model.cpdgrp.rec.amtf33b"
placeholder="请输入原始金额" placeholder="请输入原始金额"
:disabled = this.flag3
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -339,6 +340,7 @@ ...@@ -339,6 +340,7 @@
<c-input <c-input
v-model="model.cpdgrp.rec.f36" v-model="model.cpdgrp.rec.f36"
placeholder="" placeholder=""
:disabled = this.flag3
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -353,7 +355,7 @@ ...@@ -353,7 +355,7 @@
v-model="model.cpdgrp.rec.cur71f" v-model="model.cpdgrp.rec.cur71f"
placeholder="" placeholder=""
style="width: 100%" style="width: 100%"
:disabled = this.flag3
> >
<el-option <el-option
v-for="item in codes.currencycode" v-for="item in codes.currencycode"
...@@ -373,6 +375,7 @@ ...@@ -373,6 +375,7 @@
<c-input <c-input
v-model="model.cpdgrp.rec.amt71f" v-model="model.cpdgrp.rec.amt71f"
placeholder="请输入发报行扣费金额" placeholder="请输入发报行扣费金额"
:disabled = this.flag3
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -441,6 +444,7 @@ ...@@ -441,6 +444,7 @@
v-model="model.cpdgrp.pye.pts.adrblk" v-model="model.cpdgrp.pye.pts.adrblk"
show-word-limit show-word-limit
placeholder="请输入Address Block" placeholder="请输入Address Block"
disabled
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -2516,6 +2520,7 @@ export default { ...@@ -2516,6 +2520,7 @@ export default {
], ],
infptaVisible: false, infptaVisible: false,
flag1:true, flag1:true,
flag3:false,
bustyp:[ bustyp:[
{ label: 'GODX', value: '货期贸易' }, { label: 'GODX', value: '货期贸易' },
{ label: 'STRX', value: '服务贸易' }, { label: 'STRX', value: '服务贸易' },
...@@ -2577,6 +2582,33 @@ export default { ...@@ -2577,6 +2582,33 @@ export default {
} }
}, },
watch:{
//通过账号、收款人账号控制原始金额、发报行扣费金额、汇率
"model.cpdgrp.orc.pts.extkey":{
immediate:true,
handler(val ,oldVal){
if(this.model.cpdgrp.orc.pts.extkey != '' && this.model.cpdgrp.pye.pts.extkey != ''){
this.flag3=true;
}
else{
this.flag3=false;
}
}
},
"model.cpdgrp.pye.pts.extkey":{
immediate:true,
handler(val ,oldVal){
if(this.model.cpdgrp.orc.pts.extkey != '' && this.model.cpdgrp.pye.pts.extkey != ''){
this.flag3=true;
}
else{
this.flag3=false;
}
}
},
},
methods: { methods: {
onSndpDet() { onSndpDet() {
this.$emit("onSndpDet"); this.$emit("onSndpDet");
......
...@@ -228,6 +228,7 @@ ...@@ -228,6 +228,7 @@
<c-input <c-input
maxlength="16" maxlength="16"
placeholder="" placeholder=""
v-model="sespay.intacc"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -285,7 +286,7 @@ ...@@ -285,7 +286,7 @@
maxlength="140" maxlength="140"
show-word-limit show-word-limit
placeholder="请输入Address Block" placeholder="请输入Address Block"
v-model="setgll.setgrp.awi.pts.adrblk" v-model="this.setgll.setgrp.awi.pts.adrblk"
disabled disabled
></c-input> ></c-input>
</el-form-item> </el-form-item>
...@@ -423,16 +424,19 @@ export default { ...@@ -423,16 +424,19 @@ export default {
extkey: '', extkey: '',
adrblk: '', adrblk: '',
} }
} },
} }
},
sespay:{
intacc:'',
} }
}; };
}, },
methods: { ...Event, methods: { ...Event,
setgllChange(){ setgllChange(){
console.log(this.model.setmod.setglg) console.log(this.model.setmod.setglg)
this.model.setmod.setglg.setgll[this.model.setmod.setglg.setgll.length - 1].setgrp.awi.pts.extkey = this.setgll.setgrp.awi.pts.extkey; //this.model.setmod.setglg.setgll[this.model.setmod.setglg.setgll.length - 1].setgrp.awi.pts.extkey = this.setgll.setgrp.awi.pts.extkey;
this.model.setmod.setglg.setgll[this.model.setmod.setglg.setgll.length - 1].setgrp.awi.pts.adrblk = this.setgll.setgrp.awi.pts.adrblk; //this.model.setmod.setglg.setgll[this.model.setmod.setglg.setgll.length - 1].setgrp.awi.pts.adrblk = this.setgll.setgrp.awi.pts.adrblk;
} }
}, },
created: function () { created: function () {
......
...@@ -478,12 +478,11 @@ ...@@ -478,12 +478,11 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="远期到期日"> <el-form-item label="远期到期日" prop="bddgrp.rec.matdat">
<c-date-picker <c-date-picker
type="date" type="date"
v-model="model.bddgrp.rec.matdat" v-model="model.bddgrp.rec.matdat"
style="width: 100%" style="width: 100%"
disabled
placeholder="请选择到期日" placeholder="请选择到期日"
> >
</c-date-picker> </c-date-picker>
......
...@@ -312,7 +312,7 @@ ...@@ -312,7 +312,7 @@
</c-col> </c-col>
</el-row> </el-row>
<m-busbtn ref="childs" :ownref="ownref" trnCode="ditsel" :model="ditselModel" ownrefPath="bddgrp" tabIndex=3 @onChoose="onChoose" >11</m-busbtn> <m-busbtn ref="childs" :ownref="ownref" trnCode="ditsel" :model="ditselModel" ownrefPath="bddgrp" tabIndex=3 @onChoose="onChoose" >11</m-busbtn>
</div> </div>
</template> </template>
<script> <script>
......
...@@ -13,6 +13,10 @@ ...@@ -13,6 +13,10 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item label="Opening between" prop="infcon.opndatfrom"> <el-form-item label="Opening between" prop="infcon.opndatfrom">
<c-col :span="11"> <c-col :span="11">
...@@ -48,6 +52,19 @@ ...@@ -48,6 +52,19 @@
</c-col> </c-col>
</c-row> </c-row>
<c-row>
<c-col :span="8">
<el-form-item label="SG Reference" prop="infcon.seashgref">
<c-input
v-model="model.infcon.seashgref"
maxlength="16"
placeholder="请输入SG Reference"
></c-input>
</el-form-item>
</c-col>
</c-row>
<c-row v-show="searchSlot.searchToggle"> <c-row v-show="searchSlot.searchToggle">
<c-row> <c-row>
<c-col :span="8"> <c-col :span="8">
......
...@@ -364,6 +364,9 @@ export default { ...@@ -364,6 +364,9 @@ export default {
handler(){ handler(){
if(this.model.brdgrp.rec.advtyp == '750' ){ if(this.model.brdgrp.rec.advtyp == '750' ){
this.model.brdgrp.rec.advdat = ' ' this.model.brdgrp.rec.advdat = ' '
this.model.brdgrp.blk.docdisflg= 'X'
}else if(this.model.brdgrp.rec.advtyp == '754'){ }else if(this.model.brdgrp.rec.advtyp == '754'){
this.model.brdgrp.rec.disdat = ' ' this.model.brdgrp.rec.disdat = ' '
// this.model.brdgrp.blk.docdisflg= "" // this.model.brdgrp.blk.docdisflg= ""
......
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
<el-form-item label="Available by" prop="lidgrp.rec.avbby"> <el-form-item label="Available by" prop="lidgrp.rec.avbby">
<c-select <c-select
disabled disabled
:code="codes.avbby"
v-model="model.lidgrp.rec.avbby" style="width:100%" placeholder="请选择Available by"> v-model="model.lidgrp.rec.avbby" style="width:100%" placeholder="请选择Available by">
</c-select> </c-select>
</el-form-item> </el-form-item>
...@@ -107,8 +108,10 @@ ...@@ -107,8 +108,10 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Form of L/C" prop="lidgrp.rec.lcrtyp"> <el-form-item label="Form of L/C" prop="lidgrp.rec.lcrtyp">
<c-input disabled v-model="model.lidgrp.rec.lcrtyp" style="width:100%" placeholder="请选择信用证类型"> <c-select
</c-input> :code="codes.lcrtyp"
disabled v-model="model.lidgrp.rec.lcrtyp" style="width:100%" placeholder="请选择信用证类型">
</c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<!-- 左 --> <!-- 左 -->
<el-col :span="11"> <el-col :span="11">
<c-col :span="24"> <c-col :span="24">
<c-form-item label="L/C Reference" prop="lidget.lid.ownref"> <c-form-item label="L/C Reference" prop="lidgrp.lid.ownref">
<c-fullbox> <c-fullbox>
<c-input <c-input
v-model="model.lidget.lid.ownref" v-model="model.lidget.lid.ownref"
...@@ -860,7 +860,7 @@ export default { ...@@ -860,7 +860,7 @@ export default {
key: 3, key: 3,
}, },
{ {
label: "Oth.Docs", label: "Oth. Docs",
key: 4, key: 4,
}, },
{ {
......
...@@ -81,7 +81,7 @@ export default { ...@@ -81,7 +81,7 @@ export default {
if(rtnmsg.respCode == SUCCESS) if(rtnmsg.respCode == SUCCESS)
{ {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
Utils.copyValueFromVO(this.model, rtnmsg.data); this.updateModel(rtnmsg.data)
} }
else else
{ {
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<c-date-picker <c-date-picker
type="date" type="date"
v-model="scope.row.matdat" v-model="scope.row.matdat"
value-format="yyyy-MM-dd" value-format="YYYY-MM-DD"
placeholder="请选择Date" placeholder="请选择Date"
style="width: 100%" style="width: 100%"
@change="executeDefault('liaall.liaallg.matdat')" @change="executeDefault('liaall.liaallg.matdat')"
...@@ -59,9 +59,9 @@ ...@@ -59,9 +59,9 @@
<el-table-column prop="acc" label="Account" width="150px"> <el-table-column prop="acc" label="Account" width="150px">
</el-table-column> </el-table-column>
<el-table-column prop="valdat" label="Value Date" width="200px"> <el-table-column prop="valdat" label="Value Date" width="200px">
<!-- <template slot-scope="scope"> <template slot-scope="scope">
{{dateFormat(scope.row.valdat)}} {{dateFormat(scope.row.valdat)}}
</template> --> </template>
</el-table-column> </el-table-column>
<el-table-column label="" prop="det" width="80px" fixed="right"> <el-table-column label="" prop="det" width="80px" fixed="right">
<template slot-scope="scope" slot="header"> <template slot-scope="scope" slot="header">
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
v-model="model.bopmod.acttyp" v-model="model.bopmod.acttyp"
style="width: 100%" style="width: 100%"
placeholder="请选择" placeholder="请选择"
:disabled="model.bopmod.szflg==='3' || model.bopmod.szflg==='2'" :disabled="model.bopmod.szflg==='3' || model.bopmod.szflg==='2' ||model.bopmod.szflg===''"
> >
<el-option <el-option
v-for="item in codes.acttyp" v-for="item in codes.acttyp"
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
v-model="model.bopmod.ownextkey" v-model="model.bopmod.ownextkey"
style="width: 100%" style="width: 100%"
placeholder="请选择" placeholder="请选择"
:disabled="model.bopmod.szflg==='3'" :disabled="model.bopmod.szflg==='3' ||model.bopmod.szflg===''"
> >
<el-option <el-option
v-for="item in codesOwnextkey" v-for="item in codesOwnextkey"
......
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