Commit 502e96c3 by sheyinchen

bttsnd页面完善和优化

parent e8a3c883
......@@ -4515,6 +4515,11 @@ const CodeTable = {
{ label: "2nd Beneficiary", value: "BE2" },
{ label: "Presenter(PRP)", value: "PRB" },
],
docprbrolbe1: [
{ label: "1st Beneficiary", value: "BE1" },
{ label: "Presenter(PRP)", value: "PRP" },
],
// payrol1:[
// {label:"Applicant : TG3131232121",value:"1"},
// {label:"Issuing Bank : CHINA EVERBRIGHT BANK",value:"2"},
......
......@@ -17,6 +17,10 @@ export default class Bttdck{
dadsnd:"", // Drag Drop Sender .bttp.ltdget.sdamod.dadsnd
},
},
docgrdm:{
docgrd:"",
docdsclab:"",
},
ledget:{
sdamod:{
dadsnd:"", // Drag Drop Sender .bttp.ledget.sdamod.dadsnd
......@@ -130,6 +134,7 @@ export default class Bttdck{
dbfadrblkcn:"", // Chinese address .btdgrp.prp.dbfadrblkcn
},
blk:{
docpre:"",
intdis:"", // Internal Discrepancies .btdgrp.blk.intdis
comcon:"", // Comments and Conclusions .btdgrp.blk.comcon
setinsbt:"", // Settlement Instructions transaction field .btdgrp.blk.setinsbt
......@@ -156,6 +161,7 @@ export default class Bttdck{
mtabut: new Pub().data.Mtabut,
trnmod: new Pub().data.Trnmod,
liaall: new Pub().data.Liaall,
oldbe2amt:"",
pageId: "" // ctx的key
}
}
......
......@@ -76,14 +76,14 @@ export default {
{max: 40,message:"长度不能超过40"}
],
"btdgrp.rec.matdat":[
{type: "date", required: false, message: "输入正确的日期"}
{type: "string", required: false, message: "输入正确的日期"}
],
"btdgrp.prb.pts.ref":[
{type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"}
],
"btdgrp.rec.predat":[
{type: "date", required: false, message: "输入正确的日期"}
{type: "string", required: false, message: "输入正确的日期"}
],
"btdgrp.rec.docsta":[
{type: "string", required: false, message: "必输项"},
......@@ -94,7 +94,7 @@ export default {
{max: 40,message:"长度不能超过40"}
],
"btdgrp.rec.predat":[
{type: "date", required: false, message: "输入正确的日期"}
{type: "string", required: false, message: "输入正确的日期"}
],
"btdgrp.rec.rcvdatbe1":[
{type: "date", required: false, message: "输入正确的日期"}
......
import Api from "~/service/Api"
import Pts from "../Common/Pts"
import Pts from "../Common/Pts"
import Pub from "../Public"
export default class Bttsnd{
......@@ -8,15 +8,21 @@ export default class Bttsnd{
ltdgrp:{
rec:{
ownref:"", // Transfer Reference .ltdgrp.rec.ownref
},
be1:{
pts:new Pts().data,
},
},
mtabut: new Pub().data.Mtabut,
setmod: new Pub().data.Setmod,
be1:{
pts:new Pts().data,
},
},
mtabut: new Pub().data.Mtabut,
setmod: new Pub().data.Setmod,
liaall: new Pub().data.Liaall,
bttpayl1blk:"",
bttpayl2blk:"",
bttp:{
docgrdm:{
docgrd:"",
docdsclab:"",
},
ltdget:{
sdamod:{
seainf:"", // .bttp.ltdget.sdamod.seainf
......@@ -109,6 +115,7 @@ export default class Bttsnd{
dbfadrblkcn:"", // Chinese address .btdgrp.prb.dbfadrblkcn
},
blk:{
docpre:"",
be1ins:"", // Instructions 1st Beneficiary .btdgrp.blk.be1ins
be2ins:"", // Instructions 2nd Beneficiary .btdgrp.blk.be2ins
benref:"", // New Benificiary Ref. .btdgrp.blk.benref
......@@ -130,15 +137,16 @@ export default class Bttsnd{
},
rmbclmnow:"", // Claim Reimbursement now .rmbclmnow
rmbclmlate:"", // Claim Reimbursement late .rmbclmlate
trnmod:{
trndoc:{
advlabel:"", // ADVLABEL .trnmod.trndoc.advlabel
amdnam:"", // AMDNAM .trnmod.trndoc.amdnam
advdoc:"", // 国内证通知书 .trnmod.trndoc.advdoc
advnam:"", // 国内证落款 .trnmod.trndoc.advnam
amdapl:"", // 修改申请人名称 .trnmod.trndoc.amdapl
},
},
// trnmod:{
// trndoc:{
// advlabel:"", // ADVLABEL .trnmod.trndoc.advlabel
// amdnam:"", // AMDNAM .trnmod.trndoc.amdnam
// advdoc:"", // 国内证通知书 .trnmod.trndoc.advdoc
// advnam:"", // 国内证落款 .trnmod.trndoc.advnam
// amdapl:"", // 修改申请人名称 .trnmod.trndoc.amdapl
// },
// },
trnmod: new Pub().data.Trnmod,
pageId: "" // ctx的key
}
}
......
......@@ -8,7 +8,7 @@
maxlength="50"
show-word-limit
:disabled="model.btdgrp.blk.docdisflg ? false : true"
placeholder="请输入Discrepancies" ></c-input>
placeholder="请输入Discrepancies" disabled ></c-input>
</el-form-item>
</c-col>
<c-col :span="4">
......@@ -55,12 +55,15 @@
</c-col>
</el-row>
<el-row>
<c-col :span="22" :offset="2">
<c-istream-table
:list="model.bttp.docgrdmbe1.docgrd"
:columns="columns1"
>
</c-istream-table>
<c-col :span="24">
<c-docpre
:model="model"
:argadr="{
path: 'btdgrp.blk.prsdocbe1',
grp: 'bttp',
code: 'docpre',
}"
></c-docpre>
</c-col>
<!--
<c-col :span="24" :offset="1">
......@@ -90,12 +93,15 @@
</el-row>
<el-row>
<c-col :span="22" :offset="2">
<c-istream-table
:list="model.bttp.docgrdmbe2.docgrd"
:columns="columns2"
>
</c-istream-table>
<c-col :span="24">
<c-docpre
:model="model"
:argadr="{
path: 'btdgrp.blk.prsdocbe2',
grp: 'bttp',
code: 'docpre',
}"
></c-docpre>
</c-col>
<!--
<c-col :span="24" :offset="1">
......@@ -131,14 +137,16 @@
</c-col>
<c-col :span="24">
<el-form-item label="Further Handling" prop="bttp.futhndflg">
<c-select v-model="model.bttp.futhndflg" style="width:100%" placeholder="请选择further handling">
<c-select v-model="model.bttp.futhndflg" style="width:100%"
placeholder="请选择further handling" :code="codes.futhndflg">
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Document set Status" prop="bttp.futhndflg">
<c-select v-model="model.btdgrp.rec.docsta" style="width:100%" placeholder="请选择further handling">
</c-select>
<c-input v-model="model.btdgrp.rec.docsta" style="width:100%"
placeholder="请选择further handling" disabled>
</c-input>
</el-form-item>
</c-col>
......@@ -153,18 +161,24 @@ import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "~/model/Bttdck/Event"
import Docpre from "~/views/Public/Docpre";
export default {
components: { },
components: { "c-docpre": Docpre },
inject: ['root'],
props:["model","codes"],
mixins: [commonProcess],
data(){
return {
columns1: ['0 0 "lst1" 50 ', '1 1 "lst2" 50', '2 2 "document" 400'],
columns2: ['0 0 "lst1" 50 ', '1 1 "lst2" 50', '2 2 "document" 400'],
};
},
// data(){
// return {
// columns1: ['0 0 "lst1" 50 ', '1 1 "lst2" 50', '2 2 "document" 400'],
// columns2: ['0 0 "lst1" 50 ', '1 1 "lst2" 50', '2 2 "document" 400'],
// };
// },
data() {
return {
}
},
methods:{...Event},
created:function(){
......
<template>
<div class="eibs-tab">
<el-row>
<c-col :span="6">
<el-form-item label="Document Amount" prop="btdgrp.cbs.max.cur">
<c-select disabled v-model="model.btdgrp.cbs.max.cur"
style="width: 100%"
placeholder="请选择Currency"><!--@keyup.enter.native="nom1CurEvent"-->
<el-option v-for="item in codes.cur"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</c-select>
</el-form-item>
</c-col>
<c-col :span="5">
<el-form-item
style="text-align: left"
label-width="20px"
prop="btdgrp.cbs.max.amt"
>
<c-input-currency
v-model="model.btdgrp.cbs.max.amt"
style="text-align: left; width: 100%"
placeholder="Document Amount"
></c-input-currency>
</el-form-item>
</c-col>
</el-row>
<el-row>
<c-col :span="6">
<el-form-item label="Claim Add Amt" prop="btdgrp.cbs.max2.cur">
<c-select disabled v-model="model.btdgrp.cbs.max2.cur"
style="width: 100%"
placeholder="请选择Currency"><!--@keyup.enter.native="nom1CurEvent"-->
<el-option v-for="item in codes.cur"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</c-select>
</el-form-item>
</c-col>
<c-col :span="5">
<el-form-item
style="text-align: left"
label-width="20px"
prop="btdgrp.cbs.max2.amt">
<c-input-currency
v-model="model.btdgrp.cbs.max2.amt"
style="text-align: left; width: 100%"
placeholder="Additional Amount"
></c-input-currency>
</el-form-item>
</c-col>
</el-row>
<el-row>
<c-col :span="12">
<el-form-item label="Charges Deducted" prop="btdgrp.blk.chaded">
<c-input type="textarea" style="overflow-y:hidden" v-model="model.btdgrp.blk.chaded" maxlength="190" rows="6" cols="35" show-word-limit placeholder="请输入Charges Deducted" ></c-input>
</el-form-item>
</c-col>
</el-row>
<el-row>
<c-col :span="12">
<el-form-item label="Charges Added" prop="btdgrp.blk.chaadd">
<c-input type="textarea" style="overflow-y:hidden" v-model="model.btdgrp.blk.chaadd" maxlength="190" rows="6" cols="35" show-word-limit placeholder="请输入Charges Added" ></c-input>
</el-form-item>
</c-col>
</el-row>
<el-row>
<c-col :span="6">
<el-form-item label="Amount to be paid" prop="btdgrp.rec.totcur">
<c-select disabled v-model="model.btdgrp.rec.totcur"
style="width: 100%"
placeholder="请选择Currency"><!--@keyup.enter.native="nom1CurEvent"-->
<el-option v-for="item in codes.cur"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</c-select>
</el-form-item>
</c-col>
<c-col :span="5">
<el-form-item label="" style="text-align: left"
label-width="20px" prop="btdgrp.rec.totamt">
<c-input-currency
v-model="model.btdgrp.rec.totamt"
style="text-align: left; width: 100%"
placeholder="Amount to be paid"
></c-input-currency>
</el-form-item>
</c-col>
</el-row>
<el-row>
<c-col :span="8" >
<el-form-item label="Account with Bank">
<c-input placeholder="" disabled></c-input>
</el-form-item>
</c-col>
<c-col :span="7" >
<el-form-item label="" label-width="15px">
<c-button size="small" type="primary" @click="onSndpDet" disabled>
Details
</c-button>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="">
<c-input
type="textarea"
placeholder=""
maxlength="140"
show-word-limit
rows="4"
disable
style="width: 90%"
></c-input>
</el-form-item>
</c-col>
</el-row>
<el-row>
<c-col :span="12">
<c-col >
<el-form-item label="Discrepancies" prop="btdgrp.blk.docdis">
<c-input type="textarea" style="overflow-y:hidden" rows="7" cols="50" v-model="model.btdgrp.blk.docdis" maxlength="3500" placeholder="请输入Discrepancies" ></c-input>
</el-form-item>
</c-col>
<c-col :span="12" offset="8">
<c-checkbox v-model="model.btdgrp.blk.docdisflg">discrepancies modified</c-checkbox>
</c-col>
</c-col>
</el-row>
</div>
</template>
<script>
import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "~/model/Bttdck/Event"
export default {
inject: ['root'],
props:["model","codes"],
mixins: [commonProcess],
data(){
return {
}
},
methods:{...Event},
created:function(){
}
}
</script>
<style>
</style>
<template>
<div class="eibs-tab">
<!--==========================左边==========================-->
<c-col :span="11">
<el-row>
<c-col :span="12">
<el-form-item label="Document Amount" prop="btdgrp.cbs.max.cur">
<c-select disabled v-model="model.btdgrp.cbs.max.cur"
style="width: 100%"
placeholder="请选择Currency"><!--@keyup.enter.native="nom1CurEvent"-->
<el-option v-for="item in codes.cur"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item
style="text-align: left"
label-width="20px"
prop="btdgrp.cbs.max.amt">
<c-input-currency
v-model="model.btdgrp.cbs.max.amt"
style="text-align: left; width: 100%"
placeholder="Document Amount">
</c-input-currency>
</el-form-item>
</c-col>
</el-row>
<el-row>
<c-col :span="12">
<el-form-item label="Claim Add Amt" prop="btdgrp.cbs.opn2.cur">
<c-select disabled v-model="model.btdgrp.cbs.opn2.cur"
style="width: 100%"
placeholder="请选择Currency"><!--@keyup.enter.native="nom1CurEvent"-->
<el-option v-for="item in codes.cur"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item
style="text-align: left"
label-width="20px"
prop="btdgrp.cbs.max2.amt">
<c-input-currency
v-model="model.btdgrp.cbs.max2.amt"
style="text-align: left; width: 100%"
placeholder="Additional Amount"
></c-input-currency>
</el-form-item>
</c-col>
</el-row>
<el-row>
<c-col :span="24">
<el-form-item label="Charges Deducted" prop="btdgrp.blk.chaded">
<c-input type="textarea" style="overflow-y:hidden" v-model="model.btdgrp.blk.chaded" rows="6" cols="35" show-word-limit placeholder="请输入Charges Deducted" ></c-input>
</el-form-item>
</c-col>
</el-row>
<el-row>
<c-col :span="24">
<el-form-item label="Charges Added" prop="btdgrp.blk.chaadd">
<c-input type="textarea" style="overflow-y:hidden" v-model="model.btdgrp.blk.chaadd" rows="6" cols="35" show-word-limit placeholder="请输入Charges Added" ></c-input>
</el-form-item>
</c-col>
</el-row>
<el-row>
<c-col :span="12">
<el-form-item label="Total Amount Claimed" prop="btdgrp.rec.totcur">
<c-select disabled v-model="model.btdgrp.rec.totcur"
style="width: 100%"
placeholder="请选择Currency"><!--@keyup.enter.native="nom1CurEvent"-->
<el-option v-for="item in codes.cur"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="" style="text-align: left"
label-width="20px" prop="btdgrp.rec.totamt">
<c-input-currency
v-model="model.btdgrp.rec.totamt"
style="text-align: left; width: 100%"
placeholder="Amount to be paid"
></c-input-currency>
</el-form-item>
</c-col>
</el-row>
<el-row>
<c-col :span="18" >
<el-form-item label="Reimbursing Bank">
<c-input placeholder=""></c-input>
</el-form-item>
</c-col>
<c-col :span="6" >
<el-form-item label="" label-width="15px">
<c-button size="small" type="primary" @click="onSndpDet" disabled>
Details
</c-button>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="">
<c-input
type="textarea"
placeholder=""
maxlength="140"
show-word-limit
rows="4"
style="width: 90%"
></c-input>
</el-form-item>
</c-col>
</el-row>
<el-row>
<c-col :span="18" >
<el-form-item label="Account with Bank">
<c-input placeholder=""></c-input>
</el-form-item>
</c-col>
<c-col :span="4" >
<el-form-item label="" label-width="15px">
<c-button size="small" type="primary" @click="onSndpDet" disabled>
Details
</c-button>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="">
<c-input
type="textarea"
placeholder=""
maxlength="140"
show-word-limit
rows="4"
style="width: 90%"
></c-input>
</el-form-item>
</c-col>
</el-row>
<el-row>
<c-col :span="18">
<el-form-item label="Date to be Paid" prop="btdgrp.rec.totdat">
<c-date-picker type="date" v-model="model.btdgrp.rec.totdat" style="width:100%" placeholder="请选择Date to be Paid"></c-date-picker>
</el-form-item>
</c-col>
</el-row>
</c-col>
<!--==========================右边==========================-->
<c-col :span="12" offset="1">
<c-col :span="24">
<el-form-item prop="btdgrp.blk.nartxt77a">
<span slot="label" label-position="top" style="color: #f56c6c;font-size: 14px;vertical-align: top;">Narrative Tag77A of MT754</span>
<c-input type="textarea" v-model="model.btdgrp.blk.nartxt77a" maxlength="700" rows="20" cols="35" placeholder="请输入Narrative Tag77A of MT754" ></c-input>
</el-form-item>
</c-col>
</c-col>
</div>
</template>
<script>
import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "~/model/Bttdck/Event"
export default {
inject: ['root'],
props:["model","codes"],
mixins: [commonProcess],
data(){
return {
}
},
methods:{...Event},
created:function(){
}
}
</script>
<style>
</style>
......@@ -40,19 +40,19 @@
</c-content>
</el-tab-pane>
<!--PD000282 -->
<!--PD000282
<el-tab-pane label="Advice of Discrepancy" v-if="model.btdgrp.rec.advtyp=='750'" name="mt750p">
<c-content>
<m-mt750p :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
</el-tab-pane> -->
<!--PD000268 -->
<!--PD000268
<el-tab-pane label="Advice of Payment" v-if="model.btdgrp.rec.advtyp=='754'" name="mt754p">
<c-content>
<m-mt754p :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
</el-tab-pane> -->
<!--PD000027 -->
<el-tab-pane label="Liability" name="engp">
......@@ -103,8 +103,9 @@ import Default from "~/model/Bttdck/Default";
import Pattern from "~/model/Bttdck/Pattern";
import Drv from "./Drv";
import Dscinsp from "./Dscinsp";
import Mt750p from "./Mt750p";
import Mt754p from "./Mt754p";
import Utils from "~/utils";
//import Mt750p from "./Mt750p";
//import Mt754p from "./Mt754p";
import Glepan from "~/views/Public/Glepan";
import Setpan from "~/views/Public/Setpan";
......@@ -117,8 +118,8 @@ export default {
components:{
"m-drv" : Drv,
"m-dscinsp" : Dscinsp,
"m-mt750p" : Mt750p,
"m-mt754p" : Mt754p,
//"m-mt750p" : Mt750p,
//"m-mt754p" : Mt754p,
"m-engp" : Engp,
"m-setpan" : Setpan,
"m-coninfp" : Coninfp,
......
<template>
<div class="eibs-tab">
<!-- S0000042 : 是否报送跨境人民币2101表 -->
<c-col :span="12">
<el-form-item :label="$t('cnybop.S0000042')" prop="cnybop.cnyflg">
<c-select v-model="model.cnybop.cnyflg" style="width:100%" :placeholder="$t('other.please_enter')+$t('cnybop.S0000042')">
<el-form-item label="是否报送跨境人名币2101表" prop="cnybop.cnyflg">
<c-select v-model="model.cnybop.cnyflg" style="width:100%" placeholder="不申报" disabled>
</c-select>
</el-form-item>
</c-col>
......
......@@ -60,12 +60,26 @@
</c-col>
<c-col :span="24">
</c-col>
<c-docpre
:model="model"
:argadr="{
path: 'btdgrp.blk.prsdocbe1',
grp: 'bttp',
code: 'docpre',
}"
></c-docpre>
</c-col>
<c-col :span="24">
<c-docpre
:model="model"
:argadr="{
path: 'btdgrp.blk.prsdocbe2',
grp: 'bttp',
code: 'docpre',
}"
></c-docpre>
</c-col>
</c-col>
......@@ -128,10 +142,10 @@
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "~/model/Bttsnd/Event"
//import Docpre from "~/views/Public/Docpre";
import Docpre from "~/views/Public/Docpre";
export default {
//components: { "c-docpre": Docpre },
components: { "c-docpre": Docpre },
inject: ['root'],
props: ["model", "codes"],
mixins: [commonProcess],
......
......@@ -111,6 +111,7 @@ import Glepan from "~/views/Public/Glepan";
import Docpan from "~/views/Public/Docpan";
import Coninfp from "~/views/Public/Coninfp";
import Doctre from "~/views/Public/Doctre";
import Utils from "~/utils";
export default {
components:{
......
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