Commit 8f904279 by liyixun

gitame bug (675)

parent 965c33af
...@@ -249,5 +249,7 @@ export default { ...@@ -249,5 +249,7 @@ export default {
"gitamep.plateflg" :Utils.defaultFunction, "gitamep.plateflg" :Utils.defaultFunction,
"gidgrp.rec.orddat" :Utils.defaultFunction, "gidgrp.rec.orddat" :Utils.defaultFunction,
"setmod.glemod.glepan" :Utils.defaultFunction, "setmod.glemod.glepan" :Utils.defaultFunction,
"gidgrp.rec.sndto" :Utils.defaultFunction,
"gidgrp.blk.deltoadr" :Utils.defaultFunction,
} }
//你可以添加自动default处理 //你可以添加自动default处理
...@@ -44,10 +44,7 @@ ...@@ -44,10 +44,7 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Undertaking Send to" prop="gidgrp.rec.sndto"> <el-form-item label="Undertaking Send to" prop="gidgrp.rec.sndto">
<c-select <c-select
:disabled=" disabled
model.gidgrp.rec.purpos == 'ICCO' ||
model.gidgrp.rec.purpos == 'ISCO'
"
v-model="model.gidgrp.rec.sndto" v-model="model.gidgrp.rec.sndto"
style="width: 100%" style="width: 100%"
placeholder="请选择Undertaking Send to" placeholder="请选择Undertaking Send to"
...@@ -78,7 +75,7 @@ ...@@ -78,7 +75,7 @@
placeholder="请选择Deliv. To/Collection By" placeholder="请选择Deliv. To/Collection By"
> >
<el-option <el-option
v-for="item in codes.delto" v-for="item in codes.delto1"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -94,8 +91,9 @@ ...@@ -94,8 +91,9 @@
prop="gidgrp.blk.deltoadr" prop="gidgrp.blk.deltoadr"
> >
<c-input <c-input
:disabled="model.gidgrp.rec.delto == ''" :disabled="model.gidgrp.rec.delto == '' || model.gidgrp.rec.delto != 'OTHR'"
type="textarea" type="textarea"
rows="4"
v-model="model.gidgrp.blk.deltoadr" v-model="model.gidgrp.blk.deltoadr"
maxlength="35" maxlength="35"
show-word-limit show-word-limit
...@@ -109,6 +107,7 @@ ...@@ -109,6 +107,7 @@
<c-input <c-input
disabled disabled
type="textarea" type="textarea"
rows="4"
v-model="model.gidgrp.blk.trfcond" v-model="model.gidgrp.blk.trfcond"
maxlength="65" maxlength="65"
show-word-limit show-word-limit
...@@ -158,6 +157,7 @@ ...@@ -158,6 +157,7 @@
<c-fullbox> <c-fullbox>
<c-input <c-input
type="textarea" type="textarea"
rows="4"
v-model="model.gidgrp.blk.feetxt" v-model="model.gidgrp.blk.feetxt"
maxlength="35" maxlength="35"
show-word-limit show-word-limit
......
...@@ -48,7 +48,8 @@ ...@@ -48,7 +48,8 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="地址名称" prop="gidgrp.apl.pts.adrblk"> <el-form-item label="地址名称" prop="gidgrp.apl.pts.adrblk">
<c-input <c-input
disabled :disabled="model.gidgrp.apl.pts.adrblk != ''"
:rows="4"
type="textarea" type="textarea"
v-model="model.gidgrp.apl.pts.adrblk" v-model="model.gidgrp.apl.pts.adrblk"
maxlength="35" maxlength="35"
...@@ -59,17 +60,73 @@ ...@@ -59,17 +60,73 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-ptap <el-form-item
v-if="model.gitp.swiftflg == 'Y'" v-if="model.gitp.swiftflg == 'Y'"
:model="model" label="Accountee/ObI. Ref."
:argadr="{ prop="gidgrp.ctr.pts.ref"
title: 'Accountee/ObI.',
grp: 'gidgrp',
rol: 'ctr',
}"
@onAplpDet="onConpDet"
> >
</c-ptap> <c-input
v-model="model.gidgrp.ctr.pts.ref"
maxlength="16"
placeholder="请输入Accountee/ObI. Ref."
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item
v-if="model.gitp.swiftflg == 'Y'"
label="Accountee/ObI."
prop="gidgrp.ctr.pts.extkey"
>
<c-fullbox>
<c-input
v-model="model.gidgrp.ctr.pts.extkey"
maxlength="16"
placeholder="请输入External Key of Address"
@keyup.enter.native="
showGridPromptDialog(`gidgrp.ctr.pts.extkey`)
"
></c-input>
<template slot="footer">
<c-button
v-if="model.gitp.swiftflg == 'Y'"
style="margin: 0 10px 0 10px; padding: 0 12px"
size="small"
type="primary"
>
<span style="font-family: '宋体'; font-weight: bold"
>i</span
>
</c-button>
<c-button
v-if="model.gitp.swiftflg == 'Y'"
disabled
size="small"
type="primary"
@click="onCtrpDet"
>
Details
</c-button>
</template>
</c-fullbox>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item
v-if="model.gitp.swiftflg == 'Y'"
label="地址名称"
prop="gidgrp.ctr.pts.adrblk"
>
<c-input
:disabled="model.gidgrp.ctr.pts.adrblk != ''"
:rows="4"
type="textarea"
v-model="model.gidgrp.ctr.pts.adrblk"
maxlength="35"
show-word-limit
placeholder="请输入地址名称"
></c-input>
</el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
...@@ -131,7 +188,7 @@ ...@@ -131,7 +188,7 @@
prop="gidgrp.con.pts.adrblk" prop="gidgrp.con.pts.adrblk"
> >
<c-input <c-input
disabled :disabled="model.gidgrp.con.pts.adrblk != ''"
type="textarea" type="textarea"
rows="4" rows="4"
v-model="model.gidgrp.con.pts.adrblk" v-model="model.gidgrp.con.pts.adrblk"
...@@ -141,20 +198,6 @@ ...@@ -141,20 +198,6 @@
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<!-- <c-col :span="24">
<c-ptap v-if="model.gitp.swiftflg=='N'"
:model="model"
:argadr="{
title: 'Confirming Bank',
grp: 'gidgrp',
rol: 'con',
}"
:disabled="true"
@onAplpDet="onConpDet"
>
</c-ptap>
</c-col> -->
</c-col> </c-col>
<c-col :span="11" :offset="1"> <c-col :span="11" :offset="1">
...@@ -203,7 +246,10 @@ ...@@ -203,7 +246,10 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="地址名称" prop="gidgrp.ben.pts.adrblk"> <el-form-item label="地址名称" prop="gidgrp.ben.pts.adrblk">
<c-input <c-input
:disabled="model.gidgrp.rec.hndtyp == 'OT'" :disabled="
model.gidgrp.rec.hndtyp == 'OT' ||
model.gidgrp.ben.pts.adrblk != ''
"
rows="4" rows="4"
type="textarea" type="textarea"
v-model="model.gidgrp.ben.pts.adrblk" v-model="model.gidgrp.ben.pts.adrblk"
...@@ -283,7 +329,7 @@ ...@@ -283,7 +329,7 @@
prop="gidgrp.iss.pts.adrblk" prop="gidgrp.iss.pts.adrblk"
> >
<c-input <c-input
disabled :disabled="model.gidgrp.iss.pts.adrblk != ''"
rows="4" rows="4"
type="textarea" type="textarea"
v-model="model.gidgrp.iss.pts.adrblk" v-model="model.gidgrp.iss.pts.adrblk"
...@@ -295,17 +341,72 @@ ...@@ -295,17 +341,72 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-ptap <el-form-item
v-if="model.gitp.swiftflg == 'Y'"
label="Advising Bank ref."
prop="gidgrp.atb.pts.ref"
>
<c-input
v-model="model.gidgrp.atb.pts.ref"
maxlength="16"
placeholder="请输入Advising Bank Ref."
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item
v-if="model.gitp.swiftflg == 'Y'"
label="Advising Bank"
prop="gidgrp.atb.pts.extkey"
>
<c-fullbox>
<c-input
v-model="model.gidgrp.atb.pts.extkey"
maxlength="16"
placeholder="请输入External Key of Address"
@keyup.enter.native="
showGridPromptDialog(`gidgrp.atb.pts.extkey`)
"
></c-input>
<template slot="footer">
<c-button
v-if="model.gitp.swiftflg == 'Y'"
style="margin: 0 10px 0 10px; padding: 0 12px"
size="small"
type="primary"
>
<span style="font-family: '宋体'; font-weight: bold"
>i</span
>
</c-button>
<c-button
v-if="model.gitp.swiftflg == 'Y'"
size="small"
type="primary"
@click="onAtbpDet"
>
Details
</c-button>
</template>
</c-fullbox>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item
v-if="model.gitp.swiftflg == 'Y'" v-if="model.gitp.swiftflg == 'Y'"
:model="model" label="地址名称"
:argadr="{ prop="gidgrp.atb.pts.adrblk"
title: 'Advising Bank',
grp: 'gidgrp',
rol: 'atb',
}"
@onAplpDet="onConpDet"
> >
</c-ptap> <c-input
:disabled="model.gidgrp.atb.pts.adrblk != ''"
rows="4"
type="textarea"
v-model="model.gidgrp.atb.pts.adrblk"
maxlength="35"
show-word-limit
placeholder="请输入地址名称"
></c-input>
</el-form-item>
</c-col> </c-col>
</c-col> </c-col>
</c-col> </c-col>
......
...@@ -144,23 +144,55 @@ ...@@ -144,23 +144,55 @@
<m-addbcb :model="model" :codes="codes" /> <m-addbcb :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="Seq. C: History" name="amephisc"> <el-tab-pane
v-if="
model.gidgrp.rec.purpos == 'ISCO' ||
model.gidgrp.rec.purpos == 'ICCO'
" label="Seq. C: History" name="amephisc">
<m-amephisc :model="model" :codes="codes" /> <m-amephisc :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="Seq. C: Overview" name="ovwpc"> <el-tab-pane
v-if="
model.gidgrp.rec.purpos == 'ISCO' ||
model.gidgrp.rec.purpos == 'ICCO'
"
label="Seq. C: Overview"
name="ovwpc"
>
<m-ovwpc :model="model" :codes="codes" /> <m-ovwpc :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="Seq. C: Parties" name="ptypc"> <el-tab-pane
v-if="
model.gidgrp.rec.purpos == 'ISCO' ||
model.gidgrp.rec.purpos == 'ICCO'
"
label="Seq. C: Parties"
name="ptypc"
>
<m-ptypc :model="model" :codes="codes" /> <m-ptypc :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="Seq. C: Presentation/ Delivery" name="preperpc"> <el-tab-pane
v-if="
model.gidgrp.rec.purpos == 'ISCO' ||
model.gidgrp.rec.purpos == 'ICCO'
"
label="Seq. C: Presentation/ Delivery"
name="preperpc"
>
<m-preperpc :model="model" :codes="codes" /> <m-preperpc :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="Seq. C: Details" name="detpc"> <el-tab-pane
v-if="
model.gidgrp.rec.purpos == 'ISCO' ||
model.gidgrp.rec.purpos == 'ICCO'
"
label="Seq. C: Details"
name="detpc"
>
<m-detpc :model="model" :codes="codes" /> <m-detpc :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
...@@ -178,7 +210,7 @@ ...@@ -178,7 +210,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane <el-tab-pane
v-if="model.trnmod.swiadd.addamtflgc == 'X'" v-if="model.trnmod.swiadd.addamtflg == 'X'"
label="Seq. C: Add. Amounts" label="Seq. C: Add. Amounts"
name="aacp" name="aacp"
> >
......
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