Skip to content

V
vue-gjjs
Commit cb470a5d by lixinyi
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 6c47583d 0674bcbc
Showing with 71 additions and 22 deletions
src/business/litame/model/index.js
...@@ -82,6 +82,10 @@ export default class Litame { ...@@ -82,6 +82,10 @@ export default class Litame {
max2: { max2: {
cur: '', cur: '',
amt: '0.00', amt: '0.00',
},
opn2: {
cur: '',
amt: '0',
} }
} }
}, },
...@@ -162,6 +166,9 @@ export default class Litame { ...@@ -162,6 +166,9 @@ export default class Litame {
ini: { ini: {
pts: new Pts().data, pts: new Pts().data,
}, },
cmb: {
pts: new Pts().data,
},
cbs: { cbs: {
opn2: { opn2: {
cur: '', cur: '',
...@@ -206,7 +213,7 @@ export default class Litame { ...@@ -206,7 +213,7 @@ export default class Litame {
prepers18: '', prepers18: '',
amenbr: '', amenbr: '',
nartxt: '', nartxt: '',
addamt: '', addamt: '0',
amecur: '', amecur: '',
newshpdat: '', newshpdat: '',
newamt: '', newamt: '',
......
src/business/litame/views/Aamp.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
prop="lidgrp.cbs.max2.amt" prop="lidgrp.cbs.max2.amt"
> >
<c-input <c-input
v-model="model.lidgrp.cbs.max2.amt" v-model="max2amt"
style="text-align: left; width: 100%" style="text-align: left; width: 100%"
placeholder="请输入附加金额" placeholder="请输入附加金额"
disabled disabled
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
prop="lidgrp.cbs.opn2.amt" prop="lidgrp.cbs.opn2.amt"
> >
<c-input <c-input
v-model="model.lidgrp.cbs.opn2.amt" v-model="opn2amt"
style="text-align: left; width: 100%" style="text-align: left; width: 100%"
placeholder="请输入附加金额余额" placeholder="请输入附加金额余额"
disabled disabled
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<el-form-item label="39C场" prop="lidgrp.blk.addamtcov"> <el-form-item label="39C场" prop="lidgrp.blk.addamtcov">
<c-input <c-input
type="textarea" type="textarea"
v-model="model.lidgrp.blk.addamtcov" v-model="blkaddamtcov"
maxlength="35" maxlength="35"
:rows="4" :rows="4"
show-word-limit show-word-limit
...@@ -84,6 +84,24 @@ export default { ...@@ -84,6 +84,24 @@ export default {
}, },
methods: {}, methods: {},
created: function () {}, created: function () {},
computed: {
opn2amt(){
this.model.lidgrp.cbs.opn2.amt = parseInt(this.model.oldlidgrp.cbs.opn2.amt)+
parseInt(this.model.lidgrp.cbs.max2.amt)-
parseInt(this.model.oldlidgrp.cbs.max2.amt)
return this.model.lidgrp.cbs.opn2.amt
},
max2amt(){
this.model.lidgrp.cbs.max2.amt = this.model.swiadd.addamt
return this.model.lidgrp.cbs.max2.amt
},
blkaddamtcov(){
if(this.model.litp.aamp.aammod.addamtflg==='X'){
this.model.lidgrp.blk.addamtcov = this.model.lidgrp.cbs.max2.cur + '' + this.model.lidgrp.cbs.max2.amt
return this.model.lidgrp.blk.addamtcov
}
}
}
}; };
</script> </script>
<style> <style>
......
src/business/litame/views/Amep.vue
...@@ -400,7 +400,7 @@ ...@@ -400,7 +400,7 @@
<el-form-item label="附加金额覆盖" prop="swiadd.addamtcov"> <el-form-item label="附加金额覆盖" prop="swiadd.addamtcov">
<c-input <c-input
type="textarea" type="textarea"
v-model="model.swiadd.addamtcov" v-model="swiaddaddamtcov"
maxlength="140" maxlength="140"
show-word-limit show-word-limit
placeholder="请输入附加金额" placeholder="请输入附加金额"
...@@ -452,8 +452,16 @@ export default { ...@@ -452,8 +452,16 @@ export default {
litamepengamt(){ 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) ); 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 return this.model.litamep.engamt
},
swiaddaddamtcov(){
if(this.model.litp.aamp.aammod.addamtflg==='X'){
this.model.swiadd.addamtcov = this.model.lidgrp.cbs.max2.cur + '' + this.model.swiadd.addamt
return this.model.swiadd.addamtcov
}else{
this.model.swiadd.addamt = '0.00'
} }
}, },
},
created: function () {}, created: function () {},
}; };
</script> </script>
......
src/business/litame/views/Detp.vue
...@@ -372,16 +372,30 @@ export default { ...@@ -372,16 +372,30 @@ export default {
this.flag4 = true; this.flag4 = true;
this.flag5 = false; this.flag5 = false;
this.flag6 = true; this.flag6 = true;
} //Confirming Bank } //Confirming Bank 保兑行
else if (val == 'C') { else if (val == 'C') {
this.flag4 = true; this.flag4 = true;
this.flag5 = true; this.flag5 = true;
this.flag6 = true; this.flag6 = true;
} //Specified Bank // this.model.lidgrp.avb.pts.adrblk = null
// this.model.lidgrp.avb.pts.extkey = null
} //Specified Bank 指定银行
else if (val == 'S') { else if (val == 'S') {
this.flag4 = true; this.flag4 = true;
this.flag5 = false; this.flag5 = false;
this.flag6 = false; this.flag6 = true;
}
//Reimbursing Bank 偿付行
else if (val == 'R') {
this.flag4 = true;
this.flag5 = true;
this.flag6 = true;
}
//Transferring Bank 转让行
else if (val == 'T') {
this.flag4 = true;
this.flag5 = true;
this.flag6 = true;
} }
}, },
}, },
......
src/business/trtset/model/index.js
...@@ -20,6 +20,7 @@ export default class Trtset { ...@@ -20,6 +20,7 @@ export default class Trtset {
ovdflg: "", // Overdue Flag .trdgrp.rec.ovdflg ovdflg: "", // Overdue Flag .trdgrp.rec.ovdflg
actrat: "", // 执行利率 .trdgrp.rec.actrat actrat: "", // 执行利率 .trdgrp.rec.actrat
branchinr: "", branchinr: "",
ver: "",
}, },
cbs: { cbs: {
max: { max: {
...@@ -74,21 +75,22 @@ export default class Trtset { ...@@ -74,21 +75,22 @@ export default class Trtset {
reptyp: "", // 还款方式 .trtmod.finmod.reptyp reptyp: "", // 还款方式 .trtmod.finmod.reptyp
cbs: { cbs: {
cbb: { cbb: {
intamt1: "", // 表外欠息利息 .trtmod.finmod.cbs.cbb.intamt1 intamt1: "0.00", // 表外欠息利息 .trtmod.finmod.cbs.cbb.intamt1
intamty1: "", // 表外本年欠息 .trtmod.finmod.cbs.cbb.intamty1 intamty1: "0.00", // 表外本年欠息 .trtmod.finmod.cbs.cbb.intamty1
intamt2: "", // 表内欠息利息 .trtmod.finmod.cbs.cbb.intamt2 intamt2: "0.00", // 表内欠息利息 .trtmod.finmod.cbs.cbb.intamt2
intamty2: "", // 表内本年欠息 .trtmod.finmod.cbs.cbb.intamty2 intamty2: "0.00", // 表内本年欠息 .trtmod.finmod.cbs.cbb.intamty2
intamt: "", // 利息 .trtmod.finmod.cbs.cbb.intamt intamt: "0.00", // 利息 .trtmod.finmod.cbs.cbb.intamt
amt: "", // 本金 .trtmod.finmod.cbs.cbb.amt amt: "0.00", // 本金 .trtmod.finmod.cbs.cbb.amt
}, },
cbe: { cbe: {
intamt1: "", // 偿还表外欠息利息 .trtmod.finmod.cbs.cbe.intamt1 intamt1: "0.00", // 偿还表外欠息利息 .trtmod.finmod.cbs.cbe.intamt1
intamty1: "", // 偿还表外欠息 .trtmod.finmod.cbs.cbe.intamty1 intamty1: "0.00", // 偿还表外欠息 .trtmod.finmod.cbs.cbe.intamty1
intamt2: "", // 偿还表内欠息利息 .trtmod.finmod.cbs.cbe.intamt2 intamt2: "0.00", // 偿还表内欠息利息 .trtmod.finmod.cbs.cbe.intamt2
intamty2: "", // 偿还表内欠息 .trtmod.finmod.cbs.cbe.intamty2 intamty2: "0.00", // 偿还表内欠息 .trtmod.finmod.cbs.cbe.intamty2
intamt: "", // 偿还本金利息 .trtmod.finmod.cbs.cbe.intamt intamt: "0.00", // 偿还本金利息 .trtmod.finmod.cbs.cbe.intamt
amt: "", // 偿还本金 .trtmod.finmod.cbs.cbe.amt amt: "0.00", // 偿还本金 .trtmod.finmod.cbs.cbe.amt
}, },
calflg: "",
totint: "", // 偿还利息总额 .trtmod.finmod.cbs.totint totint: "", // 偿还利息总额 .trtmod.finmod.cbs.totint
}, },
acttyp: "", // 第三方还款方式 .trtmod.finmod.acttyp acttyp: "", // 第三方还款方式 .trtmod.finmod.acttyp
......
src/config/CodeTable/index.js
...@@ -602,7 +602,7 @@ const CodeTable = { ...@@ -602,7 +602,7 @@ const CodeTable = {
avbwth: [ avbwth: [
{ label: "开证行", value: "I" }, { label: "开证行", value: "I" },
{ label: "指定银行", value: "S" }, { label: "指定银行", value: "S" },
{ label: "保兌行", value: "C" }, { label: "保兑行", value: "C" },
{ label: "任何银行", value: "O" }, { label: "任何银行", value: "O" },
{ label: "偿付行", value: "R" }, { label: "偿付行", value: "R" },
{ label: "通知行", value: "A" }, { label: "通知行", value: "A" },
......
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