Skip to content

V
vue-gjjs
Commit d8d4b258 by wangna
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 14fb308b c4baba41
Showing with 119 additions and 74 deletions
src/config/CodeTable/index.js
......@@ -1734,6 +1734,12 @@ const CodeTable = {
{ label: "否", value: "N" },
{ label: "是", value: "Y" },
],
cfabrttxt: [
{ label: "转开国内信用证", value: "转开国内信用证" },
{ label: "他行代开信用证", value: "他行代开信用证" },
{ label: "开至特殊监管区境内居民客户信用证", value: "开至特殊监管区境内居民客户信用证" },
{ label: "其他", value: "其他" },
],
cfaflg: [
{ label: "不报送", value: "4" },
{ label: "修改", value: "2" },
......
src/model/Brtdck/Pattern.js
......@@ -21,7 +21,8 @@ export default {
"lidgrp.cbs.opn1.amt":[
{type: "string", required: false, message: "必输项"},
{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位" }
{ pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"brtp.recget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"},
......
src/model/Brteus/Pattern.js
......@@ -21,7 +21,8 @@ export default {
"lidgrp.cbs.opn1.amt":[
{type: "string", required: false, message: "必输项"},//原为number类型，类型不匹配，页面上会显示”必输项“，为去掉”必输项“三个字，数据类型改为string
{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位" }
{pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }//含正负数
],
"brtp.recget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"},
......
src/model/Letamc/Pattern.js
......@@ -32,7 +32,8 @@ export default {
"ledgrp.cbs.opn1.amt":[
{type: "string", required: false, message: "必输项"},
{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位" }
{pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"ledgrp.apl.pts.nam":[
......
src/model/Letcan/Pattern.js
......@@ -32,7 +32,8 @@ export default {
"ledgrp.cbs.opn1.amt":[
{type: "string", required: false, message: "必输项"},
{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位" }
{pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"ledgrp.apl.pts.nam":[
......
src/model/Letdav/Pattern.js
......@@ -36,7 +36,8 @@ export default {
"ledgrp.cbs.opn1.amt":[
{type: "string", required: false, message: "必输项"},
{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位" }
{pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"bedgrp.apl.pts.nam":[
......
src/model/Letdrw/Pattern.js
......@@ -510,7 +510,8 @@ export default {
"ledgrp.cbs.opn1.amt":[
{type: "string", required: false, message: "必输项"},
{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位" }
{pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"ledgrp.apl.pts.nam":[
......
src/model/Lttopn/Event.js
......@@ -314,5 +314,13 @@ export default {
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
onSeainf(){},
onLetpButgetref(){},
onBenpDet(){},
onIsspDet(){},
onAplpDet(){},
}
\ No newline at end of file
src/views/Business/Betdcr/Betdcrs.vue
......@@ -415,6 +415,7 @@
:noRef="true"
:disabled="true"
:isAdrblk="true"
:disabledExtkey="true"
>
</c-ptap>
</c-col>
......
src/views/Business/Brteus/Brteus.vue
......@@ -123,7 +123,7 @@
<!-- 单据状态 Document Set Status-->
<c-col :span="24">
<el-form-item label="Document Set Status" prop="brdgrp.rec.docsta">
<c-select v-model="model.brdgrp.rec.docsta" style="width:100%" placeholder="请选择单据状态" :code="codes.docsta" disabled>
<c-select v-model="model.brdgrp.rec.docsta" style="width:100%" placeholder="请选择单据状态" :code="codes.docsta1" disabled>
</c-select>
</el-form-item>
</c-col>
......
src/views/Business/Brtset/Utlp.vue
......@@ -205,15 +205,16 @@
</el-form-item>
</c-col>
</c-col>
<c-col :span="24">
<c-col :span="24" >
<c-col :span="12">
<el-form-item label="跨境人民币清算模式" prop="trnmod.cmtflg">
<el-form-item label="跨境人民币清算模式" prop="trnmod.cmtflg" v-show="model.setmod.doccur == 'CNY'">
<c-select
v-model="model.trnmod.cmtflg"
style="width:100%"
placeholder="请选择跨境人民币清算模式"
:code="this.cmtflg"
:disabled="model.brdgrp.rec.frepayflg == ''?false:true"
>
</c-select>
</el-form-item>
......
src/views/Business/Brtset/index.vue
......@@ -250,8 +250,9 @@ export default {
handler(){
let cur = this.model.setmod.doccur;
let amt = this.model.setmod.docamt;
this.det202cvName= "Payment 202 PRB "+cur+" "+ amt;
this.det756Name = "Payment 756 PRB "+cur+" "+ amt;
let doc = this.model.gcdgrp.rec.docprbrol
this.det202cvName= "Payment 202 "+ doc +" "+cur+" "+ amt;
this.det756Name = "Payment 756 "+ doc +" "+cur+" "+ amt;
}
},
"model.mtabut.clsflg":{
......@@ -259,8 +260,9 @@ export default {
handler(){
let cur = this.model.setmod.doccur;
let amt = this.model.setmod.docamt;
this.det202cvName= "Payment 202 PRB "+cur+" "+ amt;
this.det756Name = "Payment 756 PRB "+cur+" "+ amt;
let doc = this.model.gcdgrp.rec.docprbrol
this.det202cvName= "Payment 202 "+ doc +" "+cur+" "+ amt;
this.det756Name = "Payment 756 "+ doc +" "+cur+" "+ amt;
}
},
},
......
src/views/Business/Brtudp/Cfap.vue
......@@ -30,9 +30,10 @@
<el-form-item label="不报送原因" prop="cfabrt.cfabrttxt">
<!-- <c-select v-model="model.cfabrt.cfabrttxt" style="width:100%" placeholder="请选择不报送原因">
</c-select> -->
<c-input v-model="model.cfabrt.cfabrttxt" style="width:100%" placeholder="不报送原因"
:disabled="model.cfabrt.cfaflg!=4">
</c-input>
<c-select v-model="model.cfabrt.cfabrttxt" style="width:100%" placeholder=""
:disabled="model.cfabrt.cfaflg!=4"
:code="codes.cfabrttxt">
</c-select>
</el-form-item>
</c-col>
</div>
......
src/views/Business/Cptadv/CptAdvChangePanel.vue
......@@ -80,7 +80,7 @@
v-model="model.cpdgrp.orc.pts.ref"
maxlength="16"
placeholder=""
disabled
:disabled="model.cpdgrp.rec.swftyp =='' "
></c-input>
</el-form-item>
</c-col>
......@@ -91,7 +91,7 @@
v-model="model.cpdgrp.rec.orcact"
maxlength="35"
placeholder="汇款人账号"
disabled
:disabled="model.cpdgrp.rec.swftyp =='' "
></c-input>
</el-form-item>
</c-col>
......@@ -105,6 +105,7 @@
@keyup.enter.native="
showGridPromptDialog('cpdgrp.orc.pts.extkey')
"
:disabled="model.cpdgrp.rec.swftyp =='' "
>
</c-input>
</el-form-item>
......@@ -124,7 +125,7 @@
size="small"
type="primary"
@click="onSndpDet"
disabled
:disabled="model.cpdgrp.rec.swftyp =='' "
>
详情
</c-button>
......@@ -141,7 +142,7 @@
v-model="model.cpdgrp.orc.pts.adrblk"
show-word-limit
placeholder="请输入Address Block"
disabled
:disabled="model.cpdgrp.rec.swftyp =='' "
></c-input>
</el-form-item>
</c-col>
......@@ -401,15 +402,11 @@
</c-col>
<c-col :span="24">
<el-form-item label="收款人" prop="cpdgrp.pye.pts.extkey">
<el-form-item label="收款人" prop="cpdgrp.pye.pts.ref">
<c-input
v-model="model.cpdgrp.pye.pts.extkey"
v-model="model.cpdgrp.pye.pts.ref"
maxlength="14"
placeholder="请输入收款人"
@keyup.enter.native="
showGridPromptDialog('cpdgrp.pye.pts.extkey')
"
></c-input>
</el-form-item>
</c-col>
......@@ -426,7 +423,7 @@
<c-col :span="24">
<c-fullbox>
<el-form-item label="" prop="cpdgrp.pye.pts.extkey">
<el-form-item label="收款人" prop="cpdgrp.pye.pts.extkey">
<c-input
v-model="model.cpdgrp.pye.pts.extkey"
placeholder="请输入收款人客户号"
......@@ -1844,7 +1841,7 @@
</el-form-item>
</c-col>
<c-col :span="11" :offset="12">
<c-col :span="11" :offset="12" v-if="true">
<el-form-item label="汇款人名称">
<c-input
v-model="model.cptp.resbchnam"
......
src/views/Business/Cptadv/Incp.vue
......@@ -82,7 +82,7 @@
<el-option
v-for="item in codes.currencycode"
:key="item.value"
:label="item.label"
:label="item.value + ' '+item.label"
:value="item.value"
></el-option>
</c-select>
......
src/views/Business/Lttopn/Ptyp.vue
......@@ -3,15 +3,15 @@
<!-- SF000237 : 2nd Advising Bank -->
<!-- S0000320 : Ref. -->
<c-col :span="12">
<!-- <c-col :span="12">
<c-form-item :label="$t('lttp.SF000237')" prop="ltdgrp.a2t.pts.ref">
<c-input v-model="model.ltdgrp.a2t.pts.ref" maxlength="16" :placeholder="$t('other.please_enter')+$t('lttp.SF000237')"></c-input>
</c-form-item>
</c-col>
</c-col> -->
<!-- SF000316 : Reimbursement Bank (MT 740) -->
<!-- SF000236 : Ref. -->
<c-col :span="12">
<!-- <c-col :span="12">
<c-form-item :label="$t('lttp.SF000316')" prop="ltdgrp.rmt.pts.ref">
<c-input v-model="model.ltdgrp.rmt.pts.ref" maxlength="16" :placeholder="$t('other.please_enter')+$t('lttp.SF000316')"></c-input>
</c-form-item>
......@@ -111,19 +111,19 @@
<c-form-item label="地址" prop="ltdgrp.rmt.adrelc">
<c-input type="textarea" v-model="model.ltdgrp.rmt.adrelc" maxlength="35" show-word-limit :placeholder="$t('other.please_enter')+'地址'" ></c-input>
</c-form-item>
</c-col>
</c-col> -->
<!-- SF000385 : Confirming Bank -->
<!-- SF000386 : Ref. -->
<c-col :span="12">
<!-- <c-col :span="12">
<c-form-item :label="$t('lttp.SF000385')" prop="ltdgrp.con.pts.ref">
<c-input v-model="model.ltdgrp.con.pts.ref" maxlength="16" :placeholder="$t('other.please_enter')+$t('lttp.SF000385')"></c-input>
</c-form-item>
</c-col>
</c-col> -->
<!-- SF000319 : Available with Bank -->
<!-- SF000235 : Ref. -->
<c-col :span="12">
<!-- <c-col :span="12">
<c-form-item :label="$t('lttp.SF000319')" prop="ltdgrp.avt.pts.ref">
<c-input v-model="model.ltdgrp.avt.pts.ref" maxlength="16" :placeholder="$t('other.please_enter')+$t('lttp.SF000319')"></c-input>
</c-form-item>
......@@ -223,10 +223,10 @@
<c-form-item label="地址" prop="ltdgrp.avt.adrelc">
<c-input type="textarea" v-model="model.ltdgrp.avt.adrelc" maxlength="35" show-word-limit :placeholder="$t('other.please_enter')+'地址'" ></c-input>
</c-form-item>
</c-col>
</c-col> -->
<!-- S0000060 : 其他关联方 -->
<c-col :span="24">
<!-- <c-col :span="24">
<div class="e-table-wrapper">
<el-table
:data="model.lttp.ptsaddp.ptsaddg"
......@@ -262,7 +262,7 @@
:total="pager.lttp_ptsaddp_ptsaddg.total">
</el-pagination>
</div>
</c-col>
</c-col> -->
</div>
</template>
<script>
......
src/views/Business/Lttopn/index.vue
<template>
<div class="eContainer">
<!-- <c-bus-button :$pntvm="this"></c-bus-button> -->
<c-function-btn
:handleSubmit="handleSubmit"
:handleCheck="handleCheck"
:handleStash="handleStash"
>
<el-button size="small">流程附言</el-button>
<el-button size="small">交易历史</el-button>
<el-button size="small">备忘录</el-button>
<el-button size="small">影像信息</el-button>
<!-- <el-button size="small">保存模板</el-button> -->
<!-- <el-button size="small">使用模板</el-button> -->
<el-button size="small">制裁信息</el-button>
<!-- <el-button size="small">拆分报文</el-button> -->
<el-button size="small">智能提示</el-button>
</c-function-btn>
<el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right" size="small" :validate-on-rule-change="false">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<!--lttp PD000001 Overview -->
<el-tab-pane :label="$t('lttp.PD000001')" name="ovwp">
<el-tab-pane label="Overview" name="ovwp">
<m-ovwp :model="model" :codes="codes"/>
</el-tab-pane>
<!--lttp PD000169 Orig. L/C Details -->
<el-tab-pane :label="$t('lttp.PD000169')" name="lttinf">
<m-lttinf :model="model" :codes="codes"/>
<!--lttp PD000077 Details -->
<el-tab-pane label="Details" name="detp">
<m-detp :model="model" :codes="codes"/>
</el-tab-pane>
<!--lttp PD000042 Parties -->
<el-tab-pane :label="$t('lttp.PD000042')" name="ptyp">
<el-tab-pane label="Patries" name="ptyp">
<m-ptyp :model="model" :codes="codes"/>
</el-tab-pane>
<!--lttp PD000057 Goods -->
<el-tab-pane :label="$t('lttp.PD000057')" name="dogp">
<el-tab-pane label="Goods" name="dogp">
<m-dogp :model="model" :codes="codes"/>
</el-tab-pane>
<!--lttp PD000060 Documents -->
<el-tab-pane :label="$t('lttp.PD000060')" name="dorp">
<el-tab-pane label="Documents" name="dorp">
<m-dorp :model="model" :codes="codes"/>
</el-tab-pane>
<!--lttp PD000073 Add. Cond. -->
<el-tab-pane label="Add. Cond." name="adcp">
<m-adcp :model="model" :codes="codes"/>
</el-tab-pane>
<!--lttp PD000169 Orig. L/C Details -->
<el-tab-pane label="Orig. L/C Details" name="lttinf">
<m-lttinf :model="model" :codes="codes"/>
</el-tab-pane>
<!--liaall PD000027 Liability -->
<el-tab-pane label="Liability" name="engp">
<m-engp :model="model" :codes="codes"/>
</el-tab-pane>
<!--setmod PD000000 Settlement -->
<el-tab-pane :label="$t('setmod.PD000000')" name="setpan">
<el-tab-pane label="Settlement" name="setpan">
<m-setpan :model="model" :codes="codes"/>
</el-tab-pane>
<!--glemod PD000001 -->
<el-tab-pane :label="$t('glemod.PD000001')" name="glepan">
<el-tab-pane label="Bookings" name="glepan">
<m-glepan :model="model" :codes="codes"/>
</el-tab-pane>
<!--coninf PD000000 Completion -->
<el-tab-pane :label="$t('coninf.PD000000')" name="coninfp">
<el-tab-pane label="Completion" name="coninfp">
<m-coninfp :model="model" :codes="codes"/>
</el-tab-pane>
<!--trndoc PD000529 &Messages -->
<el-tab-pane :label="$t('trndoc.PD000529')" name="docpan">
<el-tab-pane label="Messages" name="docpan">
<m-docpan :model="model" :codes="codes"/>
</el-tab-pane>
<!--trndoc PD000546 Attachments -->
<el-tab-pane :label="$t('trndoc.PD000546')" name="doctre">
<el-tab-pane label="Attachments" name="doctre">
<m-doctre :model="model" :codes="codes"/>
</el-tab-pane>
<!--cnybop PD000002 跨境人民币申报 -->
<el-tab-pane :label="$t('cnybop.PD000002')" name="cnyp">
<el-tab-pane label="跨境人民币申报" name="cnyp">
<m-cnyp :model="model" :codes="codes"/>
</el-tab-pane>
<!--lttp PD000371 Special Payment Beneficiary -->
<el-tab-pane :label="$t('lttp.PD000371')" name="spcbenp">
<el-tab-pane label="Special Payment Beneficiary" name="spcbenp">
<m-spcbenp :model="model" :codes="codes"/>
</el-tab-pane>
<!--lttp PD000372 Special Payment Rcv Bank only -->
<el-tab-pane :label="$t('lttp.PD000372')" name="spcrcvp">
<el-tab-pane label="Special Payment Rcv Bank only" name="spcrcvp">
<m-spcrcvp :model="model" :codes="codes"/>
</el-tab-pane>
<!--liaall PD000027 Liability -->
<el-tab-pane :label="$t('liaall.PD000027')" name="engp">
<m-engp :model="model" :codes="codes"/>
</el-tab-pane>
<!--lttp PD000073 Add. Cond. -->
<el-tab-pane :label="$t('lttp.PD000073')" name="adcp">
<m-adcp :model="model" :codes="codes"/>
</el-tab-pane>
<!--lttp PD000077 Details -->
<el-tab-pane :label="$t('lttp.PD000077')" name="detp">
<m-detp :model="model" :codes="codes"/>
</el-tab-pane>
</c-tabs>
</el-form>
</div>
......@@ -75,6 +94,7 @@ import Api from "~/service/Api"
import CodeTable from "~/config/CodeTable"
import Lttopn from "~/model/Lttopn"
import commonProcess from "~/mixin/commonProcess"
import commonFuncs from "~/mixin/commonFuncs";
import Check from "~/model/Lttopn/Check"
import Default from "~/model/Lttopn/Default"
import Pattern from "~/model/Lttopn/Pattern"
......@@ -83,17 +103,18 @@ import Lttinf from "./Lttinf"
import Ptyp from "./Ptyp"
import Dogp from "./Dogp"
import Dorp from "./Dorp"
import Setpan from "./Setpan"
import Glepan from "./Glepan"
import Coninfp from "./Coninfp"
import Docpan from "./Docpan"
import Doctre from "./Doctre"
import Cnyp from "./Cnyp"
import Spcbenp from "./Spcbenp"
import Spcrcvp from "./Spcrcvp"
import Engp from "./Engp"
import Adcp from "./Adcp"
import Detp from "./Detp"
import Engp from "~/views/Public/Engp";
import Setpan from "~/views/Public/Setpan";
import Coninfp from "~/views/Public/Coninfp";
import Docpan from "~/views/Public/Docpan";
import Doctre from "~/views/Public/Doctre";
import Glepan from "~/views/Public/Glepan";
export default {
......@@ -111,7 +132,7 @@ export default {
"m-doctre" : Doctre,
"m-cnyp" : Cnyp,
"m-spcbenp" : Spcbenp,
"m-spcrcvp" : Spcrcvp,
"m-spcrcvp" : Spcrcvp,
"m-engp" : Engp,
"m-adcp" : Adcp,
"m-detp" : Detp,
......@@ -121,7 +142,7 @@ export default {
root: this
}
},
mixins: [commonProcess], // 里面包含了Default、Check等的公共处理
mixins: [commonProcess,commonFuncs], // 里面包含了Default、Check等的公共处理
data(){
return {
tabVal: "",
......@@ -133,6 +154,7 @@ export default {
pattern: Pattern,
rules: null,
codes: {
...CodeTable,
},
}
},
......
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