Skip to content

V
vue-gjjs
Commit 51e0653f by wangren
Options

inflid、litdav、litame、litopn交易bug修正

parent f6a9abe8
Showing with 125 additions and 54 deletions
src/config/CodeTable/index.js
......@@ -4104,10 +4104,7 @@ const CodeTable = {
],
// lcrtyp: [
// { label: "可转让", value: "IT" },
// { label: "不可转让", value: "I" },
// ],
lcrtyp: [
{ label: "可转让", value: "IT" },
{ label: "不可转让", value: "I" },
......@@ -4183,7 +4180,7 @@ const CodeTable = {
advtyp: [
{ label: "Advice of Discrepancy (MT750)", value: "750" },
{ label: "Advice of Payment (MT754)", value: "754" },
{ label: "Other", value: "oth" },
{ label: "Other", value: "OTH" },
],
limittype: [
......
src/model/Litame/Pattern.js
......@@ -822,16 +822,40 @@ export default {
{type: "string", required: true, message: "必输项"},
{max: 50,message:"长度不能超过50"}
],
"lidgrp.blk.spcbename":[
{type: "string", required: true, message: "必输项"},
{max: 50,message:"长度不能超过50"}
],
"lidgrp.blk.spcrcbame":[
{type: "string", required: true, message: "必输项"},
{max: 50,message:"长度不能超过50"}
],
"lidgrp.blk.adlcnd":[
{type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
"lidgrp.blk.spcben":[
{type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
"lidgrp.blk.spcrcb":[
{type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
"litamep.adlcndamep.usrblk":[
{type: "string", required: true, message: "必输项"},
{max: 1650,message:"长度不能超过1650"}
],
"litamep.spcbenamep.usrblk":[
{type: "string", required: true, message: "必输项"},
{max: 1650,message:"长度不能超过1650"}
],
"litamep.spcrcbamep.usrblk":[
{type: "string", required: true, message: "必输项"},
{max: 1650,message:"长度不能超过1650"}
],
......
src/model/Litdav/Default.js
......@@ -24,6 +24,7 @@ export default {
"liaall.limmod.comamt" :Utils.defaultFunction,
"liaall.limmod.ccvamt" :Utils.defaultFunction,
"brdgrp.cbs.max2.amt" :Utils.defaultFunction,
"brdgrp.rec.totamt" :Utils.defaultFunction,
"liaall.limmod.limpts.wrk.pts.extkey" :Utils.defaultFunction,
"liaall.limmod.limpts.wrk.pts.nam" :Utils.defaultFunction,
"setmod.doccur" :Utils.defaultFunction,
......
src/model/Litdav/Pattern.js
......@@ -58,7 +58,11 @@ export default {
{type: "string", required: false, message: "输入正确的日期"}
],
"brdgrp.prb.pts.ref":[
{type: "string", required: false, message: "必输项"},
{type: "string", required: true, message: "必输项"},
{max: 16,message:"长度不能超过16"}
],
"brdgrp.rec.advtyp":[
{type: "string", required: true, message: "必输项"},
{max: 16,message:"长度不能超过16"}
],
"lidgrp.rec.expdat":[
......@@ -97,10 +101,6 @@ export default {
"brdgrp.rec.disdat":[
{type: "string", required: false, message: "输入正确的日期"}
],
"brdgrp.prb.pts.ref":[
{type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"}
],
"brtp.prbp.ptsget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"},
......@@ -331,7 +331,7 @@ export default {
],
"brdgrp.acb.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
{max: 135,message:"长度不能超过135"}
],
"brdgrp.acb.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
......@@ -348,7 +348,7 @@ export default {
"brdgrp.blk.nartxt77a":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
{max: 3500,message:"长度不能超过3500"}
],
"brtp.rmbp.ptsget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"},
......@@ -369,7 +369,7 @@ export default {
],
"brdgrp.rmb.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
{max: 135,message:"长度不能超过135"}
],
"brdgrp.rmb.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
......@@ -398,7 +398,7 @@ export default {
],
"brdgrp.beb.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{max: 40,message:"长度不能超过40"}
{max: 140,message:"长度不能超过140"}
],
"brdgrp.beb.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
......
src/views/Business/Inflid/index.vue
<template>
<div class="eContainer">
<el-form :model="model" :rules="rules" ref="modelForm" label-width="200px" size="small" :validate-on-rule-change="false">
<div class="eContainer" style="height:90%">
<div style="padding:0 15px">
<el-form
:model="model"
:rules="rules"
ref="modelForm"
label-width="110"
label-position="right"
size="small"
:validate-on-rule-change="false">
<c-content>
<m-infsea :model="model" :codes="codes" ref="infsea" />
</c-content>
</el-form>
</div>
</div>
</template>
<script>
......@@ -33,7 +42,7 @@ export default {
mixins: [commonProcess], // 里面包含了Default、Check等的公共处理
data(){
return {
tabVal: "infsea",
tabVal: "",
trnName: "inflid",
model: new Inflid().data,
checkRules: Check,
......@@ -62,6 +71,6 @@ export default {
}
}
</script>
<style>
<style scoped>
</style>
src/views/Business/Litame/Adcpame.vue
......@@ -47,19 +47,21 @@
v-model="model.lidgrp.rec.spcbenflg">Spec.Pay.Cond.for Beneficiary</c-checkbox>
</c-col>
<c-col :span="12">
<c-col :span="12">
<c-checkbox
@change="open"
style=" margin: 0px 0 10px 150px;"
v-model="model.lidgrp.rec.spcrcbflg">Special Payment Conditions for Bank only</c-checkbox>
v-model="model.litamep.adlcndamep.modflg">Modify Text to Replace</c-checkbox>
</c-col>
<c-col :span="12">
<c-col :span="12">
<c-checkbox
@change="open"
style=" margin: 0px 0 10px 100px;"
v-model="model.litamep.adlcndamep.modflg">Modify Text to Replace</c-checkbox>
v-model="model.lidgrp.rec.spcrcbflg">Special Payment Conditions for Bank only</c-checkbox>
</c-col>
<c-col :span="12">
<c-checkbox
@change="open1"
......
src/views/Business/Litame/Spbpame.vue
......@@ -24,7 +24,7 @@
<c-col :span="2">
<c-button size="small" type="primary" icon="el-icon-search"
:disabled="this.flag2"
@click="showGridPromptDialog('litamep.lcrdocame.buttxmsel',null,null,{TXT: 'litamep.lcrdocamep.usrblk'}, {TXT: false},'doxpDialog')">
>
</c-button>
</c-col>
</c-col>
......
src/views/Business/Litame/Sprpame.vue
......@@ -24,8 +24,7 @@
</c-col>
<c-col :span="2">
<c-button size="small" type="primary" icon="el-icon-search"
:disabled="this.flag2"
@click="showGridPromptDialog('litamep.lcrdocame.buttxmsel',null,null,{TXT: 'litamep.lcrdocamep.usrblk'}, {TXT: false},'doxpDialog')">
:disabled="this.flag2">
</c-button>
</c-col>
</c-col>
......
src/views/Business/Litdav/Davp.vue
......@@ -64,8 +64,10 @@
</c-col>
<c-col :span="19">
<el-form-item label="Available by" prop="lidgrp.rec.avbby">
<c-input :disabled="true" v-model="model.lidgrp.rec.avbby" style="width:100%" placeholder="请选择Available by">
</c-input>
<c-select
:code="codes.avbby"
:disabled="true" v-model="model.lidgrp.rec.avbby" style="width:100%" placeholder="请选择Available by">
</c-select>
</el-form-item>
</c-col>
<c-col :span="5" >
......@@ -96,8 +98,8 @@
<c-col :span="24">
<el-form-item label="Form of L/C" prop="lidgrp.rec.lcrtyp">
<c-input :code="codes.lcrtyp" :disabled="true" v-model="model.lidgrp.rec.lcrtyp" style="width:100%" placeholder="请选择信用证类型">
</c-input>
<c-select :code="codes.lcrtyp" :disabled="true" v-model="model.lidgrp.rec.lcrtyp" style="width:100%" placeholder="请选择信用证类型">
</c-select>
</el-form-item>
</c-col>
......@@ -128,13 +130,17 @@
<c-col :span="12">
<el-form-item label="Payment advised on" prop="brdgrp.rec.advdat">
<c-date-picker type="date" v-model="model.brdgrp.rec.advdat" style="width:100%" placeholder="请选择Payment advised on"></c-date-picker>
<c-date-picker
:disabled=" (this.model.brdgrp.rec.advtyp == '750' || this.model.brdgrp.rec.advtyp == 'OTH') "
type="date" v-model="model.brdgrp.rec.advdat" style="width:100%" placeholder="请选择Payment advised on"></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Discrep. advised on" prop="brdgrp.rec.disdat">
<c-date-picker type="date" v-model="model.brdgrp.rec.disdat" style="width:100%" placeholder="请选择Discrep. advised on"></c-date-picker>
<c-date-picker
:disabled=" (this.model.brdgrp.rec.advtyp == '754' || this.model.brdgrp.rec.advtyp == 'OTH') "
type="date" v-model="model.brdgrp.rec.disdat" style="width:100%" placeholder="请选择Discrep. advised on"></c-date-picker>
</el-form-item>
</c-col>
</el-col>
......@@ -352,6 +358,18 @@ export default {
data() {
return {};
},
watch:{
"model.brdgrp.rec.advtyp":{
immediate:true,
handler(){
if(this.model.brdgrp.rec.advtyp == '750' || this.model.brdgrp.rec.advtyp == 'OTH'){
this.model.brdgrp.rec.advdat = ' '
}else if(this.model.brdgrp.rec.advtyp == '754' || this.model.brdgrp.rec.advtyp == 'OTH'){
this.model.brdgrp.rec.disdat = ' '
}
}
}
},
methods: { ...Event },
created: function() {}
};
......
src/views/Business/Litdav/Mt750p.vue
......@@ -3,7 +3,9 @@
<c-col>
<c-col :span="7">
<el-form-item label="Document Amount" prop="brdgrp.cbs.max.cur">
<c-input v-model="model.brdgrp.cbs.max.cur" maxlength="3" placeholder="请输入Document Amount"></c-input>
<c-input
disabled
v-model="model.brdgrp.cbs.max.cur" maxlength="3" placeholder="请输入Document Amount"></c-input>
</el-form-item>
</c-col>
......@@ -16,8 +18,10 @@
<c-col>
<c-col :span="7">
<el-form-item label="附加金额" prop="brdgrp.cbs.opn2.cur">
<c-select v-model="model.brdgrp.cbs.opn2.cur" style="width:100%" placeholder="请选择附加金额">
<el-form-item label="Drawn Add.Amount" prop="brdgrp.cbs.opn2.cur">
<c-select
disabled
v-model="model.brdgrp.cbs.opn2.cur" style="width:100%" placeholder="请选择附加金额">
</c-select>
</el-form-item>
</c-col>
......@@ -48,7 +52,9 @@
<c-col>
<c-col :span="7">
<el-form-item label="Total Amount Claimed" prop="brdgrp.rec.totcur">
<c-input v-model="model.brdgrp.rec.totcur" maxlength="3" placeholder="请输入Total Amount Claimed"></c-input>
<c-input
disabled
v-model="model.brdgrp.rec.totcur" maxlength="3" placeholder="请输入Total Amount Claimed"></c-input>
</el-form-item>
</c-col>
......@@ -59,39 +65,52 @@
</c-col>
</c-col>
<c-col>
<c-col :span="12">
<c-col :span="24">
<c-col :span="12">
<el-form-item label="External Key of Address" prop="brdgrp.acb.pts.extkey">
<c-fullbox>
<c-input
v-model="model.brdgrp.acb.pts.extkey"
maxlength="16"
placeholder="请输入External Key of Address"
@keyup.enter.native="showGridPromptDialog('brdgrp.acb.pts.extkey')"
></c-input>
<template slot="footer">
<c-button size="small" type="primary" @click="onAcbpDet">
Details
</c-button>
</template>
</c-fullbox>
</el-form-item>
</c-col>
<c-col :span="12">
<c-button size="small" type="primary" @click="onAcbpDet">
Details
</c-button>
<el-form-item label=" ">
</el-form-item>
</c-col>
</c-col>
</c-col>
<c-col :span="12">
<!-- <c-col :span="12">
<el-form-item label="名称" prop="brdgrp.acb.namelc">
<c-input type="textarea" v-model="model.brdgrp.acb.namelc" maxlength="35" show-word-limit placeholder="请输入名称" ></c-input>
</el-form-item>
</c-col>
-->
<c-col :span="12">
<el-form-item label="Address Block" prop="brdgrp.acb.pts.adrblk">
<c-input type="textarea" v-model="model.brdgrp.acb.pts.adrblk" maxlength="35" show-word-limit placeholder="请输入Address Block" ></c-input>
<c-input
:rows="4"
type="textarea" v-model="model.brdgrp.acb.pts.adrblk" maxlength="135" show-word-limit placeholder="请输入Address Block" ></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<!-- <c-col :span="12">
<el-form-item label="Chinese address" prop="brdgrp.acb.dbfadrblkcn">
<c-input type="textarea" v-model="model.brdgrp.acb.dbfadrblkcn" maxlength="35" show-word-limit placeholder="请输入Chinese address" ></c-input>
</el-form-item>
......@@ -101,15 +120,16 @@
<el-form-item label="地址" prop="brdgrp.acb.adrelc">
<c-input type="textarea" v-model="model.brdgrp.acb.adrelc" maxlength="35" show-word-limit placeholder="请输入地址" ></c-input>
</el-form-item>
</c-col>
</c-col> -->
<c-col>
<c-col :span="12">
<el-form-item label="Discrepancies" prop="brdgrp.blk.docdis">
<c-input
:rows="6"
:disabled="!(this.model.brdgrp.blk.docdisflg =='X')"
type="textarea" v-model="model.brdgrp.blk.docdis" maxlength="50" show-word-limit placeholder="请输入不符点" ></c-input>
type="textarea" v-model="model.brdgrp.blk.docdis" maxlength="150" show-word-limit placeholder="请输入不符点" ></c-input>
</el-form-item>
</c-col>
</c-col>
......
src/views/Business/Litdav/index.vue
......@@ -106,6 +106,7 @@ import Limitbody from "~/views/Public/Limitbody";
export default {
name:"Litdav",
components:{
"m-davp" : Davp,
......@@ -134,9 +135,7 @@ export default {
defaultRules: Default,
pattern: Pattern,
rules: null,
codes: {
...CodeTable
},
codes: {...CodeTable},
}
},
methods:{
......
src/views/Business/Litopn/Detp.vue
......@@ -335,7 +335,9 @@
<c-col :span="24">
<el-form-item label="Tenor day" prop="lidgrp.rec.tenmaxday">
<c-input v-model="model.lidgrp.rec.tenmaxday" placeholder="请输入Maximum tenor in days"></c-input>
<c-input
:disabled=" !(!(this.model.lidgrp.rec.avbby == 'P')) "
v-model="model.lidgrp.rec.tenmaxday" placeholder="请输入Maximum tenor in days"></c-input>
</el-form-item>
</c-col>
......
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