Skip to content

V
vue-gjjs
Commit 9aebacee by taojinrui
Options

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 34a5001c 72917dfb
Showing with 105 additions and 106 deletions
src/model/Betdrv/Pattern.js
...@@ -18,7 +18,7 @@ export default { ...@@ -18,7 +18,7 @@ export default {
"ledgrp.cbs.opn1.amt":[ "ledgrp.cbs.opn1.amt":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {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位" }//同属适用于正负数
], ],
"betp.recget.sdamod.dadsnd":[ "betp.recget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
......
src/model/Betsnd/Pattern.js
...@@ -16,9 +16,9 @@ export default { ...@@ -16,9 +16,9 @@ export default {
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
"ledgrp.cbs.opn1.amt":[ "ledgrp.cbs.opn1.amt":[
{type: "number", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {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位" }//同属适用于正负数
], ],
"betp.recget.sdamod.dadsnd":[ "betp.recget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
...@@ -38,7 +38,7 @@ export default { ...@@ -38,7 +38,7 @@ export default {
], ],
"bedgrp.cbs.max.amt":[ "bedgrp.cbs.max.amt":[
{type: "number", required: false, message: "必输项"}, {type: "strig", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {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位" }
], ],
...@@ -52,7 +52,7 @@ export default { ...@@ -52,7 +52,7 @@ export default {
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
"bedgrp.cbs.opn1.amt":[ "bedgrp.cbs.opn1.amt":[
{type: "number", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {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位" }
], ],
...@@ -111,7 +111,7 @@ export default { ...@@ -111,7 +111,7 @@ export default {
], ],
"bedgrp.oth.pts.adrblk":[ "bedgrp.oth.pts.adrblk":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 140,message:"长度不能超过140"}
], ],
"bedgrp.oth.dbfadrblkcn":[ "bedgrp.oth.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
...@@ -141,7 +141,7 @@ export default { ...@@ -141,7 +141,7 @@ export default {
], ],
"bedgrp.prb.pts.adrblk":[ "bedgrp.prb.pts.adrblk":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 140,message:"长度不能超过140"}
], ],
"bedgrp.prb.dbfadrblkcn":[ "bedgrp.prb.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
...@@ -171,7 +171,7 @@ export default { ...@@ -171,7 +171,7 @@ export default {
"bedgrp.blk.intdis":[ "bedgrp.blk.intdis":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"} {max: 1300,message:"长度不能超过1300"}
], ],
...@@ -181,21 +181,21 @@ export default { ...@@ -181,21 +181,21 @@ export default {
"bedgrp.blk.comcon":[ "bedgrp.blk.comcon":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"} {max: 1300,message:"长度不能超过1300"}
], ],
"bedgrp.rec.disdat":[ "bedgrp.rec.disdat":[
{type: "date", required: false, message: "输入正确的日期"} {type: "date", required: false, message: "输入正确的日期"}
], ],
"bedgrp.rec.lescom":[ "bedgrp.rec.lescom":[
{type: "number", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {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位" }
], ],
"bedgrp.blk.setinsbe":[ "bedgrp.blk.setinsbe":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"} {max: 390,message:"长度不能超过390"}
], ],
...@@ -204,7 +204,7 @@ export default { ...@@ -204,7 +204,7 @@ export default {
"bedgrp.blk.docdis":[ "bedgrp.blk.docdis":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 50,message:"长度不能超过50"} {max: 3500,message:"长度不能超过3500"}
], ],
"betp.docp.ptsget.sdamod.dadsnd":[ "betp.docp.ptsget.sdamod.dadsnd":[
...@@ -226,7 +226,7 @@ export default { ...@@ -226,7 +226,7 @@ export default {
], ],
"bedgrp.doc.pts.adrblk":[ "bedgrp.doc.pts.adrblk":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 140,message:"长度不能超过140"}
], ],
"bedgrp.doc.dbfadrblkcn":[ "bedgrp.doc.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
...@@ -238,21 +238,21 @@ export default { ...@@ -238,21 +238,21 @@ export default {
], ],
"bedsnd.usadet":[ "bedsnd.usadet":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"} {max: 650,message:"长度不能超过650"}
], ],
"bedsnd.addphr":[ "bedsnd.addphr":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"} {max: 650,message:"长度不能超过650"}
], ],
"bedsnd.newbenadr":[ "bedsnd.newbenadr":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 175,message:"长度不能超过175"}
], ],
"bedgrp.blk.benref":[ "bedgrp.blk.benref":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 16,message:"长度不能超过16"} {max: 160,message:"长度不能超过160"}
], ],
"liaall.outamt":[ "liaall.outamt":[
{type: "number", required: false, message: "必输项"}, {type: "number", required: false, message: "必输项"},
...@@ -387,7 +387,7 @@ export default { ...@@ -387,7 +387,7 @@ export default {
], ],
"rmbclm.rmbrmb.pts.adrblk":[ "rmbclm.rmbrmb.pts.adrblk":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 140,message:"长度不能超过140"}
], ],
"rmbclm.rmbrmb.dbfadrblkcn":[ "rmbclm.rmbrmb.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
...@@ -420,7 +420,7 @@ export default { ...@@ -420,7 +420,7 @@ export default {
], ],
"rmbclm.acwacw.pts.adrblk":[ "rmbclm.acwacw.pts.adrblk":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 140,message:"长度不能超过140"}
], ],
"rmbclm.acwacw.dbfadrblkcn":[ "rmbclm.acwacw.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
...@@ -453,7 +453,7 @@ export default { ...@@ -453,7 +453,7 @@ export default {
], ],
"rmbclm.bebbeb.pts.adrblk":[ "rmbclm.bebbeb.pts.adrblk":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 140,message:"长度不能超过140"}
], ],
"rmbclm.bebbeb.dbfadrblkcn":[ "rmbclm.bebbeb.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
......
src/model/Betsnd/index.js
...@@ -31,6 +31,7 @@ export default class Betsnd{ ...@@ -31,6 +31,7 @@ export default class Betsnd{
adaflg:"", // Add. amount .betp.adaflg adaflg:"", // Add. amount .betp.adaflg
docgrdm:{ docgrdm:{
docdsclab:"", // Label of document description .betp.docgrdm.docdsclab docdsclab:"", // Label of document description .betp.docgrdm.docdsclab
docgrd:"", //betp.docgrdm.docgrd 加表格内容字段
}, },
othp:{ othp:{
ptsget:{ ptsget:{
...@@ -124,7 +125,8 @@ export default class Betsnd{ ...@@ -124,7 +125,8 @@ export default class Betsnd{
setinsbe:"", // Settlement Instructions transaction field .bedgrp.blk.setinsbe setinsbe:"", // Settlement Instructions transaction field .bedgrp.blk.setinsbe
docdis:"", // Discrepancies .bedgrp.blk.docdis docdis:"", // Discrepancies .bedgrp.blk.docdis
docdisflg:"", // Discrepancies modified .bedgrp.blk.docdisflg docdisflg:"", // Discrepancies modified .bedgrp.blk.docdisflg
benref:"", // 新受益人编号 .bedgrp.blk.benref benref:"", // 新受益人编号 .bedgrp.blk.benref\
prsdoc:"", //加Rgfp.vue左下表格字段//path字段 bedgrp.blk.prsdoc
}, },
doc:{ doc:{
pts:new Pts().data, pts:new Pts().data,
...@@ -133,6 +135,12 @@ export default class Betsnd{ ...@@ -133,6 +135,12 @@ export default class Betsnd{
dbfadrblkcn:"", // Chinese address .bedgrp.doc.dbfadrblkcn dbfadrblkcn:"", // Chinese address .bedgrp.doc.dbfadrblkcn
}, },
}, },
oldbedgrp:{
rec:{
rcvdat:"", //到单日期recevied on 是否高亮可选 oldbedgrp.rec.rcvdat
predat:"", //提示日期 Presented on 是否高亮可选 oldbedgrp.rec.predat
}
},
ameadrflg:"", // Ammendment Ben. or Iss. Address .ameadrflg ameadrflg:"", // Ammendment Ben. or Iss. Address .ameadrflg
bedsnd:{ bedsnd:{
snd732:"", // Create MT 732 .bedsnd.snd732 snd732:"", // Create MT 732 .bedsnd.snd732
......
src/views/Business/Betsnd/Cnyp.vue
<template> <template>
<div class="eibs-tab"> <div class="eibs-tab">
<!-- S0000042 : 是否报送跨境人民币2101表 -->
<c-col :span="12"> <c-col :span="12">
<el-form-item :label="$t('cnybop.S0000042')" prop="cnybop.cnyflg"> <!-- S0000042 : 是否报送跨境人民币2101表 -->
<c-select <c-col :span="18">
v-model="model.cnybop.cnyflg" <el-form-item label="是否报送跨境人民币2101表" label-width=160px prop="cnybop.cnyflg">
style="width: 100%" <c-select disabled v-model="model.cnybop.cnyflg" style="width:70%" placeholder="请选择是否报送跨境人民币2101表"
:placeholder="$t('other.please_enter') + $t('cnybop.S0000042')" :code="codes.cnyflg">
> </c-select>
</c-select> </el-form-item>
</el-form-item> </c-col>
</c-col>
<!-- S0000045 : 是否报送跨境人民币2107表 --> <!-- S0000045 : 是否报送跨境人民币2107表 -->
<c-col :span="18">
<c-col :span="12"> <el-form-item label="是否报送跨境人民币2107表" label-width=160px prop="cnybop.traflg">
<el-form-item :label="$t('cnybop.S0000045')" prop="cnybop.traflg"> <c-select disabled v-model="model.cnybop.traflg" style="width:70%" placeholder="请选择是否报送跨境人民币2107表"
<c-select :code="codes.traflg">
v-model="model.cnybop.traflg" </c-select>
style="width: 100%" </el-form-item>
:placeholder="$t('other.please_enter') + $t('cnybop.S0000045')" </c-col>
>
</c-select>
</el-form-item>
</c-col>
<!-- S0000077 : 是否报送跨境人民币2111表 --> <!-- S0000077 : 是否报送跨境人民币2111表 -->
<c-col :span="18">
<c-col :span="12"> <el-form-item label="是否报送跨境人民币2111表" label-width=160px prop="cnybop.outflg">
<el-form-item :label="$t('cnybop.S0000077')" prop="cnybop.outflg"> <c-select disabled v-model="model.cnybop.outflg" style="width:70%" placeholder="请选择是否报送跨境人民币2111表"
<c-select :code="codes.outflg">
v-model="model.cnybop.outflg" </c-select>
style="width: 100%" </el-form-item>
:placeholder="$t('other.please_enter') + $t('cnybop.S0000077')" </c-col>
>
</c-select>
</el-form-item>
</c-col>
<!-- S0000113 : 是否报送跨境人民币2106表 --> <!-- S0000113 : 是否报送跨境人民币2106表 -->
<c-col :span="18">
<c-col :span="12"> <el-form-item label="是否报送跨境人民币2106表" label-width=160px prop="cnybop.libflg">
<el-form-item :label="$t('cnybop.S0000113')" prop="cnybop.libflg"> <c-select v-model="model.cnybop.libflg" style="width:70%" placeholder="请选择是否报送跨境人民币2106表"
<c-select :code="codes.libflg">
v-model="model.cnybop.libflg" </c-select>
style="width: 100%" </el-form-item>
:placeholder="$t('other.please_enter') + $t('cnybop.S0000113')" </c-col>
>
</c-select>
</el-form-item>
</c-col>
<!-- S0000142 : 是否报送跨境人民币2122表 --> <!-- S0000142 : 是否报送跨境人民币2122表 -->
<c-col :span="18">
<c-col :span="12"> <el-form-item label="是否报送跨境人民币2122表" label-width=160px prop="cnybop.vouflg">
<el-form-item :label="$t('cnybop.S0000142')" prop="cnybop.vouflg"> <c-select disabled v-model="model.cnybop.vouflg" style="width:70%" placeholder="请选择是否报送跨境人民币2122表"
<c-select :code="codes.vouflg">
v-model="model.cnybop.vouflg" </c-select>
style="width: 100%" </el-form-item>
:placeholder="$t('other.please_enter') + $t('cnybop.S0000142')" </c-col>
>
</c-select>
</el-form-item>
</c-col> </c-col>
</div> </div>
</template> </template>
...@@ -79,4 +61,6 @@ export default { ...@@ -79,4 +61,6 @@ export default {
created: function () {}, created: function () {},
} }
</script> </script>
<style></style> <style>
</style>
src/views/Business/Betsnd/Rgfdet.vue
<template> <template>
<div class="eibs-tab"> <div class="eibs-tab">
<!-- SF000060 : 远期单据指示 --> <!-- SF000060 : 远期单据指示 -->
<c-col :span="20">
<c-col :span="12"> <c-col :span="21">
<c-form-item :label="$t('bedsnd.SF000060')" prop="bedsnd.usadet"> <c-form-item label="Instructions regarding Usance Documengts" prop="bedsnd.usadet">
<c-input <c-input
type="textarea" type="textarea"
v-model="model.bedsnd.usadet" v-model="model.bedsnd.usadet"
maxlength="65" maxlength="650"
:rows="8"
show-word-limit show-word-limit
:placeholder="$t('other.please_enter') + $t('bedsnd.SF000060')" placeholder="请输入远期单据指示"
></c-input> ></c-input>
</c-form-item> </c-form-item>
</c-col> </c-col>
<c-col :span="3">
<c-col :span="12">
<c-button <c-button
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@click="onUsatxtButtxmsel" @click="onUsatxtButtxmsel"
> >
{{ $t('bedsnd.CF000057') }} ...
</c-button> </c-button>
</c-col> </c-col>
<!-- SF000059 : 偿付条款 --> </c-col>
<c-col :span="12"> <!-- SF000059 : 偿付条款 -->
<c-form-item :label="$t('bedsnd.SF000059')" prop="bedsnd.addphr"> <c-col :span="20">
<c-col :span="21">
<c-form-item label="Reimmursement Pharse" prop="bedsnd.addphr">
<c-input <c-input
type="textarea" type="textarea"
v-model="model.bedsnd.addphr" v-model="model.bedsnd.addphr"
maxlength="65" maxlength="650"
:rows="8"
show-word-limit show-word-limit
:placeholder="$t('other.please_enter') + $t('bedsnd.SF000059')" placeholder="请输入偿付条款"
></c-input> ></c-input>
</c-form-item> </c-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="3">
<c-button <c-button
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@click="onRgfphrButtxmsel" @click="onRgfphrButtxmsel"
> >
{{ $t('bedsnd.CF000058') }} ...
</c-button> </c-button>
</c-col> </c-col>
<!-- SG000345 : 新受益人地址 --> </c-col>
<c-col :span="12"> <!-- SG000345 : 新受益人地址 -->
<c-form-item :label="$t('bedsnd.SG000345')" prop="bedsnd.newbenadr"> <c-col :span="20">
<c-form-item label="New Ben.Address" prop="bedsnd.newbenadr">
<c-input <c-input
type="textarea" type="textarea"
v-model="model.bedsnd.newbenadr" v-model="model.bedsnd.newbenadr"
maxlength="35" maxlength="175"
:rows="5"
show-word-limit show-word-limit
:placeholder="$t('other.please_enter') + $t('bedsnd.SG000345')" placeholder="请输入新受益人地址"
:disabled="model.ameadrflg==''"
style="width:60%"
></c-input> ></c-input>
</c-form-item> </c-form-item>
</c-col> </c-col>
<!-- S0000347 : 新受益人编号 --> <!-- S0000347 : 新受益人编号 -->
<c-col :span="20">
<c-col :span="12"> <c-form-item label="New Beneficiary Ref." prop="bedgrp.blk.benref">
<c-form-item :label="$t('bedsnd.S0000347')" prop="bedgrp.blk.benref">
<c-input <c-input
type="textarea" type="textarea"
v-model="model.bedgrp.blk.benref" v-model="model.bedgrp.blk.benref"
maxlength="16" maxlength="160"
:rows="5"
show-word-limit show-word-limit
:placeholder="$t('other.please_enter') + $t('bedsnd.S0000347')" placeholder="请输入新受益人编号"
style="width:60%"
></c-input> ></c-input>
</c-form-item> </c-form-item>
</c-col> </c-col>
......
src/views/Business/Betsnd/index.vue
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<!--betsnd PD000050 Instr./ Discrep. --> <!--betsnd PD000050 Instr./ Discrep. -->
<el-tab-pane label="Discr./Instr." name="dscins"> <el-tab-pane label="Instr./ Discrep." name="dscins">
<c-content> <c-content>
<m-dscins :model="model" :codes="codes" /> <m-dscins :model="model" :codes="codes" />
</c-content> </c-content>
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<!--rmbclm PD000128 Reimbursement Details --> <!--rmbclm PD000128 Reimbursement Details -->
<el-tab-pane label="Reimbursement Details" name="remp"> <el-tab-pane label="Reimbursement Details" name="remp" v-if="model.rmbclmnow ">
<c-content> <c-content>
<m-remp :model="model" :codes="codes" /> <m-remp :model="model" :codes="codes" />
</c-content> </c-content>
...@@ -90,14 +90,13 @@ ...@@ -90,14 +90,13 @@
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<!--cnybop PD000110 2106银行跟单结算及表外融资 --> <!--cnybop PD000110 2106银行跟单结算及表外融资 -->
<el-tab-pane label="2106银行跟单结算及表外融资" name="libp"> <el-tab-pane label="2106银行跟单结算及表外融资" name="libp" v-if="this.model.cnybop.libflg == '1'">
<c-content> <c-content>
<m-libp :model="model" :codes="codes" /> <m-libp :model="model" :codes="codes" />
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<!--limmod PD000001 统一授信 --> <!--limmod PD000001 统一授信 -->
<el-tab-pane label="统一授信" name="limitbody" <el-tab-pane label="统一授信" name="limitbody">
>\
<c-content> <c-content>
<m-limitbody :model="model" :codes="codes" /> <m-limitbody :model="model" :codes="codes" />
</c-content> </c-content>
......
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