Commit 89c4fbb0 by liyixun

gitame bug (629,684,708)

parent 32a041be
......@@ -7161,5 +7161,9 @@ const CodeTable = {
{ label: "进口保函", value: "LG" },
{ label: "出口保函", value: "AG" },
],
gitamecho:[
{ label: "无特殊规定", value: "无特殊规定" },
{ label: "有特殊规定,条件为:", value: "有特殊规定,条件为:" },
]
}
export default CodeTable;
......@@ -5,6 +5,19 @@ import Pub from "../Public"
export default class Gitame{
constructor () {
this.data = {
gitbenl5blk:"",
gitbenl3blk:"",
gitapll1blk:"",
gitbenl1blk:"",
gitbenl2blk:"",
gitapll2blk:"",
gitbenl4blk:"",
gitapll3blk:"",
gitissl1blk:"",
gitbenl6blk:"",
gitrmbl2blk:"",
gitapll4blk:"",
gitrmbl1blk:"",
gitp:{
swiftflg:"", // 是否SWIFT格式 .gitp.swiftflg
recget:{
......@@ -534,6 +547,7 @@ export default class Gitame{
},
},
addbcb:{
addbcbl1blk:"",
name:"", // �'�物简称及税号 .addbcb.name
godnam:"", // �'�物简称 .addbcb.godnam
pwtyp1:"", // 进口许可证 .addbcb.pwtyp1
......
......@@ -5,6 +5,13 @@ import Pub from "../Public"
export default class Gitpop{
constructor () {
this.data = {
gitapll1blk:"",
gitbenl2blk:"",
gitbenl1blk:"",
gitapll3blk:"",
gitbenl4blk:"",
gitapll2blk:"",
gitapll4blk:"",
decreadat:"", // Validity for Declaration of Readiness .decreadat
decreatxt:"", // Declaration of Readiness Text .decreatxt
gitp:{
......
<template>
<div class="eibs-tab">
<!-- SF000783 : Additional Amount -->
<c-col :span="12">
<c-form-item :label="$t('gitp.SF000783')" prop="gidgrp.cbs.max2.cur">
<c-input v-model="model.gidgrp.cbs.max2.cur" maxlength="3" :placeholder="$t('other.please_enter')+$t('gitp.SF000783')"></c-input>
</c-form-item>
</c-col>
<c-col :span="12">
<c-form-item label="Balance" prop="gidgrp.cbs.max2.amt">
<c-input v-model="model.gidgrp.cbs.max2.amt" :placeholder="$t('other.please_enter')+'Balance'"></c-input>
</c-form-item>
</c-col>
<!-- SF000784 : Open Add. Amount -->
<c-col :span="12">
<c-form-item :label="$t('gitp.SF000784')" prop="gidgrp.cbs.opn2.cur">
<c-input v-model="model.gidgrp.cbs.opn2.cur" maxlength="3" :placeholder="$t('other.please_enter')+$t('gitp.SF000784')"></c-input>
</c-form-item>
</c-col>
<c-col :span="12">
<c-form-item label="Balance" prop="gidgrp.cbs.opn2.amt">
<c-input v-model="model.gidgrp.cbs.opn2.amt" :placeholder="$t('other.please_enter')+'Balance'"></c-input>
</c-form-item>
</c-col>
<!-- SF000785 : Covered -->
<c-col :span="12">
<c-form-item :label="$t('gitp.SF000785')" prop="gidgrp.blk.addamtcovs20">
<c-input type="textarea" v-model="model.gidgrp.blk.addamtcovs20" maxlength="65" show-word-limit :placeholder="$t('other.please_enter')+$t('gitp.SF000785')" ></c-input>
</c-form-item>
</c-col>
</div>
</template>
<script>
import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "~/model/Gitame/Event"
export default {
inject: ['root'],
props:["model","codes"],
mixins: [commonProcess],
data(){
return {
}
},
methods:{...Event},
created:function(){
}
}
</script>
<style>
</style>
......@@ -16,6 +16,7 @@
v-model="model.addbcb.gitamecho"
style="width: 100%"
placeholder="请选择"
:code="codes.gitamecho"
>
</c-select>
</el-form-item>
......@@ -48,216 +49,6 @@
</c-col>
</c-col>
</c-row>
<!-- <c-col :span="12">
<c-form-item label="�'�物简称及税号" prop="addbcb.name">
<c-input v-model="model.addbcb.name" maxlength="15" :placeholder="$t('other.please_enter')+'��物简称及税号'"></c-input>
</c-form-item>
</c-col> -->
<!-- S0000004 : 货物简称 -->
<!-- <c-col :span="12">
<c-form-item label="�'�物简称" prop="addbcb.godnam">
<c-input v-model="model.addbcb.godnam" maxlength="40" :placeholder="$t('other.please_enter')+'��物简称'"></c-input>
</c-form-item>
</c-col> -->
<!-- S0000005 : 批文类型 -->
<!-- <c-col :span="12">
<c-checkbox v-model="model.addbcb.pwtyp1">{{$t('addbcb.C0000006')}}</c-checkbox>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.addbcb.pwtyp2">{{$t('addbcb.C0000007')}}</c-checkbox>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.addbcb.pwtyp3">{{$t('addbcb.C0000008')}}</c-checkbox>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.addbcb.pwtyp4">{{$t('addbcb.C0000009')}}</c-checkbox>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.addbcb.pwtyp5">{{$t('addbcb.C0000010')}}</c-checkbox>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.addbcb.pwtyp6">{{$t('addbcb.C0000011')}}</c-checkbox>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.addbcb.pwtyp7">{{$t('addbcb.C0000012')}}</c-checkbox>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.addbcb.pwtyp8">{{$t('addbcb.C0000013')}}</c-checkbox>
</c-col>
<c-col :span="12">
<c-form-item label="批文类型填写文本框" prop="addbcb.pwtyp9">
<c-input v-model="model.addbcb.pwtyp9" maxlength="30" :placeholder="$t('other.please_enter')+'批文类型填写文本框'"></c-input>
</c-form-item>
</c-col> -->
<!-- S0000014 : 备案表类型 -->
<!-- <c-col :span="12">
<c-checkbox v-model="model.addbcb.bcbtyp1">{{$t('addbcb.C0000015')}}</c-checkbox>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.addbcb.bcbtyp2">{{$t('addbcb.C0000016')}}</c-checkbox>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.addbcb.bcbtyp3">{{$t('addbcb.C0000017')}}</c-checkbox>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.addbcb.bcbtyp4">{{$t('addbcb.C0000018')}}</c-checkbox>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.addbcb.bcbtyp5">{{$t('addbcb.C0000019')}}</c-checkbox>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.addbcb.bcbtyp6">{{$t('addbcb.C0000020')}}</c-checkbox>
</c-col>
<c-col :span="12">
<c-form-item label="备查表类型填写文本框" prop="addbcb.bcbtyp7">
<c-input v-model="model.addbcb.bcbtyp7" maxlength="25" :placeholder="$t('other.please_enter')+'备查表类型填写文本框'"></c-input>
</c-form-item>
</c-col> -->
<!-- S0000050 : 不规范条款类型 -->
<!-- S0000052 : 特殊规定 -->
<!-- <c-col :span="12">
<el-form-item label="批文效期" prop="addbcb.pwdat">
<c-date-picker type="date" v-model="model.addbcb.pwdat" style="width:100%" :placeholder="$t('other.please_enter')+'批文效期'"></c-date-picker>
</el-form-item>
</c-col> -->
<!-- S0000044 : 批文效期 -->
<!-- <c-col :span="12">
<el-form-item label="不规范条款类型" prop="addbcb.bgftktyp">
<c-select v-model="model.addbcb.bgftktyp" style="width:100%" :placeholder="$t('other.please_enter')+'不规范条款类型'">
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="特殊规定" prop="addbcb.litameadv">
<c-select v-model="model.addbcb.litameadv" style="width:100%" :placeholder="$t('other.please_enter')+'特殊规定'">
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="备案表效期" prop="addbcb.bcbdat">
<c-date-picker type="date" v-model="model.addbcb.bcbdat" style="width:100%" :placeholder="$t('other.please_enter')+'备案表效期'"></c-date-picker>
</el-form-item>
</c-col> -->
<!-- S0000045 : 备案表效期 -->
<!-- <c-col :span="12">
<c-form-item label="特殊规定条件" prop="addbcb.ameadvrmk">
<c-input type="textarea" v-model="model.addbcb.ameadvrmk" maxlength="34" show-word-limit :placeholder="$t('other.please_enter')+'特殊规定条件'" ></c-input>
</c-form-item>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.addbcb.modtyp">{{$t('addbcb.C0000051')}}</c-checkbox>
</c-col> -->
<!-- S0000029 : 贸易金融部意见 -->
<!-- <c-col :span="12">
<span v-text="model.addbcb.label1" data-path=".addbcb.label1" > </span>
</c-col>
<c-col :span="12">
<span v-text="model.addbcb.label2" data-path=".addbcb.label2" > </span>
</c-col>
<c-col :span="12">
<span v-text="model.addbcb.label3" data-path=".addbcb.label3" > </span>
</c-col>
<c-col :span="12">
<span v-text="model.addbcb.label4" data-path=".addbcb.label4" > </span>
</c-col>
<c-col :span="12">
<el-form-item label="国际部意见" prop="addbcb.label5">
<c-select v-model="model.addbcb.label5" style="width:100%" :placeholder="$t('other.please_enter')+'国际部意见'">
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<span v-text="model.addbcb.label6" data-path=".addbcb.label6" > </span>
</c-col> -->
<!-- S0000047 : 授信条件对于本笔修改项下有无特殊规定: -->
<!-- S0000072 : 预计效期为 -->
<!-- S0000074 : 效期为 -->
<!-- <c-col :span="12">
<el-form-item label="效期为" prop="addbcb.expdat">
<c-date-picker type="date" v-model="model.addbcb.expdat" style="width:100%" :placeholder="$t('other.please_enter')+'效期为'"></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="预计效期为" prop="addbcb.preexpdat">
<c-date-picker type="date" v-model="model.addbcb.preexpdat" style="width:100%" :placeholder="$t('other.please_enter')+'预计效期为'"></c-date-picker>
</el-form-item>
</c-col> -->
<!-- S0000077 : 以下两个选项二选一 -->
<!-- S0000060 : 效期是否敞口 -->
<!-- <c-col :span="12">
<el-form-item label="效期是否敞口" prop="addbcb.bccls1">
<c-select v-model="model.addbcb.bccls1" style="width:100%" :placeholder="$t('other.please_enter')+'效期是否敞口'">
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="GITAMECHO" prop="addbcb.gitamecho">
<c-select v-model="model.addbcb.gitamecho" style="width:100%" :placeholder="$t('other.please_enter')+'GITAMECHO'">
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="以下两个选项二选一" prop="addbcb.bccls4">
<c-select v-model="model.addbcb.bccls4" style="width:100%" :placeholder="$t('other.please_enter')+'以下两个选项二选一'">
</c-select>
</el-form-item>
</c-col> -->
<!-- S0000075 : 合同尚未签订或生效 -->
<!-- <c-col :span="12">
<el-form-item :label="$t('addbcb.S0000075')" prop="addbcb.bccls2">
<c-select v-model="model.addbcb.bccls2" style="width:100%" :placeholder="$t('other.please_enter')+$t('addbcb.S0000075')">
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<c-form-item label="GITAMERMK" prop="addbcb.gitamermk">
<c-input type="textarea" v-model="model.addbcb.gitamermk" maxlength="34" show-word-limit :placeholder="$t('other.please_enter')+'GITAMERMK'" ></c-input>
</c-form-item>
</c-col> -->
<!-- S0000065 : 保函期限超过三年,已经总行贸易金融部批准办理 -->
<!-- <c-col :span="12">
<el-form-item :label="$t('addbcb.S0000065')" prop="addbcb.bccls3">
<c-select v-model="model.addbcb.bccls3" style="width:100%" :placeholder="$t('other.please_enter')+$t('addbcb.S0000065')">
</c-select>
</el-form-item>
</c-col> -->
</div>
</template>
<script>
......
......@@ -336,7 +336,6 @@
prop="trnmod.swiadd.amenbr"
>
<c-input
disabled
v-model="model.trnmod.swiadd.amenbr"
placeholder="请输入Amend. No Receiv."
></c-input>
......@@ -350,6 +349,7 @@
prop="gidgrp.rec.amenbr"
>
<c-input
disabled
v-model="model.gidgrp.rec.amenbr"
placeholder="请输入Actual Amendment No "
></c-input>
......@@ -866,6 +866,7 @@
:disabled="model.trnmod.swiadd.addamtflg == ''"
v-model="model.trnmod.swiadd.addamt"
@blur="addamtBlur"
placeholder="请输入Additional Amount"
></c-input>
</c-form-item>
......@@ -991,7 +992,7 @@ export default {
},
async addamtBlur() {
let rtnmsg = await this.executeDefault("trnmod.swiadd.addamtcovs20");
let rtnmsg = await this.executeDefault("trnmod.swiadd.addamt");
if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
......
......@@ -492,7 +492,6 @@
prop="gitp.indirectswiadd"
>
<c-input
disabled
type="textarea"
rows="4"
v-model="model.gitp.indirectswiadd"
......
......@@ -595,7 +595,8 @@
prop="gidgrp.apl.pts.adrblk"
>
<c-input
:disabled="model.gidgrp.rec.hndtyp != 'OT'"
:disabled="model.gidgrp.rec.hndtyp != 'OT' ||
model.gidgrp.apl.pts.adrblk != ''"
rows="4"
type="textarea"
v-model="model.gidgrp.apl.pts.adrblk"
......@@ -607,21 +608,83 @@
</c-col>
<c-col :span="24">
<c-ptap
<el-form-item
v-if="
(model.gidgrp.rec.hndtyp == 'OL' ||
model.gidgrp.rec.hndtyp == '') &&
model.gitp.swiftflg != 'Y'
"
:model="model"
:argadr="{
title: 'Adv/Rcv bank',
grp: 'gidgrp',
rol: 'adv',
}"
@onAplpDet="onAdvpDet"
label="Adv/Rcv bank"
prop="gidgrp.adv.pts.ref"
>
<c-input
v-model="model.gidgrp.adv.pts.ref"
maxlength="16"
placeholder="请输入Adv/Rcv bank"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item
v-if="
(model.gidgrp.rec.hndtyp == 'OL' ||
model.gidgrp.rec.hndtyp == '') &&
model.gitp.swiftflg != 'Y'
"
label="Adv/Rcv bank"
prop="gidgrp.adv.pts.extkey"
>
<c-fullbox>
<c-input
v-model="model.gidgrp.adv.pts.extkey"
maxlength="16"
placeholder="请输入External Key of Address"
@keyup.enter.native="
showGridPromptDialog(`gidgrp.adv.pts.extkey`)
"
></c-input>
<template slot="footer">
<c-button
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
disabled
size="small"
type="primary"
@click="onIsspDet"
>
Details
</c-button>
</template>
</c-fullbox>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item
v-if="
(model.gidgrp.rec.hndtyp == 'OL' ||
model.gidgrp.rec.hndtyp == '') &&
model.gitp.swiftflg != 'Y'
"
label="地址名称"
prop="gidgrp.adv.pts.adrblk"
>
</c-ptap>
<c-input
disabled
rows="4"
type="textarea"
v-model="model.gidgrp.adv.pts.adrblk"
maxlength="35"
show-word-limit
placeholder="请输入地址名称"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
......@@ -761,7 +824,8 @@
prop="gidgrp.ben.pts.adrblk"
>
<c-input
:disabled="model.gidgrp.rec.hndtyp == 'OT'"
:disabled="model.gidgrp.rec.hndtyp == 'OT' ||
model.gidgrp.ben.pts.adrblk != ''"
rows="4"
type="textarea"
v-model="model.gidgrp.ben.pts.adrblk"
......
......@@ -16,6 +16,7 @@
<el-form-item label="Applicant" prop="gidgrp.apl.pts.extkey">
<c-fullbox>
<c-input
:disabled="model.gidgrp.apl.pts.extkey != ''"
v-model="model.gidgrp.apl.pts.extkey"
maxlength="16"
placeholder="请输入External Key of Address"
......@@ -34,7 +35,7 @@
>
</c-button>
<c-button
disabled
:disabled="model.gidgrp.apl.pts.extkey == ''"
size="small"
type="primary"
@click="onAplpDet"
......@@ -100,7 +101,7 @@
</c-button>
<c-button
v-if="model.gitp.swiftflg == 'Y'"
disabled
:disabled="model.gidgrp.ctr.pts.extkey == ''"
size="small"
type="primary"
@click="onCtrpDet"
......@@ -170,7 +171,7 @@
>
</c-button>
<c-button
disabled
:disabled="model.gidgrp.con.pts.extkey == ''"
size="small"
type="primary"
@click="onConpDet"
......@@ -188,7 +189,7 @@
prop="gidgrp.con.pts.adrblk"
>
<c-input
:disabled="model.gidgrp.con.pts.adrblk != ''"
disabled
type="textarea"
rows="4"
v-model="model.gidgrp.con.pts.adrblk"
......@@ -232,7 +233,7 @@
>
</c-button>
<c-button
:disabled="model.gidgrp.rec.hndtyp == 'OT'"
:disabled="model.gidgrp.ben.pts.extkey == ''"
size="small"
type="primary"
@click="onBenpDet"
......@@ -260,7 +261,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<!-- <c-col :span="24">
<el-form-item
v-if="
(model.gidgrp.rec.hndtyp == 'OC' ||
......@@ -338,7 +339,7 @@
placeholder="请输入地址名称"
></c-input>
</el-form-item>
</c-col>
</c-col> -->
<c-col :span="24">
<el-form-item
......@@ -361,6 +362,7 @@
>
<c-fullbox>
<c-input
disabled
v-model="model.gidgrp.atb.pts.extkey"
maxlength="16"
placeholder="请输入External Key of Address"
......@@ -380,6 +382,7 @@
>
</c-button>
<c-button
:disabled="model.gidgrp.atb.pts.extkey == ''"
v-if="model.gitp.swiftflg == 'Y'"
size="small"
type="primary"
......@@ -398,7 +401,7 @@
prop="gidgrp.atb.pts.adrblk"
>
<c-input
:disabled="model.gidgrp.atb.pts.adrblk != ''"
disabled
rows="4"
type="textarea"
v-model="model.gidgrp.atb.pts.adrblk"
......
......@@ -112,13 +112,13 @@
</c-content>
</el-tab-pane>
<el-tab-pane label="Settlement" name="Settlement">
<el-tab-pane label="Settlement" name="setpan">
<c-content>
<m-setpan :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-tab-pane v-if="this.flag" label="Bookings" name="Booking">
<el-tab-pane label="Bookings" name="Booking">
<c-content>
<m-glepan :model="model" :codes="codes" />
</c-content>
......
......@@ -859,7 +859,8 @@
<c-input
:disabled="
model.gidgrp.ghd.segtyp == '02' ||
model.gidgrp.rec.hndtyp != 'OT'
model.gidgrp.rec.hndtyp != 'OT' ||
model.gidgrp.apl.pts.adrbkl != ''
"
:rows="4"
type="textarea"
......@@ -947,7 +948,8 @@
<c-input
:disabled="
model.gidgrp.ghd.segtyp == '02' ||
model.gidgrp.rec.hndtyp == 'OT'
model.gidgrp.rec.hndtyp == 'OT' ||
model.gidgrp.ben.pts.adrbkl != ''
"
:rows="4"
type="textarea"
......
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