Skip to content

V
vue-gjjs
Commit 24b53fbb by nanrui
Options

Merge remote-tracking branch 'origin/development-202206' into development-202206

parents 31cdcf20 e2efa8f3
Showing with 472 additions and 48 deletions
src/model/Lttopn/Check.js
......@@ -7,6 +7,7 @@ let checkObj = {
"liaall.misamt" :null,
"ltdgrp.rec.cnfins" :null,
"ltdgrp.rec.nomspc" :null,
"cnybop.cnylib.doccurdate" :null,
"ltdgrp.a2t.adrelc" :null,
"ltdgrp.blk.lcrdoc" :null,
"ltdgrp.avt.namelc" :null,
......@@ -16,20 +17,24 @@ let checkObj = {
"lttp.usr.extkey" :null,
"ltdgrp.rec.nomtop" :null,
"ltdgrp.rec.nomton" :null,
"cnybop.cnylib.sbankorgcode" :null,
"ltdgrp.rec.opndat" :null,
"ltdgrp.cbs.nom1.amt" :null,
"ltdgrp.be2.pts.extkey" :null,
"setmod.dspflg" :null,
"ltdgrp.be2.namelc" :null,
"cnybop.cnylib.stermtype" :null,
"ltdgrp.rmt.adrelc" :null,
"ltdgrp.cbs.max.amt" :null,
"ltdgrp.rmt.pts.extkey" :null,
"ltdgrp.blk.dftat" :null,
"cnybop.cnylib.currencycode" :null,
"ltdgrp.rec.expdat" :null,
"cnybop.cnyflg" :null,
"ltdgrp.cbs.nom1.cur" :null,
"ltdgrp.blk.adlcnd" :null,
"ltdgrp.be1.pts.nam" :null,
"cnybop.cnylib.dcreditenddate" :null,
"ltdgrp.blk.spcben" :null,
"ltdgrp.rec.shpdat" :null,
"ltdgrp.avt.pts.adrblk" :null,
......@@ -38,37 +43,49 @@ let checkObj = {
"ltdgrp.adt.pts.extkey" :null,
"ltdgrp.blk.mixdet" :null,
"ltdgrp.drw.adrelc" :null,
"cnybop.cnylib.famt" :null,
"ltdgrp.drw.pts.extkey" :null,
"cnybop.saddwordlib" :null,
"cnybop.cnylib.stransattr" :null,
"ltdgrp.blk.insbnk" :null,
"ltdgrp.con.pts.extkey" :null,
"ltdgrp.con.namelc" :null,
"ltdgrp.adt.adrelc" :null,
"cnybop.sforeignorgname" :null,
"ltdgrp.avt.adrelc" :null,
"ltdgrp.rec.expplc" :null,
"ltdgrp.be2.pts.adrblk" :null,
"cnybop.traflg" :null,
"cnybop.sbankname" :null,
"ltdgrp.rec.avbwth" :null,
"ltdgrp.blk.spcrcb" :null,
"ltdgrp.blk.feetxt" :null,
"ltdgrp.rec.avbby" :null,
"ltdgrp.blk.preper" :null,
"ltdgrp.rmt.namelc" :null,
"cnybop.cnylib.stranstype" :null,
"ltdgrp.blk.addamtcov" :null,
"ltdgrp.cbs.max2.amt" :null,
"ltdgrp.rec.ownref" :null,
"ltdgrp.be2.adrelc" :null,
"cnybop.cnylib.sbanktrano" :null,
"ltdgrp.adt.pts.adrblk" :null,
"ltdgrp.rec.prepers18" :null,
"ltdgrp.blk.lcrgod" :null,
"cnybop.cnylib.sforbankswiftbic" :null,
"cnybop.cnylib.denddate" :null,
"ltdgrp.be1.pts.extkey" :null,
"ltdgrp.avt.pts.extkey" :null,
"cnybop.sorgname" :null,
"ltdgrp.rec.apprultxt" :null,
"ltdgrp.rmt.pts.adrblk" :null,
"mtabut.coninf.conexedat" :null,
"cnybop.libflg" :null,
"ltdgrp.adt.namelc" :null,
"cnybop.cnylib.sorgcode" :null,
"ltdgrp.con.adrelc" :null,
"ltdgrp.rec.lcrtyp" :null,
"cnybop.fexchangeamt" :null,
"ltdgrp.rec.tenmaxday" :null,
"ltdgrp.rec.apprul" :null,
"setmod.docamt" :null,
......@@ -77,6 +94,7 @@ let checkObj = {
"ltdgrp.drw.pts.adrblk" :null,
"ltdgrp.a2t.namelc" :null,
"ltdgrp.con.pts.adrblk" :null,
"cnybop.cnylib.sforeigncountrycode" :null,
"cnybop.vouflg" :null,
}
......
src/model/Lttopn/Pattern.js
......@@ -657,4 +657,73 @@ export default {
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"cnybop.cnylib.spk":[
{type: "string", required: false, message: "必输项"},
{max: 20,message:"长度不能超过20"}
],
"cnybop.cnylib.sbanktrano":[
{type: "string", required: false, message: "必输项"},
{max: 22,message:"长度不能超过22"}
],
"cnybop.cnylib.sbankorgcode":[
{type: "string", required: false, message: "必输项"},
{max: 12,message:"长度不能超过12"}
],
"cnybop.sbankname":[
{type: "string", required: false, message: "必输项"},
{max: 80,message:"长度不能超过80"}
],
"cnybop.cnylib.sforbankswiftbic":[
{type: "string", required: false, message: "必输项"},
{max: 11,message:"长度不能超过11"}
],
"cnybop.sorgname":[
{type: "string", required: false, message: "必输项"},
{max: 80,message:"长度不能超过80"}
],
"cnybop.cnylib.sorgcode":[
{type: "string", required: false, message: "必输项"},
{max: 18,message:"长度不能超过18"}
],
"cnybop.sforeignorgname":[
{type: "string", required: false, message: "必输项"},
{max: 80,message:"长度不能超过80"}
],
"cnybop.cnylib.sforeigncountrycode":[
{type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"}
],
"cnybop.cnylib.doccurdate":[
{type: "date", required: false, message: "输入正确的日期"}
],
"cnybop.cnylib.denddate":[
{type: "date", required: false, message: "输入正确的日期"}
],
"cnybop.cnylib.dcreditenddate":[
{type: "date", required: false, message: "输入正确的日期"}
],
"cnybop.cnylib.famt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"cnybop.cnylib.dexchangedate":[
{type: "date", required: false, message: "输入正确的日期"}
],
"cnybop.fexchangeamt":[
{type: "string", required: false, message: "必输项"},
{max: 20,message:"长度不能超过20"}
],
"cnybop.cnylib.dexchangeenddate":[
{type: "date", required: false, message: "输入正确的日期"}
],
"cnybop.saddwordlib":[
{type: "string", required: false, message: "必输项"},
{max: 80,message:"长度不能超过80"}
],
}
\ No newline at end of file
src/model/Lttopn/index.js
......@@ -206,6 +206,9 @@ export default class Lttopn {
},
},
be1:{
pta:{
inr:"",
},
pts:new Pts().data,
},
adt:{
......@@ -274,6 +277,29 @@ export default class Lttopn {
outflg:"", // 是否报送跨境人民币2111表 .cnybop.outflg
libflg:"", // 是否报送跨境人民币2106表 .cnybop.libflg
vouflg:"", // 是否报送跨境人民币2122表 .cnybop.vouflg
cnylib:{
spk:"", // 业务主键 .cnybop.cnylib.spk
sbankorgcode:"", // 银行机构代码 .cnybop.cnylib.sbankorgcode
stransattr:"", // 业务属性 .cnybop.cnylib.stransattr
stranstype:"", // 业务类型 .cnybop.cnylib.stranstype
sforbankswiftbic:"", // 境外对手行代码 .cnybop.cnylib.sforbankswiftbic
sorgcode:"", // 境内企业机构代码 .cnybop.cnylib.sorgcode
sforeigncountrycode:"", // 境外企业国别地区代码 .cnybop.cnylib.sforeigncountrycode
doccurdate:"", // 业务发生日期 .cnybop.cnylib.doccurdate
denddate:"", // 业务到期日 .cnybop.cnylib.denddate
dcreditenddate:"", // 信用证到期日 .cnybop.cnylib.dcreditenddate
famt:"", // 金额 .cnybop.cnylib.famt
dexchangedate:"", // 承兑日期 .cnybop.cnylib.dexchangedate
dexchangeenddate:"", // 承兑到期日 .cnybop.cnylib.dexchangeenddate
sbanktrano:"", // 银行业务编号 .cnybop.cnylib.sbanktrano
stermtype:"", // 期限条件 .cnybop.cnylib.stermtype
currencycode:"", // 币种 .cnybop.cnylib.currencycode
},
sorgname:"", // 境内企业名称 .cnybop.sorgname
sforeignorgname:"", // 境外企业名称 .cnybop.sforeignorgname
saddwordlib:"", // 交易附言 .cnybop.saddwordlib
sbankname:"", // 银行机构名称 .cnybop.sbankname
fexchangeamt:"", // 承兑金额 .cnybop.fexchangeamt
},
pageId: "", // ctx的key
trnmod: new Pub().data.Trnmod,
......
src/views/Business/Lttopn/Cnyp.vue
<template>
<div class="eibs-tab">
<!-- S0000042 : 是否报送跨境人民币2101表 -->
<c-col :span="12">
<c-col :span="12">
<!-- S0000042 : 是否报送跨境人民币2101表 -->
<c-col :span="24">
<el-form-item label="是否报送跨境人民币2101表" prop="cnybop.cnyflg">
<c-select v-model="model.cnybop.cnyflg" style="width:100%" placeholder="请输入是否报送跨境人民币2101表 " :code="codes.cnyflg" disabled>
</c-select>
<c-select
v-model="model.cnybop.cnyflg"
style="width: 100%"
placeholder="请输入是否报送跨境人民币2101表 "
:code="codes.cnyflg"
disabled
>
</c-select>
</el-form-item>
</c-col>
<!-- S0000045 : 是否报送跨境人民币2107表 -->
<c-col :span="12">
</c-col>
<!-- S0000045 : 是否报送跨境人民币2107表 -->
<c-col :span="24">
<el-form-item label="是否报送跨境人民币2107表" prop="cnybop.traflg">
<c-select v-model="model.cnybop.traflg" style="width:100%" placeholder="请输入是否报送跨境人民币2107表" :code="codes.cnyflg" disabled>
</c-select>
<c-select
v-model="model.cnybop.traflg"
style="width: 100%"
placeholder="请输入是否报送跨境人民币2107表"
:code="codes.cnyflg"
disabled
>
</c-select>
</el-form-item>
</c-col>
<!-- S0000077 : 是否报送跨境人民币2111表 -->
<c-col :span="12">
</c-col>
<!-- S0000077 : 是否报送跨境人民币2111表 -->
<c-col :span="24">
<el-form-item label="是否报送跨境人民币2111表" prop="cnybop.outflg">
<c-select v-model="model.cnybop.outflg" style="width:100%" placeholder="请输入是否报送跨境人民币2111表" :code="codes.cnyflg" disabled>
</c-select>
<c-select
v-model="model.cnybop.outflg"
style="width: 100%"
placeholder="请输入是否报送跨境人民币2111表"
:code="codes.cnyflg"
disabled
>
</c-select>
</el-form-item>
</c-col>
<!-- S0000113 : 是否报送跨境人民币2106表 -->
<c-col :span="12">
</c-col>
<!-- S0000113 : 是否报送跨境人民币2106表 -->
<c-col :span="24">
<el-form-item label="是否报送跨境人民币2106表" prop="cnybop.libflg">
<c-select v-model="model.cnybop.libflg" style="width:100%" placeholder="请输入是否报送跨境人民币2106表" :code="codes.cnyflg" disabled>
</c-select>
<c-select
v-model="model.cnybop.libflg"
style="width: 100%"
placeholder="请输入是否报送跨境人民币2106表"
:code="codes.cnyflg"
>
</c-select>
</el-form-item>
</c-col>
<!-- S0000142 : 是否报送跨境人民币2122表 -->
<c-col :span="12">
</c-col>
<!-- S0000142 : 是否报送跨境人民币2122表 -->
<c-col :span="24">
<el-form-item label="是否报送跨境人民币2122表" prop="cnybop.vouflg">
<c-select v-model="model.cnybop.vouflg" style="width:100%" placeholder="请输入是否报送跨境人民币2122表" :code="codes.cnyflg" disabled>
</c-select>
<c-select
v-model="model.cnybop.vouflg"
style="width: 100%"
placeholder="请输入是否报送跨境人民币2122表"
:code="codes.cnyflg"
disabled
>
</c-select>
</el-form-item>
</c-col>
</c-col>
</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/Lttopn/Event"
import CodeTable from "~/config/CodeTable";
import Event from "~/model/Lttopn/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>
src/views/Business/Lttopn/Libp.vue 0 → 100644
<template>
<div class="eibs-tab">
<!--===============左 =================== -->
<el-col :span="11">
<c-col :span="24">
<el-form-item label="业务主键" prop="cnybop.cnylib.spk">
<c-input
disabled
v-model="model.cnybop.cnylib.spk"
maxlength="20"
placeholder="请输入业务主键"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="银行机构代码" prop="cnybop.cnylib.sbankorgcode">
<c-input
disabled
v-model="model.cnybop.cnylib.sbankorgcode"
maxlength="12"
placeholder="请输入银行机构代码"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="业务属性" prop="cnybop.cnylib.stransattr">
<c-select
v-model="model.cnybop.cnylib.stransattr"
style="width: 100%"
placeholder="请选择业务属性"
:code="codes.stransattr"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item
label="境外对手行代码"
prop="cnybop.cnylib.sforbankswiftbic"
>
<c-input
v-model="model.cnybop.cnylib.sforbankswiftbic"
maxlength="11"
placeholder="请输入境外对手行代码"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="境内企业机构代码" prop="cnybop.cnylib.sorgcode">
<c-input
v-model="model.cnybop.cnylib.sorgcode"
maxlength="18"
placeholder="请输入境内企业机构代码"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item
label="境外企业国别地区代码"
prop="cnybop.cnylib.sforeigncountrycode"
>
<c-fullbox>
<c-input
v-model="model.cnybop.cnylib.sforeigncountrycode"
maxlength="3"
placeholder="请输入境外企业国别地区代码"
@keyup.enter.native="eventFunction('cnybop.cnylib.sforeigncountrycode')"
></c-input>
<template slot="footer">
<!-- @click="showGridPromptDialog('cnybop.libcty.selbut1',null,null,{TXT:'cnybop.cnylib.sforeigncountrycode'},{TXT:false},'doxpDialog')" -->
<c-button
size="small"
type="primary"
icon="el-icon-search"
@click="showGridPromptDialog('cnybop.libcty.selbut1', null, null,{TXT:
'cnybop.cnylib.sforeigncountrycode'}, {TXT: false},'doxpDialog')"
>
?
</c-button>
</template>
</c-fullbox>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="业务到期日" prop="cnybop.cnylib.denddate">
<c-date-picker
type="date"
v-model="model.cnybop.cnylib.denddate"
style="width: 100%"
placeholder="请选择业务到期日"
></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="币种" prop="cnybop.cnylib.currencycode">
<c-select
v-model="model.cnybop.cnylib.currencycode"
style="width: 100%"
placeholder="请选择币种"
:code="codes.currencycode"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="期限条件" prop="cnybop.cnylib.stermtype">
<c-select
v-model="model.cnybop.cnylib.stermtype"
style="width: 100%"
placeholder="请选择期限条件"
:code="codes.stermtype"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="承兑日期" prop="cnybop.cnylib.dexchangedate">
<c-date-picker
type="date"
v-model="model.cnybop.cnylib.dexchangedate"
style="width: 100%"
placeholder="请选择承兑日期"
></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="承兑到期日" prop="cnybop.cnylib.dexchangeenddate">
<c-date-picker
type="date"
v-model="model.cnybop.cnylib.dexchangeenddate"
style="width: 100%"
placeholder="请选择承兑到期日"
></c-date-picker>
</el-form-item>
</c-col>
</el-col>
<!-- ===============右 ===========================-->
<el-col :span="11" :offset="1">
<c-col :span="24">
<el-form-item label="银行业务编号" prop="cnybop.cnylib.sbanktrano">
<c-input
disabled
v-model="model.cnybop.cnylib.sbanktrano"
maxlength="22"
placeholder="请输入银行业务编号"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="银行机构名称" prop="cnybop.sbankname">
<c-input
disabled
v-model="model.cnybop.sbankname"
maxlength="80"
placeholder="请输入银行机构名称"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="业务类型" prop="cnybop.cnylib.stranstype">
<c-select
v-model="model.cnybop.cnylib.stranstype"
style="width: 100%"
placeholder="请选择业务类型"
:code="codes.stranstype"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="境内企业名称" prop="cnybop.sorgname">
<c-input
v-model="model.cnybop.sorgname"
maxlength="80"
placeholder="请输入境内企业名称"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="境外企业名称" prop="cnybop.sforeignorgname">
<c-input
v-model="model.cnybop.sforeignorgname"
maxlength="80"
placeholder="请输入境外企业名称"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="业务发生日期" prop="cnybop.cnylib.doccurdate">
<c-date-picker
type="date"
v-model="model.cnybop.cnylib.doccurdate"
style="width: 100%"
placeholder="请选择业务发生日期"
></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="信用证到期日" prop="cnybop.cnylib.dcreditenddate">
<c-date-picker
type="date"
v-model="model.cnybop.cnylib.dcreditenddate"
style="width: 100%"
placeholder="请选择信用证到期日"
></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="金额" prop="cnybop.cnylib.famt">
<c-input
v-model="model.cnybop.cnylib.famt"
placeholder="请输入金额"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="承兑金额" prop="cnybop.fexchangeamt">
<c-input
v-model="model.cnybop.fexchangeamt"
maxlength="20"
placeholder="请输入承兑金额"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="交易附言" prop="cnybop.saddwordlib">
<c-input
v-model="model.cnybop.saddwordlib"
maxlength="80"
placeholder="请输入交易附言"
></c-input>
</el-form-item>
</c-col>
</el-col>
</div>
</template>
<script>
import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "~/model/Lttopn/Event"
export default {
inject: ['root'],
props:["model","codes"],
mixins: [commonProcess],
data(){
return {
}
},
methods:{...Event},
created:function(){
}
}
</script>
<style>
</style>
src/views/Business/Lttopn/Ovwp.vue
......@@ -85,7 +85,7 @@
size="small"
type="primary"
:disabled="
!model.ltdgrp.rec.ownref
!model.ltdgrp.rec.ownref&&model.ltdgrp.be1.pta.inr
? false
: true
"
......
src/views/Business/Lttopn/index.vue
......@@ -88,6 +88,10 @@
<el-tab-pane label="跨境人民币申报" name="cnyp">
<m-cnyp :model="model" :codes="codes" />
</el-tab-pane>
<!--cnybop PD000110 2106银行跟单结算及表外融资 -->
<el-tab-pane label="2106银行跟单结算及表外融资" name="libp" v-if="model.cnybop.libflg=='1'">
<m-libp :model="model" :codes="codes"/>
</el-tab-pane>
<!--lttp PD000371 Special Payment Beneficiary -->
<el-tab-pane
label="Special Paymt Cond. Beneficiary"
......@@ -158,6 +162,7 @@ import Doctre from "~/views/Public/Doctre";
import Glepan from "~/views/Public/Glepan";
import Doxp from '~/views/Public/Doxp';
import Aamp from "./Aamp"
import Libp from "./Libp"
export default {
name: "Lttopn",
......@@ -165,6 +170,7 @@ export default {
"m-ovwp": Ovwp,
"m-lttinf": Lttinf,
"m-ptyp": Ptyp,
"m-libp" : Libp,
"m-setpan": Setpan,
"m-glepan": Glepan,
"m-coninfp": Coninfp,
......
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