Skip to content

V
vue-gjjs
Commit 1324c63b by huangxin
Options

botset,botdav处理bug

parent 2291a1e1
Showing with 342 additions and 48 deletions
src/model/Botdav/Check.js
...@@ -4,24 +4,34 @@ import Utils from "~/utils" ...@@ -4,24 +4,34 @@ import Utils from "~/utils"
* Botdav Check规则 * Botdav Check规则
*/ */
let checkObj = { let checkObj = {
"liaall.misamt" :null,
"bodgrp.rec.matpertyp" :null, "bodgrp.rec.matpertyp" :null,
"botp.recget.sdamod.dadsnd" :null, "botp.recget.sdamod.dadsnd" :null,
"bodgrp.rec.doctypcod" :null, "bodgrp.rec.doctypcod" :null,
"cnybop.cnylib.doccurdate" :null,
"bodgrp.dre.adrelc" :null, "bodgrp.dre.adrelc" :null,
"bodgrp.srm.djuusr" :null, "bodgrp.srm.djuusr" :null,
"cnybop.outflg" :null, "cnybop.outflg" :null,
"cnybop.cnylib.sbankorgcode" :null,
"setmod.dspflg" :null, "setmod.dspflg" :null,
"cnybop.cnylib.stermtype" :null,
"bodgrp.srm.djutyp" :null, "bodgrp.srm.djutyp" :null,
"bodgrp.col.pts.adrblk" :null, "bodgrp.col.pts.adrblk" :null,
"bodgrp.blk.dftins" :null, "bodgrp.blk.dftins" :null,
"cnybop.cnylib.currencycode" :null,
"cnybop.cnyflg" :null, "cnybop.cnyflg" :null,
"bodgrp.blk.delins" :null, "bodgrp.blk.delins" :null,
"cnybop.cnylib.dcreditenddate" :null,
"bodgrp.srm.djuref" :null, "bodgrp.srm.djuref" :null,
"bodgrp.rec.stacty" :null, "bodgrp.rec.stacty" :null,
"bodgrp.drr.adrelc" :null, "bodgrp.drr.adrelc" :null,
"bodgrp.rec.matpercnt" :null, "bodgrp.rec.matpercnt" :null,
"bodgrp.dre.namelc" :null, "bodgrp.dre.namelc" :null,
"cnybop.cnylib.famt" :null,
"cnybop.saddwordlib" :null,
"cnybop.cnylib.stransattr" :null,
"bodgrp.dre.pts.adrblk" :null, "bodgrp.dre.pts.adrblk" :null,
"cnybop.sforeignorgname" :null,
"bodgrp.rec.invtyp" :null, "bodgrp.rec.invtyp" :null,
"bodgrp.drr.pts.extkey" :null, "bodgrp.drr.pts.extkey" :null,
"bodgrp.blk.setinsbo" :null, "bodgrp.blk.setinsbo" :null,
...@@ -33,25 +43,33 @@ let checkObj = { ...@@ -33,25 +43,33 @@ let checkObj = {
"bodgrp.cbs.max.amt" :null, "bodgrp.cbs.max.amt" :null,
"cnybop.traflg" :null, "cnybop.traflg" :null,
"botp.colp.ptsget.sdamod.dadsnd" :null, "botp.colp.ptsget.sdamod.dadsnd" :null,
"cnybop.sbankname" :null,
"bodgrp.drr.pts.ref" :null, "bodgrp.drr.pts.ref" :null,
"bodgrp.col.adrelc" :null, "bodgrp.col.adrelc" :null,
"bodgrp.rec.shpdat" :null, "bodgrp.rec.shpdat" :null,
"cnybop.cnylib.stranstype" :null,
"bodgrp.rec.ownref" :null, "bodgrp.rec.ownref" :null,
"botp.drrp.ptsget.sdamod.dadsnd" :null, "botp.drrp.ptsget.sdamod.dadsnd" :null,
"bodgrp.col.pts.extkey" :null, "bodgrp.col.pts.extkey" :null,
"cnybop.cnylib.sbanktrano" :null,
"botp.usr.extkey" :null, "botp.usr.extkey" :null,
"cnybop.cnylib.sforbankswiftbic" :null,
"cnybop.cnylib.denddate" :null,
"bodgrp.rec.dircolflg" :null, "bodgrp.rec.dircolflg" :null,
"cnybop.sorgname" :null,
"mtabut.coninf.conexedat" :null, "mtabut.coninf.conexedat" :null,
"bodgrp.col.namelc" :null, "bodgrp.col.namelc" :null,
"cnybop.libflg" :null, "cnybop.libflg" :null,
"botp.drep.ptsget.sdamod.dadsnd" :null, "botp.drep.ptsget.sdamod.dadsnd" :null,
"cnybop.cnylib.sorgcode" :null,
"bodgrp.blk.colins" :null, "bodgrp.blk.colins" :null,
"cnybop.fexchangeamt" :null,
"setmod.docamt" :null, "setmod.docamt" :null,
"bodgrp.drr.namelc" :null, "bodgrp.drr.namelc" :null,
"bodgrp.blk.othins" :null, "bodgrp.blk.othins" :null,
"bodgrp.dre.pts.extkey" :null, "bodgrp.dre.pts.extkey" :null,
"cnybop.cnylib.sforeigncountrycode" :null,
"cnybop.vouflg" :null, "cnybop.vouflg" :null,
// "bodgrp.cbs.max.cur" :null,
} }
for (const key in checkObj) { for (const key in checkObj) {
......
src/model/Botset/Default.js
...@@ -79,5 +79,6 @@ export default { ...@@ -79,5 +79,6 @@ export default {
"mtabut.coninf.conexedat" :Utils.defaultFunction, "mtabut.coninf.conexedat" :Utils.defaultFunction,
"cnybop.outflg" :Utils.defaultFunction, "cnybop.outflg" :Utils.defaultFunction,
"bodgrp.rec.docsta" :Utils.defaultFunction, "bodgrp.rec.docsta" :Utils.defaultFunction,
"bopmod.outchargeamt" :Utils.defaultFunction,
} }
//你可以添加自动default处理 //你可以添加自动default处理
src/views/Business/Botame/Ovwp.vue
...@@ -250,7 +250,7 @@ ...@@ -250,7 +250,7 @@
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col v-if="model.trnmod.swiadd.newmatpertyp!='M'" :span="1" style="margin-left:-10px"> <c-col v-if=" (model.trnmod.swiadd.newmatpertyp=='D')||(model.oldbodgrp.rec.matpertyp==''&&model.trnmod.swiadd.newmatpertyp=='')||(model.oldbodgrp.rec.matpertyp=='D' &&model.trnmod.swiadd.newmatpertyp=='')" :span="1" style="margin-left:-10px">
<el-form-item label="Days"> </el-form-item> <el-form-item label="Days"> </el-form-item>
</c-col> </c-col>
......
src/views/Business/Botdav/Libp.vue 0 → 100644
<template>
<div class="eibs-tab">
<!--===============左 =================== -->
<el-col :span="11">
<c-col :span="24">
<el-form-item label="业务主键" prop="cnybop.cnylib.spk">
<c-input
disabled
v-model="model.cnybop.cnylib.spk"
maxlength="20"
placeholder="请输入业务主键"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="银行机构代码" prop="cnybop.cnylib.sbankorgcode">
<c-input
disabled
v-model="model.cnybop.cnylib.sbankorgcode"
maxlength="12"
placeholder="请输入银行机构代码"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="业务属性" prop="cnybop.cnylib.stransattr">
<c-select
v-model="model.cnybop.cnylib.stransattr"
style="width: 100%"
placeholder="请选择业务属性"
:code="codes.stransattr"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item
label="境外对手行代码"
prop="cnybop.cnylib.sforbankswiftbic"
>
<c-input
v-model="model.cnybop.cnylib.sforbankswiftbic"
maxlength="11"
placeholder="请输入境外对手行代码"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="境内企业机构代码" prop="cnybop.cnylib.sorgcode">
<c-input
v-model="model.cnybop.cnylib.sorgcode"
maxlength="18"
placeholder="请输入境内企业机构代码"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item
label="境外企业国别地区代码"
prop="cnybop.cnylib.sforeigncountrycode"
>
<c-fullbox>
<c-input
v-model="model.cnybop.cnylib.sforeigncountrycode"
maxlength="3"
placeholder="请输入境外企业国别地区代码"
@keyup.enter.native="eventFunction('cnybop.cnylib.sforeigncountrycode')"
></c-input>
<template slot="footer">
<!-- @click="showGridPromptDialog('cnybop.libcty.selbut1',null,null,{TXT:'cnybop.cnylib.sforeigncountrycode'},{TXT:false},'doxpDialog')" -->
<c-button
size="small"
type="primary"
icon="el-icon-search"
@click="onLibctySelbut1"
>
?
</c-button>
</template>
</c-fullbox>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="业务到期日" prop="cnybop.cnylib.denddate">
<c-date-picker
type="date"
v-model="model.cnybop.cnylib.denddate"
style="width: 100%"
placeholder="请选择业务到期日"
></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="币种" prop="cnybop.cnylib.currencycode">
<c-select
v-model="model.cnybop.cnylib.currencycode"
style="width: 100%"
placeholder="请选择币种"
:code="codes.currencycode"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="期限条件" prop="cnybop.cnylib.stermtype">
<c-select
v-model="model.cnybop.cnylib.stermtype"
style="width: 100%"
placeholder="请选择期限条件"
:code="codes.stermtype"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="承兑日期" prop="cnybop.cnylib.dexchangedate">
<c-date-picker
type="date"
v-model="model.cnybop.cnylib.dexchangedate"
style="width: 100%"
placeholder="请选择承兑日期"
></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="承兑到期日" prop="cnybop.cnylib.dexchangeenddate">
<c-date-picker
type="date"
v-model="model.cnybop.cnylib.dexchangeenddate"
style="width: 100%"
placeholder="请选择承兑到期日"
></c-date-picker>
</el-form-item>
</c-col>
</el-col>
<!-- ===============右 ===========================-->
<el-col :span="11" :offset="1">
<c-col :span="24">
<el-form-item label="银行业务编号" prop="cnybop.cnylib.sbanktrano">
<c-input
disabled
v-model="model.cnybop.cnylib.sbanktrano"
maxlength="22"
placeholder="请输入银行业务编号"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="银行机构名称" prop="cnybop.sbankname">
<c-input
disabled
v-model="model.cnybop.sbankname"
maxlength="80"
placeholder="请输入银行机构名称"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="业务类型" prop="cnybop.cnylib.stranstype">
<c-select
v-model="model.cnybop.cnylib.stranstype"
style="width: 100%"
placeholder="请选择业务类型"
:code="codes.stranstype"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="境内企业名称" prop="cnybop.sorgname">
<c-input
v-model="model.cnybop.sorgname"
maxlength="80"
placeholder="请输入境内企业名称"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="境外企业名称" prop="cnybop.sforeignorgname">
<c-input
v-model="model.cnybop.sforeignorgname"
maxlength="80"
placeholder="请输入境外企业名称"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="业务发生日期" prop="cnybop.cnylib.doccurdate">
<c-date-picker
type="date"
v-model="model.cnybop.cnylib.doccurdate"
style="width: 100%"
placeholder="请选择业务发生日期"
></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="信用证到期日" prop="cnybop.cnylib.dcreditenddate">
<c-date-picker
type="date"
v-model="model.cnybop.cnylib.dcreditenddate"
style="width: 100%"
placeholder="请选择信用证到期日"
></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="金额" prop="cnybop.cnylib.famt">
<c-input
v-model="model.cnybop.cnylib.famt"
placeholder="请输入金额"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="承兑金额" prop="cnybop.fexchangeamt">
<c-input
v-model="model.cnybop.fexchangeamt"
maxlength="20"
placeholder="请输入承兑金额"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="交易附言" prop="cnybop.saddwordlib">
<c-input
v-model="model.cnybop.saddwordlib"
maxlength="80"
placeholder="请输入交易附言"
></c-input>
</el-form-item>
</c-col>
</el-col>
</div>
</template>
<script>
import Api from '~/service/Api'
import commonProcess from '~/mixin/commonProcess'
import CodeTable from '~/config/CodeTable'
import Event from '~/model/Betsnd/Event'
export default {
inject: ['root'],
props: ['model', 'codes'],
mixins: [commonProcess],
data() {
return {}
},
methods: { ...Event },
created: function () {},
}
</script>
<style></style>
src/views/Business/Botdav/Ovwp.vue
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<c-col :span="1"> <c-col :span="1">
</c-col> </c-col>
<c-col :span="3" style="text-align: right"> <c-col :span="3" style="text-align: right">
<c-button style="margin:0 0" size="small" type="primary" :disabled="this.flag" @click="onDitpButgetref"> <c-button style="margin:0 0" size="small" type="primary" :disabled="this.flag" @click="onBotpButgetref">
获取 获取
</c-button> </c-button>
</c-col> </c-col>
......
src/views/Business/Botdav/index.vue
...@@ -124,7 +124,7 @@ ...@@ -124,7 +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' import Libp from './Libp'
export default { export default {
......
src/views/Business/Botset/Basp3.vue
...@@ -306,11 +306,11 @@ export default { ...@@ -306,11 +306,11 @@ export default {
}, },
}, },
methods:{ methods:{
async change() { // async change() {
if(this.model.bopmod.szflg=="1"){ // if(this.model.bopmod.szflg=="1"){
this.model.bopmod.dbagrp.bas.outchargeamt=this.model.bopmod.outchargeamt // this.model.bopmod.dbagrp.bas.outchargeamt=this.model.bopmod.outchargeamt
} // }
} // }
}, },
created:function(){ created:function(){
......
src/views/Business/Botset/Setp.vue
...@@ -323,13 +323,13 @@ ...@@ -323,13 +323,13 @@
label-width="5px" label-width="5px"
prop="setmod.redamt" prop="setmod.redamt"
> >
<c-input <c-input-currency
:disabled="model.bodgrp.rec.focflg == 'X'" :disabled="model.bodgrp.rec.focflg == 'X'"
v-model="model.setmod.redamt" v-model="model.setmod.redamt"
style="text-align: left; width: 100%" style="text-align: left; width: 100%"
placeholder="请输入Reduction Amt" placeholder="请输入Reduction Amt"
@keyup.enter.native="showGridPromptDialog('setmod.redamt')" @keyup.enter.native="defaultFunction('setmod.redamt', model.setmod.redamt)"
></c-input> ></c-input-currency>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
...@@ -364,13 +364,13 @@ ...@@ -364,13 +364,13 @@
label-width="5px" label-width="5px"
prop="setmod.docamt" prop="setmod.docamt"
> >
<c-input <c-input-currency
v-model="model.setmod.docamt" v-model="model.setmod.docamt"
style="text-align: left; width: 100%" style="text-align: left; width: 100%"
placeholder="请输入Settle Amt." placeholder="请输入Settle Amt."
@change="change1" @change="change1"
@keyup.enter.native="showGridPromptDialog('setmod.docamt')" @keyup.enter.native="defaultFunction('setmod.docamt', model.setmod.docamt)"
></c-input> ></c-input-currency>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -482,37 +482,36 @@ export default { ...@@ -482,37 +482,36 @@ export default {
} }
}, },
async multipleSelect(selection) { async multipleSelect(selection) {
if (selection.length > 1) { if (selection.length > 1) {
this.$notify({ this.$notify({
title: "error", title: "error",
message: "You cannot select more than one tenor", message: "You cannot select more than one tenor",
type: "error", type: "error",
}); });
} else { } else {
let selIds; let chkIds;
if (selection.length === 0) { if (selection.length === 0) {
this.$notify({ chkIds = [];
title: "error", this.$nextTick(async () => {
message: "Please select at least one tenor", this.model.setmod.docamt = "0.000";
type: "error", })
}); this.model.liaall.tensetstm.rows = [];
selIds = []; } else {
this.model.setmod.docamt = "0.000"; chkIds = [selection[0] + 1];
this.isDisabled = false; }
} else { //
selIds = [selection[0] + 1]; console.log(this.model.liaall.tensetstm);
this.model.setmod.docamt = this.model.bodgrp.cbs.max.amt; let params = { chkDst: "liaall.tenstm", chkIds };
this.isDisabled = true; console.log(params);
} const rtnmsg = await this.executeRule("liaall.tenstm", params);
let params = { selDst: "liaall.tenstm", selIds }; console.log(rtnmsg);
const rtnmsg = await this.executeRule("liaall.tenstm", params); if (rtnmsg.respCode == SUCCESS) {
if (rtnmsg.respCode == SUCCESS) { this.updateModel(rtnmsg.data);
this.updateModel(rtnmsg.data); } else {
} else { this.$notify.error({ title: "错误", message: "服务请求失败！" });
this.$notify.error({ title: "错误", message: "服务请求失败！" }); }
} }
} },
},
}, },
created: function () {}, created: function () {},
......
src/views/Business/Botset/Wg.vue
...@@ -94,11 +94,12 @@ ...@@ -94,11 +94,12 @@
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<el-form-item label="" label-width="5px" prop="bopmod.outchargeamt"> <el-form-item label="" label-width="5px" prop="bopmod.outchargeamt">
<c-input <c-input-currency
v-model="model.bopmod.outchargeamt" v-model="model.bopmod.outchargeamt"
placeholder="请输入国外银行扣费（涉外收入申报专用）" placeholder="请输入国外银行扣费（涉外收入申报专用）"
:disabled="model.bopmod.szflg!='1' || model.lendoc.actflg!='X'" :disabled="model.bopmod.szflg!='1' || model.lendoc.actflg!='X'"
></c-input> @keyup.enter.native="defaultFunction('bopmod.outchargeamt', model.bopmod.outchargeamt)"
></c-input-currency>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
......
src/views/Business/Botset/index.vue
...@@ -118,6 +118,9 @@ ...@@ -118,6 +118,9 @@
v-on:select-ety="selectEty" v-on:select-ety="selectEty"
> >
</c-grid-ety-prompt-dialog> </c-grid-ety-prompt-dialog>
<c-grid-ety-prompt-dialog ref="doxpDialog" :isPty="false" :promptData="promptData"
@select-ety="selectMsg">
</c-grid-ety-prompt-dialog>
</div> </div>
</c-page> </c-page>
</template> </template>
......
src/views/Business/Brtcan/index.vue
...@@ -112,6 +112,7 @@ export default { ...@@ -112,6 +112,7 @@ export default {
pattern: Pattern, pattern: Pattern,
rules: null, rules: null,
codes: { codes: {
...CodeTable,
}, },
} }
}, },
......
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