Skip to content

V
vue-gjjs
Commit 3cfafa5d by liaoxing
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 eb54e413 8d2f5966
Showing with 36 additions and 111 deletions
src/business/letnot/model/index.js
......@@ -23,6 +23,7 @@ export default class Letnot {
spcrcb: ''
},
rec: {
branchinr: '',
tenmaxday: '',
nomton: '',
expplc: '',
......@@ -62,7 +63,7 @@ export default class Letnot {
advdat: '',
porloa: '',
apprultxt: '',
branchinr: '',
},
cbs: {
opn2: {
......@@ -71,7 +72,7 @@ export default class Letnot {
},
max: {
cur: '',
amt: ''
amt: '0.00'
},
nom1: {
cur: '',
......@@ -79,7 +80,7 @@ export default class Letnot {
},
max2: {
cur: '',
amt: ''
amt: '0.00'
}
},
ben: {
......
src/business/letnot/views/Ovwp1.vue
......@@ -381,7 +381,7 @@
</c-ptap>
</c-col>
<c-col :span="24">
<c-col :span="24">
<c-ptap
:model="model"
:argadr="{
......
src/business/litame/model/check.js
......@@ -3,24 +3,18 @@ export default {
{type: 'string', required: false, message: '必输项'},
{max: 16,message:'长度不能超过16'}
],
'lidgrp.rec.ownref':[
{type: 'string', required: false, message: '必输项'},
{max: 16,message:'长度不能超过16'}
],
'litamep.recget.sdamod.seainf':[
{type: 'string', required: false, message: '必输项'},
{max: 3,message:'长度不能超过3'}
],
'lidgrp.rec.nam':[
{type: 'string', required: false, message: '必输项'},
{max: 40,message:'长度不能超过40'}
],
'swiadd.amedat':[
{type: 'string', required: false, message: '输入正确的日期'}
],
'swiadd.amenbr':[
{required: true, message: '必输项'},
{type: 'string', max: 999,message:'只能输入数字,且长度不能超过3'}
// {type: 'string', max: 999,message:'只能输入数字,且长度不能超过3'}
],
'litamep.amenbr':[
{required: false, message: '必输项'},
......@@ -52,19 +46,6 @@ export default {
{max: 18,message:'整数位不能超过15位'},
{pattern: /(^\d+$)|(^\.\d{1,2}$)|(^\d+\.\d{1,2}$)/, message: '小数位不能超过2位' }
],
'swiadd.ameamt':[
{required: false, message: '必输项'},
{type: 'string', max: 18,message:'整数位不能超过15位'},
{pattern: /(^(\+|\-)|\d+$)|(^(\+|\-)|\.\d{1,2}$)|(^(\+|\-)|\d+\.\d{1,2}$)/, message: '小数位不能超过2位' }
],
'litamep.engamt':[
{type: 'string', required: false, message: '必输项'},
{max: 18,message:'整数位不能超过15位'},
],
'swiadd.newamt':[
{type: 'string', required: false, message: '必输项'},
{max: 18,message:'整数位不能超过15位'},
],
'swiadd.newnomtop':[
{required: false, message: '必输项'},
{type: 'number', max: 99,message:'只能输入数字,长度不能超过2'}
......@@ -815,94 +796,15 @@ export default {
/**
* Litame Check规则
*/
'liaall.misamt': null,
'lidgrp.apl.namelc': null,
'lidgrp.rec.prepers18': null,
'lidgrp.rec.lcrtyp': null,
'ameadvrmk': null,
'lidgrp.rec.apprul': null,
'lidgrp.blk.lcrgod': null,
'bcbtyp7': null,
'lidgrp.rec.stacty': null,
'lidgrp.blk.lcrdoc': null,
'litamep.lcrgodamep.usrblk': null,
'liaall.limmod.limpts.oth.pts.nam': null,
'setmod.dspflg': null,
'lidgrp.a2b.namelc': null,
'litamep.adlcndamep.usrblk': null,
'swiadd.amenbr': null,
'lidgrp.avb.pts.adrblk': null,
'liaall.liaccv.totcovamt': null,
'liaall.limmod.limpts.wrk.pts.nam': null,
'lidgrp.blk.preper': null,
'oldlidgrp.rec.expdat': null,
'swiadd.insbnk': null,
'lidgrp.rec.shptrss18': null,
'lidgrp.rec.cnfdet': null,
'lidgrp.avb.adrelc': null,
'lidgrp.ini.pts.extkey': null,
'swiadd.newshpdat': null,
'lidgrp.rmb.pts.extkey': null,
'swiadd.newexpdat': null,
'lidgrp.adv.pts.extkey': null,
'lidgrp.adv.adrelc': null,
'lidgrp.ben.pts.extkey': null,
'lidgrp.a2b.pts.extkey': null,
'lidgrp.blk.defdet': null,
'lidgrp.apl.pts.adrblk': null,
'lidgrp.rmb.pts.nam': null,
'lidgrp.con.adrelc': null,
'lidgrp.con.pts.adrblk': null,
'lidgrp.blk.dftat': null,
'lidgrp.rec.tenmaxday': null,
'lidgrp.ben.namelc': null,
'lidgrp.drw.pts.adrblk': null,
'lidgrp.drw.namelc': null,
'litameadv': null,
'liaall.limmod.limpts.oth.pts.extkey': null,
'liaall.limmod.ownref': null,
'swiadd.newamt': null,
'liaall.limmod.ecifno': null,
'lidgrp.rec.apprultxt': null,
'lidgrp.adv.pts.adrblk': null,
'lidgrp.blk.adlcnd': null,
'lidgrp.ini.namelc': null,
'lidgrp.rec.shppars18': null,
'lidgrp.ini.pts.adrblk': null,
'litamep.lcrdocamep.usrblk': null,
'swiadd.trnfeetxt': null,
'lidgrp.apl.adrelc': null,
'litp.usr.extkey': null,
'lidgrp.rec.avbwth': null,
'swiadd.addamt': null,
'lidgrp.rec.opndat': null,
'lidgrp.a2b.adrelc': null,
'lidgrp.avb.namelc': null,
'lidgrp.blk.feetxt': null,
'swiadd.newnomtop': null,
'swiadd.newnomton': null,
'lidgrp.ben.adrelc': null,
'lidgrp.a2b.pts.adrblk': null,
'lidgrp.adv.namelc': null,
'liaall.limmod.limpts.wrk.pts.extkey': null,
'lidgrp.blk.mixdet': null,
'lidgrp.drw.adrelc': null,
'lidgrp.rec.expplc': null,
'swiadd.ameamt': null,
'mtabut.coninf.conexedat': null,
'swiadd.nartxt': null,
'lidgrp.avb.pts.extkey': null,
'liaall.limmod.limpts.nonrevflg1': null,
'lidgrp.blk.insbnk': null,
'lidgrp.con.pts.extkey': null,
'setmod.docamt': null,
'swiadd.prepers18': null,
'lidgrp.ini.adrelc': null,
'lidgrp.ben.pts.adrblk': null,
'liaall.liaccv.cshpct': null,
'lidgrp.drw.pts.extkey': null,
'lidgrp.apl.pts.extkey': null,
'swiadd.purpos': null,
'lidgrp.con.namelc': null,
'liaall.liaccv.relcshpct': null,
}
src/business/litame/views/Amep.vue
......@@ -112,7 +112,7 @@
<c-col :span="12">
<el-form-item label="" prop="swiadd.newamt">
<c-input-currency-min
v-model="model.swiadd.newamt"
v-model="swiaddnewamt"
placeholder="请输入修改后金额"
></c-input-currency-min>
</el-form-item>
......@@ -296,7 +296,7 @@
<c-col :span="12">
<el-form-item label="" prop="litamep.engamt">
<c-input-currency-min
v-model="model.litamep.engamt"
v-model="litamepengamt"
placeholder="请输入修改总金额"
class="m-input-currency"
disabled
......@@ -444,6 +444,16 @@ export default {
// });
// },
},
computed:{
swiaddnewamt(){
this.model.swiadd.newamt = new Number( parseFloat(new Number(this.model.swiadd.ameamt) + new Number(this.model.oldlidgrp.cbs.nom1.amt)).toFixed(2) );
return this.model.swiadd.newamt
},
litamepengamt(){
this.model.litamep.engamt = new Number( parseFloat(new Number(this.model.swiadd.ameamt) + new Number(this.model.swiadd.newamt) * new Number(this.model.swiadd.newnomtop)/100).toFixed(2) );
return this.model.litamep.engamt
}
},
created: function () {},
};
</script>
......
src/business/litdav/views/Mt750p.vue
......@@ -5,7 +5,7 @@
<el-form-item label="单据金额" prop="brdgrp.cbs.max.cur">
<c-input
disabled
v-model="model.brdgrp.cbs.max.cur" maxlength="3" placeholder="请输入单据金额"></c-input>
v-model="maxcur" maxlength="3" placeholder="请输入单据金额"></c-input>
</el-form-item>
</c-col>
......@@ -21,7 +21,7 @@
<el-form-item label="提取附加金额" prop="brdgrp.cbs.opn2.cur">
<c-select
disabled
v-model="model.brdgrp.cbs.opn2.cur" style="width:100%" placeholder="请选择附加金额">
v-model="opn2cur" style="width:100%" placeholder="请选择附加金额">
</c-select>
</el-form-item>
</c-col>
......@@ -54,7 +54,7 @@
<el-form-item label="索赔总额" prop="brdgrp.rec.totcur">
<c-input
disabled
v-model="model.brdgrp.rec.totcur" maxlength="3" placeholder="请输入索赔总额"></c-input>
v-model="rectotcur" maxlength="3" placeholder="请输入索赔总额"></c-input>
</el-form-item>
</c-col>
......@@ -142,7 +142,19 @@ export default {
parseFloat(isNaN(maxAmt) || !maxAmt ? 0 : maxAmt) +
parseFloat(isNaN(max2Amt) || !max2Amt ? 0 : max2Amt)
return this.model.brdgrp.rec.totamt
}
} ,
maxcur(){
this.model.brdgrp.cbs.max.cur = this.model.lidgrp.cbs.nom1.cur
return this.model.brdgrp.cbs.max.cur
},
opn2cur(){
this.model.brdgrp.cbs.opn2.cur = this.model.lidgrp.cbs.nom1.cur
return this.model.brdgrp.cbs.opn2.cur
},
rectotcur(){
this.model.brdgrp.rec.totcur = this.model.lidgrp.cbs.nom1.cur
return this.model.brdgrp.rec.totcur
}
// totamt(){
// this.model.brdgrp.rec.totamt = 0
// if(!isNaN(this.model.brdgrp.cbs.max.amt)){
......
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