Commit 9f239085 by liyixun

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
parents a98bd40c 0a605d81
......@@ -4114,10 +4114,7 @@ const CodeTable = {
],
// lcrtyp: [
// { label: "可转让", value: "IT" },
// { label: "不可转让", value: "I" },
// ],
lcrtyp: [
{ label: "可转让", value: "IT" },
{ label: "不可转让", value: "I" },
......@@ -4193,7 +4190,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: [
......@@ -7079,5 +7076,19 @@ const CodeTable = {
{label:"Applicant",value:"APPL" },
{label:"Obligor",value:"OBLI" },
],
detdrv_deltol:[
{label:"Beneficiary",value:"BENE" },
{label:"Specified address",value:"OTHR" },
],
prsdoc:[
{label:"增值税发票",value:"增值税发票" },
{label:"发票",value:"发票" },
{label:"装箱单",value:"装箱单" },
{label:"空运单",value:"空运单" },
{label:"海运提单",value:"海运提单" },
{label:"铁路运单",value:"铁路运单" },
{label:"货物收据",value:"货物收据" },
{label:"邮政收据",value:"邮政收据" },
]
}
export default CodeTable;
......@@ -18,7 +18,7 @@ export default {
"dedgrp.cbs.opn1.amt": [
{ type: "string", required: false, message: "必输项" },
{ max: 18, message: "整数位不能超过14位" },
{ pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
{ pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"bftp.recget.sdamod.dadsnd": [
{ type: "string", required: false, message: "必输项" },
......
......@@ -150,7 +150,7 @@ export default {
"dedgrp.cbs.opn1.amt": [
{ type: "string" },
{ max: 18, message: "整数位不能超过14位" },
{ pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
{ pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"bftp.recget.sdamod.dadsnd": [
{ type: "string", required: false, message: "必输项" },
......
......@@ -35,7 +35,7 @@ export default {
"bodgrp.drr.pts.adrblk" :Utils.defaultFunction,
"bodgrp.cbs.max.amt" :Utils.defaultFunction,
"bodgrp.rec.doctypcod" :Utils.defaultFunction,
"bodgrp.cbs.max.cur" :Utils.defaultFunction,
// "bodgrp.cbs.max.cur" :Utils.defaultFunction,
"bodgrp.rec.shpdat" :Utils.defaultFunction,
"bodgrp.rec.matpercnt" :Utils.defaultFunction,
"bodgrp.rec.matperbeg" :Utils.defaultFunction,
......
......@@ -12,7 +12,7 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"lidgrp.rec.expdat":[
{type: "date", required: false, message: "输入正确的日期"}
//{type: "date", required: false, message: "输入正确的日期"}
],
"lidgrp.cbs.opn1.cur":[
{type: "string", required: false, message: "必输项"},
......@@ -63,10 +63,10 @@ export default {
{max: 40,message:"长度不能超过40"}
],
"brdgrp.rec.rcvdat":[
{type: "date", required: false, message: "输入正确的日期"}
//{type: "date", required: false, message: "输入正确的日期"}
],
"brdgrp.rec.advdat":[
{type: "date", required: false, message: "输入正确的日期"}
//{type: "date", required: false, message: "输入正确的日期"}
],
"brdgrp.ben.pts.ref":[
{type: "string", required: false, message: "必输项"},
......@@ -104,7 +104,7 @@ export default {
{max: 16,message:"长度不能超过16"}
],
"brdgrp.rec.disdat":[
{type: "date", required: true, message: "输入正确的日期"}
//{type: "date", required: true, message: "输入正确的日期"}
],
"brdgrp.prb.pts.extkey":[
{type: "string", required: false, message: "必输项"},
......
......@@ -55,17 +55,17 @@ export default {
{max: 40,message:"长度不能超过40"}
],
"lidgrp.rec.opndat":[
{type: "date", required: false, message: "输入正确的日期"}
//{type: "date", required: false, message: "输入正确的日期"}
],
"lidgrp.rec.shpdat":[
{type: "date", required: false, message: "输入正确的日期"}
//{type: "date", required: false, message: "输入正确的日期"}
],
"brdgrp.prb.pts.ref":[
{type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"}
],
"lidgrp.rec.expdat":[
{type: "date", required: false, message: "输入正确的日期"}
//{type: "date", required: false, message: "输入正确的日期"}
],
"lidgrp.rec.expplc":[
{type: "string", required: false, message: "必输项"},
......@@ -112,10 +112,10 @@ export default {
],
"brdgrp.rec.relgoddat":[
{type: "date", required: false, message: "输入正确的日期"}
//{type: "date", required: false, message: "输入正确的日期"}
],
"brdgrp.rec.expdat":[
{type: "date", required: false, message: "输入正确的日期"}
//{type: "date", required: false, message: "输入正确的日期"}
],
"brdgrp.blk.carnam":[
{type: "string", required: false, message: "必输项"},
......@@ -132,7 +132,7 @@ export default {
],
"brdgrp.rec.tradat":[
{type: "date", required: false, message: "输入正确的日期"}
//{type: "date", required: false, message: "输入正确的日期"}
],
"brdgrp.blk.relstoadr":[
//{type: "string", required: true, message: "必输项"},
......
......@@ -12,7 +12,7 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"lidgrp.rec.expdat":[
{type: "date", required: false, message: "输入正确的日期"}
//{type: "date", required: false, message: "输入正确的日期"}
],
"lidgrp.cbs.opn1.cur":[
{type: "string", required: false, message: "必输项"},
......@@ -67,10 +67,10 @@ export default {
{max: 40,message:"长度不能超过40"}
],
"brdgrp.rec.rcvdat":[
{type: "date", required: false, message: "输入正确的日期"}
//{type: "date", required: false, message: "输入正确的日期"}
],
"brdgrp.rec.advdat":[
{type: "date", required: false, message: "输入正确的日期"}
//{type: "date", required: false, message: "输入正确的日期"}
],
"brdgrp.ben.pts.ref":[
{type: "string", required: false, message: "必输项"},
......
......@@ -12,7 +12,7 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"lidgrp.rec.expdat":[
{type: "date", required: false, message: "输入正确的日期"}
//{type: "date", required: false, message: "输入正确的日期"}
],
"lidgrp.cbs.opn1.cur":[
{type: "string", required: false, message: "必输项"},
......@@ -63,10 +63,10 @@ export default {
{max: 40,message:"长度不能超过40"}
],
"brdgrp.rec.rcvdat":[
{type: "date", required: false, message: "输入正确的日期"}
//{type: "date", required: false, message: "输入正确的日期"}
],
"brdgrp.rec.advdat":[
{type: "date", required: false, message: "输入正确的日期"}
//{type: "date", required: false, message: "输入正确的日期"}
],
"brdgrp.ben.pts.ref":[
{type: "string", required: false, message: "必输项"},
......@@ -99,10 +99,10 @@ export default {
"brdgrp.rec.orddat":[
{type: "date", required: false, message: "输入正确的日期"}
//{type: "date", required: false, message: "输入正确的日期"}
],
"swtdat":[
{type: "date", required: false, message: "输入正确的日期"}
//{type: "date", required: false, message: "输入正确的日期"}
],
"brtp.prbp.ptsget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"},
......
......@@ -2,53 +2,86 @@ import Api from "~/service/Api"
import Utils from "~/utils"
export default {
async onSerbut(){
let rtnmsg = await this.executeRule("serbut")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
async onSerbut() {
let rtnmsg = await this.executeRule("serbut")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败!'});
}
},
async onButprt(){
let rtnmsg = await this.executeRule("butprt")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
},
async onButprt() {
let rtnmsg = await this.executeRule("butprt")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败!'});
}
},
async onDtlbut(){
let rtnmsg = await this.executeRule("dtlbut")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
},
async onDtlbut() {
let rtnmsg = await this.executeRule("dtlbut")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败!'});
}
},
async onExi(){
let rtnmsg = await this.executeRule("exi")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
},
async onExi() {
let rtnmsg = await this.executeRule("exi")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败!'});
}
},
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
},
async handleSearch() {
this.stmData.data = [];
let opndatfrom = this.model.frmdat;
if (!opndatfrom || opndatfrom == '') {
this.$notify.error({ title: '错误', message: '查询开始日期必输!' });
return;
}
let opndatto = this.model.tildat;
if (!opndatto || opndatto == '') {
this.$notify.error({ title: '错误', message: '查询结束日期必输!' });
return;
}
let rtnmsg = await this.executeRule("infbut.searow")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
this.stmData.data = rtnmsg.data.infbut_dspstm.rows;
// this.updateModel(rtnmsg.data);
// this.stmData.data = rtnmsg.data.infbut_dspstm.rows;
//this.model.infbut.dspstm = rtnmsg.data.infbut_dspstm
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
},
async handleReset() {
this.model.infcon.seaownref = ""
this.model.infcon.opndatfrom = new Date();
this.model.infcon.opndatto = new Date();
this.model.infcon.searef = "";
this.model.infcon.pty.extkey = "";
this.model.infcon.usr.extkey = "";
this.model.infcon.searol = "";
this.model.infcon.pty.nam = "";
this.model.infcon.seapty = "";
this.model.infcon.curtxt1 = "";
this.model.infcon.nam = "";
this.model.infcon.seaamtfr = "";
this.model.infcon.seaamtto = "";
this.model.infcon.seasta = "";
this.model.infcon.doctypcod = "";
},
}
\ No newline at end of file
......@@ -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"}
],
......
......@@ -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,
......
......@@ -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: "必输项"},
......
<template>
<div class="eibs-tab">
<c-col :span="20">
<c-col :span="18">
<el-form-item label="单据内部不符点" prop="bfdgrp.blk.intdis">
<c-input
type="textarea"
......@@ -24,7 +24,7 @@
</c-button>
</c-col>
<c-col :span="20">
<c-col :span="18">
<el-form-item label="不符点" prop="bfdgrp.blk.docdis">
<c-input
type="textarea"
......@@ -50,11 +50,11 @@
</c-button>
</c-col>
<c-col :span="2">
<c-col :span="4">
<c-checkbox v-model="model.rejpenins">保留单据,等候指示</c-checkbox>
</c-col>
<c-col :span="2">
<c-col :span="4">
<c-checkbox v-model="docdisflg">不符点修改</c-checkbox>
</c-col>
......
......@@ -424,6 +424,9 @@
style="width: 100%"
placeholder="请选择交单行"
disabled
@change="eventFunction(
'bfdgrp.rec.docprbrol'
)"
>
<el-option
v-for="item in codes.docprbrol"
......@@ -447,6 +450,7 @@
:noRef="true"
:disabled="true"
:isAdrblk="false"
:disabledExtkey="model.bfdgrp.rec.docprbrol=='BEN'"
@onSeainf="onSeainf"
@onAplpDet="onBenpDet"
>
......
......@@ -378,7 +378,7 @@
</c-col> -->
<c-col :span="24">
<c-col :span="12">
<c-col :span="11">
<el-form-item label="收单日期" prop="bfdgrp.rec.rcvdat">
<c-date-picker
type="date"
......@@ -389,7 +389,7 @@
></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="12">
<c-col :span="11" :offset="1">
<el-form-item label="装运日期" prop="bfdgrp.rec.shpdat">
<c-date-picker
type="date"
......@@ -401,7 +401,7 @@
</c-col>
</c-col>
<c-col :span="24">
<c-col :span="12">
<c-col :span="11">
<el-form-item label="寄单日期" prop="bfdgrp.rec.predat">
<c-date-picker
type="date"
......@@ -411,7 +411,7 @@
></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="12">
<c-col :span="11" :offset="1">
<el-form-item label="到期日期" prop="bfdgrp.rec.matdat">
<c-date-picker
type="date"
......
......@@ -50,7 +50,7 @@
<c-col :span="24">
<el-form-item label="" prop="bodgrp.blk.colinsflg">
<c-checkbox v-model="colinsflg">Collection instructions modified</c-checkbox>
<c-checkbox v-model="colinsflg">Delivery of Documents Instructions modified</c-checkbox>
</el-form-item>
</c-col>
......
......@@ -39,7 +39,7 @@
</c-button>
</c-col>
</c-row>
</c-input>
</el-form-item>
</c-col>
<c-col :span="12">
......@@ -50,7 +50,7 @@
</c-col>
<c-col :span="12">
<el-form-item label="Document Amount" prop="bodgrp.cbs.max.cur">
<c-select v-model="model.bodgrp.cbs.max.cur" style="width: 100%" placeholder="请选择Currency">
<c-select v-model="model.bodgrp.cbs.max.cur" style="width: 100%" placeholder="请选择Currency" @change="changeCur">
<el-option v-for="item in codes.currencycode" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</c-select>
......@@ -322,6 +322,13 @@
},
methods: {
...Event,
changeCur(){
this.executeDefault("bodgrp.cbs.max.cur").then((res) => {
if ((res.respCode == SUCCESS)) {
Utils.copyValueFromVO(this.model, res.data);
}
});
},
addTableValue(index) {
var newTableValue = Object.assign({}, this.newValue);
const serial = Utils.generateUUID();
......
......@@ -31,7 +31,7 @@
<!--Parties -->
<el-tab-pane label="Parties" name="ptyp">
<c-content>
<m-ptyp :model="model" />
<m-ptyp :model="model" />
</c-content>
</el-tab-pane>
......@@ -77,10 +77,17 @@
</el-tab-pane>
<!--跨境人民币申报 -->
<el-tab-pane label="跨境人民币申报" name="cnyp">
<el-tab-pane label="跨境人民币申报" name="cnyp" >
<m-cnyp :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane label="2106银行跟单结算及表外融资" name="libp" v-if="model.cnybop.libflg ==='1'">
<c-content>
<m-libp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--货权单据 -->
<el-tab-pane label="货权单据" name="srmp">
<m-srmp :model="model" :codes="codes" />
......@@ -117,6 +124,7 @@
import Engp from "~/views/Public/Engp"
import Glepan from "~/views/Public/Glepan"
import Doctre from "~/views/Public/Doctre"
import Libp from '../Betsnd/Libp'
export default {
......@@ -133,6 +141,7 @@
"m-cnyp": Cnyp,
"m-srmp": Srmp,
"m-engp": Engp,
'm-libp': Libp,
"m-glepan": Glepan,
},
......
<template>
<div class="eibs-tab">
<c-list-search @form-reset="handleReset" @form-search="handleSearch">
<!-- ===================左边================= -->
<c-col :span="11">
<c-col :span="24">
......@@ -30,6 +31,33 @@
</el-form-item>
</c-col>
</c-col>
<!-- =====================右边=========================== -->
<c-col :span="11" :offset="1">
<el-form-item label="From" prop="frmdat">
<c-col :span="24">
<c-col :span="11">
<c-date-picker
type="date"
v-model="model.frmdat"
style="width: 100%"
placeholder="请选择From"
></c-date-picker>
</c-col>
<c-col :span="2" style="text-align:center">-</c-col>
<c-col :span="11">
<c-date-picker
type="date"
v-model="model.tildat"
style="width: 100%"
placeholder="请选择Until"
></c-date-picker>
</c-col>
</c-col>
</el-form-item>
<c-col :span="24">
<el-form-item label="业务所属行" prop="ownextkey">
<c-select
......@@ -48,30 +76,8 @@
</el-form-item>
</c-col>
</c-col>
<!-- =====================右边=========================== -->
<c-col :span="11" :offset="1">
<c-col :span="24">
<el-form-item label="From" prop="frmdat">
<c-date-picker
type="date"
v-model="model.frmdat"
style="width: 100%"
placeholder="请选择From"
></c-date-picker>
</el-form-item>
</c-col>
</c-list-search>
<c-col :span="24">
<el-form-item label="Until" prop="tildat">
<c-date-picker
type="date"
v-model="model.tildat"
style="width: 100%"
placeholder="请选择Until"
></c-date-picker>
</el-form-item>
</c-col>
</c-col>
<!-- ======================底部============================ -->
<c-col :span="24">
<!-- <c-col :span="24">
......@@ -166,6 +172,8 @@
</c-button>
</c-col> -->
</div>
</template>
<script>
import Api from "~/service/Api";
......
......@@ -245,7 +245,7 @@
maxlength="65"
show-word-limit
placeholder="请输入汇款人地址"
disabled
></c-input>
</el-form-item>
</c-col>
......@@ -528,7 +528,9 @@
v-model="model.attp.resbchnam"
maxlength="42"
placeholder="请输入接收行名称"
@keyup.enter.native="showGridPromptDialog('attp.resbchnam')"
@keyup.enter.native="
showGridPromptDialog('attp.resbchnam')
"
></c-input>
</el-form-item>
</c-col>
......
......@@ -33,7 +33,7 @@
maxlength="16"
placeholder="请输入External Key of Address"
@keyup.enter.native="
showGridPromptDialog('attp.atd.sbkact')
showGridPromptDialog('cpdgrp.ori.pts.extkey')
"
></c-input>
</el-form-item>
......@@ -229,7 +229,7 @@
</el-form-item>
</c-col>
<!-- <c-col :span="24">
<!-- <c-col :span="24">showGridPromptDialog
<el-form-item
label="Drag Drop Sender"
prop="attp.pybp.ptsget.sdamod.dadsnd"
......@@ -252,7 +252,7 @@
maxlength="16"
placeholder="请输入External Key of Address"
@keyup.enter.native="
showGridPromptDialog('cpdgrp.pyd.pts.extkey')
showGridPromptDialog('cpdgrp.pyb.pts.extkey')
"
></c-input>
</el-form-item>
......
......@@ -4,7 +4,7 @@
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<!--PD000071 -->
<el-tab-pane label="PD000071" name="inftrnps">
<el-tab-pane label="selection panel" name="inftrnps">
<m-inftrnps :model="model" :codes="codes"/>
</el-tab-pane>
</c-tabs>
......
......@@ -441,6 +441,7 @@
v-model="model.bfdgrp.rec.docprbrol"
style="width: 100%"
placeholder="请选择交单人"
:code="codes.detdrv_deltol"
>
</c-select>
</el-form-item>
......
<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>
......@@ -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"
......
......@@ -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>
......
......@@ -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>
......
......@@ -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() {}
};
......
......@@ -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>
......
......@@ -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:{
......
......@@ -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>
......
......@@ -36,8 +36,8 @@
</c-col>
<c-col :span="12">
<div style="float: right;">
<c-button @click="addTableValue" v-if="ifShowAdd">+</c-button><br>
<c-button @click="deleteTable" v-if="ifShowDelete">-</c-button>
<c-button @click="addTableValue" v-if="ifShowAdd"></c-button><br>
<c-button @click="deleteTable" v-if="ifShowDelete"></c-button>
</div>
</c-col>
</c-row>
......@@ -197,8 +197,8 @@ export default {
font-size: 12px;
}
.add_del_button:hover {
cursor: pointer;
/* .add_del_button:hover {
cursor: pointer;
background-color: rgb(230, 227, 227);
}
......@@ -215,7 +215,7 @@ export default {
.add_button {
margin-bottom: 2px;
}
} */
/* body .el-table th.gutter {
display: table-cell !important;
......
......@@ -9,7 +9,7 @@ import Bftdcr from "~/views/Business/Bftdcr";
import { ReviewWrapper } from "~/components/gj-common.min.js";
export default {
name: "ReviewBftsnd",
name: "ReviewBftdcr",
components: { ReviewWrapper, Bftdcr },
created() {},
mounted() {},
......
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