Commit cf7eab82 by lianyang

letame交易首页金额计算修改

parent e4317c45
...@@ -57,13 +57,13 @@ export default { ...@@ -57,13 +57,13 @@ export default {
{required: false, message: "必输项"}, {required: false, message: "必输项"},
{type: "string", max: 18,message:"整数位不能超过14位"}, {type: "string", max: 18,message:"整数位不能超过14位"},
{pattern: /(^(\+|\-)|\d+$)|(^(\+|\-)|\.\d{1,3}$)|(^(\+|\-)|\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^(\+|\-)|\d+$)|(^(\+|\-)|\.\d{1,3}$)|(^(\+|\-)|\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
// { pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
"letamep.engamt":[ "letamep.engamt":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
{ pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
"trnmod.swiadd.newamt":[ "trnmod.swiadd.newamt":[
......
...@@ -115,18 +115,14 @@ ...@@ -115,18 +115,14 @@
label-width="5px" label-width="5px"
prop="oldledgrp.cbs.nom1.amt" prop="oldledgrp.cbs.nom1.amt"
> >
<c-input-currency <c-input
v-model="model.oldledgrp.cbs.nom1.amt" v-model="model.oldledgrp.cbs.nom1.amt"
placeholder="请输入Original Data" placeholder="请输入Original Data"
style="width: 100%" style="width: 100%"
@keyup.enter.native=" @keyup.enter.native="$event.target.blur()"
defaultFunction( class="m-input-currency"
'oldledgrp.cbs.nom1.amt',
model.oldledgrp.cbs.nom1.amt
)
"
disabled disabled
></c-input-currency> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -148,13 +144,15 @@ ...@@ -148,13 +144,15 @@
label-width="5px" label-width="5px"
prop="trnmod.swiadd.ameamt" prop="trnmod.swiadd.ameamt"
> >
<c-input-currency <c-input
v-model="model.trnmod.swiadd.ameamt" v-model="model.trnmod.swiadd.ameamt"
placeholder="请输入Amended" placeholder="请输入Amended"
@keyup.enter.native="$event.target.blur()"
@blur="ameamtOtherDefault" @blur="ameamtOtherDefault"
@keyup.enter.native="$event.target.blur"
style="width: 100%" style="width: 100%"
></c-input-currency> class="m-input-currency"
></c-input>
<!-- 回车失去焦点,失去焦点会自动触发默认事件:@keyup.enter.native="$event.target.blur()" -->
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -177,7 +175,7 @@ ...@@ -177,7 +175,7 @@
label-width="5px" label-width="5px"
prop="trnmod.swiadd.newamt" prop="trnmod.swiadd.newamt"
> >
<c-input-currency <c-input
v-model="model.trnmod.swiadd.newamt" v-model="model.trnmod.swiadd.newamt"
placeholder="请输入New Data" placeholder="请输入New Data"
@keyup.enter.native=" @keyup.enter.native="
...@@ -186,7 +184,8 @@ ...@@ -186,7 +184,8 @@
) )
" "
style="width: 100%" style="width: 100%"
></c-input-currency> class="m-input-currency"
></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -238,6 +237,7 @@ ...@@ -238,6 +237,7 @@
v-model.number="model.trnmod.swiadd.newnomtop" v-model.number="model.trnmod.swiadd.newnomtop"
placeholder="请输入New positive tolerance" placeholder="请输入New positive tolerance"
style="width: 100%" style="width: 100%"
@keyup.enter.native="$event.target.blur()"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -252,6 +252,7 @@ ...@@ -252,6 +252,7 @@
v-model.number="model.trnmod.swiadd.newnomton" v-model.number="model.trnmod.swiadd.newnomton"
placeholder="请输入New negative tolerance" placeholder="请输入New negative tolerance"
style="width: 100%" style="width: 100%"
@keyup.enter.native="$event.target.blur()"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -281,12 +282,13 @@ ...@@ -281,12 +282,13 @@
label-width="5px" label-width="5px"
prop="oldledgrp.cbs.max.amt" prop="oldledgrp.cbs.max.amt"
> >
<c-input-currency <c-input
v-model="model.oldledgrp.cbs.max.amt" v-model="model.oldledgrp.cbs.max.amt"
placeholder="请输入Original Data" placeholder="请输入Original Data"
style="width: 100%" style="width: 100%"
disabled disabled
></c-input-currency> class="m-input-currency"
></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -304,11 +306,12 @@ ...@@ -304,11 +306,12 @@
</c-col> </c-col>
<c-col :span="14"> <c-col :span="14">
<el-form-item label="" label-width="5px" prop="letamep.engamt"> <el-form-item label="" label-width="5px" prop="letamep.engamt">
<c-input-currency <c-input
v-model="model.letamep.engamt" v-model="model.letamep.engamt"
placeholder="请输入Total Amendment" placeholder="请输入Total Amendment"
disabled disabled
></c-input-currency> class="m-input-currency"
></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -326,11 +329,12 @@ ...@@ -326,11 +329,12 @@
</c-col> </c-col>
<c-col :span="14"> <c-col :span="14">
<el-form-item label="" label-width="5px" prop="letamep.maxamt"> <el-form-item label="" label-width="5px" prop="letamep.maxamt">
<c-input-currency <c-input
v-model="model.letamep.maxamt" v-model="model.letamep.maxamt"
placeholder="请输入New Maximum Amount" placeholder="请输入New Maximum Amount"
disabled disabled
></c-input-currency> class="m-input-currency"
></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -1019,6 +1023,7 @@ import Api from '~/service/Api' ...@@ -1019,6 +1023,7 @@ import Api from '~/service/Api'
import commonProcess from '~/mixin/commonProcess' import commonProcess from '~/mixin/commonProcess'
import CodeTable from '~/config/CodeTable' import CodeTable from '~/config/CodeTable'
import Event from '~/model/Letame/Event' import Event from '~/model/Letame/Event'
import Utils from "~/utils"
export default { export default {
inject: ['root'], inject: ['root'],
...@@ -1032,7 +1037,7 @@ export default { ...@@ -1032,7 +1037,7 @@ export default {
onSeainf(){}, onSeainf(){},
ameamtOtherDefault(){ ameamtOtherDefault(){
this.executeDefault('letamep.swiadd.newamt').then((res) => { this.executeDefault('letamep.swiadd.newamt').then((res) => {
if (res.respCode == SUCCESS) { if ((res.respCode == SUCCESS)) {
Utils.copyValueFromVO(this.model, res.data) Utils.copyValueFromVO(this.model, res.data)
} }
}) })
......
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