Skip to content

V
vue-gjjs
Commit 70fbc69e by lianyang
Options

getame/getopn缺陷解决

parent 0ff18868
Showing with 114 additions and 132 deletions
src/model/Getame/Pattern.js
...@@ -56,27 +56,27 @@ export default { ...@@ -56,27 +56,27 @@ export default {
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
"oldgidgrp.cbs.max.amt":[ "oldgidgrp.cbs.max.amt":[
{type: "number", 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位" }
], ],
"trnmod.swiadd.amecur":[ "trnmod.swiadd.amecur":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
"trnmod.swiadd.ameamt":[ "trnmod.swiadd.ameamt":[
{type: "number", 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位" }
], ],
"trnmod.swiadd.newcur":[ "trnmod.swiadd.newcur":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
"trnmod.swiadd.newamt":[ "trnmod.swiadd.newamt":[
{type: "number", 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位" }
], ],
"gitamep.ametxt":[ "gitamep.ametxt":[
......
src/views/Business/Getame/Ameps20.vue
...@@ -68,11 +68,13 @@ ...@@ -68,11 +68,13 @@
label-width="5px" label-width="5px"
prop="oldgidgrp.cbs.max.amt" prop="oldgidgrp.cbs.max.amt"
> >
<c-input <!-- 不确定能否回显负金额，因此空为disabled,故暂定能显示负金额 -->
<c-input-currency-min
disabled disabled
v-model="model.oldgidgrp.cbs.max.amt" v-model="model.oldgidgrp.cbs.max.amt"
placeholder="请输入" placeholder="请输入"
></c-input> class="input-currency-left"
></c-input-currency-min>
</c-form-item> </c-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -98,17 +100,13 @@ ...@@ -98,17 +100,13 @@
label-width="5px" label-width="5px"
prop="trnmod.swiadd.ameamt" prop="trnmod.swiadd.ameamt"
> >
<c-input <c-input-currency-min
v-model="model.trnmod.swiadd.ameamt" v-model="model.trnmod.swiadd.ameamt"
placeholder="请输入" placeholder="请输入"
@blur="ameamtBlur" @blur="ameamtBlur"
@keyup.enter.native=" @keyup.enter.native="$event.target.blur()"
defaultFunction( class="input-currency-left"
'trnmod.swiadd.newamt', ></c-input-currency-min>
model.trnmod.swiadd.newamt
)
"
></c-input>
</c-form-item> </c-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -134,17 +132,13 @@ ...@@ -134,17 +132,13 @@
label-width="5px" label-width="5px"
prop="trnmod.swiadd.newamt" prop="trnmod.swiadd.newamt"
> >
<c-input <c-input-currency-min
v-model="model.trnmod.swiadd.newamt" v-model="model.trnmod.swiadd.newamt"
placeholder="请输入" placeholder="请输入"
@blur="newamtBlur" @blur="newamtBlur"
@keyup.enter.native=" @keyup.enter.native="$event.target.blur()"
eventFunction( class="input-currency-left"
'trnmod.swiadd.newamt', ></c-input-currency-min>
model.trnmod.swiadd.newamt
)
"
></c-input>
</c-form-item> </c-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -171,11 +165,13 @@ ...@@ -171,11 +165,13 @@
label-width="5px" label-width="5px"
prop="trnmod.swiadd.addamt" prop="trnmod.swiadd.addamt"
> >
<c-input <!-- 不确定能否回显负金额，因此空为disabled,故暂定能显示负金额 -->
<c-input-currency-min
disabled disabled
v-model="model.trnmod.swiadd.addamt" v-model="model.trnmod.swiadd.addamt"
placeholder="请输入" placeholder="请输入"
></c-input> class="input-currency-left"
></c-input-currency-min>
</c-form-item> </c-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -368,11 +364,13 @@ ...@@ -368,11 +364,13 @@
label-width="5px" label-width="5px"
prop="oldgidgrp.cbs.max.amt" prop="oldgidgrp.cbs.max.amt"
> >
<c-input <!-- 不确定能否回显负金额，因此空为disabled,故暂定能显示负金额 -->
<c-input-currency-min
disabled disabled
v-model="model.oldgidgrp.cbs.max.amt" v-model="model.oldgidgrp.cbs.max.amt"
placeholder="请输入" placeholder="请输入"
></c-input> class="input-currency-left"
></c-input-currency-min>
</c-form-item> </c-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -397,17 +395,13 @@ ...@@ -397,17 +395,13 @@
label-width="5px" label-width="5px"
prop="trnmod.swiadd.ameamt" prop="trnmod.swiadd.ameamt"
> >
<c-input <c-input-currency-min
v-model="model.trnmod.swiadd.ameamt" v-model="model.trnmod.swiadd.ameamt"
placeholder="请输入" placeholder="请输入"
@blur="ameamtBlur" @blur="ameamtBlur"
@keyup.enter.native=" @keyup.enter.native="$event.target.blur()"
defaultFunction( class="input-currency-left"
'trnmod.swiadd.newamt', ></c-input-currency-min>
model.trnmod.swiadd.newamt
)
"
></c-input>
</c-form-item> </c-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -436,12 +430,7 @@ ...@@ -436,12 +430,7 @@
v-model="model.trnmod.swiadd.newamt" v-model="model.trnmod.swiadd.newamt"
placeholder="请输入" placeholder="请输入"
@blur="newamtBlur" @blur="newamtBlur"
@keyup.enter.native=" @keyup.enter.native="$event.target.blur()"
eventFunction(
'trnmod.swiadd.newamt',
model.trnmod.swiadd.newamt
)
"
></c-input> ></c-input>
</c-form-item> </c-form-item>
</c-col> </c-col>
...@@ -830,18 +819,14 @@ ...@@ -830,18 +819,14 @@
label-width="5px" label-width="5px"
prop="trnmod.swiadd.addamt" prop="trnmod.swiadd.addamt"
> >
<c-input <c-input-currency-min
:disabled="model.trnmod.swiadd.addamtflg == ''" :disabled="model.trnmod.swiadd.addamtflg == ''"
v-model="model.trnmod.swiadd.addamt" v-model="model.trnmod.swiadd.addamt"
placeholder="请输入附加金额" placeholder="请输入附加金额"
@blur="addamtBlur" @blur="addamtBlur"
@keyup.enter.native=" @keyup.enter.native="$event.target.blur()"
defaultFunction( class="input-currency-left"
'trnmod.swiadd.addamt', ></c-input-currency-min>
model.trnmod.swiadd.addamt
)
"
></c-input>
</c-form-item> </c-form-item>
</c-col> </c-col>
</c-col> </c-col>
......
src/views/Business/Getame/Opnp.vue
<template> <template>
<div class="eibs"> <div class="eibs">
<c-col :span="12"> <!-- =======================================左边======================================== -->
<c-col :span="12" style="padding-right: 20px;">
<c-col :span="24">
<el-form-item label="是否SWIFT格式" prop="gitp.swiftflg"> <el-form-item label="是否SWIFT格式" prop="gitp.swiftflg">
<c-select <c-select
v-model="model.gitp.swiftflg" v-model="model.gitp.swiftflg"
...@@ -17,33 +19,13 @@ ...@@ -17,33 +19,13 @@
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24">
<c-col :span="12"> <c-col :span="model.gidgrp.cbs.max.cur == 'CNY'? 20 : 24">
<el-form-item label="是否对外担保" prop="gidgrp.rec.fingua">
<c-select
disabled
v-model="model.gidgrp.rec.fingua"
style="width: 100%"
placeholder="请选择是否对外担保"
>
<el-option
v-for="item in codes.fingua"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<c-col :span="20">
<el-form-item label="对外担保类型" prop="gidgrp.rec.cfaguatyp"> <el-form-item label="对外担保类型" prop="gidgrp.rec.cfaguatyp">
<c-select <c-select
disabled disabled
v-model="model.gidgrp.rec.cfaguatyp" v-model="model.gidgrp.rec.cfaguatyp"
style="width: 90%" :style="model.gidgrp.cbs.max.cur == 'CNY'? 'width:90%' : 'width:100%'"
placeholder="请选择对外担保类型" placeholder="请选择对外担保类型"
> >
<el-option <el-option
...@@ -65,6 +47,29 @@ ...@@ -65,6 +47,29 @@
> >
</c-col> </c-col>
</c-col> </c-col>
</c-col>
<!-- =======================================右边======================================== -->
<c-col :span="12" style="padding-left: 20px;">
<c-col :span="24">
<el-form-item label="是否对外担保" prop="gidgrp.rec.fingua">
<c-select
disabled
v-model="model.gidgrp.rec.fingua"
style="width: 100%"
placeholder="请选择是否对外担保"
>
<el-option
v-for="item in codes.fingua"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</c-select>
</el-form-item>
</c-col>
</c-col>
</div> </div>
</template> </template>
<script> <script>
......
src/views/Business/Getame/Ovwp.vue
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<el-collapse-item title="Seq C : 附加金额" name="aacp" v-if="model.gitp.swiftflg == 'Y' && (model.trnmod.swiadd.purposame == 'ISCA' || model.trnmod.swiadd.purposame == 'ICCA') && model.trnmod.swiadd.addamtflgc == 'X'"> <el-collapse-item title="Seq C : 附加金额" name="aacp" v-if="model.gitp.swiftflg == 'Y' && (model.trnmod.swiadd.purposame == 'ISCA' || model.trnmod.swiadd.purposame == 'ICCA') && model.trnmod.swiadd.addamtflgc == 'X'">
<m-aacp :model="model" :codes="codes"/> <m-aacp :model="model" :codes="codes"/>
</el-collapse-item> </el-collapse-item>
<el-collapse-item title="Seq C : 附加金额" name="aamp20" v-if="model.gitp.swiftflg == 'Y' && model.trnmod.swiadd.purposame == 'ISUA' && model.trnmod.swiadd.addamtflg == 'X' && model.gidgrp.rec.purpos != 'ISSU' || model.trnmod.swiadd.addamt!=''"> <el-collapse-item title="Seq C : 附加金额" name="aamp20" v-if="model.gitp.swiftflg == 'Y' && model.trnmod.swiadd.purposame == 'ISUA' && model.trnmod.swiadd.addamtflg == 'X' && model.gidgrp.rec.purpos != 'ISSU' || model.trnmod.swiadd.addamt!='0.00'">
<m-aamp20 :model="model" :codes="codes"/> <m-aamp20 :model="model" :codes="codes"/>
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
......
src/views/Business/Getame/Ovwp1.vue
...@@ -504,39 +504,6 @@ ...@@ -504,39 +504,6 @@
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24">
<c-col :span="20">
<el-form-item
v-if="model.gitp.swiftflg == 'N'"
label="对外担保类型"
prop="gidgrp.rec.cfaguatyp"
>
<c-select
disabled
v-model="model.gidgrp.rec.cfaguatyp"
style="width: 90%"
placeholder="请选择对外担保类型"
:code="codes.cfaguatyp"
>
</c-select>
</el-form-item>
</c-col>
<c-col
:span="4"
v-if="
model.gidgrp.cbs.max.cur == 'CNY' && model.gitp.swiftflg == 'N'
"
class="centerLable"
>
<c-checkbox
label="跨境人民币保函"
disabled
v-model="model.gidgrp.rec.cmtflg"
>跨境人民币保函</c-checkbox
>
</c-col>
</c-col>
</c-col> </c-col>
<!-- ============右边================= --> <!-- ============右边================= -->
<c-col :span="12" style="padding-left: 20px;"> <c-col :span="12" style="padding-left: 20px;">
...@@ -785,21 +752,6 @@ ...@@ -785,21 +752,6 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item <el-form-item
v-if="model.gitp.swiftflg == 'N'" v-if="model.gitp.swiftflg == 'N'"
label="被保证人"
prop="gidgrp.gidcxm.warran"
>
<c-input
v-model="model.gidgrp.gidcxm.warran"
maxlength="40"
placeholder="请输入被保证人"
></c-input>
</el-form-item>
</c-col>
<!-- -->
<c-col :span="24">
<el-form-item
v-if="model.gitp.swiftflg == 'N'"
label="生效日期" label="生效日期"
prop="gidgrp.rec.opndat" prop="gidgrp.rec.opndat"
> >
...@@ -830,9 +782,53 @@ ...@@ -830,9 +782,53 @@
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<!-- --> <c-col :span="24" v-if="model.gitp.swiftflg == 'N'">
<c-col :span="model.gidgrp.cbs.max.cur == 'CNY' ? 20 : 24">
<el-form-item
label="担保类型"
prop="gidgrp.rec.cfaguatyp"
>
<c-select
disabled
v-model="model.gidgrp.rec.cfaguatyp"
:style="model.gidgrp.cbs.max.cur == 'CNY' ? 'width: 90%' : 'width: 100%'"
placeholder="请选择对外担保类型"
:code="codes.cfaguatyp"
>
</c-select>
</el-form-item>
</c-col>
<c-col
:span="4"
v-if="
model.gidgrp.cbs.max.cur == 'CNY'
"
class="centerLable"
>
<c-checkbox
label="跨境人民币保函"
disabled
v-model="model.gidgrp.rec.cmtflg"
>跨境人民币保函</c-checkbox
>
</c-col>
</c-col>
<c-col :span="24">
<el-form-item
v-if="model.gitp.swiftflg == 'N'"
label="被保证人"
prop="gidgrp.gidcxm.warran"
>
<c-input
v-model="model.gidgrp.gidcxm.warran"
maxlength="40"
placeholder="请输入被保证人"
></c-input>
</el-form-item>
</c-col>
<!-- --> <!-- -->
<c-col :span="24"> <c-col :span="24">
<el-form-item <el-form-item
......
src/views/Business/Getame/index.vue
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<!-- 结算 --> <!-- 结算 -->
<m-setpan :model="model" :codes="codes" /> <m-setpan :model="model" :codes="codes" />
</el-collapse-item> </el-collapse-item>
<el-collapse-item v-if="this.flag" title="会计分录" name="glepan"> <el-collapse-item title="会计分录" name="glepan">
<!-- 会计分录 --> <!-- 会计分录 -->
<m-glepan :model="model" :codes="codes" /> <m-glepan :model="model" :codes="codes" />
</el-collapse-item> </el-collapse-item>
...@@ -347,7 +347,6 @@ export default { ...@@ -347,7 +347,6 @@ export default {
...CodeTable, ...CodeTable,
}, },
activeNames: ["engp"], activeNames: ["engp"],
flag: false,
}; };
}, },
methods: { methods: {
...@@ -358,9 +357,6 @@ export default { ...@@ -358,9 +357,6 @@ export default {
**/ **/
let name = tab.name; let name = tab.name;
let rulePath; let rulePath;
if (name === "setpan") {
this.flag = true;
}
if (!!rulePath) { if (!!rulePath) {
this.executeRule(rulePath).then((res) => { this.executeRule(rulePath).then((res) => {
if (res.respCode == SUCCESS) { if (res.respCode == SUCCESS) {
......
src/views/Business/Getopn/Opnp.vue
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<c-select <c-select
disabled disabled
v-model="model.gidgrp.rec.fingua" v-model="model.gidgrp.rec.fingua"
style="width: 95%" style="width: 100%"
placeholder="请选择是否对外担保" placeholder="请选择是否对外担保"
> >
<el-option <el-option
......
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