Commit a6952a2a by panziyi

getcan,gitcrq修改

parent 3f579376
...@@ -8,6 +8,8 @@ let checkObj = { ...@@ -8,6 +8,8 @@ let checkObj = {
"liaall.limmod.limpts.oth.pts.extkey" :null, "liaall.limmod.limpts.oth.pts.extkey" :null,
"liaall.limmod.ownref" :null, "liaall.limmod.ownref" :null,
"liaall.limmod.ecifno" :null, "liaall.limmod.ecifno" :null,
"gidgrp.acb.namelc" :null,
"gidgrp.acb.pts.adrblk" :null,
"liaall.limmod.limpts.oth.pts.nam" :null, "liaall.limmod.limpts.oth.pts.nam" :null,
"setmod.dspflg" :null, "setmod.dspflg" :null,
"liaall.limmod.limpts.wrk.pts.nam" :null, "liaall.limmod.limpts.wrk.pts.nam" :null,
...@@ -16,6 +18,9 @@ let checkObj = { ...@@ -16,6 +18,9 @@ let checkObj = {
"liaall.limmod.limpts.nonrevflg1" :null, "liaall.limmod.limpts.nonrevflg1" :null,
"newref" :null, "newref" :null,
"setmod.docamt" :null, "setmod.docamt" :null,
"gidgrp.acb.pts.extkey" :null,
"gidgrp.acb.adrelc" :null,
"gidgrp.rec.redamt" :null,
"mtabut.clsflg" :null, "mtabut.clsflg" :null,
} }
......
...@@ -10,6 +10,7 @@ export default { ...@@ -10,6 +10,7 @@ export default {
"liaall.limmod.limpts.oth.pts.extkey" :Utils.defaultFunction, "liaall.limmod.limpts.oth.pts.extkey" :Utils.defaultFunction,
"gidgrp.rec.ownref" :Utils.defaultFunction, "gidgrp.rec.ownref" :Utils.defaultFunction,
"gidgrp.cbs.opn1.cur" :Utils.defaultFunction, "gidgrp.cbs.opn1.cur" :Utils.defaultFunction,
"trnmod.swiadd.chacur" :Utils.defaultFunction,
"gidgrp.rec.liadat" :Utils.defaultFunction, "gidgrp.rec.liadat" :Utils.defaultFunction,
"setmod.doccur" :Utils.defaultFunction, "setmod.doccur" :Utils.defaultFunction,
"setmod.dspflg" :Utils.defaultFunction, "setmod.dspflg" :Utils.defaultFunction,
...@@ -26,6 +27,11 @@ export default { ...@@ -26,6 +27,11 @@ export default {
"liaall.limmod.limpts.nonrevflg1" :Utils.defaultFunction, "liaall.limmod.limpts.nonrevflg1" :Utils.defaultFunction,
"gidgrp.ben.pts.nam" :Utils.defaultFunction, "gidgrp.ben.pts.nam" :Utils.defaultFunction,
"gidgrp.rec.gartyp" :Utils.defaultFunction, "gidgrp.rec.gartyp" :Utils.defaultFunction,
"gidgrp.acb.pts.extkey" :Utils.defaultFunction,
"gidgrp.acb.adrelc" :Utils.defaultFunction,
"gidgrp.acb.namelc" :Utils.defaultFunction,
"gidgrp.acb.dbfadrblkcn" :Utils.defaultFunction,
"gidgrp.acb.pts.adrblk" :Utils.defaultFunction,
"gidgrp.rec.hndtyp" :Utils.defaultFunction, "gidgrp.rec.hndtyp" :Utils.defaultFunction,
"liaall.limmod.limpts.oth.pts.nam" :Utils.defaultFunction, "liaall.limmod.limpts.oth.pts.nam" :Utils.defaultFunction,
"gidgrp.apl.pts.nam" :Utils.defaultFunction, "gidgrp.apl.pts.nam" :Utils.defaultFunction,
...@@ -35,11 +41,14 @@ export default { ...@@ -35,11 +41,14 @@ export default {
"liaall.limmod.limpts.wrk.pts.nam" :Utils.defaultFunction, "liaall.limmod.limpts.wrk.pts.nam" :Utils.defaultFunction,
"gidgrp.ctr.pts.nam" :Utils.defaultFunction, "gidgrp.ctr.pts.nam" :Utils.defaultFunction,
"liaall.misamt" :Utils.defaultFunction, "liaall.misamt" :Utils.defaultFunction,
"gidgrp.rec.outcur" :Utils.defaultFunction,
"mtabut.coninf.oitinf.oit.inftxt" :Utils.defaultFunction, "mtabut.coninf.oitinf.oit.inftxt" :Utils.defaultFunction,
"mtabut.coninf.oitinf.oit.inflev" :Utils.defaultFunction, "mtabut.coninf.oitinf.oit.inflev" :Utils.defaultFunction,
"gidgrp.rec.redamt" :Utils.defaultFunction,
"gidgrp.cbs.opn1.amt" :Utils.defaultFunction, "gidgrp.cbs.opn1.amt" :Utils.defaultFunction,
"mtabut.clsflg" :Utils.defaultFunction, "mtabut.clsflg" :Utils.defaultFunction,
"mtabut.coninf.conexedat" :Utils.defaultFunction, "mtabut.coninf.conexedat" :Utils.defaultFunction,
"gidgrp.rec.redcur" :Utils.defaultFunction,
"mtabut.coninf.oitset.oit.inftxt" :Utils.defaultFunction, "mtabut.coninf.oitset.oit.inftxt" :Utils.defaultFunction,
"mtabut.coninf.oitset.oit.inflev" :Utils.defaultFunction, "mtabut.coninf.oitset.oit.inflev" :Utils.defaultFunction,
} }
......
...@@ -173,5 +173,17 @@ export default { ...@@ -173,5 +173,17 @@ export default {
this.$notify.error({title: '错误',message: '服务请求失败!'}); this.$notify.error({title: '错误',message: '服务请求失败!'});
} }
}, },
async onAcbpDet(){
let rtnmsg = await this.executeRule("acbp.det")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败!'});
}
},
} }
\ No newline at end of file
...@@ -251,4 +251,75 @@ export default { ...@@ -251,4 +251,75 @@ export default {
{max: 14,message:"长度不能超过14"} {max: 14,message:"长度不能超过14"}
], ],
"gidgrp.rec.reddat":[
{type: "date", required: false, message: "输入正确的日期"}
],
"gidgrp.blk.accspc":[
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"gidgrp.rec.redcur":[
{type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"}
],
"gidgrp.rec.redamt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"gidgrp.blk.amtspc":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"gidgrp.rec.outcur":[
{type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"}
],
"gidgrp.rec.outamt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"trnmod.swiadd.chacur":[
{type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"}
],
"trnmod.swiadd.chaamt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"gidgrp.blk.chaded":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"gitp0.acbp.ptsget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"}
],
"gidgrp.acb.pts.extkey":[
{type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"}
],
"gitp0.acbp.ptsget.sdamod.seainf":[
{type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"}
],
"gidgrp.acb.namelc":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"gidgrp.acb.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"gidgrp.acb.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"gidgrp.acb.adrelc":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
} }
\ No newline at end of file
...@@ -4,14 +4,10 @@ import Pub from "../Public" ...@@ -4,14 +4,10 @@ import Pub from "../Public"
export default class Getcan{ export default class Getcan{
constructor () { constructor () {
this.data = { this.data = {
gitapll2blk: "", setmod: new Pub().data.Setmod,
gitapll1blk: "", mtabut: new Pub().data.Mtabut,
gitbenl1blk: "", trnmod: new Pub().data.Trnmod,
gitbenl2blk: "", liaall: new Pub().data.Liaall,
setmod: new Pub().data.Setmod,
mtabut: new Pub().data.Mtabut,
trnmod: new Pub().data.Trnmod,
liaall: new Pub().data.Liaall,
gitp0:{ gitp0:{
explab:"", // Label unlimited Validity .gitp0.explab explab:"", // Label unlimited Validity .gitp0.explab
lialab:"", // Label unlimited lLability .gitp0.lialab lialab:"", // Label unlimited lLability .gitp0.lialab
...@@ -24,6 +20,14 @@ export default class Getcan{ ...@@ -24,6 +20,14 @@ export default class Getcan{
dadsnd:"", // Drag Drop Sender .gitp0.recget.sdamod.dadsnd dadsnd:"", // Drag Drop Sender .gitp0.recget.sdamod.dadsnd
}, },
}, },
acbp:{
ptsget:{
sdamod:{
seainf:"", // .gitp0.acbp.ptsget.sdamod.seainf
dadsnd:"", // Drag Drop Sender .gitp0.acbp.ptsget.sdamod.dadsnd
},
},
},
}, },
gidgrp:{ gidgrp:{
rec:{ rec:{
...@@ -34,6 +38,11 @@ export default class Getcan{ ...@@ -34,6 +38,11 @@ export default class Getcan{
expdat:"", // Valid until .gidgrp.rec.expdat expdat:"", // Valid until .gidgrp.rec.expdat
liadat:"", // Liability until .gidgrp.rec.liadat liadat:"", // Liability until .gidgrp.rec.liadat
purcan:"", // Reason of Cancelation .gidgrp.rec.purcan purcan:"", // Reason of Cancelation .gidgrp.rec.purcan
reddat:"", // Date of Reduction .gidgrp.rec.reddat
redcur:"", // Amount Reduced .gidgrp.rec.redcur
redamt:"", // Reduced Amount to be Paid .gidgrp.rec.redamt
outcur:"", // Amount Outstanding .gidgrp.rec.outcur
outamt:"", // Outstanding Amount .gidgrp.rec.outamt
}, },
cbs:{ cbs:{
max:{ max:{
...@@ -57,11 +66,24 @@ export default class Getcan{ ...@@ -57,11 +66,24 @@ export default class Getcan{
iss:{ iss:{
pts:new Pts().data, pts:new Pts().data,
}, },
blk:{
accspc:"", // Account Specification .gidgrp.blk.accspc
amtspc:"", // Amount Specification .gidgrp.blk.amtspc
chaded:"", // Details of Charges .gidgrp.blk.chaded
},
acb:{
pts:new Pts().data,
namelc:"", // 名称 .gidgrp.acb.namelc
adrelc:"", // 地址 .gidgrp.acb.adrelc
dbfadrblkcn:"", // Chinese address .gidgrp.acb.dbfadrblkcn
},
}, },
newref:"", // New Reference .newref newref:"", // New Reference .newref
// trnmod:{ // trnmod:{
// swiadd:{ // swiadd:{
// strinf:"", // Sender to receiver info Tag 72 .trnmod.swiadd.strinf // strinf:"", // Sender to receiver info Tag 72 .trnmod.swiadd.strinf
// chacur:"", // Amount of Charges .trnmod.swiadd.chacur
// chaamt:"", // charges amount .trnmod.swiadd.chaamt
// }, // },
// trndoc:{ // trndoc:{
// advlabel:"", // ADVLABEL .trnmod.trndoc.advlabel // advlabel:"", // ADVLABEL .trnmod.trndoc.advlabel
......
...@@ -18,11 +18,6 @@ export default { ...@@ -18,11 +18,6 @@ export default {
}, },
onSeainf() {
},
async onPrbpDet(){ async onPrbpDet(){
let rtnmsg = await this.executeRule("prbp.det") let rtnmsg = await this.executeRule("prbp.det")
if(rtnmsg.respCode == SUCCESS) if(rtnmsg.respCode == SUCCESS)
......
...@@ -14,6 +14,9 @@ export default { ...@@ -14,6 +14,9 @@ export default {
this.$notify.error({title: '错误',message: '服务请求失败!'}); this.$notify.error({title: '错误',message: '服务请求失败!'});
} }
}, },
async onSeainf(){
},
async onLiaallButmissig(){ async onLiaallButmissig(){
let rtnmsg = await this.executeRule("liaall.butmissig") let rtnmsg = await this.executeRule("liaall.butmissig")
if(rtnmsg.respCode == SUCCESS) if(rtnmsg.respCode == SUCCESS)
......
...@@ -21,6 +21,9 @@ ...@@ -21,6 +21,9 @@
<m-canp :model="model" :codes="codes"/> <m-canp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="Mt769" name="Mt769p" v-if="model.gidgrp.rec.purcan=='RR'">
<m-mt769p :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000027 --> <!--PD000027 -->
<el-tab-pane label="Liability" name="engp"> <el-tab-pane label="Liability" name="engp">
<m-engp :model="model" :codes="codes"/> <m-engp :model="model" :codes="codes"/>
...@@ -80,6 +83,7 @@ import Doctre from "~/views/Public/Doctre" ...@@ -80,6 +83,7 @@ import Doctre from "~/views/Public/Doctre"
import Docpan from "~/views/Public/Docpan" import Docpan from "~/views/Public/Docpan"
import Setpan from "~/views/Public/Setpan" import Setpan from "~/views/Public/Setpan"
import Coninfp from "~/views/Public/Coninfp" import Coninfp from "~/views/Public/Coninfp"
import Mt769p from "./Mt769p"
export default { export default {
...@@ -92,6 +96,7 @@ export default { ...@@ -92,6 +96,7 @@ export default {
"m-docpan" : Docpan, "m-docpan" : Docpan,
"m-doctre" : Doctre, "m-doctre" : Doctre,
"m-limitbody" : Limitbody, "m-limitbody" : Limitbody,
"m-mt769p" : Mt769p,
}, },
provide() { provide() {
return { return {
......
...@@ -19,13 +19,14 @@ ...@@ -19,13 +19,14 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<el-form-item label="Reduced Amount to be Paid" prop="gidgrp.rec.redamt"> <el-form-item label="" prop="gidgrp.rec.redamt" style="text-align: left"
label-width="5px">
<c-input v-model="model.gidgrp.rec.redamt" placeholder="请输入Reduced Amount to be Paid"></c-input> <c-input v-model="model.gidgrp.rec.redamt" placeholder="请输入Reduced Amount to be Paid"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Amount Specification" prop="gidgrp.blk.amtspc"> <el-form-item label="Amount Specification" prop="gidgrp.blk.amtspc">
<c-input type="textarea" v-model="model.gidgrp.blk.amtspc" maxlength="35" show-word-limit placeholder="请输入Amount Specification" ></c-input> <c-input type="textarea" v-model="model.gidgrp.blk.amtspc" rows="4" maxlength="35" show-word-limit placeholder="请输入Amount Specification" ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -36,7 +37,8 @@ ...@@ -36,7 +37,8 @@
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<el-form-item label="Outstanding Amount" prop="gidgrp.rec.outamt"> <el-form-item label="" prop="gidgrp.rec.outamt" style="text-align: left"
label-width="5px">
<c-input v-model="model.gidgrp.rec.outamt" placeholder="请输入Outstanding Amount"></c-input> <c-input v-model="model.gidgrp.rec.outamt" placeholder="请输入Outstanding Amount"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -48,13 +50,14 @@ ...@@ -48,13 +50,14 @@
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<el-form-item label="charges amount" prop="trnmod.swiadd.chaamt"> <el-form-item label="" prop="trnmod.swiadd.chaamt" style="text-align: left"
label-width="5px">
<c-input v-model="model.trnmod.swiadd.chaamt" placeholder="请输入charges amount"></c-input> <c-input v-model="model.trnmod.swiadd.chaamt" placeholder="请输入charges amount"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Details of Charges " prop="gidgrp.blk.chaded"> <el-form-item label="Details of Charges " prop="gidgrp.blk.chaded">
<c-input type="textarea" v-model="model.gidgrp.blk.chaded" maxlength="35" show-word-limit placeholder="请输入Details of Charges " ></c-input> <c-input type="textarea" v-model="model.gidgrp.blk.chaded" rows="4" maxlength="35" show-word-limit placeholder="请输入Details of Charges " ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -101,7 +104,7 @@ ...@@ -101,7 +104,7 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Address Block" prop="gidgrp.acb.pts.adrblk"> <el-form-item label="Address Block" prop="gidgrp.acb.pts.adrblk">
<c-input type="textarea" v-model="model.gidgrp.acb.pts.adrblk" maxlength="35" show-word-limit placeholder="请输入Address Block" ></c-input> <c-input type="textarea" v-model="model.gidgrp.acb.pts.adrblk" maxlength="35" rows="4" show-word-limit placeholder="请输入Address Block" ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
......
...@@ -72,7 +72,12 @@ ...@@ -72,7 +72,12 @@
prop="gcdgrp.cbs.max.cur" prop="gcdgrp.cbs.max.cur"
previewLabel="信用证币种" previewLabel="信用证币种"
> >
<c-input v-model="model.gcdgrp.cbs.max.cur" maxlength="3" disabled placeholder="请输入Amount Claimed"></c-input> <c-input
v-model="model.gcdgrp.cbs.max.cur"
maxlength="3"
disabled
placeholder="请输入Amount Claimed"
></c-input>
</c-form-item> </c-form-item>
</c-col> </c-col>
...@@ -94,9 +99,15 @@ ...@@ -94,9 +99,15 @@
</c-form-item> </c-form-item>
</c-col> </c-col>
<c-col :span="5"> <c-col :span="5">
<c-checkbox v-model="model.gctp.gcthdr" disabled style="margin-left:18px;height: 32px; <c-checkbox
line-height: 32px; v-model="model.gctp.gcthdr"
padding-bottom: 2px;" disabled
style="
margin-left: 18px;
height: 32px;
line-height: 32px;
padding-bottom: 2px;
"
>Add. Amount >Add. Amount
</c-checkbox> </c-checkbox>
</c-col> </c-col>
...@@ -163,8 +174,8 @@ ...@@ -163,8 +174,8 @@
></c-input> ></c-input>
</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="12"> <c-col :span="12">
<c-form-item <c-form-item
label="Open Amount" label="Open Amount"
...@@ -256,13 +267,13 @@ ...@@ -256,13 +267,13 @@
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="24" style="height: 0px"> <c-col :span="24" style="height: 0px">
<el-divider></el-divider> <el-divider></el-divider>
</c-col> </c-col>
<c-col :span="11" style="margin-top:15px"> <c-col :span="11" style="margin-top: 15px">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Select Rejection type " prop="lettername"> <el-form-item label="Select Rejection type " prop="lettername">
<c-input <c-input
...@@ -289,8 +300,14 @@ ...@@ -289,8 +300,14 @@
<c-col :span="12"> <c-col :span="12">
<el-card class="box-card"> <el-card class="box-card">
<template> <template>
<el-radio v-model="model.rejtypsel" label="Pending instructions" ></el-radio> <el-radio
<el-radio v-model="model.rejtypsel" label="Outright,return documents" ></el-radio> v-model="model.rejtypsel"
label="Pending instructions"
></el-radio>
<el-radio
v-model="model.rejtypsel"
label="Outright,return documents"
></el-radio>
</template> </template>
</el-card> </el-card>
</c-col> </c-col>
...@@ -299,7 +316,7 @@ ...@@ -299,7 +316,7 @@
<c-date-picker <c-date-picker
type="date" type="date"
v-model="model.gcdgrp.rec.msgdat" v-model="model.gcdgrp.rec.msgdat"
style="width: 100%" style="width: 100%"
placeholder="请选择 Message Date" placeholder="请选择 Message Date"
></c-date-picker> ></c-date-picker>
</el-form-item> </el-form-item>
...@@ -307,7 +324,7 @@ ...@@ -307,7 +324,7 @@
<c-col :span="12"> <c-col :span="12">
<c-checkbox <c-checkbox
v-model="model.mtabut.clsflgp" v-model="model.mtabut.clsflgp"
style="margin-left:32px" style="margin-left: 32px"
:disabled="model.rejtypsel != 'Outright,return documents'" :disabled="model.rejtypsel != 'Outright,return documents'"
>Close Contract</c-checkbox >Close Contract</c-checkbox
> >
...@@ -362,7 +379,16 @@ ...@@ -362,7 +379,16 @@
style="margin: 0 0 0 10px; padding: 1px 1px" style="margin: 0 0 0 10px; padding: 1px 1px"
size="small" size="small"
type="primary" type="primary"
@click="onSeainf" @click="
showGridPromptDialog(
'gctp.disdoc.buttxmsel',
null,
null,
{ TXT: 'gcdgrp.blk.disdoc' },
{ TXT: false },
'doxpDialog'
)
"
> >
<span style="font-family: '宋体'; font-weight: bold">...</span> <span style="font-family: '宋体'; font-weight: bold">...</span>
</c-button> </c-button>
...@@ -372,16 +398,7 @@ ...@@ -372,16 +398,7 @@
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="11" :offset="1" style="margin-top: 15px">
<!-- <c-col :span="24">
<el-form-item label="Presented by" prop="gcdgrp.rec.docprbrol">
<c-select v-model="model.gcdgrp.rec.docprbrol" style="width:100%" placeholder="请选择Presented by"
:code="codes.docprbrol">
</c-select>
</el-form-item>
</c-col> -->
<c-col :span="11" :offset="1" style="margin-top:15px">
<c-col :span="24"> <c-col :span="24">
<c-form-item label="Presented by" prop="gcdgrp.rec.docprbrol"> <c-form-item label="Presented by" prop="gcdgrp.rec.docprbrol">
<c-select <c-select
...@@ -390,12 +407,6 @@ ...@@ -390,12 +407,6 @@
style="width: 100%" style="width: 100%"
disabled disabled
> >
<el-option
v-for="item in docprbrol2"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</c-select> </c-select>
</c-form-item> </c-form-item>
</c-col> </c-col>
...@@ -412,20 +423,13 @@ ...@@ -412,20 +423,13 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item <el-form-item label="" prop="gcdgrp.prb.pts.extkey">
label=""
prop="gcdgrp.prb.pts.extkey"
>
<c-fullbox> <c-fullbox>
<c-input <c-input
disabled disabled
v-model="model.gcdgrp.prb.pts.extkey" v-model="model.gcdgrp.prb.pts.extkey"
maxlength="16" maxlength="16"
placeholder="请输入External Key of Address" placeholder="请输入External Key of Address"
@keyup.enter.native="
showGridPromptDialog('gcdgrp.prb.pts.extkey')
"
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
...@@ -436,10 +440,13 @@ ...@@ -436,10 +440,13 @@
> >
<span style="font-family: '宋体'; font-weight: bold">i</span> <span style="font-family: '宋体'; font-weight: bold">i</span>
</c-button> </c-button>
<c-button size="small" type="primary" <c-button
style="margin: 0 0" size="small"
@click="onPrbpDet"> type="primary"
Temp. style="margin: 0 0"
@click="onPrbpDet"
>
Details
</c-button> </c-button>
</template> </template>
</c-fullbox> </c-fullbox>
...@@ -494,10 +501,9 @@ ...@@ -494,10 +501,9 @@
placeholder="请选择Payer" placeholder="请选择Payer"
style="width: 100%" style="width: 100%"
disabled disabled
@change="commonExecuteRule('gcdgrp.rec.payrol')"
> >
<el-option <el-option
v-for="item in codes.payee" v-for="item in codes.payrol"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -505,31 +511,15 @@ ...@@ -505,31 +511,15 @@
</c-select> </c-select>
</c-form-item> </c-form-item>
</c-col> </c-col>
<!-- <c-col :span="24">
<el-form-item label="Reference " prop="gcdgrp.oth.pts.ref">
<c-input
v-model="model.gcdgrp.oth.pts.ref"
:disabled="model.gcdgrp.rec.payrol != 2"
maxlength="16"
placeholder="请输入Reference "
></c-input>
</el-form-item>
</c-col> -->
<c-col :span="24"> <c-col :span="24">
<el-form-item <el-form-item label="" prop="gcdgrp.oth.pts.extkey">
label=""
prop="gcdgrp.oth.pts.extkey"
>
<c-fullbox> <c-fullbox>
<c-input <c-input
v-model="model.gcdgrp.oth.pts.extkey" v-model="model.gcdgrp.oth.pts.extkey"
maxlength="16" maxlength="16"
:disabled="model.gcdgrp.rec.payrol != 'OWN'" disabled
placeholder="请输入External Key of Address" placeholder="请输入External Key of Address"
@keyup.enter.native="
showGridPromptDialog('gcdgrp.oth.pts.extkey')
"
> >
</c-input> </c-input>
<template slot="footer"> <template slot="footer">
...@@ -545,7 +535,7 @@ ...@@ -545,7 +535,7 @@
style="margin: 0 0" style="margin: 0 0"
size="small" size="small"
type="primary" type="primary"
@click="onOthpDet" @click="onOthpDet"
> >
Details Details
</c-button> </c-button>
...@@ -561,7 +551,7 @@ ...@@ -561,7 +551,7 @@
rows="4" rows="4"
v-model="model.gcdgrp.oth.pts.adrblk" v-model="model.gcdgrp.oth.pts.adrblk"
maxlength="100" maxlength="100"
:disabled="model.gcdgrp.rec.payrol != 'OWN'" disabled
show-word-limit show-word-limit
placeholder="请输入Address Block" placeholder="请输入Address Block"
></c-input> ></c-input>
...@@ -894,30 +884,9 @@ export default { ...@@ -894,30 +884,9 @@ export default {
props: ["model", "codes"], props: ["model", "codes"],
mixins: [commonProcess], mixins: [commonProcess],
data() { data() {
return { return {};
docprbrol2: [
// { label: "2nd Advising Bank", value: "A2B" },
// { label: "Advising Bank", value: "ADV" },
{ label: "Beneficiary", value: "BEN" },
{ label: "Presenter(PRP)", value: "PRB" },
],
payrol2: [
{ label: "Applicant", value: "1" },
{ label: "Issuing Bank", value: "2" },
{ label: "other paying party", value: "3" },
],
};
}, },
methods: { ...Event, methods: { ...Event },
commonExecuteRule(ruleName){
this.executeRule(ruleName).then((res) => {
if ((res.respCode == SUCCESS)) {
Utils.copyValueFromVO(this.model, res.data);
}
});
},
},
created: function () {}, created: function () {},
}; };
</script> </script>
......
...@@ -53,6 +53,16 @@ ...@@ -53,6 +53,16 @@
</el-tab-pane> </el-tab-pane>
</c-tabs> </c-tabs>
</el-form> </el-form>
<c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData"
v-on:select-ety="selectEty">
</c-grid-ety-prompt-dialog>
<c-grid-ety-prompt-dialog
ref="doxpDialog"
:isPty="false"
:promptData="promptData"
@select-ety="selectMsg"
>
</c-grid-ety-prompt-dialog>
</div> </div>
</template> </template>
<script> <script>
......
...@@ -431,14 +431,14 @@ ...@@ -431,14 +431,14 @@
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> --> </c-col> -->
<c-col :span="11" :offset="1" style="margin-top: 15px">
<c-col :span="24"> <!-- <c-col :span="24">
<c-form-item label="Presented by" prop="gcdgrp.rec.docprbrol"> <c-form-item label="Presented by" prop="gcdgrp.rec.docprbrol">
<c-select <c-select
v-model="model.gcdgrp.rec.docprbrol" v-model="model.gcdgrp.rec.docprbrol"
placeholder="请选择" placeholder="请选择"
style="width: 100%" style="width: 100%"
@change="commonExecuteRule('gcdgrp.rec.docprbrol')" @change="commonExecuteRule('gcdgrp.rec.docprbrol')"
> >
<el-option <el-option
v-for="item in codes.docprbrol" v-for="item in codes.docprbrol"
...@@ -460,19 +460,20 @@ ...@@ -460,19 +460,20 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24" v-if="model.gcdgrp.rec.docprbrol!='PRB'">
<c-col :span="24" >
<el-form-item <el-form-item
label="" label=""
prop="gcdgrp.prb.pts.extkey" prop="gcdgrp.prb.pts.extkey"
> >
<c-fullbox> <c-fullbox>
<c-input <c-input
:disabled="model.gcdgrp.rec.docprbrol != 'PRB'" :disabled="model.gcdgrp.rec.docprbrol == 'A2B'"
v-model="model.gcdgrp.prb.pts.extkey" v-model="model.gcdgrp.prb.pts.extkey"
maxlength="16" maxlength="16"
placeholder="请输入External Key of Address" placeholder="请输入External Key of Address"
@keyup.enter.native=" @keyup.enter.native="
showGridPromptDialog(`gcdgrp.prb.pts.extkey`) showGridPromptDialog('gcdgrp.prb.pts.extkey')
" "
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
...@@ -492,92 +493,80 @@ ...@@ -492,92 +493,80 @@
style="margin: 0 0" style="margin: 0 0"
@click="onPrbpDet" @click="onPrbpDet"
> >
Temp. Details
</c-button> </c-button>
</template> </template>
</c-fullbox> </c-fullbox>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24" v-if="model.gcdgrp.rec.docprbrol=='PRB'"> <c-col :span="24">
<el-form-item <el-form-item label="" prop="gcdgrp.prb.pts.adrblk">
label="" <c-input
prop="gcdgrp.prb.pts.extkey" :disabled="model.gcdgrp.rec.docprbrol == 'A2B'"
> type="textarea"
<c-fullbox> rows="4"
<c-input v-model="model.gcdgrp.prb.pts.adrblk"
:disabled="model.gcdgrp.rec.docprbrol != 'PRB'" maxlength="100"
v-model="model.gcdgrp.prb.pts.extkey" show-word-limit
maxlength="16" placeholder="请输入Address Block"
placeholder="请输入External Key of Address" ></c-input>
@keyup.enter.native=" </el-form-item>
showGridPromptDialog('gcdgrp.prb.pts.extkey') </c-col> -->
" <c-col :span="11" :offset="1" style="margin-top: 15px">
<c-col :span="24">
<el-form-item label="Presented by" prop="gcdgrp.rec.docprbrol">
<c-select
:code="codes.docprbrol"
v-model="model.gcdgrp.rec.docprbrol" style="width:100%" placeholder="请选择Presented by">
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Reference" prop="gcdgrp.prb.pts.ref">
<c-input v-model="model.gcdgrp.prb.pts.ref" maxlength="16" placeholder="请输入Reference"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="" prop="gcdgrp.prb.pts.extkey">
<c-fullbox>
<c-input
v-model="model.gcdgrp.prb.pts.extkey"
maxlength="16"
placeholder="请输入External Key of Address"
@keyup.enter.native="showGridPromptDialog('gcdgrp.prb.pts.extkey')"
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
v-model="model.gctp.prbp.ptsget.sdamod.seainf"
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" @click="model.gctp.prbp.ptsget.sdamod.seainf"
> >
<span style="font-family: '宋体'; font-weight: bold">i</span> <span style="font-family: '宋体'; font-weight: bold">i</span>
</c-button> </c-button>
<c-button <c-button
style="margin: 0 0"
size="small" size="small"
type="primary" type="primary"
v-model="model.gctp.prbp.det"
style="margin: 0 0"
@click="onPrbpDet" @click="onPrbpDet"
> >
Details Details
</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="gcdgrp.prb.pts.adrblk"> <el-form-item label="" prop="gcdgrp.prb.pts.adrblk">
<c-input <c-input
:disabled="model.gcdgrp.rec.docprbrol != 'PRB'" :rows="4"
type="textarea" type="textarea" v-model="model.gcdgrp.prb.pts.adrblk" maxlength="300" show-word-limit placeholder="请输入Address Block" ></c-input>
rows="4"
v-model="model.gcdgrp.prb.pts.adrblk"
maxlength="100"
show-word-limit
placeholder="请输入Address Block"
></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<!-- <c-col :span="24">
<el-form-item label="名称地址" prop="gcdgrp.prb.namelc">
<c-input :disabled="model.gcdgrp.rec.docprbrol=='BEN'" type="textarea" v-model="model.gcdgrp.prb.namelc" maxlength="35" show-word-limit placeholder="请输入名称" ></c-input>
</el-form-item>
</c-col> -->
<!--
<c-col :span="24">
<el-form-item :disabled="model.gcdgrp.rec.docprbrol=='BEN'" label="地址" prop="gcdgrp.prb.adrelc">
<c-input :disabled="model.gcdgrp.rec.docprbrol=='BEN'" type="textarea" v-model="model.gcdgrp.prb.adrelc" maxlength="35" show-word-limit placeholder="请输入地址" ></c-input>
</el-form-item>
</c-col> -->
<!-- <c-col :span="24">
<el-form-item label="Payer" prop="gcdgrp.rec.payrol">
<c-select v-model="model.gcdgrp.rec.payrol" style="width:100%" placeholder="请选择Payer"
@change="onPayrol">
<el-option
v-for="item in codes.payrol"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</c-select>
</el-form-item>
</c-col>
-->
<c-col :span="24"> <c-col :span="24">
<c-form-item label="Payer" prop="gcdgrp.rec.payrol"> <c-form-item label="Payer" prop="gcdgrp.rec.payrol">
...@@ -585,15 +574,8 @@ ...@@ -585,15 +574,8 @@
v-model="model.gcdgrp.rec.payrol" v-model="model.gcdgrp.rec.payrol"
placeholder="请选择" placeholder="请选择"
style="width: 100%" style="width: 100%"
@change="commonExecuteRule('gcdgrp.rec.payrol')" :code="codes.payrol"
> >
<el-option
v-for="item in codes.payee"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</c-select> </c-select>
</c-form-item> </c-form-item>
</c-col> </c-col>
...@@ -601,7 +583,6 @@ ...@@ -601,7 +583,6 @@
<el-form-item label="Reference " prop="gcdgrp.oth.pts.ref"> <el-form-item label="Reference " prop="gcdgrp.oth.pts.ref">
<c-input <c-input
v-model="model.gcdgrp.oth.pts.ref" v-model="model.gcdgrp.oth.pts.ref"
:disabled="model.gcdgrp.rec.payrol != 'OWN'"
maxlength="16" maxlength="16"
placeholder="请输入Reference " placeholder="请输入Reference "
></c-input> ></c-input>
...@@ -616,25 +597,22 @@ ...@@ -616,25 +597,22 @@
<c-input <c-input
v-model="model.gcdgrp.oth.pts.extkey" v-model="model.gcdgrp.oth.pts.extkey"
maxlength="16" maxlength="16"
:disabled="model.gcdgrp.rec.payrol != 'OWN'"
placeholder="请输入External Key of Address" placeholder="请输入External Key of Address"
@keyup.enter.native=" @keyup.enter.native="
showGridPromptDialog(`gcdgrp.oth.pts.extkey`) showGridPromptDialog('gcdgrp.oth.pts.extkey')
" "
> >
</c-input> </c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
v-model="model.gctp.othp.ptsget.sdamod.seainf"
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" @click="model.gctp.othp.ptsget.sdamod.seainf"
> >
<span style="font-family: '宋体'; font-weight: bold">i</span> <span style="font-family: '宋体'; font-weight: bold">i</span>
</c-button> </c-button>
<c-button <c-button
v-model="model.gctp.othp.det"
style="margin: 0 0" style="margin: 0 0"
size="small" size="small"
type="primary" type="primary"
...@@ -654,7 +632,6 @@ ...@@ -654,7 +632,6 @@
rows="4" rows="4"
v-model="model.gcdgrp.oth.pts.adrblk" v-model="model.gcdgrp.oth.pts.adrblk"
maxlength="100" maxlength="100"
:disabled="model.gcdgrp.rec.payrol != 'OWN'"
show-word-limit show-word-limit
placeholder="请输入Address Block" placeholder="请输入Address Block"
></c-input> ></c-input>
...@@ -715,10 +692,7 @@ export default { ...@@ -715,10 +692,7 @@ export default {
data() { data() {
return { return {
payrol2: [
{ label: "Applicant's Bank", value: "1" },
{ label: "other paying party", value: "2" },
],
}; };
}, },
computed: { computed: {
...@@ -733,13 +707,7 @@ computed: { ...@@ -733,13 +707,7 @@ computed: {
// }, // },
commonExecuteRule(ruleName){
this.executeRule(ruleName).then((res) => {
if ((res.respCode == SUCCESS)) {
Utils.copyValueFromVO(this.model, res.data);
}
});
},
}, },
created: function () {}, created: function () {},
......
...@@ -403,7 +403,7 @@ ...@@ -403,7 +403,7 @@
disabled disabled
> >
<el-option <el-option
v-for="item in docprbrol2" v-for="item in codes.docprbrol"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -485,7 +485,7 @@ ...@@ -485,7 +485,7 @@
@change="payrolChange" @change="payrolChange"
> >
<el-option <el-option
v-for="item in payrol2" v-for="item in codes.payrol"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -503,7 +503,7 @@ ...@@ -503,7 +503,7 @@
<c-input <c-input
v-model="model.gcdgrp.oth.pts.extkey" v-model="model.gcdgrp.oth.pts.extkey"
maxlength="16" maxlength="16"
:disabled="model.gcdgrp.rec.payrol != 2"
placeholder="请输入External Key of Address" placeholder="请输入External Key of Address"
@keyup.enter.native=" @keyup.enter.native="
showGridPromptDialog('gcdgrp.oth.pts.extkey') showGridPromptDialog('gcdgrp.oth.pts.extkey')
...@@ -542,7 +542,7 @@ ...@@ -542,7 +542,7 @@
rows="4" rows="4"
v-model="model.gcdgrp.oth.pts.adrblk" v-model="model.gcdgrp.oth.pts.adrblk"
maxlength="100" maxlength="100"
:disabled="model.gcdgrp.rec.payrol != 2"
show-word-limit show-word-limit
placeholder="请输入Address Block" placeholder="请输入Address Block"
></c-input> ></c-input>
......
...@@ -395,7 +395,7 @@ ...@@ -395,7 +395,7 @@
disabled disabled
> >
<el-option <el-option
v-for="item in docprbrol2" v-for="item in codes.docprbrol"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -477,7 +477,7 @@ ...@@ -477,7 +477,7 @@
@change="commonExecuteRule('gcdgrp.rec.payrol')" @change="commonExecuteRule('gcdgrp.rec.payrol')"
> >
<el-option <el-option
v-for="item in payrol2" v-for="item in codes.payrol"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -495,7 +495,7 @@ ...@@ -495,7 +495,7 @@
<c-input <c-input
v-model="model.gcdgrp.oth.pts.extkey" v-model="model.gcdgrp.oth.pts.extkey"
maxlength="16" maxlength="16"
:disabled="model.gcdgrp.rec.payrol != 2"
placeholder="请输入External Key of Address" placeholder="请输入External Key of Address"
@keyup.enter.native=" @keyup.enter.native="
showGridPromptDialog('gcdgrp.oth.pts.extkey') showGridPromptDialog('gcdgrp.oth.pts.extkey')
...@@ -534,7 +534,7 @@ ...@@ -534,7 +534,7 @@
rows="4" rows="4"
v-model="model.gcdgrp.oth.pts.adrblk" v-model="model.gcdgrp.oth.pts.adrblk"
maxlength="100" maxlength="100"
:disabled="model.gcdgrp.rec.payrol != 2"
show-word-limit show-word-limit
placeholder="请输入Address Block" placeholder="请输入Address Block"
></c-input> ></c-input>
...@@ -850,20 +850,11 @@ export default { ...@@ -850,20 +850,11 @@ export default {
data() { data() {
return { return {
payrol2: [
{ label: "Applicant", value: "1" },
{ label: "other paying party", value: "2" },
],
}; };
}, },
methods: { ...Event, methods: { ...Event,
commonExecuteRule(ruleName){
this.executeRule(ruleName).then((res) => {
if ((res.respCode == SUCCESS)) {
Utils.copyValueFromVO(this.model, res.data);
}
});
},
}, },
created: function () {}, created: function () {},
......
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