Commit 4681c44e by nanrui

Merge remote-tracking branch 'origin/development-202206' into development-202206

parents 0399e395 ebd0441d
......@@ -70,15 +70,17 @@ export default {
return arr;
},
tableData() {
const temp = this.column;
const res = [];
return this.list.map((row) => {
const res = {}
for (let i = 0; i < temp.length; i++) {
res[temp[i]] = row[temp[i]];
}
return res;
});
// const temp = this.column;
// const res = [];
// return this.list.map((row) => {
// const res = {}
// for (let i = 0; i < temp.length; i++) {
// res[temp[i]] = row[temp[i]];
// }
// return res;
// });
return this.list;
},
},
data() {
......
......@@ -44,6 +44,7 @@ export default {
"dedgrp.rec.elcflg" :Utils.defaultFunction,
"dedgrp.rec.expdat" :Utils.defaultFunction,
"dedgrp.rec.tratyp" :Utils.defaultFunction,
"dedgrp.rec.tenmaxday" :Utils.defaultFunction,
"trnmod.swiadd.newnomtopame" :Utils.defaultFunction,
"trnmod.swiadd.newnomtoname" :Utils.defaultFunction,
}
......
......@@ -44,5 +44,6 @@ export default {
"dedgrp.rec.elcflg" :Utils.defaultFunction,
"dedgrp.rec.expdat" :Utils.defaultFunction,
"dedgrp.rec.tratyp" :Utils.defaultFunction,
"dedgrp.rec.tenmaxday" :Utils.defaultFunction,
}
//你可以添加自动default处理
......@@ -85,8 +85,8 @@ export default {
"lidgrp.adv.dbfadrblkcn" :Utils.defaultFunction,
"lidgrp.adv.pts.adrblk" :Utils.defaultFunction,
"lidgrp.rec.shppars18" :Utils.defaultFunction,
//"litamep.lcrdocamep.modflg" :Utils.defaultFunction,
//"litamep.lcrdocamep.modmanflg" :Utils.defaultFunction,
"litamep.lcrdocamep.modflg" :Utils.defaultFunction,
"litamep.lcrdocamep.modmanflg" :Utils.defaultFunction,
"lidgrp.a2b.pts.extkey" :Utils.defaultFunction,
"lidgrp.a2b.adrelc" :Utils.defaultFunction,
"lidgrp.a2b.namelc" :Utils.defaultFunction,
......@@ -132,7 +132,7 @@ export default {
"mtabut.coninf.oitset.oit.inftxt" :Utils.defaultFunction,
"mtabut.coninf.oitset.oit.inflev" :Utils.defaultFunction,
"lidgrp.ini.pts.adrblk" :Utils.defaultFunction,
//"lidgrp.blk.adlcnd" :Utils.defaultFunction,
"lidgrp.blk.adlcnd" :Utils.defaultFunction,
"litamep.engamt" :Utils.defaultFunction,
"trnmod.swiadd.nomspc" :Utils.defaultFunction,
"mtabut.coninf.usr.extkey" :Utils.defaultFunction,
......@@ -145,7 +145,7 @@ export default {
"liaall.limmod.limpts.oth.pts.nam" :Utils.defaultFunction,
"liaall.liaccv.concur" :Utils.defaultFunction,
"lidgrp.rec.prepers18" :Utils.defaultFunction,
//"lidgrp.blk.lcrdoc" :Utils.defaultFunction,
"lidgrp.blk.lcrdoc" :Utils.defaultFunction,
"lidgrp.rec.stacty" :Utils.defaultFunction,
"lidgrp.rmb.pts.nam" :Utils.defaultFunction,
"oldlidgrp.rec.expdat" :Utils.defaultFunction,
......
......@@ -23,7 +23,7 @@ export default class Litame{
maxamt:"", // New Maximum Amount .litamep.maxamt
cre707flg:"", // Create Amendment Message .litamep.cre707flg
ramrol:"", // Request of Amendment send to .litamep.ramrol
amenbr:"", // 实际修改次数 .litamep.amenbr
amenbr:0, // 实际修改次数 .litamep.amenbr
lcrdocamep:{
usrblk:"", // Block to enter additional info for Add/Delete .litamep.lcrdocamep.usrblk
modflg:"", // Modify Text to Replace .litamep.lcrdocamep.modflg
......@@ -56,8 +56,8 @@ export default class Litame{
ownref:"", // Reference .lidgrp.rec.ownref
nam:"", // Name .lidgrp.rec.nam
lcrtyp:"", // Form of L/C .lidgrp.rec.lcrtyp
nomtop:"", // Amount Tolerance +/- .lidgrp.rec.nomtop
nomton:"", // Amount Tolerance - Negative .lidgrp.rec.nomton
nomtop:0, // Amount Tolerance +/- .lidgrp.rec.nomtop
nomton:0, // Amount Tolerance - Negative .lidgrp.rec.nomton
nomspc:"", // Amount Specification .lidgrp.rec.nomspc
opndat:"", // L/C Issued on .lidgrp.rec.opndat
preadvdt:"", // Date Pre-advised .lidgrp.rec.preadvdt
......@@ -87,8 +87,8 @@ export default class Litame{
shpto:"", // Final Destination .lidgrp.rec.shpto
chato:"", // Drafts at .lidgrp.rec.chato
stacty:"", // Country Code Risk Country .lidgrp.rec.stacty
tenmaxday:"", // Maximum tenor in days .lidgrp.rec.tenmaxday
prepers18:"", // Days of presentation period .lidgrp.rec.prepers18
tenmaxday:0, // Maximum tenor in days .lidgrp.rec.tenmaxday
prepers18:0, // Days of presentation period .lidgrp.rec.prepers18
prepertxts18:"", // Presentation period text .lidgrp.rec.prepertxts18
redclsflg:"", // Red/Green Clause .lidgrp.rec.redclsflg
spcbenflg:"", // Special payment conditions for beneficiary exists .lidgrp.rec.spcbenflg
......@@ -199,12 +199,12 @@ export default class Litame{
},
},
rec:{
nomtop:"", // Amount Tolerance - Positive .oldlidgrp.rec.nomtop
nomton:"", // Amount Tolerance - Negative .oldlidgrp.rec.nomton
nomtop:0, // Amount Tolerance - Positive .oldlidgrp.rec.nomtop
nomton:0, // Amount Tolerance - Negative .oldlidgrp.rec.nomton
expdat:"", // 到期日 .oldlidgrp.rec.expdat
shpdat:"", // 装运日 .oldlidgrp.rec.shpdat
prepertxts18:"", // Presentation period text .oldlidgrp.rec.prepertxts18
prepers18:"", // Presentation Period .oldlidgrp.rec.prepers18
prepers18:0, // Presentation Period .oldlidgrp.rec.prepers18
},
blk:{
preper:"", // Presentation Period .oldlidgrp.blk.preper
......
......@@ -94,6 +94,7 @@ export default class Trnmod {
},
filrecv: "", // File Receiver .trnmod.trndoc.filrecv
doceot: [],
addstr750:""//trnmod.trndoc.addstr750
},
docimm:{
ascin:"", // Message as stream .trnmod.docimm.ascin
......
<template>
<div class="eContainer">
<!-- <c-bus-button :$pntvm="this"></c-bus-button> -->
<c-function-btn
:handleSubmit="handleSubmit"
......@@ -18,120 +17,132 @@
<el-button size="small">智能提示</el-button>
</c-function-btn>
<el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right" size="small" :validate-on-rule-change="false">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<el-form
:model="model"
:rules="rules"
ref="modelForm"
label-width="150px"
label-position="right"
size="small"
:validate-on-rule-change="false"
>
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<!--PD000034 -->
<el-tab-pane label="收款" name="setp">
<c-content>
<m-setp ref="setp" :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000027 -->
<el-tab-pane label="或有" name="engp">
<m-engp :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000034 -->
<el-tab-pane label="收款" name="setp">
<c-content>
<m-setp ref="setp" :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--PD000027 -->
<el-tab-pane label="或有" name="engp">
<m-engp :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000000 -->
<el-tab-pane label="账务" name="setpan" >
<c-content>
<m-setpan :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000000 -->
<el-tab-pane label="账务" name="setpan">
<c-content>
<m-setpan :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--PD000000 -->
<el-tab-pane label="分录" name="glepan" v-if="glepan">
<m-glepan :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000000 -->
<el-tab-pane label="附言" name="coninfp">
<m-coninfp :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000000 -->
<el-tab-pane label="附言" name="coninfp">
<m-coninfp :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000529 -->
<el-tab-pane label="报文及面函" name="docpan">
<m-docpan :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000529 -->
<el-tab-pane label="报文及面函" name="docpan">
<m-docpan :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000001 -->
<el-tab-pane label="统一授信" name="limitbody">
<m-limitbody :model="model" :codes="codes"/>
</el-tab-pane>
</c-tabs>
<!--PD000001 -->
<el-tab-pane label="统一授信" name="limitbody">
<m-limitbody :model="model" :codes="codes" />
</el-tab-pane>
</c-tabs>
</el-form>
</div>
</template>
<script>
import Api from "~/service/Api"
import CodeTable from "~/config/CodeTable"
import Bftset from "~/model/Bftset"
import commonProcess from "~/mixin/commonProcess"
import Api from "~/service/Api";
import CodeTable from "~/config/CodeTable";
import Bftset from "~/model/Bftset";
import commonProcess from "~/mixin/commonProcess";
import commonFuncs from "~/mixin/commonFuncs";
import Check from "~/model/Bftset/Check"
import Default from "~/model/Bftset/Default"
import Pattern from "~/model/Bftset/Pattern"
import Setp from "./Setp"
import Check from "~/model/Bftset/Check";
import Default from "~/model/Bftset/Default";
import Pattern from "~/model/Bftset/Pattern";
import Setp from "./Setp";
import Engp from "~/views/Public/Engp";
import Setpan from "~/views/Public/Setpan";
import Coninfp from "~/views/Public/Coninfp";
import Docpan from "~/views/Public/Docpan";
import Limitbody from "~/views/Public/Limitbody";
import Glepan from "~/views/Public/Glepan";
export default {
name: "Bftset",
components:{
"m-engp" : Engp,
"m-limitbody" : Limitbody,
"m-docpan" : Docpan,
"m-coninfp" : Coninfp,
"m-setp" : Setp,
"m-setpan" : Setpan,
},
provide() {
return {
root: this
}
name: "Bftset",
components: {
"m-engp": Engp,
"m-limitbody": Limitbody,
"m-docpan": Docpan,
"m-coninfp": Coninfp,
"m-setp": Setp,
"m-setpan": Setpan,
"m-glepan": Glepan,
},
provide() {
return {
root: this,
};
},
mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理
data() {
return {
tabVal: "setp",
trnName: "bftset",
model: new Bftset().data,
checkRules: Check,
defaultRules: Default,
pattern: Pattern,
rules: null,
codes: {
...CodeTable,
},
glepan:false,
};
},
methods: {
myTabClick(tab) {
this.tabClick(tab);
if (tab.name === "setpan") {
this.glepan = true;
}
/**
* do it yourself
**/
},
mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理
data(){
return {
tabVal: "setp",
trnName: "bftset",
model: new Bftset().data,
checkRules: Check,
defaultRules: Default,
pattern: Pattern,
rules: null,
codes: {
...CodeTable
},
}
},
methods:{
myTabClick(tab){
this.tabClick(tab)
/**
* do it yourself
**/
}
},
created:async function(){
console.log("进入bftset交易");
let rtnmsg = await this.init({})
if(rtnmsg.respCode == SUCCESS)
{
this.updateModel(rtnmsg.data)
if(this.isInDisplay){
this.restoreDisplay();
}
this.$refs.setp.$refs.table.$refs.table.toggleAllSelection();
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败!'});
}
},
created: async function () {
console.log("进入bftset交易");
let rtnmsg = await this.init({});
if (rtnmsg.respCode == SUCCESS) {
this.updateModel(rtnmsg.data);
if (this.isInDisplay) {
this.restoreDisplay();
}
this.$refs.setp.$refs.table.$refs.table.toggleAllSelection();
} else {
this.$notify.error({ title: "错误", message: "服务请求失败!" });
}
}
},
};
</script>
<style>
</style>
......@@ -5,14 +5,14 @@
title: 'Drawer',
grp: 'bodgrp',
rol: 'drr',
}" :disabled="true" @onSeainf="onSeainf">
}" :disabled="true" >
</c-ptap>
<c-ptap :model="model" :argadr="{
title: 'Drawee',
grp: 'bodgrp',
rol: 'dre',
}" :disabled="true" @onSeainf="onSeainf">
}" :disabled="true" >
</c-ptap>
</c-col>
<c-col :span="11" :offset="1">
......@@ -20,7 +20,7 @@
title: 'Collecting Bank',
grp: 'bodgrp',
rol: 'col',
}" :disabled="true" @onSeainf="onSeainf">
}" :disabled="true" >
</c-ptap>
</c-col>
......
......@@ -11,8 +11,6 @@
:disabledRef="true"
:disabledExtkey="true"
:disabled="true"
@onSeainf="onSeainf"
@onAplpDet="onBenpDet"
>
</c-ptap>
......@@ -26,8 +24,6 @@
:disabledRef="true"
:disabledExtkey="true"
:disabled="true"
@onSeainf="onSeainf"
@onAplpDet="onBenpDet"
>
</c-ptap>
</c-col>
......@@ -42,8 +38,6 @@
:disabledRef="true"
:disabledExtkey="true"
:disabled="true"
@onSeainf="onSeainf"
@onAplpDet="onBenpDet"
>
</c-ptap>
</c-col>
......
......@@ -5,14 +5,14 @@
title: 'Drawer',
grp: 'bodgrp',
rol: 'drr',
}" :disabledRef="false" :disabledExtkey="true" :disabled="true" @onSeainf="onSeainf" @onAplpDet="onBenpDet">
}" :disabledRef="false" :disabledExtkey="true" :disabled="true">
</c-ptap>
<c-ptap :model="model" :argadr="{
title: 'Drawee',
grp: 'bodgrp',
rol: 'dre',
}" :disabledRef="true" :disabledExtkey="true" :disabled="true" @onSeainf="onSeainf" @onAplpDet="onBenpDet">
}" :disabledRef="true" :disabledExtkey="true" :disabled="true" >
</c-ptap>
</c-col>
<c-col :span="11" :offset="1">
......@@ -20,7 +20,7 @@
title: 'Collecting Bank',
grp: 'bodgrp',
rol: 'col',
}" :disabledRef="true" :disabledExtkey="true" :disabled="true" @onSeainf="onSeainf" @onAplpDet="onBenpDet">
}" :disabledRef="true" :disabledExtkey="true" :disabled="true" >
</c-ptap>
</c-col>
......
......@@ -14,6 +14,7 @@
</c-select>
</el-form-item>
</c-col>
</c-col>
<c-col :span="24">
<el-form-item label="款项来源" prop="bopmod.acttyp">
......
......@@ -8,6 +8,7 @@
v-model="model.dedgrp.rec.isyifu"
style="width: 100%"
placeholder="请选择是否可议付"
@change="selectOrCheckboxRule('dedgrp.rec.isyifu')"
>
<el-option
v-for="item in codes.isyifu"
......@@ -60,9 +61,9 @@
-->
<c-ptapdome
:disabledBankno="model.dedgrp.rec.isyifu != 'Y'"
:disabledBankno="model.dedgrp.rec.avbwth != 'S'"
:disabledJigomc="true"
:disabledDizhii="model.dedgrp.rec.isyifu != 'Y'"
:disabledDizhii="model.dedgrp.rec.avbwth != 'S'"
:model="model"
:argadr="{
title: '议付行',
......@@ -290,9 +291,9 @@
-->
<c-ptapdome
:disabledBankno="true"
:disabledJigomc="true"
:disabledDizhii="true"
:disabledBankno="this.model.dedgrp.rec.lcrtyp == 'I'"
:disabledJigomc="this.model.dedgrp.rec.lcrtyp == 'I'"
:disabledDizhii="this.model.dedgrp.rec.lcrtyp == 'I'"
:model="model"
:argadr="{
title: '转让行',
......
......@@ -16,7 +16,7 @@
style="margin: 0 10px 0 10px; padding: 0 12px"
size="small"
type="primary"
@click=""
>
<span style="font-family: '宋体'; font-weight: bold">i</span>
</c-button>
......@@ -43,7 +43,7 @@
<c-col :span="12">
<el-form-item label="信用证金额" prop="oldlidgrp.cbs.nom1.amt">
<c-input
v-model.number="model.oldlidgrp.cbs.nom1.amt"
v-model="model.oldlidgrp.cbs.nom1.amt"
placeholder="请输入信用证金额"
disabled
></c-input>
......@@ -53,7 +53,7 @@
<c-col :span="12">
<el-form-item label="Amount Tolerance +" prop="oldlidgrp.rec.nomtop">
<c-input
v-model="model.oldlidgrp.rec.nomtop"
v-model.number="model.oldlidgrp.rec.nomtop"
placeholder="请输入Amount Tolerance - Positive"
disabled
></c-input>
......@@ -63,7 +63,7 @@
<c-col :span="12">
<el-form-item label="Amount Tolerance -" prop="oldlidgrp.rec.nomton">
<c-input
v-model="model.oldlidgrp.rec.nomton"
v-model.number="model.oldlidgrp.rec.nomton"
placeholder="请输入Amount Tolerance - Negative"
disabled
></c-input>
......@@ -83,8 +83,7 @@
<c-col :span="12">
<el-form-item label="Amended Amount" prop="trnmod.swiadd.ameamt">
<c-input v-model="model.trnmod.swiadd.ameamt" placeholder="请输入增减金额"
@keyup.enter.native="amendfunc"
<c-input v-model="model.trnmod.swiadd.ameamt" placeholder="请输入增减金额."
></c-input>
</el-form-item>
</c-col>
......@@ -107,13 +106,13 @@
</c-col>
<c-col :span="12">
<el-form-item label="New positive tolerance" prop="trnmod.swiadd.newnomtop">
<c-input v-model="model.trnmod.swiadd.newnomtop" placeholder="请输入New positive tolerance"></c-input>
<c-input v-model.number="model.trnmod.swiadd.newnomtop" placeholder="请输入New positive tolerance"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="New negative tolerance" prop="trnmod.swiadd.newnomton">
<c-input v-model="model.trnmod.swiadd.newnomton" placeholder="请输入New negative tolerance"></c-input>
<c-input v-model.number="model.trnmod.swiadd.newnomton" placeholder="请输入New negative tolerance"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
......@@ -150,7 +149,7 @@
<c-col :span="24">
<el-form-item label="Presentation Period" prop="oldlidgrp.rec.prepers18">
<c-input
v-model="model.oldlidgrp.rec.prepers18"
v-model.number="model.oldlidgrp.rec.prepers18"
placeholder="请输入Presentation Period"
disabled
></c-input>
......@@ -210,14 +209,14 @@
</c-col>
<c-col :span="12">
<el-form-item label="Amend.No" prop="trnmod.swiadd.amenbr">
<c-input v-model="model.trnmod.swiadd.amenbr" placeholder="请输入修改次数"></c-input>
<c-input v-model.number="model.trnmod.swiadd.amenbr" placeholder="请输入修改次数"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Actual Amendment No" prop="litamep.amenbr">
<c-input
v-model="model.litamep.amenbr"
v-model.number="model.litamep.amenbr"
placeholder="请输入实际修改次数"
disabled
></c-input>
......@@ -302,7 +301,7 @@
</c-col>
<c-col :span="12">
<el-form-item label="New Presentation Period" prop="trnmod.swiadd.prepers18">
<c-input v-model="model.trnmod.swiadd.prepers18" placeholder="请输入New Presentation Period"></c-input>
<c-input v-model.number="model.trnmod.swiadd.prepers18" placeholder="请输入New Presentation Period"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
......@@ -310,23 +309,19 @@
<c-input v-model="model.trnmod.swiadd.prepertxts18" maxlength="35" placeholder="请输入Presentation period text"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<c-col :span="12">
<c-checkbox
style="margin: 0px 0 10px 150px;"
v-model="model.litp.aamp.aammod.addamtflg">Add. Amount</c-checkbox>
<c-checkbox v-model="model.litp.aamp.aammod.addamtflg">Add. Amount</c-checkbox>
</c-col>
</c-col>
<c-col :span="12">
<c-col :span="24">
<el-form-item label="Currency" prop="lidgrp.cbs.max2.cur">
<c-input
<c-input
disabled
v-model="model.lidgrp.cbs.max2.cur" maxlength="3" placeholder="请输入Currency"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<c-col :span="24">
<el-form-item label="Additional Amount" prop="trnmod.swiadd.addamt">
<c-input
:disabled=" !(this.model.litp.aamp.aammod.addamtflg == 'X') "
......@@ -345,14 +340,10 @@
</el-form-item>
</c-col>
<c-col :span="12">
<c-checkbox
style="margin: 0px 0 10px 150px;"
v-model="model.trnmod.swiadd.reqcan">Cancellation Request</c-checkbox>
<c-checkbox v-model="model.trnmod.swiadd.reqcan">Cancellation Request</c-checkbox>
</c-col>
<c-col :span="12">
<c-checkbox
style="margin: 0px 0 10px 150px;"
v-model="model.litamep.cre707flg">Create Amendment Message</c-checkbox>
<c-checkbox v-model="model.litamep.cre707flg">Create Amendment Message</c-checkbox>
</c-col>
</el-col>
......@@ -374,14 +365,7 @@ export default {
}
},
methods:{...Event,
async amendfunc(){
let rtnmsg = await this.executeRule("trnmod.swiadd.ameamt")
if(rtnmsg.respCode==SUCCESS){
this.updateModel(rtnmsg.data);
}else{
this.$notify.error({title: '错误',message: '服务请求失败!'});
}
}
},
created:function(){
......
......@@ -369,7 +369,10 @@
<c-col :span="12">
<el-form-item label="role">
<c-input v-model="dialog3.rol" maxlength="3" placeholder="请输入role"></c-input>
<c-select v-model="dialog3.rol" style="width:100%" placeholder="请输入role">
<el-option v-for="item in codes.rolall" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</c-select>
</el-form-item>
</c-col>
<!-- <c-col :span="12">
......@@ -390,7 +393,7 @@
<c-col :span="12">
<el-form-item label="Disposition" prop="setgll.dsp">
<c-select v-model="dialog3.dsp" style="width:100%" placeholder="请选择Disposition">
<c-select v-model="dialog3.dsp" style="width:100%" placeholder="请选择Disposition" :code="codes.setglldsp">
</c-select>
</el-form-item>
</c-col>
......
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