diff --git a/src/model/Litame/Default.js b/src/model/Litame/Default.js
index e756d41..7583ec8 100644
--- a/src/model/Litame/Default.js
+++ b/src/model/Litame/Default.js
@@ -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,
diff --git a/src/model/Litame/Pattern.js b/src/model/Litame/Pattern.js
index aa72f1b..ede946a 100644
--- a/src/model/Litame/Pattern.js
+++ b/src/model/Litame/Pattern.js
@@ -16,98 +16,98 @@ export default {
{max: 40,message:"长度不能超过40"}
],
"trnmod.swiadd.amedat":[
- {type: "string", required: false, message: "输入正确的日期"}
+ {type: "date", required: false, message: "输入正确的日期"}
],
"trnmod.swiadd.amenbr":[
- {type: "string", required: false, message: "必输项"},
- {max: 3,message:"长度不能超过3"}
+ {required: true, message: "必输项"},
+ {type: "number", max: 999,message:"长度不能超过3"}
],
"litamep.amenbr":[
- {type: "string", required: false, message: "必输项"},
- {max: 3,message:"长度不能超过3"}
+ {required: false, message: "必输项"},
+ {type: "number", max: 999,message:"长度不能超过3"}
],
"lidgrp.cbs.nom1.cur":[
{type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"}
],
"oldlidgrp.cbs.nom1.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位" }
],
"oldlidgrp.rec.nomtop":[
- {type: "string", required: false, message: "必输项"},
- {max: 2,message:"长度不能超过2"}
+ {required: false, message: "必输项"},
+ {type: "number",max: 99,message:"长度不能超过2"}
],
"oldlidgrp.rec.nomton":[
- {type: "string", required: false, message: "必输项"},
- {max: 2,message:"长度不能超过2"}
+ {required: false, message: "必输项"},
+ {type: "number", max: 99,message:"长度不能超过2"}
],
"oldlidgrp.cbs.max.cur":[
{type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"}
],
"oldlidgrp.cbs.max.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位" }
],
"trnmod.swiadd.ameamt":[
- {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位" }
],
"litamep.engamt":[
- {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位" }
],
"trnmod.swiadd.newamt":[
- {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位" }
],
"trnmod.swiadd.newnomtop":[
- {type: "string", required: false, message: "必输项"},
- {max: 2,message:"长度不能超过2"}
+ {required: false, message: "必输项"},
+ {type: "number", max: 99,message:"长度不能超过2"}
],
"trnmod.swiadd.newnomton":[
- {type: "string", required: false, message: "必输项"},
- {max: 2,message:"长度不能超过2"}
+ { required: false, message: "必输项"},
+ {type: "number", max: 99,message:"长度不能超过2"}
],
"litamep.maxcur":[
{type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"}
],
"litamep.maxamt":[
- {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位" }
],
"oldlidgrp.rec.expdat":[
- {type: "string", required: false, message: "输入正确的日期"}
+ {type: "date", required: false, message: "输入正确的日期"}
],
"oldlidgrp.rec.shpdat":[
- {type: "string", required: false, message: "输入正确的日期"}
+ {type: "date", required: false, message: "输入正确的日期"}
],
"trnmod.swiadd.newexpdat":[
- {type: "string", required: false, message: "输入正确的日期"}
+ {type: "date", required: false, message: "输入正确的日期"}
],
"trnmod.swiadd.newshpdat":[
- {type: "string", required: false, message: "输入正确的日期"}
+ {type: "date", required: false, message: "输入正确的日期"}
],
"oldlidgrp.rec.prepers18":[
- {type: "string", required: false, message: "必输项"},
- {max: 3,message:"长度不能超过3"}
+ { required: false, message: "必输项"},
+ {type: "number",max: 999,message:"长度不能超过3"}
],
"trnmod.swiadd.prepers18":[
- {type: "string", required: false, message: "必输项"},
- {max: 3,message:"长度不能超过3"}
+ {required: false, message: "必输项"},
+ {type: "number", max: 999,message:"长度不能超过3"}
],
"oldlidgrp.blk.preper":[
{type: "string", required: true, message: "必输项"},
@@ -128,13 +128,13 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"trnmod.swiadd.addamt":[
- {required: false, message: "必输项"},
+ {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"trnmod.swiadd.trnfeetxt":[
{type: "string", required: true, message: "必输项"},
- {max: 35,message:"长度不能超过35"}
+ {max: 35*6,message:"长度不能超过35"}
],
"trnmod.swiadd.addamtcov":[
{type: "string", required: true, message: "必输项"},
@@ -194,26 +194,26 @@ export default {
],
"lidgrp.cbs.nom1.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位" }
],
"lidgrp.apl.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
- {max: 35,message:"长度不能超过35"}
+ {max: 35*4,message:"长度不能超过35"}
],
"lidgrp.apl.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"lidgrp.rec.nomtop":[
- {type: "string", required: false, message: "必输项"},
- {max: 2,message:"长度不能超过2"}
+ {required: false, message: "必输项"},
+ {type: "number", max: 99,message:"长度不能超过2"}
],
"lidgrp.rec.nomton":[
- {type: "string", required: false, message: "必输项"},
- {max: 2,message:"长度不能超过2"}
+ { required: false, message: "必输项"},
+ {type: "number", max: 99,message:"长度不能超过2"}
],
"lidgrp.apl.adrelc":[
{type: "string", required: true, message: "必输项"},
@@ -226,7 +226,7 @@ export default {
],
"lidgrp.cbs.max.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位" }
],
@@ -244,10 +244,10 @@ export default {
],
"lidgrp.rec.opndat":[
- {type: "string", required: false, message: "输入正确的日期"}
+ {type: "date", required: false, message: "输入正确的日期"}
],
"lidgrp.rec.preadvdt":[
- {type: "string", required: false, message: "输入正确的日期"}
+ {type: "date", required: false, message: "输入正确的日期"}
],
"lidgrp.adv.namelc":[
{type: "string", required: true, message: "必输项"},
@@ -255,14 +255,14 @@ export default {
],
"lidgrp.adv.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
- {max: 35,message:"长度不能超过35"}
+ {max: 35*4,message:"长度不能超过35"}
],
"lidgrp.adv.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"lidgrp.rec.shpdat":[
- {type: "string", required: false, message: "输入正确的日期"}
+ {type: "date", required: false, message: "输入正确的日期"}
],
"lidgrp.adv.adrelc":[
@@ -270,7 +270,7 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"lidgrp.rec.expdat":[
- {type: "string", required: false, message: "输入正确的日期"}
+ {type: "date", required: false, message: "输入正确的日期"}
],
"lidgrp.rec.expplc":[
{type: "string", required: false, message: "必输项"},
@@ -303,7 +303,7 @@ export default {
],
"lidgrp.ben.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
- {max: 35,message:"长度不能超过35"}
+ {max: 35*4,message:"长度不能超过35"}
],
"lidgrp.ben.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
@@ -357,8 +357,8 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"lidgrp.rec.prepers18":[
- {type: "string", required: false, message: "必输项"},
- {max: 3,message:"长度不能超过3"}
+ { required: false, message: "必输项"},
+ {type: "number",max: 999,message:"长度不能超过3"}
],
"litp.avbp.ptsget.sdamod.dadsnd":[
@@ -383,8 +383,8 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"lidgrp.avb.pts.adrblk":[
- {type: "string", required: true},
-
+ {type: "string", required: true, message: "必输项"},
+ {max: 35*4,message:"长度不能超过35"}
],
"lidgrp.avb.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
@@ -400,8 +400,8 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"lidgrp.blk.feetxt":[
- {type: "string", required: true, message: "必输项"},
- {max: 35,message:"长度不能超过35"}
+ { required: true, message: "必输项"},
+ {type: "string",max: 35*6,message:"长度不能超过35"}
],
@@ -435,7 +435,7 @@ export default {
],
"lidgrp.drw.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
- {max: 35,message:"长度不能超过35"}
+ {max: 35*4,message:"长度不能超过35"}
],
"lidgrp.drw.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
@@ -454,8 +454,8 @@ export default {
{max: 65,message:"长度不能超过65"}
],
"lidgrp.rec.tenmaxday":[
- {type: "string", required: false, message: "必输项"},
- {max: 3,message:"长度不能超过3"}
+ { required: false, message: "必输项"},
+ {type: "number", max: 999,message:"长度不能超过3"}
],
"lidgrp.rec.porloa":[
{type: "string", required: false, message: "必输项"},
@@ -517,7 +517,7 @@ export default {
],
"lidgrp.ini.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
- {max: 35,message:"长度不能超过35"}
+ {max: 35*4,message:"长度不能超过35"}
],
"lidgrp.ini.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
@@ -525,7 +525,7 @@ export default {
],
"lidgrp.a2b.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
- {max: 35,message:"长度不能超过35"}
+ {max: 35*4,message:"长度不能超过35"}
],
"lidgrp.a2b.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
@@ -588,7 +588,7 @@ export default {
],
"lidgrp.con.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
- {max: 35,message:"长度不能超过35"}
+ {max: 35*4,message:"长度不能超过35"}
],
"lidgrp.con.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
@@ -601,7 +601,7 @@ export default {
"lidgrp.blk.insbnk":[
{type: "string", required: true, message: "必输项"},
- {max: 1000,message:"长度不能超过1000"}
+ {max: 65*12,message:"长度不能超过65"}
],
"lidgrp.blk.insbnkame":[
{type: "string", required: true, message: "必输项"},
@@ -612,7 +612,7 @@ export default {
{max: 50,message:"长度不能超过50"}
],
"liaall.outamt":[
- {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位" }
],
@@ -625,19 +625,19 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"liaall.misamt":[
- {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位" }
],
"liaall.exttotoldamt":[
- {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位" }
],
"liaall.exttotamt":[
- {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位" }
],
@@ -646,7 +646,7 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"liaall.liaccv.newamt":[
- {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位" }
],
@@ -655,7 +655,7 @@ export default {
{max: 5,message:"长度不能超过5"}
],
"liaall.liaccv.newresamt":[
- {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位" }
],
@@ -665,7 +665,7 @@ export default {
],
"liaall.liaccv.pctresamt":[
- {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位" }
],
@@ -673,7 +673,7 @@ export default {
"liaall.liaccv.totcovamt":[
- {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位" }
],
@@ -688,7 +688,7 @@ export default {
"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位" }
],
@@ -717,7 +717,7 @@ export default {
{max: 30,message:"长度不能超过30"}
],
"bcbdat":[
- {type: "string", required: false, message: "输入正确的日期"}
+ {type: "date", required: false, message: "输入正确的日期"}
],
@@ -739,7 +739,7 @@ export default {
],
"mtabut.coninf.conexedat":[
- {type: "string", required: false, message: "输入正确的日期"}
+ {type: "date", required: false, message: "输入正确的日期"}
],
"mtabut.coninf.usr.extkey":[
{type: "string", required: false, message: "必输项"},
@@ -794,7 +794,7 @@ export default {
],
"litamep.lcrdocamep.usrblk":[
{type: "string", required: true, message: "必输项"},
- {max: 1650,message:"长度不能超过1650"}
+ {max: 65*10,message:"长度不能超过65*10"}
],
@@ -811,7 +811,7 @@ export default {
],
"litamep.lcrgodamep.usrblk":[
{type: "string", required: true, message: "必输项"},
- {max: 1650,message:"长度不能超过1650"}
+ {max: 65*10,message:"长度不能超过65*10"}
],
@@ -846,7 +846,7 @@ export default {
"litamep.adlcndamep.usrblk":[
{type: "string", required: true, message: "必输项"},
- {max: 1650,message:"长度不能超过1650"}
+ {max: 65*10,message:"长度不能超过65*10"}
],
"litamep.spcbenamep.usrblk":[
{type: "string", required: true, message: "必输项"},
@@ -900,7 +900,7 @@ export default {
],
"liaall.limmod.comamt":[
- {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位" }
],
@@ -913,7 +913,7 @@ export default {
{max: 40,message:"长度不能超过40"}
],
"liaall.limmod.ccvamt":[
- {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位" }
],
diff --git a/src/model/Litame/index.js b/src/model/Litame/index.js
index 55b9a10..f71643b 100644
--- a/src/model/Litame/index.js
+++ b/src/model/Litame/index.js
@@ -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
diff --git a/src/views/Business/Litame/Amep.vue b/src/views/Business/Litame/Amep.vue
index b748a43..17b899b 100644
--- a/src/views/Business/Litame/Amep.vue
+++ b/src/views/Business/Litame/Amep.vue
@@ -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(){
diff --git a/src/views/Business/Litame/index.vue b/src/views/Business/Litame/index.vue
index 44895f7..6920193 100644
--- a/src/views/Business/Litame/index.vue
+++ b/src/views/Business/Litame/index.vue
@@ -1,98 +1,108 @@
<template>
<div class="eContainer">
- <c-function-btn
- :handleSubmit="handleSubmit"
- :handleCheck="handleCheck"
+ <c-function-btn
+ :handleSubmit="handleSubmit"
+ :handleCheck="handleCheck"
:handleStash="handleStash"
- >
-
- </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">
-
- <!--PD000015 -->
- <el-tab-pane label="Amendment" name="amep">
- <c-content>
- <m-amep :model="model" :codes="codes"/>
- </c-content>
- </el-tab-pane>
-
- <!--PD000001 -->
- <el-tab-pane label="Overview" name="ovwp">
- <c-content>
- <m-ovwp :model="model" :codes="codes"/>
- </c-content>
- </el-tab-pane>
+ >
+ </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">
+ <!--PD000015 -->
+ <el-tab-pane label="Amendment" name="amep">
+ <c-content>
+ <m-amep :model="model" :codes="codes" />
+ </c-content>
+ </el-tab-pane>
- <el-tab-pane v-if="this.model.litp.aamp.aammod.addamtflg" label="Additional Amount" name="aamp">
- <m-aamp :model="model" :code="codes"/>
- </el-tab-pane>
-
- <!--PD000021 -->
- <el-tab-pane label="Narrative" name="narp">
- <m-narp :model="model" :codes="codes"/>
- </el-tab-pane>
-
- <!--PD000077 -->
- <el-tab-pane label="Details" name="detp">
- <c-content>
- <m-detp :model="model" :codes="codes"/>
- </c-content>
- </el-tab-pane>
-
- <!--PD000042 -->
- <el-tab-pane label="Parties" name="ptyp">
- <c-content>
- <m-ptyp :model="model" :codes="codes"/>
- </c-content>
- </el-tab-pane>
-
- <!--PD000306 -->
- <el-tab-pane label="Instr.to P,A,N.Bank (Amend)" name="inspame">
- <m-inspame :model="model" :codes="codes"/>
- </el-tab-pane>
-
- <!--PD000027 -->
- <el-tab-pane label="Liability" name="engp">
- <m-engp :model="model" :codes="codes"/>
- </el-tab-pane>
-
- <!--PD000001 -->
- <el-tab-pane label="Cash Cover" name="ccvpan">
- <m-ccvpan :model="model" :codes="codes"/>
- </el-tab-pane>
-
- <!--PD000000 -->
- <el-tab-pane label="Settlement" name="setpan">
- <m-setpan :model="model" :codes="codes"/>
- </el-tab-pane>
-
- <!--PD000001 -->
- <el-tab-pane label="Booking" name="glepan">
- <m-glepan :model="model" :codes="codes"/>
- </el-tab-pane>
-
- <!--PD000328 -->
- <el-tab-pane label="备查表" name="addbcb">
- <m-addbcb :model="model" :codes="codes"/>
- </el-tab-pane>
-
- <!--PD000000 -->
- <el-tab-pane label="Completion" name="coninfp">
- <m-coninfp :model="model" :codes="codes"/>
- </el-tab-pane>
-
- <!--PD000529 -->
- <el-tab-pane label="message" name="docpan">
- <m-docpan :model="model" :codes="codes"/>
- </el-tab-pane>
-
- <!--PD000546 -->
- <el-tab-pane label="Attachments" name="doctre">
- <m-doctre :model="model" :codes="codes"/>
- </el-tab-pane>
+ <!--PD000001 -->
+ <el-tab-pane label="Overview" name="ovwp">
+ <c-content>
+ <m-ovwp :model="model" :codes="codes" />
+ </c-content>
+ </el-tab-pane>
- <el-tab-pane
+ <el-tab-pane
+ v-if="this.model.litp.aamp.aammod.addamtflg"
+ label="Additional Amount"
+ name="aamp"
+ >
+ <m-aamp :model="model" :code="codes" />
+ </el-tab-pane>
+
+ <!--PD000021 -->
+ <el-tab-pane label="Narrative" name="narp">
+ <m-narp :model="model" :codes="codes" />
+ </el-tab-pane>
+
+ <!--PD000077 -->
+ <el-tab-pane label="Details" name="detp">
+ <c-content>
+ <m-detp :model="model" :codes="codes" />
+ </c-content>
+ </el-tab-pane>
+
+ <!--PD000042 -->
+ <el-tab-pane label="Parties" name="ptyp">
+ <c-content>
+ <m-ptyp :model="model" :codes="codes" />
+ </c-content>
+ </el-tab-pane>
+
+ <!--PD000306 -->
+ <el-tab-pane label="Instr.to P,A,N.Bank (Amend)" name="inspame">
+ <m-inspame :model="model" :codes="codes" />
+ </el-tab-pane>
+
+ <!--PD000027 -->
+ <el-tab-pane label="Liability" name="engp">
+ <m-engp :model="model" :codes="codes" />
+ </el-tab-pane>
+
+ <!--PD000001 -->
+ <el-tab-pane label="Cash Cover" name="ccvpan">
+ <m-ccvpan :model="model" :codes="codes" />
+ </el-tab-pane>
+
+ <!--PD000000 -->
+ <el-tab-pane label="Settlement" name="setpan">
+ <m-setpan :model="model" :codes="codes" />
+ </el-tab-pane>
+
+ <!--PD000001 -->
+ <el-tab-pane label="Booking" name="glepan">
+ <m-glepan :model="model" :codes="codes" />
+ </el-tab-pane>
+
+ <!--PD000328 -->
+ <el-tab-pane label="备查表" name="addbcb">
+ <m-addbcb :model="model" :codes="codes" />
+ </el-tab-pane>
+
+ <!--PD000000 -->
+ <el-tab-pane label="Completion" name="coninfp">
+ <m-coninfp :model="model" :codes="codes" />
+ </el-tab-pane>
+
+ <!--PD000529 -->
+ <el-tab-pane label="message" name="docpan">
+ <m-docpan :model="model" :codes="codes" />
+ </el-tab-pane>
+
+ <!--PD000546 -->
+ <el-tab-pane label="Attachments" name="doctre">
+ <m-doctre :model="model" :codes="codes" />
+ </el-tab-pane>
+
+ <el-tab-pane
v-if="this.model.lidgrp.rec.spcbenflg"
label="Spe.pay conditions Ben [Amend.]" name="spbpame">
<m-spbpame :model="model" :codes="codes" />
@@ -103,27 +113,27 @@
label="Spe.pay.cond.bank only [Amend]" name="sprpame">
<m-sprpame :model="model" :codes="codes" />
</el-tab-pane>
-
- <!--PD000352 -->
- <el-tab-pane label="Doc's(Amend)" name="dorpame">
- <m-dorpame :model="model" :codes="codes"/>
- </el-tab-pane>
-
- <!--PD000355 -->
- <el-tab-pane label="Goods(Amend)" name="dogpame">
- <m-dogpame :model="model" :codes="codes"/>
- </el-tab-pane>
-
- <!--PD000359 -->
- <el-tab-pane label="Add.Con.(Amend)" name="adcpame">
- <m-adcpame :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>
+
+ <!--PD000352 -->
+ <el-tab-pane label="Doc's(Amend)" name="dorpame">
+ <m-dorpame :model="model" :codes="codes" />
+ </el-tab-pane>
+
+ <!--PD000355 -->
+ <el-tab-pane label="Goods(Amend)" name="dogpame">
+ <m-dogpame :model="model" :codes="codes" />
+ </el-tab-pane>
+
+ <!--PD000359 -->
+ <el-tab-pane label="Add.Con.(Amend)" name="adcpame">
+ <m-adcpame :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>
</el-form>
<c-grid-ety-prompt-dialog
ref="etyDialog"
@@ -141,33 +151,34 @@
</div>
</template>
<script>
-import Api from "~/service/Api"
-import CodeTable from "~/config/CodeTable"
-import Litame from "~/model/Litame"
-import commonProcess from "~/mixin/commonProcess"
+import Api from "~/service/Api";
+import Utils from "~/utils/index";
+import CodeTable from "~/config/CodeTable";
+import Litame from "~/model/Litame";
+import commonProcess from "~/mixin/commonProcess";
import commonFuncs from "~/mixin/commonFuncs";
-import Check from "~/model/Litame/Check"
-import Default from "~/model/Litame/Default"
-import Pattern from "~/model/Litame/Pattern"
-import Amep from "./Amep"
-import Ovwp from "./Ovwp"
-import Aamp from "./Aamp"
-import Narp from "./Narp"
-import Detp from "./Detp"
-import Ptyp from "./Ptyp"
-import Inspame from "./Inspame"
+import Check from "~/model/Litame/Check";
+import Default from "~/model/Litame/Default";
+import Pattern from "~/model/Litame/Pattern";
+import Amep from "./Amep";
+import Ovwp from "./Ovwp";
+import Aamp from "./Aamp";
+import Narp from "./Narp";
+import Detp from "./Detp";
+import Ptyp from "./Ptyp";
+import Inspame from "./Inspame";
// import Engp from "./Engp"
// import Ccvpan from "./Ccvpan"
// import Setpan from "./Setpan"
// import Glepan from "./Glepan"
-import Addbcb from "./Addbcb"
+import Addbcb from "./Addbcb";
// import Coninfp from "./Coninfp"
// import Docpan from "./Docpan"
// import Doctre from "./Doctre"
-import Dorpame from "./Dorpame"
-import Dogpame from "./Dogpame"
-import Adcpame from "./Adcpame"
+import Dorpame from "./Dorpame";
+import Dogpame from "./Dogpame";
+import Adcpame from "./Adcpame";
// import Limitbody from "./Limitbody"
import Engp from "~/views/Public/Engp";
@@ -178,77 +189,75 @@ import Docpan from "~/views/Public/Docpan";
import Doctre from "~/views/Public/Doctre";
import Glepan from "~/views/Public/Glepan";
import Limitbody from "~/views/Public/Limitbody";
-import AampVue from '../Detame/Aamp.vue'
+import AampVue from "../Detame/Aamp.vue";
import Spbpame from "./Spbpame.vue"
import Sprpame from "./Sprpame.vue"
+
export default {
- name:"Litame",
- components:{
- "m-amep" : Amep,
- "m-ovwp" : Ovwp,
- "m-aamp" : Aamp,
- "m-narp" : Narp,
- "m-detp" : Detp,
- "m-ptyp" : Ptyp,
- "m-inspame" : Inspame,
- "m-engp" : Engp,
- "m-ccvpan" : Ccvpan,
- "m-setpan" : Setpan,
- "m-glepan" : Glepan,
- "m-addbcb" : Addbcb,
- "m-coninfp" : Coninfp,
- "m-spbpame" : Spbpame,
- "m-sprpame" : Sprpame,
- "m-docpan" : Docpan,
- "m-doctre" : Doctre,
- "m-dorpame" : Dorpame,
- "m-dogpame" : Dogpame,
- "m-adcpame" : Adcpame,
- "m-limitbody" : Limitbody,
- },
- provide() {
- return {
- root: this
- }
- },
- mixins: [commonProcess,commonFuncs], // 里面包含了Default、Check等的公共处理
- data(){
- return {
- tabVal: "amep",
- trnName: "litame",
- model: new Litame().data,
- checkRules: Check,
- defaultRules: Default,
- pattern: Pattern,
- rules: null,
- codes: {...CodeTable
- },
- }
+ name:"Litame",
+ components: {
+ "m-amep": Amep,
+ "m-ovwp": Ovwp,
+ "m-aamp": Aamp,
+ "m-narp": Narp,
+ "m-detp": Detp,
+ "m-ptyp": Ptyp,
+ "m-inspame": Inspame,
+ "m-engp": Engp,
+ "m-ccvpan": Ccvpan,
+ "m-setpan": Setpan,
+ "m-glepan": Glepan,
+ "m-addbcb": Addbcb,
+ "m-coninfp": Coninfp,
+ "m-spbpame" : Spbpame,
+ "m-sprpame" : Sprpame,
+ "m-docpan": Docpan,
+ "m-doctre": Doctre,
+ "m-dorpame": Dorpame,
+ "m-dogpame": Dogpame,
+ "m-adcpame": Adcpame,
+ "m-limitbody": Limitbody,
+ },
+ provide() {
+ return {
+ root: this,
+ };
+ },
+ mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理
+ computed: {},
+ data() {
+ return {
+ tabVal: "amep",
+ trnName: "litame",
+ model: new Litame().data,
+ checkRules: Check,
+ defaultRules: Default,
+ pattern: Pattern,
+ rules: null,
+ codes: { ...CodeTable },
+ };
+ },
+ methods: {
+ myTabClick(tab) {
+ this.tabClick(tab);
+ /**
+ * do it yourself
+ **/
},
- methods:{
- myTabClick(tab){
- this.tabClick(tab)
- /**
- * do it yourself
- **/
- }
- },
- created:async function(){
- console.log("进入litame交易");
- let rtnmsg = await this.init({})
- if(rtnmsg.respCode == SUCCESS)
- {
- this.updateModel(rtnmsg.data)
- //TODO 处理数据逻辑
-
- }
- else
- {
- this.$notify.error({title: '错误',message: '服务请求失败！'});
- }
+ },
+ created: async function () {
+ console.log("进入litame交易");
+ let rtnmsg = await this.init({});
+ if (rtnmsg.respCode == SUCCESS) {
+ Utils.copyValueFromVO(this.model, rtnmsg.data);
+ if (this.isInDisplay) {
+ this.restoreDisplay();
+ }
+ } else {
+ this.$notify.error({ title: "错误", message: "服务请求失败！" });
}
-}
+ },
+};
</script>
<style>
-
</style>