Skip to content

V
vue-gjjs
Commit aa7fe58a by 闫泽浩
Options

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs… 

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs into settle-test-20230110
parents e3e61bfe d2d994bd
Showing with 172 additions and 179 deletions
src/business/letamc/model/check.js
......@@ -51,10 +51,10 @@ export default {
{max: 18,message:"整数位不能超过14位",trigger:"blur"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"ledgrp.rec.partcon":[
{type: "string", required: false, message: "必输项",trigger:"blur"},
{max: 6,message:"长度不能超过6",trigger:"blur"}
],
// "ledgrp.rec.partcon":[
// {type: "string", required: false, message: "必输项",trigger:"blur"},
// {max: 6,message:"长度不能超过6",trigger:"blur"}
// ],
"reqdat":[
{ required: false, message: "输入正确的日期"}
],
......
src/business/letamc/model/index.js
......@@ -59,9 +59,9 @@ export default class Litamc {
expdat: '',
cnfdet: '',
advdat: '',
apprultxt: '',
cnfflg: '',
branchinr: '',
apprultxt: ''
},
cbs: {
opn1: {
......@@ -70,7 +70,7 @@ export default class Litamc {
},
opn2: {
cur: '',
amt: ''
amt: '0.00'
},
max: {
cur: '',
......@@ -86,7 +86,7 @@ export default class Litamc {
},
max2: {
cur: '',
amt: ''
amt: '0.00'
}
},
preadvflg: '',
......
src/business/letamc/views/Ovwp1.vue
......@@ -112,8 +112,8 @@
</c-col>
<c-col :span="12">
<el-form-item label="" label-width="5px" prop="ledgrp.cbs.max.amt">
<c-input disabled v-model="model.ledgrp.cbs.max.amt" placeholder="请输入最大金额"
class="m-input-currency"></c-input>
<c-input-currency disabled v-model="model.ledgrp.cbs.max.amt" placeholder="请输入最大金额"
class="m-input-currency"></c-input-currency>
</el-form-item>
</c-col>
......
src/business/letame/event/buildCommons.js
......@@ -19,15 +19,47 @@ export default {
},
buildCommonData (model, trnName) {
let ptsptaList = [];
if (model.ledgrp.apl.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.ledgrp.apl));
if (model.ledgrp.a2b.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.ledgrp.a2b));
}
if (model.ledgrp.iss.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.ledgrp.iss));
if (model.ledgrp.adv.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.ledgrp.adv));
}
if (model.ledgrp.rmb.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.ledgrp.rmb));
}
if (model.ledgrp.apb.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.ledgrp.apb));
}
if (model.ledgrp.con.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.ledgrp.con));
}
if (model.ledgrp.drw.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.ledgrp.drw));
}
if (model.ledgrp.ben.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.ledgrp.ben));
}
if (model.ledgrp.iss.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.ledgrp.iss));
}
if (model.ledgrp.apl.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.ledgrp.apl));
}
if (model.ledgrp.avb.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.ledgrp.avb));
}
if (model.rmbclm.acwacw.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.rmbclm.acwacw));
}
if (model.rmbclm.rmbrmb.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.rmbclm.rmbrmb));
}
if (model.rmbclm.bebbeb.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.rmbclm.bebbeb));
}
let dataObj = {
rec: {
objtyp: 'LED',
......@@ -46,20 +78,20 @@ export default {
purpos: model.ledgrp.rec.purpos,
revflg: model.ledgrp.rec.revflg,
cnfsta: model.ledgrp.rec.cnfsta,
advRolsetflg: model.ledgrp.Adv.Rolsetflg,
advPtainr: model.ledgrp.Adv.pts.ptainr,
advAdrblk: model.ledgrp.Adv.pts.adrblk,
a2bRolsetflg: model.ledgrp.a2b.Rolsetflg,
a2bPtainr: model.ledgrp.a2b.pts.ptainr,
benRolsetflg: model.ledgrp.ben.Rolsetflg,
benPtainr: model.ledgrp.ben.pts.ptainr,
issRolsetflg: model.ledgrp.iss.Rolsetflg,
issPtainr: model.ledgrp.iss.pts.ptainr,
issAdrblk: model.ledgrp.iss.pts.adrblk,
newamt: model.letamep.Swiadd.newamt,
engamt: model.letamep.engamt,
opn1Amt: model.oldledgrp.cbs.opn1.Amt,
opn2Amt: model.oldledgrp.cbs.opn2.Amt,
// advRolsetflg: model.ledgrp.Adv.Rolsetflg,
// advPtainr: model.ledgrp.Adv.pts.ptainr,
// advAdrblk: model.ledgrp.Adv.pts.adrblk,
// a2bRolsetflg: model.ledgrp.a2b.Rolsetflg,
// a2bPtainr: model.ledgrp.a2b.pts.ptainr,
// benRolsetflg: model.ledgrp.ben.Rolsetflg,
// benPtainr: model.ledgrp.ben.pts.ptainr,
// issRolsetflg: model.ledgrp.iss.Rolsetflg,
// issPtainr: model.ledgrp.iss.pts.ptainr,
// issAdrblk: model.ledgrp.iss.pts.adrblk,
// newamt: model.letamep.Swiadd.newamt,
// engamt: model.letamep.engamt,
// opn1Amt: model.oldledgrp.cbs.opn1.Amt,
// opn2Amt: model.oldledgrp.cbs.opn2.Amt,
},
cbsMap: {
......@@ -68,6 +100,7 @@ export default {
OLDMAX: model.oldledgrp.cbs.max,
OLDMAX2: model.oldledgrp.cbs.max2,
OPN1: model.ledgrp.cbs.opn1,
OPN2: model.ledgrp.cbs.opn2,
MAC: model.ledgrp.cbs.mac,
MAC2: model.ledgrp.cbs.mac2,
OPC2: model.ledgrp.cbs.opc2,
......@@ -85,6 +118,8 @@ export default {
liaall: model.liaall,
liaccv: model.liaccv,
// doceot: model.trnmod.trndoc.doceot,
maxamt: model.letamep.maxamt,
trnmod: model.trnmod,
};
return params
},
......
src/business/letame/model/check.js
......@@ -90,16 +90,16 @@ export default {
],
'oldledgrp.rec.expdat': [
{ type: 'date', required: false, message: '输入正确的日期' }
{ required: false, message: '输入正确的日期' }
],
'oldledgrp.rec.shpdat': [
{ type: 'date', required: false, message: '输入正确的日期' }
{ required: false, message: '输入正确的日期' }
],
'trnmod.swiadd.newexpdat': [
{ type: 'date', required: false, message: '输入正确的日期' }
{ required: false, message: '输入正确的日期' }
],
'trnmod.swiadd.newshpdat': [
{ type: 'date', required: false, message: '输入正确的日期' }
{ required: false, message: '输入正确的日期' }
],
'trnmod.swiadd.shpper': [
{ type: 'string', required: true, message: '必输项' },
......@@ -226,10 +226,10 @@ export default {
{ max: 16, message: '长度不能超过16' }
],
'ledgrp.rec.opndat': [
{ type: 'date', required: false, message: '输入正确的日期' }
{ required: false, message: '输入正确的日期' }
],
'ledgrp.rec.preadvdt': [
{ type: 'date', required: false, message: '输入正确的日期' }
{ required: false, message: '输入正确的日期' }
],
'ledgrp.iss.pts.extkey': [
{ type: 'string', required: false, message: '必输项' },
......@@ -244,10 +244,10 @@ export default {
{ max: 35, message: '长度不能超过35' }
],
'ledgrp.rec.shpdat': [
{ type: 'date', required: false, message: '输入正确的日期' }
{ required: false, message: '输入正确的日期' }
],
'ledgrp.rec.advdat': [
{ type: 'date', required: false, message: '输入正确的日期' }
{ required: false, message: '输入正确的日期' }
],
'ledgrp.iss.pts.adrblk': [
{ type: 'string', required: true, message: '必输项' },
......@@ -258,7 +258,7 @@ export default {
{ max: 35, message: '长度不能超过35' }
],
'ledgrp.rec.expdat': [
{ type: 'date', required: false, message: '输入正确的日期' }
{ required: false, message: '输入正确的日期' }
],
'ledgrp.iss.adrelc': [
{ type: 'string', required: true, message: '必输项' },
......@@ -651,7 +651,7 @@ export default {
{ max: 2, message: '长度不能超过2' }
],
'ledgrp.rec.revdat': [
{ type: 'date', required: false, message: '输入正确的日期' }
{ required: false, message: '输入正确的日期' }
],
'ledgrp.blk.revcls': [
{ type: 'string', required: true, message: '必输项' },
......@@ -715,7 +715,7 @@ export default {
{ max: 60, message: '长度不能超过60' }
],
'mtabut.coninf.conexedat': [
{ type: 'date', required: false, message: '输入正确的日期' }
{ required: false, message: '输入正确的日期' }
],
'mtabut.coninf.usr.extkey': [
{ type: 'string', required: false, message: '必输项' },
......@@ -850,10 +850,10 @@ export default {
{ pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: '小数位不能超过3位' }
],
'letp.trnshpdat': [
{ type: 'date', required: false, message: '输入正确的日期' }
{ required: false, message: '输入正确的日期' }
],
'letp.trnexpdat': [
{ type: 'date', required: false, message: '输入正确的日期' }
{ required: false, message: '输入正确的日期' }
],
'letp.chkmsg': [
{ type: 'string', required: true, message: '必输项' },
......@@ -956,6 +956,6 @@ export default {
{ max: 35, message: '长度不能超过35' }
],
'rmbclm.valdat': [
{ type: 'date', required: false, message: '输入正确的日期' }
{ required: false, message: '输入正确的日期' }
],
}
\ No newline at end of file
src/business/letame/model/index.js
import Pts from '~/components/business/commonModel/Pts';
import Pub from '~/components/business/commonModel/index.js';
export default class Letame {
constructor() {
this.data = {
......@@ -14,110 +15,18 @@ export default class Letame {
prepers18: ''
},
cbs: {
opn2: {
cur: '',
amt: ''
},
max: {
cur: '',
amt: ''
},
nom1: {
cur: '',
amt: ''
},
max2: {
cur: '',
amt: ''
}
},
rol: {
pts: new Pts().data,
}
},
letp: {
swiftflg:'',
usr: {
extkey: ''
},
aamp: {
aammod: {
addamtflg: '',
addamtcov: '',
}
}
},
letamep: {
maxcur: '',
engcur: '',
amenbr: '',
cre707flg: '',
lcrdocame: {
buttxmsel: ''
},
benaccflg: '',
lcrdocamep: {
modflg: '',
modmanflg: '',
usrblk: ''
},
adlcndame: {
buttxmsel: ''
},
lcrgodamep: {
modflg: '',
modmanflg: '',
usrblk: ''
},
maxamt: '',
adlcndamep: {
modflg: '',
modmanflg: '',
usrblk: ''
},
engamt: '',
lcrgodame: {
buttxmsel: ''
},
},
rmbclm: {
acwacw: {
pts: {
ref: ''
}
},
valdat: '',
rmbrmb: {
pts: {
ref: ''
}
},
bebbeb: {
pts: {
ref: ''
}
},
rmbrol: ''
},
advdisflg: '',
ledgrp: {
adv: {
pts: new Pts().data,
},
a2b: {
pts: new Pts().data,
},
apb: {
pts: new Pts().data,
},
rmb: {
pts: {
ref: ''
}
},
con: {
pts: new Pts().data,
},
blk: {
insbnk: '',
revnotes: '',
......@@ -137,6 +46,7 @@ export default class Letame {
lcrgodame: ''
},
rec: {
inr:'',
tenmaxday: '',
nomton: '',
expplc: '',
......@@ -180,8 +90,16 @@ export default class Letame {
aplbnkdirsnd: '',
advdat: '',
porloa: '',
apprultxt: '',
inr: '',
apprultxt: ''
},
con: {
pts: new Pts().data,
},
adv: {
pts: new Pts().data,
},
apb: {
pts: new Pts().data,
},
cbs: {
opn2: {
......@@ -201,64 +119,103 @@ export default class Letame {
amt: ''
}
},
iss: {
pts: {
ref: '',
nam: ''
}
rmb: {
pts: new Pts().data,
},
drw: {
pts: {
extkey: '',
adrblk: ''
}
pts: new Pts().data,
},
ben: {
pts: new Pts().data,
},
preadvflg: '',
avb: {
pts: {
extkey: ''
}
},
prb: {
pts: new Pts().data,
},
apl:{
apl: {
pts: new Pts().data,
},
ben:{
iss: {
pts: new Pts().data,
},
oth:{
},
letp: {
usr: {
extkey: ''
},
aamp: {
aammod: {
addamtflg: ''
}
}
},
letamep: {
amenbr: '',
cre707flg: '',
lcrdocame: {
buttxmsel: ''
},
benaccflg: '',
lcrdocamep: {
modflg: '',
modmanflg: '',
usrblk: ''
},
adlcndame: {
buttxmsel: ''
},
lcrgodamep: {
modflg: '',
modmanflg: '',
usrblk: ''
},
maxamt: '',
adlcndamep: {
modflg: '',
modmanflg: '',
usrblk: ''
},
engamt: '',
lcrgodame: {
buttxmsel: ''
}
},
rmbclm: {
acwacw: {
pts: new Pts().data,
},
acb:{
valdat: '',
rmbrmb: {
pts: new Pts().data,
},
bebbeb: {
pts: new Pts().data,
},
rejpenins: '',
advrefflg: '',
swiadd: {
trnchato: '',
newnomtop: '',
purpos: '',
amedat: '',
addamtcov: '',
newnomton: '',
prepers18: '',
amenbr: '',
nartxt: '',
addamt: '',
amecur: '',
newshpdat: '',
newamt: '',
newexpdat: '',
trnfeetxt: '',
ameamt: '',
newcur: '',
prepertxts18: '',
nomspc: '',
reqcan: ''
rmbrol: ''
},
// trnmod: {
// swiadd: {
// newnomtop: '',
// shpfro: '',
// shpper: '',
// amedat: '',
// pordis: '',
// addamtcov: '',
// newnomton: '',
// amenbr: '',
// addamt: '',
// amecur: '',
// newshpdat: '',
// newamt: '',
// shpto: '',
// newexpdat: '',
// ameamt: '',
// newcur: '',
// porloa: '',
// nomspc: ''
// }
// },
setmod: new Pub().data.Setmod,
mtabut: new Pub().data.Mtabut,
trnmod: new Pub().data.Trnmod,
......
src/business/letdrw/event/buildCommons.js
......@@ -121,7 +121,7 @@ export default {
...this.buildCommonData(model, trnName),
rec: {
objtyp: 'LED',
objinr: model.ledgrp.rec.objinr,
objinr: model.ledgrp.rec.inr,
ownref: model.ledgrp.rec.ownref,
},
};
......@@ -132,7 +132,7 @@ export default {
...this.buildCommonData(model, trnName),
rec: {
objtyp: 'LED',
objinr: model.ledgrp.rec.objinr,
objinr: model.ledgrp.rec.inr,
ownref: model.ledgrp.rec.ownref,
// swiftflg: model.gitp.swiftflg,
},
......
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