Skip to content

V
vue-gjjs
Commit 83ca5633 by zhujiazhan
Options

Brtset、Cptadv、Cptopn交易BUG修改

parent 9a34c184
Showing with 330 additions and 54 deletions
src/model/Brtset/Default.js
......@@ -6,6 +6,7 @@ import Api from "~/service/Api";
import Utils from "~/utils/index"
export default {
"bopmod.dbcgrp.bas.buscode" :Utils.defaultFunction,
"dftcre.dfdgrp.rec.dfuflg" :Utils.defaultFunction,
"dftcre.dfdgrp.rec.fintyp" :Utils.defaultFunction,
"bptbck.dscbckcur" :Utils.defaultFunction,
......@@ -18,7 +19,9 @@ export default {
"brdgrp.prb.namelc" :Utils.defaultFunction,
"brdgrp.prb.dbfadrblkcn" :Utils.defaultFunction,
"brdgrp.prb.pts.adrblk" :Utils.defaultFunction,
"bopmod.dbcgrp.bas.rptno" :Utils.defaultFunction,
"cnybop.libflg" :Utils.defaultFunction,
"bopmod.dbcgrp.bas.methods" :Utils.defaultFunction,
"setmod.setamt" :Utils.defaultFunction,
"setmod.dspflg" :Utils.defaultFunction,
"trnmod.trndoc.condocstm" :Utils.defaultFunction,
......@@ -57,6 +60,8 @@ export default {
"dftcre.oricur" :Utils.defaultFunction,
"cfabrt.basflg" :Utils.defaultFunction,
"lidgrp.rec.ownref" :Utils.defaultFunction,
"bopmod.dbcgrp.bas.custype" :Utils.defaultFunction,
"bopmod.dbcgrp.bas.tmpref" :Utils.defaultFunction,
"liaall.limmod.comamt" :Utils.defaultFunction,
"liaall.limmod.ccvamt" :Utils.defaultFunction,
"dftcre.dfdgrp.dff.pts.adrblk" :Utils.defaultFunction,
......@@ -82,6 +87,7 @@ export default {
"liaall.liaccv.concur" :Utils.defaultFunction,
"brdgrp.rec.stadat" :Utils.defaultFunction,
"mtabut.coninf.usr.extkey" :Utils.defaultFunction,
"bopmod.dbcgrp.bas.ownextkey" :Utils.defaultFunction,
"bopmod.dclflg" :Utils.defaultFunction,
"liaall.liaccv.addinf" :Utils.defaultFunction,
"dftcre.dfdgrp.rec.flttyp" :Utils.defaultFunction,
......@@ -96,6 +102,7 @@ export default {
"brdgrp.cbs.opn2.cur" :Utils.defaultFunction,
"aamset.utlamt2" :Utils.defaultFunction,
"brdgrp.cbs.opn1.amt" :Utils.defaultFunction,
"bopmod.dbcgrp.bas.custcod" :Utils.defaultFunction,
"liaall.misamt" :Utils.defaultFunction,
"dftcre.dfdgrp.rec.resamt" :Utils.defaultFunction,
"mtabut.coninf.oitinf.oit.inftxt" :Utils.defaultFunction,
......
src/model/Brtset/Event.js
......@@ -243,5 +243,77 @@ export default {
}
},
async onSeainf() {},
async onSav(){
let rtnmsg = await this.executeRule("sav")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
async onBasppGetreftmp(){
let rtnmsg = await this.executeRule("baspp.getreftmp")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
async onBasppGetref(){
let rtnmsg = await this.executeRule("baspp.getref")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
async onCan(){
let rtnmsg = await this.executeRule("can")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
async onChk(){
let rtnmsg = await this.executeRule("chk")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
async onButpErr(){
let rtnmsg = await this.executeRule("butp.err")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
}
\ No newline at end of file
src/model/Brtset/Pattern.js
......@@ -128,7 +128,7 @@ export default {
"setmod.setamt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
{pattern: /(^\d$)|(^0\.\d$)|(^\d\.\d$)/, message: "小数位不能超过3位" }
],
"nar754":[
{type: "string", required: true, message: "必输项"},
......@@ -602,4 +602,95 @@ export default {
{type: "string", required: false, message: "必输项"},
{max: 32,message:"长度不能超过32"}
],
"bopmod.dbcgrp.bas.rptno":[
{type: "string", required: false, message: "必输项"},
{max: 22,message:"长度不能超过22"}
],
"bopmod.dbcgrp.bas.tmpref":[
{type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"}
],
"bopmod.dbcgrp.bas.actiondesc":[
{type: "string", required: false, message: "必输项"},
{max: 32,message:"长度不能超过32"}
],
"bopmod.dbcgrp.bas.buscode":[
{type: "string", required: false, message: "必输项"},
{max: 22,message:"长度不能超过22"}
],
"bopmod.dbcgrp.bas.custcod":[
{type: "string", required: false, message: "必输项"},
{max: 18,message:"长度不能超过18"}
],
"bopmod.dbcgrp.bas.custnm":[
{type: "string", required: true, message: "必输项"},
{max: 63,message:"长度不能超过63"}
],
"bopmod.dbcgrp.bas.oppuser":[
{type: "string", required: true, message: "必输项"},
{max: 63,message:"长度不能超过63"}
],
"bopmod.dbcgrp.bas.idcode":[
{type: "string", required: false, message: "必输项"},
{max: 32,message:"长度不能超过32"}
],
"bopmod.dbcgrp.bas.exrate":[
{type: "string", required: false, message: "必输项"},
{max: 13,message:"长度不能超过13"}
],
"bopmod.dbcgrp.bas.lcyamt":[
{type: "number", required: false, message: "必输项"} ],
"bopmod.dbcgrp.bas.lcyacc":[
{type: "string", required: false, message: "必输项"},
{max: 32,message:"长度不能超过32"}
],
"bopmod.dbcgrp.bas.fcyamt":[
{type: "number", required: false, message: "必输项"} ],
"bopmod.dbcgrp.bas.fcyacc":[
{type: "string", required: false, message: "必输项"},
{max: 32,message:"长度不能超过32"}
],
"bopmod.dbcgrp.bas.othamt":[
{type: "number", required: false, message: "必输项"} ],
"bopmod.dbcgrp.bas.othacc":[
{type: "string", required: false, message: "必输项"},
{max: 32,message:"长度不能超过32"}
],
"bopmod.dbcgrp.bas.txamt":[
{type: "number", required: false, message: "必输项"} ],
"bopmod.dbcgrp.bas.outchargeamt":[
{type: "number", required: false, message: "必输项"} ],
"bopmod.dbcgrp.bas.actuamt":[
{type: "number", required: false, message: "必输项"} ],
"bopmod.dbcgrp.bas.issdate":[
{type: "date", required: false, message: "输入正确的日期"}
],
"bopmod.dbcgrp.bas.lcbgno":[
{type: "string", required: false, message: "必输项"},
{max: 20,message:"长度不能超过20"}
],
"bopmod.dbcgrp.bas.tenor":[
{type: "string", required: false, message: "必输项"},
{max: 10,message:"长度不能超过10"}
],
}
\ No newline at end of file
src/model/Brtset/index.js
......@@ -188,6 +188,50 @@ export default class Brtset{
vrfflg:"", // 核销数据 .bopmod.vrfflg
ownextkey:"", // 地区机构号 .bopmod.ownextkey
acttyp:"", // 款项去向 .bopmod.acttyp
dbcp:{
baspp:{
cusnam:"", // .bopmod.dbcp.baspp.cusnam
cornam:"", // .bopmod.dbcp.baspp.cornam
corpnam:"", // .bopmod.dbcp.baspp.corpnam
roptnam:"", // RoptNam .bopmod.dbcp.baspp.roptnam
exratelab:"", // �'�汇/结汇汇率 .bopmod.dbcp.baspp.exratelab
lcyamtlab:"", // �'�汇/结汇金额 .bopmod.dbcp.baspp.lcyamtlab
acp:"", // 确认 .bopmod.dbcp.baspp.acp
tmprefnew:"", // TMPREFLABEL .bopmod.dbcp.baspp.tmprefnew
},
},
dbcgrp:{
bas:{
tmpref:"", // �'时申报流�'号 .bopmod.dbcgrp.bas.tmpref
ownextkey:"", // 地区机构号 .bopmod.dbcgrp.bas.ownextkey
actiontype:"", // 操作类型 .bopmod.dbcgrp.bas.actiontype
rptno:"", // 申报号码 .bopmod.dbcgrp.bas.rptno
idcode:"", // 身份证件号码 .bopmod.dbcgrp.bas.idcode
lcyacc:"", // 人民币帐号/银行卡号 .bopmod.dbcgrp.bas.lcyacc
fcyamt:"", // 现汇金额 .bopmod.dbcgrp.bas.fcyamt
fcyacc:"", // 外汇帐号/银行卡号 .bopmod.dbcgrp.bas.fcyacc
othamt:"", // 其它金额 .bopmod.dbcgrp.bas.othamt
othacc:"", // 其它帐号/银行卡号 .bopmod.dbcgrp.bas.othacc
methods:"", // 结算方式 .bopmod.dbcgrp.bas.methods
buscode:"", // 银行业务编号 .bopmod.dbcgrp.bas.buscode
custype:"", // 类型 .bopmod.dbcgrp.bas.custype
actiondesc:"", // 操作类型 .bopmod.dbcgrp.bas.actiondesc
exrate:"", // �'�汇汇率 .bopmod.dbcgrp.bas.exrate
lcyamt:"", // �'�汇金额 .bopmod.dbcgrp.bas.lcyamt
custnm:"", // 付款人名称 .bopmod.dbcgrp.bas.custnm
oppuser:"", // 收款人名称 .bopmod.dbcgrp.bas.oppuser
custcod:"", // 组织机构 .bopmod.dbcgrp.bas.custcod
actuccy:"", // 实际付款币种及金额 .bopmod.dbcgrp.bas.actuccy
actuamt:"", // 实际付款币种及金额 .bopmod.dbcgrp.bas.actuamt
lcbgno:"", // 信用证/保函编号 .bopmod.dbcgrp.bas.lcbgno
issdate:"", // 开证日期 .bopmod.dbcgrp.bas.issdate
tenor:"", // 期限 .bopmod.dbcgrp.bas.tenor
txccy:"", // 付款币种及金额 .bopmod.dbcgrp.bas.txccy
txamt:"", // 付款币种及金额 .bopmod.dbcgrp.bas.txamt
outchargeccy:"", // 扣费币种及金额 .bopmod.dbcgrp.bas.outchargeccy
outchargeamt:"", // 扣费币种及金额 .bopmod.dbcgrp.bas.outchargeamt
},
},
},
cfadft:{
cfaflg:"", // 海外代付 .cfadft.cfaflg
......
src/views/Business/Brtset/Utlp.vue
......@@ -131,7 +131,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="单据状态" 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>
......@@ -140,6 +140,7 @@
<c-istream-table
:list="model.liaall.tenstm.rows"
:columns="columns"
:showSelection=true
>
</c-istream-table>
</el-form-item>
......@@ -153,7 +154,7 @@
</c-col>
<c-col :span="11">
<el-form-item label="" label-width="5px" prop="setmod.docamt">
<c-input v-model="model.setmod.docamt" placeholder="请输入document amount"></c-input>
<c-input v-model="model.setmod.docamt" placeholder="请输入document amount"></c-input>
</el-form-item>
</c-col>
</c-col>
......@@ -216,7 +217,7 @@
</c-col>
<c-col :span="12">
<el-form-item label="Close Flag" label-width="80px" prop="setmod.docamt" style="margin-left:20px">
<c-checkbox v-model="model.mtabut.clsflg" style="margin-left:20px"></c-checkbox>
<c-checkbox v-model="model.mtabut.clsflg" style="margin-left:20px"></c-checkbox>
</el-form-item>
</c-col>
</c-col>
......@@ -444,12 +445,12 @@ export default {
],
table1:[],
columns:[
"1 1 \"Type\" 40",
"2 2 \"Dbt\" 48",
"3 3 \"Cdt\" 48",
"4 4 \"Cur\" 48",
"1 1 \"Type\" 80",
"2 2 \"Dbt\" 80",
"3 3 \"Cdt\" 80",
"4 4 \"Cur\" 80",
"5 5 \"Amt\" 85 2 8 1 4",
"6 6 \"Mat.Dat.\" 75 4 7 1"
"6 6 \"Mat.Dat.\" 105 4 7 1"
]
}
},
......@@ -469,15 +470,22 @@ export default {
watch: {
declareParams() {},
"model.trnmod.cmtflg":{
immediate:true,
handler(val ,oldVal){
if(this.model.trnmod.cmtflg=='P'){
this.model.trnmod.swftyp='CIV';
}else{
this.model.trnmod.swftyp='';
}
}
},
immediate:true,
handler(val ,oldVal){
if(this.model.trnmod.cmtflg=='P'){
this.model.trnmod.swftyp='CIV';
}else{
this.model.trnmod.swftyp='';
}
}
},
"model.setmod.docamt":{
immediate:true,
handler(val ,oldVal){
let rtnmsg = this.executeRule("setmod.docamt")
}
}
},
}
</script>
......
src/views/Business/Brtset/index.vue
......@@ -75,20 +75,35 @@
<m-doctre :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000008 -->
<!--PD000008
<el-tab-pane label="外管信息" name="wg">
<m-wg :model="model" :codes="codes"/>
</el-tab-pane> -->
<!--PD000002
<el-tab-pane label="跨境人民币申报" name="cnyp">
<m-cnyp :model="model" :codes="codes"/>
</el-tab-pane>-->
<!--PD000009 -->
<el-tab-pane label="申报信息" name="sbxx">
<m-sbxx :model="model" :codes="codes"/>
</el-tab-pane>
<el-tab-pane label="对外付款/承兑通知书-基础信息" name="basp" v-if="model.bopmod.basflg !='' && model.bopmod.szflg=='1'">
<m-basp :model="model" :codes="codes"/>
</el-tab-pane>
<el-tab-pane label="境内付款/承兑通知书-基础信息" name="basp" v-if="model.bopmod.basflg !='' && model.bopmod.szflg=='2'">
<m-basp :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000061 -->
<el-tab-pane label="资本项目" name="cfactlp">
<m-cfactlp :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000002 -->
<el-tab-pane label="跨境人民币申报" name="cnyp">
<m-cnyp :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD001139 -->
<el-tab-pane label="试算结果" name="shisuan">
......@@ -134,9 +149,10 @@ import Cfactlp from "./Cfactlp"
import Cnyp from "./Cnyp"
import Shisuan from "./Shisuan"
import Namp from "./Namp"
import Basp from "./Basp"
// import Dftcrep from "./Dftcrep"
import Limitbody from "~/views/Public/Limitbody";
import Sbxx from "~/views/Public/Sbxx";
export default {
name: "Brtset",
......@@ -155,8 +171,8 @@ export default {
"m-shisuan" : Shisuan,
"m-namp" : Namp,
"m-limitbody" : Limitbody,
// "m-dftcrep" : Dftcrep,
"m-sbxx": Sbxx,
"m-basp": Basp,
},
provide() {
return {
......@@ -197,6 +213,7 @@ export default {
{
this.updateModel(rtnmsg.data)
//TODO 处理数据逻辑
this.model.mtabut.clsflg="X";
}
else
{
......
src/views/Business/Cptadv/Incp.vue
......@@ -23,25 +23,24 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="付款人常驻国家/地区代码" prop="cnybop.cnyinc.spayercountrycode">
<c-fullbox>
<c-input
v-model="model.cnybop.cnyinc.spayercountrycode"
maxlength="3"
placeholder="请输入付款人常驻国家/地区代码"
style="width:100%"
@keyup.enter.native="showGridPromptDialog('cnybop.cnyinc.spayercountrycode')"
></c-input>
<template slot="footer">
<c-button
size="small"
type="primary"
icon="el-icon-search"
style="margin-left:10px;padding: 0 10px;">
</c-button>
</template>
</c-fullbox>
</el-form-item>
<c-col :span="21">
<el-form-item label="付款人常驻国家/地区代码" prop="cnybop.cnyinc.spayercountrycode">
<c-input
v-model="model.cnybop.cnyinc.spayercountrycode"
maxlength="3"
placeholder="请输入付款人常驻国家/地区代码"
style="width:100%"
@keyup.enter.native="showGridPromptDialog('cnybop.cnyinc.spayercountrycode')"
></c-input>
</el-form-item>
</c-col>
<c-col :span="3">
<c-button
                size="small"
                type="primary"
                icon="el-icon-search"
                @click="showGridPromptDialog('cptp.selbut1', null, null,{TXT: 'cnybop.cnyinc.spayercountrycode'}, {TXT: false},'doxpDialog')"> </c-button>
</c-col>
</c-col>
<c-col :span="24">
<el-form-item label="结算方式" prop="cnybop.cnyinc.sbalancemode">
......
src/views/Business/Cptopn/CptOpnp1Common.vue
......@@ -308,6 +308,7 @@
v-model="model.cpdgrp.rec.curf33b"
style="width: 100%"
placeholder=""
:disabled = this.flag3
>
<el-option
v-for="item in codes.currencycode"
......@@ -328,7 +329,7 @@
<c-input
v-model="model.cpdgrp.rec.amtf33b"
placeholder="请输入原始金额"
:disabled = this.flag3
></c-input>
</el-form-item>
</c-col>
......@@ -339,6 +340,7 @@
<c-input
v-model="model.cpdgrp.rec.f36"
placeholder=""
:disabled = this.flag3
></c-input>
</el-form-item>
</c-col>
......@@ -353,7 +355,7 @@
v-model="model.cpdgrp.rec.cur71f"
placeholder=""
style="width: 100%"
:disabled = this.flag3
>
<el-option
v-for="item in codes.currencycode"
......@@ -373,6 +375,7 @@
<c-input
v-model="model.cpdgrp.rec.amt71f"
placeholder="请输入发报行扣费金额"
:disabled = this.flag3
></c-input>
</el-form-item>
</c-col>
......@@ -441,6 +444,7 @@
v-model="model.cpdgrp.pye.pts.adrblk"
show-word-limit
placeholder="请输入Address Block"
disabled
></c-input>
</el-form-item>
</c-col>
......@@ -2516,6 +2520,7 @@ export default {
],
infptaVisible: false,
flag1:true,
flag3:false,
bustyp:[
{ label: 'GODX', value: '货期贸易' },
{ label: 'STRX', value: '服务贸易' },
......@@ -2577,6 +2582,33 @@ export default {
}
},
watch:{
//通过账号、收款人账号控制原始金额、发报行扣费金额、汇率
"model.cpdgrp.orc.pts.extkey":{
immediate:true,
handler(val ,oldVal){
if(this.model.cpdgrp.orc.pts.extkey != '' && this.model.cpdgrp.pye.pts.extkey != ''){
this.flag3=true;
}
else{
this.flag3=false;
}
}
},
"model.cpdgrp.pye.pts.extkey":{
immediate:true,
handler(val ,oldVal){
if(this.model.cpdgrp.orc.pts.extkey != '' && this.model.cpdgrp.pye.pts.extkey != ''){
this.flag3=true;
}
else{
this.flag3=false;
}
}
},
},
methods: {
onSndpDet() {
this.$emit("onSndpDet");
......
src/views/Business/Cptopn/Payment103.vue
......@@ -228,6 +228,7 @@
<c-input
maxlength="16"
placeholder=""
v-model="sespay.intacc"
></c-input>
</el-form-item>
</c-col>
......@@ -285,7 +286,7 @@
maxlength="140"
show-word-limit
placeholder="请输入Address Block"
v-model="setgll.setgrp.awi.pts.adrblk"
v-model="this.setgll.setgrp.awi.pts.adrblk"
disabled
></c-input>
</el-form-item>
......@@ -423,16 +424,19 @@ export default {
extkey: '',
adrblk: '',
}
}
},
}
},
sespay:{
intacc:'',
}
};
},
methods: { ...Event,
setgllChange(){
console.log(this.model.setmod.setglg)
this.model.setmod.setglg.setgll[this.model.setmod.setglg.setgll.length - 1].setgrp.awi.pts.extkey = this.setgll.setgrp.awi.pts.extkey;
this.model.setmod.setglg.setgll[this.model.setmod.setglg.setgll.length - 1].setgrp.awi.pts.adrblk = this.setgll.setgrp.awi.pts.adrblk;
//this.model.setmod.setglg.setgll[this.model.setmod.setglg.setgll.length - 1].setgrp.awi.pts.extkey = this.setgll.setgrp.awi.pts.extkey;
//this.model.setmod.setglg.setgll[this.model.setmod.setglg.setgll.length - 1].setgrp.awi.pts.adrblk = this.setgll.setgrp.awi.pts.adrblk;
}
},
created: function () {
......
src/views/Public/Sbxx.vue
......@@ -38,7 +38,7 @@
v-model="model.bopmod.acttyp"
style="width: 100%"
placeholder="请选择"
:disabled="model.bopmod.szflg==='3' || model.bopmod.szflg==='2'"
:disabled="model.bopmod.szflg==='3' || model.bopmod.szflg==='2' ||model.bopmod.szflg===''"
>
<el-option
v-for="item in codes.acttyp"
......@@ -56,7 +56,7 @@
v-model="model.bopmod.ownextkey"
style="width: 100%"
placeholder="请选择"
:disabled="model.bopmod.szflg==='3'"
:disabled="model.bopmod.szflg==='3' ||model.bopmod.szflg===''"
>
<el-option
v-for="item in codesOwnextkey"
......
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