Commit 82be40d8 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 8f904279 9aa99fcc
......@@ -56,7 +56,7 @@ export default {
"ccdgrp.pre.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
{max: 150,message:"长度不能超过150"}
],
"ccdgrp.pre.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
......@@ -93,7 +93,7 @@ export default {
],
"ccdgrp.dro.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
{max: 150,message:"长度不能超过150"}
],
"ccdgrp.dro.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
......@@ -161,7 +161,7 @@ export default {
],
"ccdgrp.cor.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
{max: 150, message:"长度不能超过150"}
],
"ccdgrp.cor.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
......@@ -169,7 +169,7 @@ export default {
],
"ccdgrp.col.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
{max: 150,message:"长度不能超过150"}
],
"ccdgrp.col.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
......@@ -268,7 +268,7 @@ export default {
],
"ccdgrp.blk.setins":[
{type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"}
{max: 600,message:"长度不能超过600"}
],
}
\ No newline at end of file
......@@ -108,6 +108,7 @@ export default class Cctdav{
setmod: new Pub().data.Setmod,
mtabut: new Pub().data.Mtabut,
trnmod: new Pub().data.Trnmod,
liaall: new Pub().data.Liaall,
}
}
}
\ No newline at end of file
......@@ -25,8 +25,8 @@
style="margin: 0 0"
size="small"
type="primary"
:disabled="this.flag"
@click="onCctmodButgetref"
:disabled="model.ccdgrp.rec.ownref!=''"
>
获取
</c-button>
......@@ -206,243 +206,167 @@
v-model="model.cctp.usr.extkey"
maxlength="8"
placeholder="请输入User ID"
disabled
></c-input>
</el-form-item>
</c-col>
<c-col :span="2">
<el-form-item label="" label-width="15px">
<c-button size="small" type="primary;width:10%" @click="onSeainf"
>i</c-button
>
</el-form-item>
</c-col>
<c-col :span="20">
<el-form-item
label="External Key of Address"
prop="ccdgrp.cor.pts.extkey"
<c-button
style="margin: 0 12px 0 14px; padding: 0 12px"
size="small"
type="primary"
@click="onSeainf"
>
<c-input
v-model="model.ccdgrp.cor.pts.extkey"
maxlength="16"
placeholder="请输入External Key of Address"
></c-input>
</el-form-item>
</c-col>
<c-col :span="2">
<el-form-item label="" label-width="15px">
<c-button size="small" type="primary;width:10%" @click="onSeainf"
>i</c-button
>
</el-form-item>
</c-col>
<c-col :span="2">
<c-button size="small" type="primary" @click="onCorpDet">
Details
<span style="font-family: '宋体'; font-weight: bold">i</span>
</c-button>
</c-col>
<c-col :span="24">
<el-form-item prop="ccdgrp.cor.namelc">
<c-input
type="textarea"
v-model="model.ccdgrp.cor.namelc"
maxlength="35"
show-word-limit
placeholder="请输入名称"
></c-input>
<el-form-item label="Drawer" prop="ccdgrp.cor.pts.extkey">
<c-fullbox>
<c-input
v-model="model.ccdgrp.cor.pts.extkey"
maxlength="16"
@keyup.enter.native="
showGridPromptDialog('ccdgrp.cor.pts.extkey')
"
></c-input>
<template slot="footer">
<c-button
style="margin: 0 10px 0 10px; padding: 0 12px"
size="small"
type="primary"
@click="onSeainf"
>
<span style="font-family: '宋体'; font-weight: bold">i</span>
</c-button>
<c-button style="margin: 0 0" size="small" type="primary">
详情
</c-button>
</template>
</c-fullbox>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item prop="ccdgrp.cor.adrelc">
<el-form-item label="名称地址" prop="ccdgrp.cor.pts.adrblk">
<c-input
type="textarea"
v-model="model.ccdgrp.cor.adrelc"
maxlength="35"
:rows="4"
v-model="model.ccdgrp.cor.pts.adrblk"
maxlength="150"
show-word-limit
placeholder="请输入地址"
placeholder="请输入名称地址"
:disabled="this.flag1"
></c-input>
</el-form-item>
</c-col>
</c-col>
<!-- 右边-->
<!-- ====================右边======================= -->
<c-col :span="11" :offset="1">
<c-col :span="24">
<el-form-item label="Name of CC contract" prop="ccdgrp.rec.nam">
<el-form-item label="Name" prop="ccdgrp.rec.nam">
<c-input
v-model="model.ccdgrp.rec.nam"
maxlength="40"
placeholder="请输入Name of CC contract"
placeholder="请输入Name"
disabled
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Register Ref." prop="ccdgrp.rec.regref">
<c-input
v-model="model.ccdgrp.rec.regref"
maxlength="16"
placeholder="请输入Register Ref."
disabled
></c-input>
</el-form-item>
</c-col>
</c-col>
</c-row>
<c-row>
<c-col :span="11" :offset="1">
<c-col :span="24">
<el-form-item label="Presenter Ref. No." prop="ccdgrp.pre.pts.ref">
<c-input
v-model="model.ccdgrp.pre.pts.ref"
maxlength="16"
placeholder="请输入Presenter Ref. No."
></c-input>
</el-form-item>
</c-col>
<c-col :span="20">
<el-form-item prop="ccdgrp.pre.pts.extkey">
<c-input
v-model="model.ccdgrp.pre.pts.extkey"
maxlength="16"
placeholder="请输入External Key of Address"
></c-input>
</el-form-item>
</c-col>
<c-col :span="2">
<el-form-item label="" label-width="15px">
<c-button size="small" type="primary;width:10%" @click="onSeainf"
>i</c-button
>
</el-form-item>
</c-col>
<c-col :span="2">
<c-button size="small" type="primary" @click="onPrepDet">
Details
</c-button>
</c-col>
<c-col :span="24">
<el-form-item prop="ccdgrp.pre.namelc">
<c-input
type="textarea"
v-model="model.ccdgrp.pre.namelc"
maxlength="35"
show-word-limit
placeholder="请输入名称"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item prop="ccdgrp.pre.adrelc">
<c-input
type="textarea"
v-model="model.ccdgrp.pre.adrelc"
maxlength="35"
show-word-limit
placeholder="请输入地址"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Drawn on Bank Ref" prop="ccdgrp.dro.pts.ref">
<c-input
v-model="model.ccdgrp.dro.pts.ref"
maxlength="16"
placeholder="请输入Drawn on Bank Ref"
></c-input>
</el-form-item>
</c-col>
<c-col :span="20">
<el-form-item prop="ccdgrp.dro.pts.extkey">
<c-input
v-model="model.ccdgrp.dro.pts.extkey"
maxlength="16"
placeholder="请输入External Key of Address"
></c-input>
</el-form-item>
</c-col>
<c-col :span="2">
<el-form-item label="" label-width="15px">
<c-button size="small" type="primary;width:10%" @click="onSeainf"
>i</c-button
>
</el-form-item>
</c-col>
<c-col :span="2">
<c-button size="small" type="primary" @click="onDropDet">
Details
</c-button>
</c-col>
<c-col :span="24">
<el-form-item prop="ccdgrp.dro.namelc">
<c-input
type="textarea"
v-model="model.ccdgrp.dro.namelc"
maxlength="35"
show-word-limit
placeholder="请输入名称"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item prop="ccdgrp.dro.adrelc">
<c-input
type="textarea"
v-model="model.ccdgrp.dro.adrelc"
maxlength="35"
show-word-limit
placeholder="请输入地址"
></c-input>
</el-form-item>
</c-col>
<c-ptap
:model="model"
:argadr="{
title: 'Presenter',
grp: 'ccdgrp',
rol: 'pre',
}"
disabled
>
</c-ptap>
<c-ptap
:model="model"
:argadr="{
title: 'Drawn on Bank',
grp: 'ccdgrp',
rol: 'dro',
}"
:disabled="this.flag2"
>
</c-ptap>
<!-- <c-ptap
:model="model"
:argadr="{
title: 'Coll. Bank',
grp: 'ccdgrp',
rol: 'col',
}"
:disabled="true"
>
</c-ptap> -->
<c-col :span="24">
<el-form-item label="Coll. Bank Ref No." prop="ccdgrp.col.pts.ref">
<el-form-item label="Coll. Bank参考号" prop="ccdgrp.col.pts.ref">
<c-input
v-model="model.ccdgrp.col.pts.ref"
maxlength="16"
placeholder="请输入Coll. Bank Ref No."
></c-input>
</el-form-item>
</c-col>
<c-col :span="20">
<el-form-item prop="ccdgrp.col.pts.extkey">
<c-input
v-model="model.ccdgrp.col.pts.extkey"
maxlength="16"
placeholder="请输入External Key of Address"
placeholder="请输入Coll. Bank参考号"
disabled
></c-input>
</el-form-item>
</c-col>
<c-col :span="2">
<el-form-item label="" label-width="15px">
<c-button size="small" type="primary;width:10%" @click="onSeainf"
>i</c-button
>
</el-form-item>
</c-col>
<c-col :span="2">
<c-button size="small" type="primary" @click="onColpDet">
Details
</c-button>
</c-col>
<c-col :span="24">
<el-form-item prop="ccdgrp.col.namelc">
<c-input
type="textarea"
v-model="model.ccdgrp.col.namelc"
maxlength="35"
show-word-limit
placeholder="请输入名称"
></c-input>
<el-form-item label="Coll. Bank" prop="ccdgrp.col.pts.extkey">
<c-fullbox>
<c-input
v-model="model.ccdgrp.col.pts.extkey"
maxlength="16"
placeholder="请输入Coll. Bank"
disabled
></c-input>
<template slot="footer">
<c-button
style="margin: 0 10px 0 10px; padding: 0 12px"
size="small"
type="primary"
@click="onSeainf"
>
<span style="font-family: '宋体'; font-weight: bold">i</span>
</c-button>
<c-button style="margin: 0 0" size="small" type="primary">
详情
</c-button>
</template>
</c-fullbox>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item prop="ccdgrp.col.adrelc">
<el-form-item label="名称地址" prop="ccdgrp.col.pts.adrblk">
<c-input
type="textarea"
v-model="model.ccdgrp.col.adrelc"
maxlength="35"
:rows="4"
v-model="model.ccdgrp.col.pts.adrblk"
maxlength="150"
show-word-limit
placeholder="请输入地址"
placeholder="请输入名称地址"
disabled
></c-input>
</el-form-item>
</c-col>
......@@ -455,13 +379,42 @@ import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable";
import Event from "~/model/Cctdav/Event";
import Ptap from "~/views/Public/Ptap";
export default {
components: {
"c-ptap": Ptap,
},
inject: ["root"],
props: ["model", "codes"],
mixins: [commonProcess],
data() {
return {};
return {
flag1:false,
flag2:false,
};
},
watch:{
"model.ccdgrp.cor.pts.extkey" :{
immediate:true,
handler(val ,oldVal){
if(this.model.ccdgrp.cor.pts.extkey!=''){
this.flag1=true;
}else{
this.flag1=false;
}
}
},
"model.ccdgrp.dro.pts.extkey" :{
immediate:true,
handler(val ,oldVal){
if(this.model.ccdgrp.dro.pts.extkey!=''){
this.flag2=true;
}else{
this.flag2=false;
}
}
},
},
methods: { ...Event },
created: function () {},
......
<template>
<div class="eibs-tab">
<!-- S0000066 : Settlement Instructions -->
<c-col :span="12">
<c-form-item label="Settlement Instructions" prop="ccdgrp.blk.setins">
<c-input type="textarea" v-model="model.ccdgrp.blk.setins" maxlength="65" show-word-limit :placeholder="$t('other.please_enter')+'Settlement Instructions'" ></c-input>
</c-form-item>
</c-col>
<c-col :span="12">
<c-button size="small" type="primary" icon="el-icon-search" @click="onSetinsButtxmsel">
{{$t('cctp.C0000068')}}
</c-button>
</c-col>
<c-col :span="12">
<c-form-item label="Settlement Instructions" prop="ccdgrp.blk.setins">
<c-input
type="textarea"
:rows="6"
v-model="model.ccdgrp.blk.setins"
maxlength="600"
show-word-limit
placeholder="请输入Settlement Instructions"
></c-input>
</c-form-item>
</c-col>
<c-col :span="12">
<c-button
size="small"
type="primary"
@click="
showGridPromptDialog(
'cctp.setins.buttxmsel',
null,
null,
{ TXT: 'ccdgrp.blk.setins' },
{ TXT: false },
'doxpDialog'
)
"
>
...
</c-button>
</c-col>
</div>
</template>
<script>
import Api from "~/service/Api"
import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "~/model/Cctdav/Event"
import CodeTable from "~/config/CodeTable";
import Event from "~/model/Cctdav/Event";
export default {
inject: ['root'],
props:["model","codes"],
mixins: [commonProcess],
data(){
return {
}
},
methods:{...Event},
created:function(){
}
}
inject: ["root"],
props: ["model", "codes"],
mixins: [commonProcess],
data() {
return {};
},
methods: { ...Event },
created: function () {},
};
</script>
<style>
</style>
......@@ -41,6 +41,10 @@
<el-tab-pane label="Completion" name="coninfp">
<m-coninfp :model="model" :codes="codes" />
</el-tab-pane>
<!--engp PD000000 Liability -->
<el-tab-pane label="Liability" name="engp">
<m-engp :model="model" :codes="codes" />
</el-tab-pane>
<!--setmod PD000000 Settlement -->
<el-tab-pane label="Settlement" name="setpan">
<m-setpan :model="model" :codes="codes" />
......@@ -55,6 +59,21 @@
</el-tab-pane>
</c-tabs>
</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>
</template>
<script>
......@@ -67,11 +86,6 @@ import Check from "~/model/Cctdav/Check";
import Default from "~/model/Cctdav/Default";
import Pattern from "~/model/Cctdav/Pattern";
import Cctdav1 from "./Cctdav1";
// import Docpan from "./Docpan";
// import Doctre from "./Doctre";
// import Coninfp from "./Coninfp";
// import Setpan from "./Setpan";
// import Glepan from "./Glepan";
import Setinsp from "./Setinsp";
import Docpan from "~/views/Public/Docpan";
......@@ -79,6 +93,7 @@ import Doctre from "~/views/Public/Doctre";
import Coninfp from "~/views/Public/Coninfp";
import Setpan from "~/views/Public/Setpan";
import Glepan from "~/views/Public/Glepan";
import Engp from "~/views/Public/Engp";
export default {
name: "Cctdav",
......@@ -90,6 +105,7 @@ export default {
"m-setpan": Setpan,
"m-glepan": Glepan,
"m-setinsp": Setinsp,
"m-engp": Engp,
},
provide() {
return {
......@@ -124,6 +140,9 @@ export default {
if (rtnmsg.respCode == SUCCESS) {
this.updateModel(rtnmsg.data);
//TODO 处理数据逻辑
if (this.isInDisplay) {
this.restoreDisplay();
}
} else {
this.$notify.error({ title: "错误", message: "服务请求失败!" });
}
......
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