Commit 2ff15201 by wangren

bctame、litopn、bctame、bctdor、litrog部分bug修改

parent 024a2824
......@@ -53,10 +53,10 @@ export default {
{max: 1,message:"长度不能超过1"}
],
"trnmod.swiadd.newmatpercnt":[
{type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"}
],
// "trnmod.swiadd.newmatpercnt":[
// {type: "string", required: false, message: "必输项"},
// {max: 3,message:"长度不能超过3"}
// ],
"oldbcdgrp.rec.matdat":[
......
......@@ -40,11 +40,11 @@ export default {
{max: 40,message:"长度不能超过40"}
],
"brdgrp.cbs.max.amt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
// "brdgrp.cbs.max.amt":[
// {type: "number", required: false, message: "必输项"},
// {max: 18,message:"整数位不能超过14位"},
// {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
// ],
"brdgrp.apl.pts.ref":[
{type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"}
......
......@@ -796,11 +796,11 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"liaall.limmod.comamt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
// "liaall.limmod.comamt":[
// {type: "number", required: false, message: "必输项"},
// {max: 18,message:"整数位不能超过14位"},
// {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
// ],
"liaall.limmod.limpts.wrk.pts.nam":[
{type: "string", required: false, message: "必输项"},
{max: 40,message:"长度不能超过40"}
......
......@@ -16,11 +16,11 @@ export default {
{max: 40,message:"长度不能超过40"}
],
"lidgrp.cbs.nom1.amt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
// "lidgrp.cbs.nom1.amt":[
// {type: "number", required: false, message: "必输项"},
// {max: 18,message:"整数位不能超过14位"},
// {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
// ],
"brdgrp.apl.pts.ref":[
{type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"}
......@@ -30,11 +30,11 @@ export default {
{type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"}
],
"lidgrp.cbs.opn1.amt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
// "lidgrp.cbs.opn1.amt":[
// {type: "number", required: false, message: "必输项"},
// {max: 18,message:"整数位不能超过14位"},
// {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
// ],
"brdgrp.apl.pts.nam":[
{type: "string", required: false, message: "必输项"},
......@@ -99,11 +99,11 @@ export default {
{type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"}
],
"brdgrp.cbs.max.amt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
// "brdgrp.cbs.max.amt":[
// {type: "number", required: false, message: "必输项"},
// {max: 18,message:"整数位不能超过14位"},
// {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
// ],
"brtp.prbp.ptsget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"},
......
......@@ -107,7 +107,7 @@
<c-col :span="24">
<el-form-item label="Amend Condition" prop="newdoctypcod">
<c-select v-model="model.newdoctypcod" style="width:100%" placeholder="Amend Condition">
<el-option v-for="item in codes.doctyp" :key="item.value" :label="item.label" :value="item.value">
<el-option v-for="item in codes.doctypcod" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</c-select>
</el-form-item>
......
......@@ -319,13 +319,75 @@
></c-input>
</el-form-item>
</c-col>
<c-ptap
<!-- <c-ptap
:model="model"
:argadr="{ title: 'Drawee ', grp: 'bcdgrp', rol: 'dre' }"
:disabled="true"
>
</c-ptap>
</c-ptap> -->
<c-col :span="24">
<el-form-item
label="Drawee Ref."
prop="bcdgrp.dre.pts.ref"
>
<c-input
v-model="model.bcdgrp.dre.pts.ref"
maxlength="16"
style="width: 100%"
placeholder="请输入Application Ref"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Extkey" prop="bcdgrp.dre.pts.extkey">
<c-fullbox>
<c-input
disabled
v-model="model.bcdgrp.dre.pts.extkey"
maxlength="50"
placeholder="请输入External Key of Address"
@keyup.enter.native="showGridPromptDialog('bcdgrp.dre.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
style="margin:0 0"
size="small"
type="primary"
disabled
@click="onAplpDet"
>
详情
</c-button>
</template>
</c-fullbox>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Address Block" prop="bcdgrp.dre.pts.adrblk">
<c-input
type="textarea"
:rows="4"
v-model="model.bcdgrp.dre.pts.adrblk"
maxlength="50"
disabled
show-word-limit
placeholder="请输入Address Block"
></c-input>
</el-form-item>
</c-col>
<c-ptap
:model="model"
......
......@@ -100,6 +100,7 @@ import Engp from "~/views/Public/Engp"
export default {
name:"Bctame",
components:{
"m-amep" : Amep,
"m-ovwp" : Ovwp,
......
<template>
<c-row>
<!-- ====================左边======================= -->
<c-col :span="14">
<c-col :span="24">
<c-col :span="12">
<el-form-item label-position="left" label="Delivery of Documents"></el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label=" Instructions" label-width="150px" style="margin-left:-300px" >
</el-form-item>
</c-col>
</c-col>
<c-col :span="24">
<c-col :span="20">
<c-input disabled type="textarea" disabled v-model="model.bcdgrp.blk.colins" maxlength="65" show-word-limit placeholder="请输入Collection Instructions" >
<c-col :span="11">
<c-col :span="24">
<el-form-item label="Delivery of Documents Instructions">
<c-input
disabled
type="textarea"
disabled
v-model="model.bcdgrp.blk.colins"
maxlength="65"
show-word-limit
placeholder="请输入Collection Instructions"
>
</c-input>
</c-col>
</c-col>
<c-col :span="20">
<el-form-item label-position="left" label="Draft Instructions">
</el-form-item>
</c-col>
<c-col :span="24">
<c-col :span="20">
<c-input disabled type="textarea" v-model="model.bcdgrp.blk.dftins" maxlength="65" show-word-limit placeholder="请输入Draft Instructions" ></c-input>
</c-col>
<el-form-item label="Draft Instructions">
<c-input
disabled
type="textarea"
v-model="model.bcdgrp.blk.dftins"
maxlength="65"
show-word-limit
placeholder="请输入Draft Instructions"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24" >
<c-col :span="24">
<el-form-item label="Protest Instructions" prop="bcdgrp.rec.proins">
</el-form-item>
</c-col>
<c-col :span="20" >
<c-select disabled v-model="model.bcdgrp.rec.proins" style="width:100%" placeholder="请选择Protest Instructions">
</c-select> <el-option
<c-select
disabled
v-model="model.bcdgrp.rec.proins"
style="width: 100%"
placeholder="请选择Protest Instructions"
>
</c-select>
<el-option
v-for="item in codes.proins"
:key="item.value"
:label="item.label"
:value="item.value"
> </el-option>
</c-col>
<c-col :span="24">
<el-form-item label="Other Instructions">
>
</el-option>
</el-form-item>
</c-col>
<c-col :span="24">
<c-col :span="20">
<c-input disabled type="textarea" v-model="model.bcdgrp.blk.othins" maxlength="65" show-word-limit placeholder="请输入Other Instructions" ></c-input>
</c-col>
<el-form-item label="Other Instructions">
<c-input
disabled
type="textarea"
v-model="model.bcdgrp.blk.othins"
maxlength="65"
show-word-limit
placeholder="请输入Other Instructions"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<c-col :span="5">
<el-form-item label="Good's Code">
</el-form-item>
</c-col>
<c-col :span="4">
<el-form-item label="(for Statistics)">
</el-form-item>
</c-col>
</c-col>
<c-col :span="20" >
<c-select disabled v-model="model.bcdgrp.rec.stagod" style="width:100%" placeholder="请选择Good's Code (for Statistics">
<el-form-item label="Good's Code (for Statistics)">
<c-select
disabled
v-model="model.bcdgrp.rec.stagod"
style="width: 100%"
placeholder="请选择Good's Code (for Statistics"
>
</c-select>
<el-option
v-for="item in codes.godcod"
......@@ -73,109 +78,103 @@
:value="item.value"
>
</el-option>
</el-form-item>
</c-col>
</c-col>
<!-- ====================右边======================= -->
<c-col :span="10">
<c-col :span="11" :offset="1">
<c-col :span="24">
<el-form-item label="Charges Condition">
</el-form-item>
</c-col>
<c-col :span="24">
<c-select disabled v-model="model.bcdgrp.rec.chato" style="width:100%" placeholder="请选择Our Charges to">
</c-select><el-option
<c-select
disabled
v-model="model.bcdgrp.rec.chato"
style="width: 100%"
placeholder="请选择Our Charges to"
>
</c-select
><el-option
v-for="item in codes.chadet"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Charges Text">
<c-input
disabled
type="textarea"
v-model="model.bcdgrp.blk.chgtxt"
maxlength="35"
show-word-limit
placeholder="请输入Charges Text"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<c-input disabled type="textarea" v-model="model.bcdgrp.blk.chgtxt" maxlength="35" show-word-limit placeholder="请输入Charges Text" ></c-input>
</c-col>
<c-col :span="24">
<c-checkbox disabled v-model="model.bcdgrp.rec.focflg">Free of Payment</c-checkbox>
</c-col>
<c-col :span="24">
<c-col :span="5">
<el-form-item label="Waive Collecting">
</el-form-item>
</c-col>
<c-col :span="4">
<el-form-item label="Bank Charges">
</el-form-item>
</c-col>
<c-checkbox disabled v-model="model.bcdgrp.rec.focflg"
style="margin-left:150px"
>Free of Payment</c-checkbox
>
</c-col>
<c-col :span="24">
<c-select disabled v-model="model.bcdgrp.rec.waicolcod" style="width:100%" placeholder="请选择Waive Collecting Bank Charges">
<el-form-item label="Waive Collecting Bank Charges">
<c-select
disabled
v-model="model.bcdgrp.rec.waicolcod"
style="width: 100%"
placeholder="请选择Waive Collecting Bank Charges"
>
</c-select>
</c-col>
<c-col :span="24">
<c-col :span="5">
<el-form-item label="Waive Remitting">
</el-form-item>
</c-col>
<c-col :span="4">
<el-form-item label="Bank Charges">
</el-form-item>
</c-col>
</c-col>
<c-col :span="24">
<c-select disabled v-model="model.bcdgrp.rec.wairmtcod" style="width:100%" placeholder="请选择Waive Remitting Bank Charges">
<el-form-item label="Waive Remitting Bank Charges">
<c-select
disabled
v-model="model.bcdgrp.rec.wairmtcod"
style="width: 100%"
placeholder="请选择Waive Remitting Bank Charges"
>
</c-select>
</c-col>
<c-col :span="24">
<el-form-item label="Defer Payment until">
</el-form-item>
</c-col>
<c-col :span="24">
<c-select disabled v-model="model.bcdgrp.rec.othins" style="width:100%" placeholder="请选择Defer Payment until">
<el-form-item label="Defer Payment until">
<c-select
disabled
v-model="model.bcdgrp.rec.othins"
style="width: 100%"
placeholder="请选择Defer Payment until"
>
</c-select>
</el-form-item>
</c-col>
</c-col>
</c-row>
</template>
<script>
import Api from "~/service/Api"
import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "~/model/Bctdor/Event"
import CodeTable from "~/config/CodeTable";
import Event from "~/model/Bctdor/Event";
export default {
inject: ['root'],
props:["model","codes"],
inject: ["root"],
props: ["model", "codes"],
mixins: [commonProcess],
data(){
return {
}
data() {
return {};
},
methods:{...Event},
created:function(){
}
}
methods: { ...Event },
created: function () {},
};
</script>
<style>
</style>
<style></style>
......@@ -8,7 +8,7 @@
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
<!--PD000005 -->
<el-tab-pane label="Settle BC at Maturity, " name="bctsus">
<el-tab-pane label="Settle BC at Maturity" name="bctsus">
<m-bctsus :model="model" :codes="codes"/>
</el-tab-pane>
......
......@@ -364,6 +364,9 @@ export default {
handler(){
if(this.model.brdgrp.rec.advtyp == '750' ){
this.model.brdgrp.rec.advdat = ' '
this.model.brdgrp.blk.docdisflg= 'X'
}else if(this.model.brdgrp.rec.advtyp == '754'){
this.model.brdgrp.rec.disdat = ' '
// this.model.brdgrp.blk.docdisflg= ""
......
......@@ -62,6 +62,7 @@
<el-form-item label="Available by" prop="lidgrp.rec.avbby">
<c-select
disabled
:code="codes.avbby"
v-model="model.lidgrp.rec.avbby" style="width:100%" placeholder="请选择Available by">
</c-select>
</el-form-item>
......@@ -107,8 +108,10 @@
<c-col :span="24">
<el-form-item label="Form of L/C" prop="lidgrp.rec.lcrtyp">
<c-input disabled v-model="model.lidgrp.rec.lcrtyp" style="width:100%" placeholder="请选择信用证类型">
</c-input>
<c-select
:code="codes.lcrtyp"
disabled v-model="model.lidgrp.rec.lcrtyp" style="width:100%" placeholder="请选择信用证类型">
</c-select>
</el-form-item>
</c-col>
......
......@@ -3,7 +3,7 @@
<!-- 左 -->
<el-col :span="11">
<c-col :span="24">
<c-form-item label="L/C Reference" prop="lidget.lid.ownref">
<c-form-item label="L/C Reference" prop="lidgrp.lid.ownref">
<c-fullbox>
<c-input
v-model="model.lidget.lid.ownref"
......@@ -860,7 +860,7 @@ export default {
key: 3,
},
{
label: "Oth.Docs",
label: "Oth. Docs",
key: 4,
},
{
......
......@@ -81,7 +81,7 @@ export default {
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
Utils.copyValueFromVO(this.model, rtnmsg.data);
this.updateModel(rtnmsg.data)
}
else
{
......
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