Commit fe34a940 by “yanyuxin”

Litopn交易Bug修改

parent eea8b9d4
...@@ -263,19 +263,19 @@ export default { ...@@ -263,19 +263,19 @@ export default {
], ],
"lidgrp.blk.feetxt":[ "lidgrp.blk.feetxt":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 80,message:"80"} {max: 210,message:"210"}
], ],
"lidgrp.blk.defdet":[ "lidgrp.blk.defdet":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 50,message:"长度不能超过50"} {max: 140,message:"长度不能超过140"}
], ],
"lidgrp.blk.dftat":[ "lidgrp.blk.dftat":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 50,message:"长度不能超过50"} {max: 100,message:"长度不能超过100"}
], ],
"litp.drwp.ptsget.sdamod.dadsnd":[ "litp.drwp.ptsget.sdamod.dadsnd":[
...@@ -305,7 +305,7 @@ export default { ...@@ -305,7 +305,7 @@ export default {
], ],
"lidgrp.blk.mixdet":[ "lidgrp.blk.mixdet":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 130,message:"长度不能超过130"}
], ],
"lidgrp.drw.adrelc":[ "lidgrp.drw.adrelc":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
......
...@@ -4,8 +4,10 @@ ...@@ -4,8 +4,10 @@
<c-col :span="11"> <c-col :span="11">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="授权兑付行" prop="lidgrp.rec.avbwth"> <el-form-item label="授权兑付行" prop="lidgrp.rec.avbwth">
<c-select v-model="model.lidgrp.rec.avbwth" <c-select
style="width:100%" placeholder="请选择" v-model="model.lidgrp.rec.avbwth"
style="width: 100%"
placeholder="请选择"
:code="codes.avbwth" :code="codes.avbwth"
> >
</c-select> </c-select>
...@@ -20,41 +22,58 @@ ...@@ -20,41 +22,58 @@
v-model="model.lidgrp.avb.pts.extkey" v-model="model.lidgrp.avb.pts.extkey"
maxlength="16" maxlength="16"
placeholder="请输入地址编码" placeholder="请输入地址编码"
@keyup.enter.native="showGridPromptDialog('lidgrp.avb.pts.extkey')" @keyup.enter.native="
showGridPromptDialog('lidgrp.avb.pts.extkey')
"
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0 10px 0 10px;padding: 0 12px;" style="margin: 0 10px 0 10px; padding: 0 12px"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
> >
<span style="font-family:'宋体';font-weight:bold"></span> <span style="font-family: '宋体'; font-weight: bold"></span>
</c-button> </c-button>
<c-button <c-button
style="margin:0 0" style="margin: 0 0"
size="small" size="small"
type="primary" type="primary"
@click="onAvbpDet" @click="onAvbpDet"
icon="el-icon-info" icon="el-icon-info"
> >
</c-button> </c-button>
</template> </template>
</c-fullbox> </c-fullbox>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="名称地址" prop="lidgrp.avb.pts.adrblk" <el-form-item
v-if="model.lidgrp.rec.avbwth != 'O'"> label="名称地址"
<c-input type="textarea" v-model="model.lidgrp.avb.pts.adrblk" maxlength="135" :rows="4" show-word-limit placeholder="请输入名称地址" prop="lidgrp.avb.pts.adrblk"
:disabled="model.lidgrp.rec.avbwth !== ''"></c-input> v-if="model.lidgrp.rec.avbwth != 'O'"
>
<c-input
type="textarea"
v-model="model.lidgrp.avb.pts.adrblk"
maxlength="135"
:rows="4"
show-word-limit
placeholder="请输入名称地址"
:disabled="model.lidgrp.rec.avbwth !== ''"
></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24" v-if="model.lidgrp.rec.avbwth == 'O'"> <c-col :span="24" v-if="model.lidgrp.rec.avbwth == 'O'">
<el-form-item label="Available in" prop="lidgrp.blk.avbwthtxt"> <el-form-item label="Available in" prop="lidgrp.blk.avbwthtxt">
<c-input <c-input
type="textarea" v-model="model.lidgrp.blk.avbwthtxt" maxlength="135" :rows="4" show-word-limit placeholder="请输入Available in" ></c-input> type="textarea"
v-model="model.lidgrp.blk.avbwthtxt"
maxlength="135"
:rows="4"
show-word-limit
placeholder="请输入Available in"
></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -115,7 +134,7 @@ ...@@ -115,7 +134,7 @@
<el-form-item label="兑付方式" prop="lidgrp.rec.avbby"> <el-form-item label="兑付方式" prop="lidgrp.rec.avbby">
<c-select <c-select
v-model="model.lidgrp.rec.avbby" v-model="model.lidgrp.rec.avbby"
style="width:100%" style="width: 100%"
placeholder="请选择兑付方式" placeholder="请选择兑付方式"
:code="codes.avbby" :code="codes.avbby"
> >
...@@ -125,9 +144,10 @@ ...@@ -125,9 +144,10 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="议付/延期付款指示" prop="lidgrp.blk.defdet"> <el-form-item label="议付/延期付款指示" prop="lidgrp.blk.defdet">
<c-input type="textarea" <c-input
type="textarea"
v-model="model.lidgrp.blk.defdet" v-model="model.lidgrp.blk.defdet"
maxlength="50" maxlength="140"
:rows="3" :rows="3"
show-word-limit show-word-limit
placeholder="请输入指示内容" placeholder="请输入指示内容"
...@@ -138,9 +158,10 @@ ...@@ -138,9 +158,10 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="汇票期限" prop="lidgrp.blk.dftat"> <el-form-item label="汇票期限" prop="lidgrp.blk.dftat">
<c-input type="textarea" <c-input
type="textarea"
v-model="model.lidgrp.blk.dftat" v-model="model.lidgrp.blk.dftat"
maxlength="50" maxlength="100"
:rows="3" :rows="3"
show-word-limit show-word-limit
placeholder="请输入汇票期限" placeholder="请输入汇票期限"
...@@ -156,29 +177,30 @@ ...@@ -156,29 +177,30 @@
v-model="model.lidgrp.drw.pts.extkey" v-model="model.lidgrp.drw.pts.extkey"
maxlength="16" maxlength="16"
placeholder="请输入地址编码" placeholder="请输入地址编码"
@keyup.enter.native="showGridPromptDialog('lidgrp.drw.pts.extkey')" @keyup.enter.native="
showGridPromptDialog('lidgrp.drw.pts.extkey')
"
:disabled="this.flag2" :disabled="this.flag2"
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
style="margin:0 10px 0 10px;padding: 0 12px;" style="margin: 0 10px 0 10px; padding: 0 12px"
size="small" size="small"
type="primary" type="primary"
@click="onSeainf('lidgrp.drw.pts.extkey')" @click="onSeainf('lidgrp.drw.pts.extkey')"
icon="el-icon-search" icon="el-icon-search"
> >
<span style="font-family:'宋体';font-weight:bold"></span> <span style="font-family: '宋体'; font-weight: bold"></span>
</c-button> </c-button>
<c-button <c-button
style="margin:0 0" style="margin: 0 0"
size="small" size="small"
type="primary" type="primary"
:disabled="this.flag2" :disabled="this.flag2"
@click="onDrwpDet" @click="onDrwpDet"
icon="el-icon-info" icon="el-icon-info"
> >
</c-button> </c-button>
</template> </template>
</c-fullbox> </c-fullbox>
...@@ -201,42 +223,69 @@ ...@@ -201,42 +223,69 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="名称地址" prop="lidgrp.drw.pts.adrblk"> <el-form-item label="名称地址" prop="lidgrp.drw.pts.adrblk">
<c-input type="textarea" <c-input
type="textarea"
:disabled="this.flag2" :disabled="this.flag2"
v-model="model.lidgrp.drw.pts.adrblk" maxlength="135" :rows="4" show-word-limit placeholder="请输入地址信息" ></c-input> v-model="model.lidgrp.drw.pts.adrblk"
maxlength="135"
:rows="4"
show-word-limit
placeholder="请输入地址信息"
></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="装船/发运地" prop="lidgrp.rec.shpfro"> <el-form-item label="装船/发运地" prop="lidgrp.rec.shpfro">
<c-input v-model="model.lidgrp.rec.shpfro" maxlength="65" placeholder="请输入地址"></c-input> <c-input
v-model="model.lidgrp.rec.shpfro"
maxlength="65"
placeholder="请输入地址"
></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="始发(航空)站"" prop="lidgrp.rec.porloa"> <el-form-item label="始发(航空)站" prop="lidgrp.rec.porloa">
<c-input v-model="model.lidgrp.rec.porloa" maxlength="65" placeholder="请输入地址"></c-input> <c-input
v-model="model.lidgrp.rec.porloa"
maxlength="65"
placeholder="请输入地址"
></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="终点(航空)站"" prop="lidgrp.rec.pordis"> <el-form-item label="终点(航空)站" prop="lidgrp.rec.pordis">
<c-input v-model="model.lidgrp.rec.pordis" maxlength="65" placeholder="请输入地址"></c-input> <c-input
v-model="model.lidgrp.rec.pordis"
maxlength="65"
placeholder="请输入地址"
></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="最终目的地" prop="lidgrp.rec.shpto"> <el-form-item label="最终目的地" prop="lidgrp.rec.shpto">
<c-input v-model="model.lidgrp.rec.shpto" maxlength="65" placeholder="请输入地址"></c-input> <c-input
v-model="model.lidgrp.rec.shpto"
maxlength="65"
placeholder="请输入地址"
></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="装运期" prop="lidgrp.blk.shpper"> <el-form-item label="装运期" prop="lidgrp.blk.shpper">
<c-input type="textarea" v-model="model.lidgrp.blk.shpper" maxlength="65" :rows="6" show-word-limit placeholder="请输入装运期" ></c-input> <c-input
type="textarea"
:disabled="model.lidgrp.rec.shpdat !=null && model.lidgrp.rec.shpdat !=''"
v-model="model.lidgrp.blk.shpper"
maxlength="65"
:rows="6"
show-word-limit
placeholder="请输入装运期"
></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -259,38 +308,42 @@ ...@@ -259,38 +308,42 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
--> -->
</c-col> </c-col>
<!-- ========================右边======================== --> <!-- ========================右边======================== -->
<c-col :span="11" :offset="1"> <c-col :span="11" :offset="1">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="提交期限(天)" prop="lidgrp.rec.prepers18"> <el-form-item label="提交期限(天)" prop="lidgrp.rec.prepers18">
<c-input v-model="model.lidgrp.rec.prepers18" <c-input
style="width:100%" v-model="model.lidgrp.rec.prepers18"
placeholder="请输入天数"></c-input> style="width: 100%"
placeholder="请输入天数"
></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="交单期限" prop="lidgrp.blk.preper"> <el-form-item label="交单期限" prop="lidgrp.blk.preper">
<c-fullbox> <c-fullbox>
<c-input type="textarea" v-model="model.lidgrp.blk.preper" maxlength="35" show-word-limit placeholder="请输入交单期限" ></c-input> <c-input
type="textarea"
v-model="model.lidgrp.blk.preper"
maxlength="35"
show-word-limit
placeholder="请输入交单期限"
></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@click="onPreperButtxmsel"></c-button> @click="onPreperButtxmsel"
></c-button>
</template> </template>
</c-fullbox> </c-fullbox>
</el-form-item> </el-form-item>
</c-col> </c-col>
<!-- <c-col :span="24"> <!-- <c-col :span="24">
<el-form-item label="Presentation period text" prop="lidgrp.rec.prepertxts18"> <el-form-item label="Presentation period text" prop="lidgrp.rec.prepertxts18">
<c-input v-model="model.lidgrp.rec.prepertxts18" maxlength="35" placeholder="请输入Presentation period text"></c-input> <c-input v-model="model.lidgrp.rec.prepertxts18" maxlength="35" placeholder="请输入Presentation period text"></c-input>
...@@ -304,18 +357,26 @@ ...@@ -304,18 +357,26 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="银行负担费用" prop="lidgrp.blk.feetxt"> <el-form-item label="银行负担费用" prop="lidgrp.blk.feetxt">
<c-fullbox> <c-fullbox>
<c-input type="textarea" v-model="model.lidgrp.blk.feetxt" maxlength="80" :rows="6" show-word-limit placeholder="请输入内容" ></c-input> <c-input
type="textarea"
v-model="model.lidgrp.blk.feetxt"
maxlength="210"
:rows="6"
show-word-limit
placeholder="请输入内容"
></c-input>
<template slot="footer"> <template slot="footer">
<c-button size="small" type="primary" icon="el-icon-search" @click="onChariaButtxmsel"></c-button> <c-button
size="small"
type="primary"
icon="el-icon-search"
@click="onChariaButtxmsel"
></c-button>
</template> </template>
</c-fullbox> </c-fullbox>
</el-form-item> </el-form-item>
</c-col> </c-col>
<!-- <c-col :span="24"> <!-- <c-col :span="24">
<el-form-item label="Drafts at" prop="lidgrp.rec.chato"> <el-form-item label="Drafts at" prop="lidgrp.rec.chato">
<c-select v-model="model.lidgrp.rec.chato" style="width:100%" placeholder="请选择Drafts at"> <c-select v-model="model.lidgrp.rec.chato" style="width:100%" placeholder="请选择Drafts at">
...@@ -327,7 +388,7 @@ ...@@ -327,7 +388,7 @@
<el-form-item label="收报行所属国家地区 " prop="lidgrp.rec.stacty"> <el-form-item label="收报行所属国家地区 " prop="lidgrp.rec.stacty">
<c-select <c-select
v-model="model.lidgrp.rec.stacty" v-model="model.lidgrp.rec.stacty"
style="width:100%" style="width: 100%"
:code="codes.stacty" :code="codes.stacty"
placeholder="请选择地区代码" placeholder="请选择地区代码"
> >
...@@ -335,13 +396,13 @@ ...@@ -335,13 +396,13 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="混合付款指示" prop="lidgrp.blk.mixdet"> <el-form-item label="混合付款指示" prop="lidgrp.blk.mixdet">
<c-input <c-input
type="textarea" type="textarea"
v-model="model.lidgrp.blk.mixdet" v-model="model.lidgrp.blk.mixdet"
maxlength="35" :rows="4" maxlength="130"
:rows="4"
show-word-limit show-word-limit
placeholder="请输入混合付款指示" placeholder="请输入混合付款指示"
:disabled="this.flag3" :disabled="this.flag3"
...@@ -349,115 +410,113 @@ ...@@ -349,115 +410,113 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="远期汇票最大期限(天)" prop="lidgrp.rec.tenmaxday"> <el-form-item
label="远期汇票最大期限(天)"
prop="lidgrp.rec.tenmaxday"
>
<c-input <c-input
:disabled=" !(!(this.model.lidgrp.rec.avbby == 'P')) " :disabled="!!(this.model.lidgrp.rec.avbby == 'P')"
v-model="model.lidgrp.rec.tenmaxday" placeholder="请输入天数"></c-input> v-model="model.lidgrp.rec.tenmaxday"
placeholder="请输入天数"
></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
</div> </div>
</template> </template>
<script> <script>
import Api from "~/service/Api" import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess"; import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable" import CodeTable from "~/config/CodeTable";
import Event from "~/model/Litopn/Event" import Event from "~/model/Litopn/Event";
export default { export default {
inject: ['root'], inject: ["root"],
props:["model","codes"], props: ["model", "codes"],
mixins: [commonProcess], mixins: [commonProcess],
data(){ data() {
return { return {
flag1:true, flag1: true,
flag2:true, flag2: true,
flag3:true, flag3: true,
flag4:true, flag4: true,
flag5:false, flag5: false,
flag6:false flag6: false,
} };
}, },
methods:{...Event, methods: {
onAvbpDet(){ ...Event,
console.log(this.model.lidgrp.rec.avbby) onAvbpDet() {
} console.log(this.model.lidgrp.rec.avbby);
}, },
created:function(){
}, },
watch:{ created: function () {},
"model.lidgrp.rec.avbwth":{ watch: {
immediate:true, "model.lidgrp.rec.avbwth": {
handler(val,oldVal){ immediate: true,
handler(val, oldVal) {
//Any Bank //Any Bank
if(val == 'O'){ if (val == "O") {
this.flag4=false; this.flag4 = false;
this.changeFormItemRequired('lidgrp.avb.pts.adrblk',false) this.changeFormItemRequired("lidgrp.avb.pts.adrblk", false);
this.flag6=false this.flag6 = false;
}//Advising Bank } //Advising Bank
else if(val == 'A'){ else if (val == "A") {
this.flag4=true; this.flag4 = true;
this.flag5=true; this.flag5 = true;
this.flag6=true; this.flag6 = true;
}//Issuing Bank } //Issuing Bank
else if(val == 'I'){ else if (val == "I") {
this.flag4=true; this.flag4 = true;
this.flag5=false; this.flag5 = false;
this.flag6=true; this.flag6 = true;
}//Confirming Bank } //Confirming Bank
else if(val == 'C'){ else if (val == "C") {
this.flag4=true; this.flag4 = true;
this.flag5=true; this.flag5 = true;
this.flag6=true; this.flag6 = true;
}//Specified Bank } //Specified Bank
else if(val == 'S'){ else if (val == "S") {
this.flag4=true; this.flag4 = true;
this.flag5=false; this.flag5 = false;
this.flag6=false; this.flag6 = false;
}
} }
}, },
},
"model.lidgrp.rec.avbby": { "model.lidgrp.rec.avbby": {
immediate:true, immediate: true,
handler(val,oldVal){ handler(val, oldVal) {
if (val=="D") { if (val == "D") {
this.flag1=false this.flag1 = false;
this.flag2=true this.flag2 = true;
this.flag3=true this.flag3 = true;
} }
if(val=="N"){ if (val == "N") {
this.flag1=false this.flag1 = false;
this.flag2=false this.flag2 = false;
this.flag3=true this.flag3 = true;
} }
if (val=="P") { if (val == "P") {
this.flag1=true this.flag1 = true;
this.flag2=false this.flag2 = false;
this.flag3=true this.flag3 = true;
} }
if (val=="M") { if (val == "M") {
this.flag1=true this.flag1 = true;
this.flag2=true this.flag2 = true;
this.flag3=false this.flag3 = false;
} }
if (val=="A") { if (val == "A") {
this.flag1=true this.flag1 = true;
this.flag2=false this.flag2 = false;
this.flag3=true this.flag3 = true;
} }
}, },
}, },
}, },
} };
</script> </script>
<style> <style>
.centerLable { .centerLable {
......
...@@ -93,16 +93,16 @@ ...@@ -93,16 +93,16 @@
v-model="model.lidgrp.cbs.nom1.cur" v-model="model.lidgrp.cbs.nom1.cur"
style="width: 100%" style="width: 100%"
placeholder="币种" placeholder="币种"
:code="codes.cur" :code="codes.curtxt1"
@keyup.enter.native="nom1CurEvent" @keyup.enter.native="nom1CurEvent"
> >
<el-option <!-- <el-option
v-for="item in codes.curtxt1" v-for="item in codes.curtxt1"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
> >
</el-option> </el-option> -->
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -233,6 +233,7 @@ ...@@ -233,6 +233,7 @@
<el-form-item label="最迟装船日期" prop="lidgrp.rec.shpdat"> <el-form-item label="最迟装船日期" prop="lidgrp.rec.shpdat">
<c-date-picker <c-date-picker
type="date" type="date"
:disabled="model.lidgrp.blk.shpper != '' && model.lidgrp.blk.shpper != null "
v-model="model.lidgrp.rec.shpdat" v-model="model.lidgrp.rec.shpdat"
style="width: 100%" style="width: 100%"
placeholder="请选择日期" placeholder="请选择日期"
...@@ -649,6 +650,7 @@ ...@@ -649,6 +650,7 @@
v-model="model.lidgrp.ben.pts.adrblk" v-model="model.lidgrp.ben.pts.adrblk"
maxlength="80" maxlength="80"
show-word-limit show-word-limit
:disabled ="true"
placeholder="请输入名称地址" placeholder="请输入名称地址"
></c-input> ></c-input>
</el-form-item> </el-form-item>
...@@ -675,7 +677,8 @@ ...@@ -675,7 +677,8 @@
--> -->
<c-col :span="24" class="centerLable marginLable"> <c-col :span="24" class="centerLable marginLable">
<c-checkbox v-model="model.lidgrp.rec.rmbflg" disabled <c-checkbox v-model="model.lidgrp.rec.rmbflg"
true-label="Y" false-label=""
style="margin-left:9px;padding: 0 10px;" style="margin-left:9px;padding: 0 10px;"
>偿付行信息</c-checkbox >偿付行信息</c-checkbox
> >
......
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