Skip to content

V
vue-gjjs
Commit 0ae03ae3 by zhujiazhan
Options

修改Brtset交易BUG

parent faf2da8f
Showing with 168 additions and 44 deletions
src/mixin/commonProcess.js
......@@ -173,6 +173,9 @@ export default {
if(name === 'incp'){
rulePath = "cnybop.incp"
}
if(name === 'outp'){
rulePath = "cnybop.Outp"
}
if (!!rulePath) {
// if(rulePath == "setmod.setpan"){
// this.executeCustomRule(rulePath).then(res => {
......
src/model/Brtset/Check.js
......@@ -5,6 +5,7 @@ import Utils from "~/utils"
*/
let checkObj = {
"liaall.misamt" :null,
"bopmod.dbcgrp.bas.buscode" :null,
"dftcre.dfdgrp.rec.resamt" :null,
"dftcre.dfdgrp.apl.namelc" :null,
"dftcre.dfdgrp.cbs.max.cur" :null,
......@@ -12,39 +13,58 @@ let checkObj = {
"brdgrp.prb.adrelc" :null,
"cnybop.outflg" :null,
"cfatrt.cfaflg" :null,
"bopmod.dbcgrp.bas.exrate" :null,
"bopmod.dbcgrp.bas.custype" :null,
"bopmod.dbcgrp.bas.idcode" :null,
"bopmod.dbcgrp.bas.oppuser" :null,
"brdgrp.prb.pts.adrblk" :null,
"dftcre.dfdgrp.rec.bankno" :null,
"liaall.limmod.limpts.oth.pts.nam" :null,
"setmod.dspflg" :null,
"dftcre.dfdgrp.apl.pts.extkey" :null,
"bopmod.dbcgrp.bas.fcyamt" :null,
"cfatrt.ownextkey" :null,
"bopmod.dbcgrp.bas.issdate" :null,
"bopmod.dbcgrp.bas.lcbgno" :null,
"liaall.liaccv.totcovamt" :null,
"cfabrt.ownextkey" :null,
"dftcre.dfdgrp.dff.pts.extkey" :null,
"bopmod.dbcgrp.bas.custnm" :null,
"cfabrt.cfaflg" :null,
"cfatrt.cda.useofunds" :null,
"bopmod.dbcgrp.bas.methods" :null,
"liaall.limmod.limpts.wrk.pts.nam" :null,
"cnybop.cnyflg" :null,
"dftcre.dfdgrp.rec.invtyp" :null,
"cfatrt.cda.cfeogudamount" :null,
"dftcre.dfdgrp.rec.stttendat" :null,
"bopmod.dbcgrp.bas.txamt" :null,
"brdgrp.prb.pts.ref" :null,
"bopmod.dbcgrp.bas.fcyacc" :null,
"brdgrp.apl.pts.nam" :null,
"cfadft.ownextkey" :null,
"brtp.ischktyp" :null,
"hmdmod2.bennam" :null,
"trnmod.swftyp" :null,
"bopmod.dbcgrp.bas.outchargeccy" :null,
"bopmod.dbcgrp.bas.othamt" :null,
"bopmod.dbcgrp.bas.actuamt" :null,
"dftcre.dfdgrp.dff.adrelc" :null,
"dftcre.dfdgrp.rec.fintyp" :null,
"liaall.limmod.limpts.oth.pts.extkey" :null,
"dftcre.dfdgrp.rec.matdat" :null,
"liaall.limmod.ownref" :null,
"dftcre.dfdgrp.rec.dfuflg" :null,
"bopmod.dbcgrp.bas.othacc" :null,
"liaall.limmod.ecifno" :null,
"bopmod.dbcgrp.bas.actuccy" :null,
"bopmod.dbcgrp.bas.actiontype" :null,
"dftcre.dfdgrp.rec.bankcn" :null,
"bopmod.dbcgrp.bas.lcyamt" :null,
"bopmod.szflg" :null,
"dftcre.dfdgrp.rec.trntyp" :null,
"brdgrp.cbs.max.amt" :null,
"bopmod.dbcgrp.bas.actiondesc" :null,
"cfadft.cfaflg" :null,
"cnybop.traflg" :null,
"brdgrp.prb.namelc" :null,
......@@ -52,6 +72,7 @@ let checkObj = {
"dftcre.dfdgrp.rec.flttyp" :null,
"dftcre.dfdgrp.rec.actrat" :null,
"brtp.prechkdat" :null,
"bopmod.dbcgrp.bas.rptno" :null,
"dftcre.dfdgrp.dff.pts.adrblk" :null,
"dftcre.dfdgrp.rec.intprd" :null,
"brdgrp.prb.pts.nam" :null,
......@@ -60,14 +81,18 @@ let checkObj = {
"setmod.redamt" :null,
"aamset.utlamt2" :null,
"dftcre.dfdgrp.apl.pts.adrblk" :null,
"bopmod.dbcgrp.bas.custcod" :null,
"brdgrp.prb.pts.extkey" :null,
"trnmod.cmtflg" :null,
"bopmod.dbcgrp.bas.txccy" :null,
"liaall.limmod.limpts.wrk.pts.extkey" :null,
"bopmod.basflg" :null,
"dftcre.dfdgrp.dff.namelc" :null,
"brdgrp.rec.frepayflg" :null,
"mtabut.coninf.conexedat" :null,
"bopmod.dbcgrp.bas.lcyacc" :null,
"liaall.limmod.limpts.nonrevflg1" :null,
"bopmod.dbcgrp.bas.outchargeamt" :null,
"cnybop.libflg" :null,
"bopmod.ownextkey" :null,
"cfatrt.cda.cfeogudcurr" :null,
......
src/model/Brtset/Event.js
......@@ -315,5 +315,19 @@ export default {
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
async onChangeDocamt(){
this.flag3 = false;
let rtnmsg = await this.executeRule("setmod.docamt")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
this.updateModel(rtnmsg.data);
this.flag3 = true;
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
}
\ No newline at end of file
src/model/Brtset/Pattern.js
......@@ -54,7 +54,7 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"brdgrp.cbs.opn1.amt":[
{type: "number", required: false, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
......@@ -85,7 +85,7 @@ export default {
],
"brdgrp.rec.tenmaxday":[
{type: "string", required: false, message: "必输项"},
{type: "number", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"}
],
"brdgrp.prb.pts.ref":[
......@@ -96,9 +96,6 @@ export default {
{type: "string", required: false, message: "必输项"},
{max: 40,message:"长度不能超过40"}
],
"liaall.tenstm":[
{type: "string", required: false, message: "必输项"},
{max: 1,message:"长度不能超过1"}
......@@ -120,15 +117,14 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"setmod.docamt":[
{type: "number", required: false, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"setmod.setamt":[
{type: "number", required: false, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d$)|(^0\.\d$)|(^\d\.\d$)/, message: "小数位不能超过3位" }
],
"nar754":[
{type: "string", required: true, message: "必输项"},
......@@ -137,13 +133,13 @@ export default {
"aamset.utlamt":[
{type: "number", required: false, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"aamset.utlamt2":[
{type: "number", required: false, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
......@@ -179,7 +175,7 @@ export default {
],
"brdgrp.prb.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
{max: 100,message:"长度不能超过100"}
],
"brdgrp.prb.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
......
src/model/Brtset/index.js
......@@ -9,6 +9,44 @@ export default class Brtset{
constructor () {
const pub = new Public()
this.data = {
cnybop:{
cnyflg:"", // 是否报送跨境人民币2101表 .cnybop.cnyflg
traflg:"", // 是否报送跨境人民币2107表 .cnybop.traflg
outflg:"", // 是否报送跨境人民币2111表 .cnybop.outflg
libflg:"", // 是否报送跨境人民币2106表 .cnybop.libflg
vouflg:"", // 是否报送跨境人民币2122表 .cnybop.vouflg
cnyout:{
spk:"", // 业务主键 .cnybop.cnyout.spk
sbankorgcode:"", // 银行机构代码 .cnybop.cnyout.sbankorgcode
spayeeorgcode:"", // 付款人机构代码 .cnybop.cnyout.spayeeorgcode
spayercountrycode:"", // 收款人常驻国家（地区）代码 .cnybop.cnyout.spayercountrycode
sswiftbic:"", // 收款行SWIFT BIC .cnybop.cnyout.sswiftbic
cpayeraccttyp:"", // 清算（结算）帐户类型 .cnybop.cnyout.cpayeraccttyp
spayeracct:"", // 清算（结算）帐户帐号 .cnybop.cnyout.spayeracct
smidtransbank:"", // 中�'转汇行 .cnybop.cnyout.smidtransbank
dpayeedate:"", // 付款日期 .cnybop.cnyout.dpayeedate
sorilevyno:"", // 原申报号码 .cnybop.cnyout.sorilevyno
sbanktrano:"", // 银行业务编号 .cnybop.cnyout.sbanktrano
sbalancemode:"", // 结算方式 .cnybop.cnyout.sbalancemode
iaccountperiod:"", // 结�'�期 .cnybop.cnyout.iaccountperiod
fpayeeamt:"", // 货物贸易付款金额 .cnybop.cnyout.fpayeeamt
fcustomsamt:"", // 已报关付款金额 .cnybop.cnyout.fcustomsamt
frecordamt:"", // 已备案付款金额 .cnybop.cnyout.frecordamt
fprepayeeamt:"", // 预付款金额 .cnybop.cnyout.fprepayeeamt
fonshoreamt:"", // 无货物报关进出境物流货物金额 .cnybop.cnyout.fonshoreamt
foffshoreamt:"", // 无货物报关离岸转手买卖金额 .cnybop.cnyout.foffshoreamt
fnogoodsamt:"", // 无货物报关其他金额 .cnybop.cnyout.fnogoodsamt
cpayeeattr:"", // 付款人属性 .cnybop.cnyout.cpayeeattr
spayeecny:"", // 付款币种 .cnybop.cnyout.spayeecny
spayeeacct:"", // 付款人账号 .cnybop.cnyout.spayeeacct
ftotalamt:"", // 原币金额 .cnybop.cnyout.ftotalamt
},
spayeename:"", // 付款人名称 .cnybop.spayeename
spayername:"", // 收款人名称 .cnybop.spayername
saddwordout:"", // 交易附言 .cnybop.saddwordout
sbankname:"", // 银行机构名称 .cnybop.sbankname
outscale:"", // OUTSCALE .cnybop.outscale
},
brdgrp:{
rec:{
ownref:"", // 单据参考号 .brdgrp.rec.ownref
......@@ -258,13 +296,6 @@ export default class Brtset{
dclflg:"", // 变动信息 .cfabrt.dclflg
ownextkey:"", // 地区机构号 .cfabrt.ownextkey
},
cnybop:{
cnyflg:"", // 是否报送跨境人民币2101表 .cnybop.cnyflg
traflg:"", // 是否报送跨境人民币2107表 .cnybop.traflg
outflg:"", // 是否报送跨境人民币2111表 .cnybop.outflg
libflg:"", // 是否报送跨境人民币2106表 .cnybop.libflg
vouflg:"", // 是否报送跨境人民币2122表 .cnybop.vouflg
},
hmdmod2:{
bennam:"", // 交易对手名称 .hmdmod2.bennam
},
......
src/views/Business/Brtset/Utlp.vue
......@@ -141,6 +141,7 @@
:list="model.liaall.tenstm.rows"
:columns="columns"
:showSelection=true
v-on:multipleSelect="multipleSelect"
>
</c-istream-table>
</el-form-item>
......@@ -154,7 +155,7 @@
</c-col>
<c-col :span="11">
<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" @blur="onChangeDocamt"></c-input>
</el-form-item>
</c-col>
</c-col>
......@@ -167,7 +168,7 @@
<c-col :span="11">
<c-fullbox>
<el-form-item label="" label-width="5px" prop="setmod.setamt">
<c-input v-model="model.setmod.setamt" placeholder="请输入document amount" disabled></c-input>
<c-input v-model="model.setmod.setamt" placeholder="请输入document amount" :disabled=this.flag3></c-input>
</el-form-item>
</c-fullbox>
</c-col>
......@@ -184,7 +185,7 @@
</c-col>
<c-col :span="11">
<el-form-item label="" prop="aamset.utlamt" label-width="5px">
<c-input v-model="model.aamset.utlamt" placeholder="请输入单据金额" disabled></c-input>
<c-input v-model="model.aamset.utlamt" placeholder="请输入单据金额" :disabled=this.flag3></c-input>
</el-form-item>
</c-col>
</c-col>
......@@ -198,7 +199,7 @@
</c-col>
<c-col :span="11">
<el-form-item label="" prop="aamset.utlamt2" label-width="5px">
<c-input v-model="model.aamset.utlamt2" placeholder="" disabled></c-input>
<c-input v-model="model.aamset.utlamt2" placeholder="" :disabled=this.flag3></c-input>
</el-form-item>
</c-col>
</c-col>
......@@ -217,7 +218,7 @@
</c-col>
<c-col :span="12">
<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" true-label="X"></c-checkbox>
</el-form-item>
</c-col>
</c-col>
......@@ -407,14 +408,14 @@
</c-button>
</template>
</c-fullbox>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Address Block" prop="brdgrp.prb.pts.adrblk">
......@@ -438,6 +439,7 @@ export default {
mixins: [commonProcess],
data(){
return {
flag3:true,
cmtflg:[
{ label: "代理行模式", value: "C" },
{ label: "Other", value: "O" },
......@@ -456,13 +458,24 @@ export default {
},
methods:{...Event,
commonExecuteRule(ruleName) {
this.executeRule(ruleName).then((res) => {
if ((res.respCode == SUCCESS)) {
commonExecuteRule(ruleName) {
this.executeRule(ruleName).then((res) => {
if ((res.respCode == SUCCESS)) {
}
});
},
}
});
},
async multipleSelect(selection) {
if(selection.length>0){
console.log(selection);
let line = this.model.liaall.tenstm.rows[selection];
let lines = line.split('\t');
this.model.setmod.docamt = lines[5];
}else{
this.model.setmod.docamt = 0.000;
}
this.onChangeDocamt();
},
},
created:function(){
......@@ -479,13 +492,6 @@ export default {
}
}
},
"model.setmod.docamt":{
immediate:true,
handler(val ,oldVal){
let rtnmsg = this.executeRule("setmod.docamt")
}
}
},
}
</script>
......
src/views/Business/Brtset/index.vue
......@@ -114,9 +114,32 @@
<el-tab-pane label="统一授信" name="limitbody">
<m-limitbody :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000130 -->
<el-tab-pane :label=this.det756Name name="det756" v-if="model.mtabut.clsflg !=''">
<c-content>
<m-det756 :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000131 -->
<el-tab-pane :label=this.det202cvName name="det202cv" v-if="model.mtabut.clsflg !=''">
<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'"
>
<m-outp :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000001
<el-tab-pane label="Payment 756 PRB CNY 13541.00" name="det756">
<el-tab-pane label="Payment 756 PRB CNY 13541.00" name="det756">
<m-det756 :model="model" :codes="codes"/>
</el-tab-pane>-->
</c-tabs>
......@@ -153,6 +176,9 @@ import Basp from "./Basp"
// import Dftcrep from "./Dftcrep"
import Limitbody from "~/views/Public/Limitbody";
import Sbxx from "~/views/Public/Sbxx";
import Det756 from "./Det756";
import Det202cv from "./Det202cv";
import Outp from "./Outp";
export default {
name: "Brtset",
......@@ -173,6 +199,9 @@ export default {
"m-limitbody" : Limitbody,
"m-sbxx": Sbxx,
"m-basp": Basp,
"m-det756": Det756,
"m-det202cv": Det202cv,
"m-outp": Outp,
},
provide() {
return {
......@@ -183,6 +212,8 @@ export default {
computed: {},
data(){
return {
det202cvName:"Payment 202 PRB",
det756Name:"Payment 756 PRB" ,
tabVal: "utlp",
trnName: "brtset",
model: new Brtset().data,
......@@ -204,7 +235,24 @@ export default {
}
},
watch:{
"model.setmod.doccur":{
immediate:true,
handler(){
let cur = this.model.setmod.doccur;
let amt = this.model.setmod.docamt;
this.det202cvName= "Payment 202 PRB "+cur+" "+ amt;
this.det756Name = "Payment 756 PRB "+cur+" "+ amt;
}
},
"model.mtabut.clsflg":{
immediate:true,
handler(){
let cur = this.model.setmod.doccur;
let amt = this.model.setmod.docamt;
this.det202cvName= "Payment 202 PRB "+cur+" "+ amt;
this.det756Name = "Payment 756 PRB "+cur+" "+ amt;
}
},
},
created:async function(){
......
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