Commit a9ace250 by taojinrui

cptrep交易完善,cptati和cptato交易bug修改

parent b6a22892
......@@ -70,7 +70,7 @@ export default {
],
"attp.orcnam":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
"attp.resbchnam":[
......@@ -82,12 +82,12 @@ export default {
{max: 11,message:"长度不能超过11"}
],
"attp.orcadr":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
"attp.pyenam":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
"attp.sndbchnam":[
......@@ -100,7 +100,7 @@ export default {
],
"attp.pyeadr":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
"cpdgrp.rec.orcact":[
......@@ -220,7 +220,7 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"cpdgrp.ori.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"cpdgrp.ori.dbfadrblkcn":[
......@@ -228,7 +228,7 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"cpdgrp.pyb.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"cpdgrp.pyb.dbfadrblkcn":[
......@@ -260,7 +260,7 @@ export default {
],
"attp.commet":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"cpdgrp.med.namelc":[
......@@ -268,7 +268,7 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"cpdgrp.med.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"cpdgrp.med.dbfadrblkcn":[
......@@ -280,7 +280,7 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"attp.com102":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"attp.rmtp.ptsget.sdamod.dadsnd":[
......@@ -301,7 +301,7 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"cpdgrp.rmt.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"cpdgrp.rmt.dbfadrblkcn":[
......@@ -313,7 +313,7 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"attp.shouyh":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 30,message:"长度不能超过30"}
],
"setmod.ref":[
......
......@@ -74,7 +74,7 @@ export default {
],
"attp.orcnam":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
"attp.resbchnam":[
......@@ -86,12 +86,12 @@ export default {
{max: 11,message:"长度不能超过11"}
],
"attp.orcadr":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
"attp.pyenam":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
"attp.sndbchnam":[
......@@ -104,7 +104,7 @@ export default {
],
"attp.pyeadr":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
"cpdgrp.rec.orcact":[
......@@ -224,7 +224,7 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"cpdgrp.ori.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"cpdgrp.ori.dbfadrblkcn":[
......@@ -232,7 +232,7 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"cpdgrp.pyb.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"cpdgrp.pyb.dbfadrblkcn":[
......@@ -264,7 +264,7 @@ export default {
],
"attp.commet":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"cpdgrp.med.namelc":[
......@@ -272,7 +272,7 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"cpdgrp.med.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"cpdgrp.med.dbfadrblkcn":[
......@@ -284,7 +284,7 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"attp.com102":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"attp.rmtp.ptsget.sdamod.dadsnd":[
......@@ -305,7 +305,7 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"cpdgrp.rmt.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"cpdgrp.rmt.dbfadrblkcn":[
......@@ -317,7 +317,7 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"attp.shouyh":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 30,message:"长度不能超过30"}
],
"setmod.ref":[
......
......@@ -155,7 +155,6 @@
v-model="model.attp.sysno"
maxlength="21"
placeholder="请输入清算编号"
disabled
></c-input>
</el-form-item>
</c-col>
......@@ -259,7 +258,7 @@
v-model="model.cpdgrp.rec.orcact"
maxlength="35"
placeholder="请输入汇款人帐号"
disabled
:disabled="model.attp.swftyp==''"
></c-input>
</el-form-item>
</c-col>
......@@ -314,7 +313,7 @@
maxlength="35"
show-word-limit
placeholder="请输入Address Block"
disabled
:disabled="model.attp.swftyp==''"
></c-input>
</el-form-item>
</c-col>
......@@ -478,8 +477,8 @@
<c-col :span="24">
<c-row type="flex" justify="end">
<c-col :span="12">
<el-form-item label="相关参考号" prop="" v-show="flag1">
<c-input></c-input>
<el-form-item label="相关参考号" prop="attp.xnggbh" v-show="flag1">
<c-input v-model="model.attp.xnggbh"></c-input>
</el-form-item>
</c-col>
<c-col :span="10" :offset="2" style="text-align: right">
......@@ -531,19 +530,24 @@
</c-col>
<c-col :span="24">
<c-col :span="11">
<c-fullbox>
<c-col :span="18">
<el-form-item label="发报行BIC" prop="attp.sndbch">
<c-input
v-model="model.attp.sndbch"
maxlength="11"
placeholder="请输入发报行BIC"
style="width:100%"
disabled
></c-input>
</el-form-item>
</c-col>
<template slot="footer">
<c-col :span="6">
<c-button type="primary">查询客户号</c-button>
</c-col>
</template>
</c-fullbox>
</c-col>
<c-col :span="24">
......
......@@ -62,7 +62,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="Address Block" prop="cpdgrp.ori.pts.adrblk" >
<el-form-item label="" prop="cpdgrp.ori.pts.adrblk" >
<c-input
type="textarea"
v-model="model.cpdgrp.ori.pts.adrblk"
......@@ -113,7 +113,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="Address Block" prop="cpdgrp.med.pts.adrblk">
<el-form-item label="" prop="cpdgrp.med.pts.adrblk">
<c-input
type="textarea"
v-model="model.cpdgrp.med.pts.adrblk"
......@@ -163,7 +163,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="Address Block" prop="cpdgrp.rmt.pts.adrblk">
<el-form-item label="" prop="cpdgrp.rmt.pts.adrblk">
<c-input
type="textarea"
v-model="model.cpdgrp.rmt.pts.adrblk"
......@@ -238,7 +238,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="Address Block" prop="cpdgrp.pyb.pts.adrblk">
<el-form-item label="" prop="cpdgrp.pyb.pts.adrblk">
<c-input type="textarea"
v-model="model.cpdgrp.pyb.pts.adrblk"
maxlength="35"
......
......@@ -8,6 +8,7 @@
<c-input
maxlength="16"
placeholder="请输入申报号码"
></c-input>
</c-col>
</el-form-item>
......
......@@ -20,7 +20,6 @@
style="margin: 0 10px 0 10px; padding: 0 12px"
size="small"
type="primary"
@click="onSeainf"
>
<span style="font-family: '宋体'; font-weight: bold">i</span>
</c-button>
......@@ -29,7 +28,6 @@
size="small"
type="primary"
:disabled="this.flag"
@click="onAttpGetref"
>
获取
</c-button>
......@@ -167,7 +165,6 @@
style="width: 100%"
placeholder="请选择业务种类"
>
<!-- 使用busflg,bustyp不符 -->
<el-option
v-for="item in codes.busflg"
:key="item.value"
......@@ -209,13 +206,12 @@
</c-input>
</el-form-item>
</c-col>
<!-- 还有一个按钮 -->
<c-col :span="2">
<c-button
size="small"
type="primary"
icon="el-icon-search"
@click="onCptpGetinf"
>
</c-button>
</c-col>
......@@ -315,7 +311,6 @@
style="margin: 0 10px 0 0; padding: 0 12px"
size="small"
type="primary"
@click="onSeainf"
>
<span
style="font-size: 15px; font-family: '宋体'; font-weight: bold"
......@@ -330,7 +325,6 @@
size="small"
type="primary"
:disabled="this.flag"
@click="onDetpButgetref"
>
获取
</c-button>
......@@ -513,7 +507,7 @@
<c-input></c-input>
</el-form-item>
</c-col>
<c-col :span="10" offset="2" style="text-align: right">
<c-col :span="10" :offset="2" style="text-align: right">
<c-checkbox
v-model="model.cpdgrp.rec.tsnflg"
>同名划转标志</c-checkbox>
......@@ -564,7 +558,7 @@
</c-col>
<c-col :span="24">
<c-col :span="11">
<c-col :span="24">
<el-form-item label="发报行BIC" prop="attp.sndbch">
<c-input
v-model="model.attp.sndbch"
......@@ -608,7 +602,6 @@
style="margin: 0 10px 0 0; padding: 0 12px"
size="small"
type="primary"
@click="onSeainf"
>
<span
style="font-size: 15px; font-family: '宋体'; font-weight: bold"
......@@ -622,7 +615,6 @@
size="small"
type="primary"
style="margin: 0 0"
@click="onPyepDet"
>
详情
</c-button>
......
......@@ -50,7 +50,6 @@
style="margin: 0 0"
size="small"
type="primary"
@click="onSndpDet"
disabled
>
详情
......@@ -60,7 +59,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="Address Block" prop="cpdgrp.ori.pts.adrblk">
<el-form-item label="" prop="cpdgrp.ori.pts.adrblk">
<c-input
type="textarea"
v-model="model.cpdgrp.ori.pts.adrblk"
......@@ -71,43 +70,7 @@
></c-input>
</el-form-item>
</c-col>
<!-- <c-col :span="24">
<el-form-item label="名称" prop="cpdgrp.ori.namelc">
<c-input
type="textarea"
v-model="model.cpdgrp.ori.namelc"
maxlength="35"
show-word-limit
placeholder="请输入名称"
></c-input>
</el-form-item>
</c-col> -->
<!-- <c-col :span="24">
<el-form-item label="Address Block" prop="cpdgrp.pyb.pts.adrblk">
<c-input
type="textarea"
v-model="model.cpdgrp.pyb.pts.adrblk"
maxlength="35"
show-word-limit
placeholder="请输入Address Block"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="地址" prop="cpdgrp.ori.adrelc">
<c-input
type="textarea"
v-model="model.cpdgrp.ori.adrelc"
maxlength="35"
show-word-limit
placeholder="请输入地址"
></c-input>
</el-form-item>
</c-col> -->
<c-col :span="24">
<c-fullbox>
<el-form-item
......@@ -136,7 +99,6 @@
style="margin: 0 0"
size="small"
type="primary"
@click="onSndpDet"
disabled
>
详情
......@@ -146,7 +108,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="Address Block" prop="cpdgrp.med.pts.adrblk">
<el-form-item label="" prop="cpdgrp.med.pts.adrblk">
<c-input
type="textarea"
v-model="model.cpdgrp.med.pts.adrblk"
......@@ -185,7 +147,6 @@
style="margin: 0 0"
size="small"
type="primary"
@click="onSndpDet"
disabled
>
详情
......@@ -195,7 +156,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="Address Block" prop="cpdgrp.rmt.pts.adrblk">
<el-form-item label="" prop="cpdgrp.rmt.pts.adrblk">
<c-input
type="textarea"
v-model="model.cpdgrp.rmt.pts.adrblk"
......@@ -270,7 +231,6 @@
style="margin: 0 0"
size="small"
type="primary"
@click="onSndpDet"
disabled
>
详情
......@@ -280,7 +240,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="Address Block" prop="cpdgrp.pyb.pts.adrblk">
<el-form-item label="" prop="cpdgrp.pyb.pts.adrblk">
<c-input type="textarea"
v-model="model.cpdgrp.pyb.pts.adrblk"
maxlength="235"
......
......@@ -231,45 +231,59 @@
:columns="stmData.columns"
:showButtonFlg="true"
>
<el-table-column fixed="right" prop="op" label="操作" width="150px">
<template slot="header">
<c-col :span="11" style="text-align: left"><span>操作</span></c-col>
<!-- <c-col :span="12" style="text-align: right">
<c-button icon="el-icon-s-tools"></c-button>
</c-col> -->
</template>
<!-- <template slot-scope="scope">
<el-popover placement="top-start" title="历史信息" width="800" trigger="click" :ref="'popover_' + scope.row.IDX">
<div style="text-align: right; margin-top: -30px;margin-right: 5px; font-size: 16px;">
<span class="el-icon-close" @click="closeTrn('popover_' + scope.row.IDX)"/>
<el-table-column fixed="right" prop="op" label="操作" width="140px">
<template slot="header">
<c-col :span="11" style="text-align: left"><span>操作</span></c-col>
</template>
<template slot-scope="scope">
<el-popover
placement="top-start"
title="历史信息"
width="800"
trigger="click"
:ref="'popover_' + scope.row.IDX"
>
<div style="text-align: right; margin-top: -30px; margin-right: 5px; font-size: 16px;">
<span class="el-icon-close" @click="closeTrn('popover_' + scope.row.IDX)"/>
</div>
<c-istream-table :list="trnData.data" :columns="trnData.columns">
<el-table-column prop="op" label="操作" width="0">
<template slot-scope="scope">
<c-button style="margin-left: 0" size="small" @click="display(scope.row['INR'])" >详情</c-button>
</template>
</el-table-column>
</c-istream-table>
<c-istream-table
:list="trnData.data"
:columns="trnData.columns"
>
<el-table-column prop="op" label="操作" width="0">
<template slot-scope="scope">
<c-button
style="margin-left: 0"
size="small"
@click="display(scope.row['INR'])"
>
详情
</c-button>
</template>
</el-table-column>
</c-istream-table>
<c-button
style="margin-left: 0"
size="small"
@click="getTrnInfo(scope.$index, scope.row)"
slot="reference"
>
详情
</c-button>
</el-popover>
<c-button
style="margin-left: 0"
size="small"
@click="getTrnInfo(scope.$index, scope.row)"
slot="reference"
>详情</c-button
type="primary"
@click="getButtons(scope.row['Reference'])"
>
</el-popover>
<c-button
style="margin-left: 0"
size="small"
type="primary"
@click="getButtons(scope.row['Reference'])"
>处理
</c-button>
</template> -->
</el-table-column>
处理
</c-button>
</template>
</el-table-column>
</c-istream-table>
</c-col>
<m-busbtn ref="childs" :ownref="ownref" trnCode="cptsel" :model="CptselModel" ownrefPath="cpdgrp" @onChoose="onChoose" >11</m-busbtn>
<m-busbtn ref="childs" :ownref="ownref" trnCode="cptsel" :model="cptselModel" ownrefPath="cpdgrp" @onChoose="onChoose" >11</m-busbtn>
<!-- ======================================原码=================================================== -->
<!-- <c-col :span="12">
......@@ -496,7 +510,7 @@ export default {
components: { "m-busbtn": BusNavbar },
data() {
return {
CptselModel: new CptselModel().data,
cptselModel: new CptselModel().data,
ownref: "",
stmData: {
columns: [
......@@ -554,6 +568,18 @@ export default {
},
methods: {
...Event,
async getButtons(ownref) {
this.ownref = ownref;
this.$refs.childs.initdialog = true;
console.log("ownref:" + ownref);
},
async onChoose(code) {
//跳转交易
this.$router.history.push("/business/" + code);
this.$refs.childs.initdialog = false;
},
async getTrnInfo(idx, row) {
this.model.objinr = row["INR"];
this.model.inr = row["INR"];
......@@ -569,16 +595,8 @@ export default {
closeTrn(refId) {
this.$refs[refId].doClose();
},
async getButtons(ownref) {
this.ownref = ownref;
this.$refs.childs.initdialog = true;
console.log("ownref:" + ownref);
},
async onChoose(code) {
//跳转交易
this.$router.history.push("/business/" + code);
this.$refs.childs.initdialog = false;
},
},
created: function () {},
};
......
......@@ -14,7 +14,6 @@
v-model="model.cnybop.cnyflg"
style="width: 100%"
placeholder="请选择"
disabled
>
<el-option
v-for="item in codes.cnyflg"
......@@ -54,6 +53,7 @@
v-model="model.cnybop.outflg"
style="width: 100%"
placeholder="请选择"
disabled
>
<el-option
v-for="item in codes.outflg"
......
......@@ -46,7 +46,7 @@
placeholder="请选择地区机构号"
>
<el-option
v-for="item in codes.ownextkey"
v-for="item in codes.ownextkey1"
:key="item.value"
:label="item.label"
:value="item.value"
......
......@@ -4,62 +4,90 @@
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<!--cptrep PD000020 Overview -->
<el-tab-pane label="Overview" name="opnp1">
<c-content>
<m-opnp1 :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--setmod PD000000 Settlement -->
<el-tab-pane label="Settlement" name="setpan">
<c-content>
<m-setpan :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--glemod PD000001 Bookings-->
<el-tab-pane label="Bookings" name="glepan">
<c-content>
<m-glepan :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--coninf PD000000 Completion -->
<el-tab-pane label="Completion" name="coninfp">
<c-content>
<m-coninfp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--trndoc PD000529 &Messages -->
<el-tab-pane label="Messages" name="docpan1">
<c-content>
<m-docpan1 :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--trndoc PD000546 Attachments -->
<el-tab-pane label="Attachments" name="doctre">
<c-content>
<m-doctre :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--cptp PD000434 Detail for MT910 -->
<el-tab-pane label="Detail for MT910" name="det910">
<el-tab-pane label="Detail for MT910" name="det910" v-if="model.cpdgrp.rec.swftyp=='910'">
<c-content>
<m-det910 :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--lendoc PD000001 收账通知 -->
<el-tab-pane label="收账通知" name="docpan">
<c-content>
<m-docpan :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--bopgat PD000006 外管信息 -->
<el-tab-pane label="外管信息" name="wg">
<c-content>
<m-wg :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--dbap PD000001 涉外收入申报单-申报信息 -->
<el-tab-pane label="涉外收入申报单-基础信息" name="dclp" v-if="model.bopmod.szflg === '1' && model.bopmod.basflg">
<c-content>
<m-dclp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--dbdp PD000000 境内收入申报单-基础信息 -->
<el-tab-pane label="境内收入申报单-基础信息" name="basp" v-if="model.bopmod.szflg === '2' && model.bopmod.basflg">
<c-content>
<m-basp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--hvpmod PD000007 跨境支付 -->
<el-tab-pane label="跨境支付" name="secpan">
<c-content>
<m-secpan :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--cnybop PD000002 跨境人民币申报 -->
<el-tab-pane label="跨境人民币申报" name="cnyp">
<c-content>
<m-cnyp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--cnybop PD000001 2101跨境收入信息 -->
<el-tab-pane label="2101跨境收入信息" name="incp">
<el-tab-pane label="2101跨境收入信息" name="incp" v-if="model.cnybop.cnyflg=='1'">
<c-content>
<m-incp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
......
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