Commit b2972846 by 李少勇

Merge branch 'develop' of http://114.115.138.98:8900/isc-v3.1/isc-web-vue into develop

parents ee2a0f5d b37f67ac
......@@ -52,6 +52,9 @@ const BusRouter = [
{ path: 'sndsel', component: () => import("./Sndsel/views"), name: 'Sndsel', meta: { keepAlive: true, title: '发报查询', module: 'frontend' } },
{ path: 'msgdtl', component: () => import("./Msgdtl/views"), name: 'Msgdtl', meta: { keepAlive: true, title: '报文原文展示', module: 'frontend' } },
{ path: 'msgdtlrsm', component: () => import("./Msgdtlrsm/views"), name: 'Msgdtlrsm', meta: { keepAlive: true, title: '报文疑似重复详情页面', module: 'frontend' } },
{ path: 'Msgdtlsep', component: () => import("./Msgdtlsep/views"), name: 'Msgdtlsep', meta: { keepAlive: true, title: '报文失败处理详情页面', module: 'frontend' } },
{ path: 'Msgdtlrtm', component: () => import("./Msgdtlrtm/views"), name: 'Msgdtlrtm', meta: { keepAlive: true, title: '报文人工清分详情页面', module: 'frontend' } },
{ path: 'Msgdtlblk', component: () => import("./Msgdtlblk/views"), name: 'Msgdtlblk', meta: { keepAlive: true, title: '收报灰名单详情页面', module: 'frontend' } },
{ path: 'sndselcop', component: () => import("./Sndselcop/views"), name: 'Sndselcop', meta: { keepAlive: true, title: '发报疑似重复处理', module: 'frontend' } },
{ path: 'rcvselcop', component: () => import("./Rcvselcop/views"), name: 'Rcvselcop', meta: { keepAlive: true, title: '收报疑似重复处理', module: 'frontend' } },
{ path: 'msgrtm', component: () => import("./Msgrtm/views"), name: 'Msgrtm', meta: { keepAlive: true, title: '人工清分', module: 'frontend' } },
......
......@@ -6,9 +6,9 @@
<c-button class="medium_bcs" size="medium" style="margin-left: 40px" type="primary" @click="handleCheck">
放行
</c-button>
<c-button class="medium_bcs" size="medium" style="margin-left: 40px" type="primary" @click="handleReject">
<!-- <c-button class="medium_bcs" size="medium" style="margin-left: 40px" type="primary" @click="handleReject">
丢弃
</c-button>
</c-button> -->
<c-button class="medium_bcs" size="medium" style="margin-left: 40px" type="primary" @click="handleSkip">
忽略
</c-button>
......@@ -78,15 +78,31 @@ export default {
let params={
mpsinr: this.$route.query.mpsinr || "",
};
const rtnmsg = await Api.post(`/${this.moduleRouter()}/msgsel/check`, params);
const rtnmsg = await Api.post(`/${this.moduleRouter()}/msgsel/rtmp/sav`, params);
if (rtnmsg.respCode === SUCCESS) {
this.$notify({ title: '成功', type: 'success', message: '放行成功' })
}
});
},
async handleSkip() {
this.$confirm("确定忽略该报文?", "提示", {
confirmButtonText: "确认",
cancelButtonText: "取消",
type: "warning",
}).then(async() => {
let params={
mpsinr: this.$route.query.mpsinr || "",
};
const rtnmsg = await Api.post(`/${this.moduleRouter()}/msgsel/rtmp/skip`, params);
if (rtnmsg.respCode === SUCCESS) {
this.$notify({ title: '成功', type: 'success', message: '丢弃成功' })
this.$notify({ title: '成功', type: 'success', message: '忽略成功' })
}
});
},
async handleReject() {
this.$confirm("确定丢弃该报文?", "提示", {
async handleReSkip() {
this.$confirm("确定取消忽略该报文?", "提示", {
confirmButtonText: "确认",
cancelButtonText: "取消",
type: "warning",
......@@ -94,9 +110,9 @@ export default {
let params={
mpsinr: this.$route.query.mpsinr || "",
};
const rtnmsg = await Api.post(`/${this.moduleRouter()}/msgsel/reject`, params);
const rtnmsg = await Api.post(`/${this.moduleRouter()}/msgsel/rtmp/reskip`, params);
if (rtnmsg.respCode === SUCCESS) {
this.$notify({ title: '成功', type: 'success', message: '丢弃成功' })
this.$notify({ title: '成功', type: 'success', message: '取消忽略成功' })
}
});
},
......
<template>
<div class="eContainer">
<c-page title="汇入汇款">
<el-form :model="model" :rules="curRules" ref="modelForm" label-width="120px" label-position="right" size="small" :validate-on-rule-change="false">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
<!--cptadv PD000020 -->
<el-tab-pane label="业务信息" name="opnp1">
<c-content>
<m-ovwp :codes="codes" :model="model" />
</c-content>
</el-tab-pane>
<el-tab-pane :label="$t('commonModels.费用/账务')" name="setpan">
<c-content>
<m-setmod :codes="codes" :model="model" />
</c-content>
</el-tab-pane>
<el-tab-pane label="报文/面函" name="docpan">
<c-content>
<m-docpan :codes="codes" :model="model" />
</c-content>
</el-tab-pane>
<!--bopgat PD000006 外管信息 -->
<el-tab-pane label="外管信息" name="bopgat" v-if="model.cpdgrp.rec.accmod=='' || model.cpdgrp.rec.accmod=='G' || model.cpdgrp.rec.accmod=='0'">
<c-content>
<m-bopgat :codes="codes" :model="model" />
</c-content>
</el-tab-pane>
<!--rmbbop PD000001 跨境人民币申报 -->
<el-tab-pane label="跨境人民币申报" name="rmbbop" v-if="showRmbbop">
<c-content>
<m-rmbbop :codes="codes" :model="model" ref="rmbbop" />
</c-content>
</el-tab-pane>
<el-tab-pane :label="$t('commonModels.统一名单')" name="usrmd">
<c-content>
<m-usrmd :codes="codes" :model="model" />
</c-content>
</el-tab-pane>
<!-- 国贸公服 -->
<el-tab-pane :label="$t('commonModels.国贸公服')" name="gmgf" v-if="model.gmgfVo.visual">
<c-content>
<m-gmgf :codes="codes" :model="model.gmgfVo" />
</c-content>
</el-tab-pane>
</c-tabs>
</el-form>
<!-- 底部按钮 -->
<c-function-btn :handleSubmit="handleSubmit" :handleCheck="handleCheck" :handleStash="handleStash" ref="commonBtn" @handleSureWarning="handleSureWarning"></c-function-btn>
</c-page>
</div>
</template>
<script>
import CodeTable from "~/config/CodeTable";
import Cptadv from "~/page/Remittance/Cptadv/model";
import event from "~/page/Remittance/Cptadv/event";
import operationFunc from "~/mixin/operationFunc";
import commonDepend from "~/mixin/commonDepend";
import Checkswift from "~/page/Remittance/Cptadv/model/checkswift";
import Checkcips from "~/page/Remittance/Cptadv/model/checkcips";
import Checkjnwb from "~/page/Remittance/Cptadv/model/checkjnwb";
import Checkhnhz from "~/page/Remittance/Cptadv/model/checkhnhz";
import Checkother from "~/page/Remittance/Cptadv/model/checkother";
import Default from "~/page/Remittance/Cptadv/model/default";
import buildFn from "~/page/Remittance/Cptadv/event/buildCommons.js";
import SwiftOpnp from "~/page/Remittance/Cptadv/views/swift/Opnp1";
import CipsOpnp from "~/page/Remittance/Cptadv/views/cips/Opnp1";
import JnwbOpnp from "~/page/Remittance/Cptadv/views/jnwb/Opnp1";
import HnhzOpnp from "~/page/Remittance/Cptadv/views/hnhz/Opnp1";
import OtherOpnp from "~/page/Remittance/Cptadv/views/other/Opnp1";
import Orcpye from "~/page/Remittance/Cptadv/views/swift/Orcpye";
import Orcpye2 from "~/page/Remittance/Cptadv/views/cips/Orcpye";
import Orcpye3 from "~/page/Remittance/Cptadv/views/jnwb/Orcpye";
import Orcpye4 from "~/page/Remittance/Cptadv/views/hnhz/Orcpye";
import Orcpye5 from "~/page/Remittance/Cptadv/views/other/Orcpye";
import Routeinfo from "~/page/Remittance/Cptadv/views/Routeinfo";
import Setmod from "~/components/business/setmod/views";
import Docpan from "~/components/business/docpan/views";
import Doctre from "~/components/business/doctre/views";
import Rmbbop from "~/components/business/rmb/rmbbop/views";
import Usrmd from "~/components/business/Usrmd/views";
import Bopgat from "~/components/business/Bopgat/views";
import Ovwp from "~/page/Remittance/Cptadv/views/Ovwp";
import Gmgf from "~/components/business/gmgf/views";
export default {
name: "Cptadvgzth",
components: {
"m-swift-opnp": SwiftOpnp,
"m-cips-opnp": CipsOpnp,
"m-jnwb-opnp": JnwbOpnp,
"m-hnhz-opnp": HnhzOpnp,
"m-other-opnp": OtherOpnp,
"m-routeinfo": Routeinfo,
"m-swift-orcpye": Orcpye,
"m-cips-orcpye": Orcpye2,
"m-jnwb-orcpye": Orcpye3,
"m-hnhz-orcpye": Orcpye4,
"m-other-orcpye": Orcpye5,
"m-setmod": Setmod,
"m-docpan": Docpan,
"m-doctre": Doctre,
"m-rmbbop": Rmbbop,
"m-usrmd": Usrmd,
"m-bopgat": Bopgat,
"m-ovwp": Ovwp,
"m-gmgf": Gmgf,
},
provide() {
return {
root: this,
markPyeact: "" //备份收款人账号
};
},
mixins: [Default, operationFunc, event, commonDepend, buildFn],
data() {
return {
tabVal: "opnp1",
trnName: "cptadv",
model: new Cptadv().data,
codes: {
...CodeTable
},
activeNames: ["route"],
markRules: {},
rules: {}
};
},
computed: {
curRules() {
if (this.model.cpdgrp.rec.cptrou == "SWIFT") {
return { ...Checkswift.apply(this), ...this.rules };
} else if (this.model.cpdgrp.rec.cptrou == "CIPS") {
return { ...Checkcips.apply(this), ...this.rules };
} else if (this.model.cpdgrp.rec.cptrou == "JNWB") {
return { ...Checkjnwb.apply(this), ...this.rules };
} else if (this.model.cpdgrp.rec.cptrou == "HNHZ") {
return { ...Checkhnhz.apply(this), ...this.rules };
}else if (this.model.cpdgrp.rec.cptrou == "OTHER") {
return { ...Checkother.apply(this), ...this.rules };
}
return {};
},
showRmbbop() {
const cptrou = this.model.cpdgrp.rec.cptrou;
if (cptrou === "HNHZ") {
const orcact = this.model.cpdgrp.rec.orcact; //汇款人账号
const pyeact = this.model.cpdgrp.rec.pyeact; //收款人账号
const flag1 = orcact.includes("EFN") || orcact.includes("FTN") || orcact.includes("NRA");
const flag2 = !pyeact.includes("EFN") && !pyeact.includes("FTN") && !pyeact.includes("NRA");
return this.model.cpdgrp.rec.manbod !== "1" && !(flag1 && flag2);
} else {
const accmod = this.model.cpdgrp.rec.accmod;
return cptrou !== 'JNWB' && (accmod === '' || accmod === '0' || accmod === 'G');
}
}
},
methods: {},
created() {
console.log("进入cptadv交易");
let params = {
transName: this.trnName,
operation: this.$route.query.type,
cpdgrp: {
rec: {
inr: this.$route.query.inr,
accmod: this.$route.query.accmod
}
}
};
this.model.operation = this.$route.query.type;
this.init(params);
}
};
</script>
<style lang="less" scoped>
::v-deep .el-collapse-item__content{
padding-bottom: 0px!important;
}
::v-deep .el-tabs__content .eibs-tab{
padding:0px!important
}
</style>
\ No newline at end of file
<template>
<div class="eContainer">
<c-page title="汇入汇款">
<el-form :model="model" :rules="curRules" ref="modelForm" label-width="120px" label-position="right" size="small" :validate-on-rule-change="false">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
<!--cptadv PD000020 -->
<el-tab-pane label="业务信息" name="opnp1">
<c-content>
<m-ovwp :codes="codes" :model="model" />
</c-content>
</el-tab-pane>
<el-tab-pane :label="$t('commonModels.费用/账务')" name="setpan">
<c-content>
<m-setmod :codes="codes" :model="model" />
</c-content>
</el-tab-pane>
<el-tab-pane label="报文/面函" name="docpan">
<c-content>
<m-docpan :codes="codes" :model="model" />
</c-content>
</el-tab-pane>
<!--bopgat PD000006 外管信息 -->
<el-tab-pane label="外管信息" name="bopgat" v-if="model.cpdgrp.rec.accmod=='' || model.cpdgrp.rec.accmod=='G' || model.cpdgrp.rec.accmod=='0'">
<c-content>
<m-bopgat :codes="codes" :model="model" />
</c-content>
</el-tab-pane>
<!--rmbbop PD000001 跨境人民币申报 -->
<el-tab-pane label="跨境人民币申报" name="rmbbop" v-if="showRmbbop">
<c-content>
<m-rmbbop :codes="codes" :model="model" ref="rmbbop" />
</c-content>
</el-tab-pane>
<el-tab-pane :label="$t('commonModels.统一名单')" name="usrmd">
<c-content>
<m-usrmd :codes="codes" :model="model" />
</c-content>
</el-tab-pane>
<!-- 国贸公服 -->
<el-tab-pane :label="$t('commonModels.国贸公服')" name="gmgf" v-if="model.gmgfVo.visual">
<c-content>
<m-gmgf :codes="codes" :model="model.gmgfVo" />
</c-content>
</el-tab-pane>
</c-tabs>
</el-form>
<!-- 底部按钮 -->
<c-function-btn :handleSubmit="handleSubmit" :handleCheck="handleCheck" :handleStash="handleStash" ref="commonBtn" @handleSureWarning="handleSureWarning"></c-function-btn>
</c-page>
</div>
</template>
<script>
import CodeTable from "~/config/CodeTable";
import Cptadv from "~/page/Remittance/Cptadv/model";
import event from "~/page/Remittance/Cptadv/event";
import operationFunc from "~/mixin/operationFunc";
import commonDepend from "~/mixin/commonDepend";
import Checkswift from "~/page/Remittance/Cptadv/model/checkswift";
import Checkcips from "~/page/Remittance/Cptadv/model/checkcips";
import Checkjnwb from "~/page/Remittance/Cptadv/model/checkjnwb";
import Checkhnhz from "~/page/Remittance/Cptadv/model/checkhnhz";
import Checkother from "~/page/Remittance/Cptadv/model/checkother";
import Default from "~/page/Remittance/Cptadv/model/default";
import buildFn from "~/page/Remittance/Cptadv/event/buildCommons.js";
import SwiftOpnp from "~/page/Remittance/Cptadv/views/swift/Opnp1";
import CipsOpnp from "~/page/Remittance/Cptadv/views/cips/Opnp1";
import JnwbOpnp from "~/page/Remittance/Cptadv/views/jnwb/Opnp1";
import HnhzOpnp from "~/page/Remittance/Cptadv/views/hnhz/Opnp1";
import OtherOpnp from "~/page/Remittance/Cptadv/views/other/Opnp1";
import Orcpye from "~/page/Remittance/Cptadv/views/swift/Orcpye";
import Orcpye2 from "~/page/Remittance/Cptadv/views/cips/Orcpye";
import Orcpye3 from "~/page/Remittance/Cptadv/views/jnwb/Orcpye";
import Orcpye4 from "~/page/Remittance/Cptadv/views/hnhz/Orcpye";
import Orcpye5 from "~/page/Remittance/Cptadv/views/other/Orcpye";
import Routeinfo from "~/page/Remittance/Cptadv/views/Routeinfo";
import Setmod from "~/components/business/setmod/views";
import Docpan from "~/components/business/docpan/views";
import Doctre from "~/components/business/doctre/views";
import Rmbbop from "~/components/business/rmb/rmbbop/views";
import Usrmd from "~/components/business/Usrmd/views";
import Bopgat from "~/components/business/Bopgat/views";
import Ovwp from "~/page/Remittance/Cptadv/views/Ovwp";
import Gmgf from "~/components/business/gmgf/views";
export default {
name: "Cptadvjfth",
components: {
"m-swift-opnp": SwiftOpnp,
"m-cips-opnp": CipsOpnp,
"m-jnwb-opnp": JnwbOpnp,
"m-hnhz-opnp": HnhzOpnp,
"m-other-opnp": OtherOpnp,
"m-routeinfo": Routeinfo,
"m-swift-orcpye": Orcpye,
"m-cips-orcpye": Orcpye2,
"m-jnwb-orcpye": Orcpye3,
"m-hnhz-orcpye": Orcpye4,
"m-other-orcpye": Orcpye5,
"m-setmod": Setmod,
"m-docpan": Docpan,
"m-doctre": Doctre,
"m-rmbbop": Rmbbop,
"m-usrmd": Usrmd,
"m-bopgat": Bopgat,
"m-ovwp": Ovwp,
"m-gmgf": Gmgf,
},
provide() {
return {
root: this,
markPyeact: "" //备份收款人账号
};
},
mixins: [Default, operationFunc, event, commonDepend, buildFn],
data() {
return {
tabVal: "opnp1",
trnName: "cptadv",
model: new Cptadv().data,
codes: {
...CodeTable
},
activeNames: ["route"],
markRules: {},
rules: {}
};
},
computed: {
curRules() {
if (this.model.cpdgrp.rec.cptrou == "SWIFT") {
return { ...Checkswift.apply(this), ...this.rules };
} else if (this.model.cpdgrp.rec.cptrou == "CIPS") {
return { ...Checkcips.apply(this), ...this.rules };
} else if (this.model.cpdgrp.rec.cptrou == "JNWB") {
return { ...Checkjnwb.apply(this), ...this.rules };
} else if (this.model.cpdgrp.rec.cptrou == "HNHZ") {
return { ...Checkhnhz.apply(this), ...this.rules };
}else if (this.model.cpdgrp.rec.cptrou == "OTHER") {
return { ...Checkother.apply(this), ...this.rules };
}
return {};
},
showRmbbop() {
const cptrou = this.model.cpdgrp.rec.cptrou;
if (cptrou === "HNHZ") {
const orcact = this.model.cpdgrp.rec.orcact; //汇款人账号
const pyeact = this.model.cpdgrp.rec.pyeact; //收款人账号
const flag1 = orcact.includes("EFN") || orcact.includes("FTN") || orcact.includes("NRA");
const flag2 = !pyeact.includes("EFN") && !pyeact.includes("FTN") && !pyeact.includes("NRA");
return this.model.cpdgrp.rec.manbod !== "1" && !(flag1 && flag2);
} else {
const accmod = this.model.cpdgrp.rec.accmod;
return cptrou !== 'JNWB' && (accmod === '' || accmod === '0' || accmod === 'G');
}
}
},
methods: {},
created() {
console.log("进入cptadv交易");
let params = {
transName: this.trnName,
operation: this.$route.query.type,
cpdgrp: {
rec: {
inr: this.$route.query.inr,
accmod: this.$route.query.accmod
}
}
};
this.model.operation = this.$route.query.type;
this.init(params);
}
};
</script>
<style lang="less" scoped>
::v-deep .el-collapse-item__content{
padding-bottom: 0px!important;
}
::v-deep .el-tabs__content .eibs-tab{
padding:0px!important
}
</style>
......@@ -3,7 +3,8 @@ const RemittanceRouter = [
// { path: 'cptatt', component: () => import('./Cptatt/views'), name: 'cptatt', meta: { keepAlive: true, title: '境内外币汇入汇款' } },
// { path: 'cptato', component: () => import('./Cptato/views'), name: 'cptato', meta: { keepAlive: true, title: '境内外币汇出汇款' } },
{ path: 'cptadv', component: () => import('./Cptadv/views'), name: 'Cptadv', meta: { keepAlive: true, title: '汇入汇款申请' ,module:'Remittance'} },
//{ path: 'cptadv0', component: () => import('./Cptadv0/views'), name: 'cptadv0', meta: { keepAlive: true, title: '汇入汇款' } },
{ path: 'cptadvgzth', component: () => import('./Cptadvgzth/views'), name: 'Cptadvgzth', meta: { keepAlive: true, title: '汇入汇款挂账退汇' ,module:'Remittance'} },
{ path: 'cptadvjfth', component: () => import('./Cptadvjfth/views'), name: 'Cptadvjfth', meta: { keepAlive: true, title: '汇入汇款解付后退汇',module:'Remittance' } },
{ path: 'cptopn', component: () => import('./Cptopn/views'), name: 'Cptopn', meta: { keepAlive: true, title: '汇出汇款申请', module: 'Remittance'} },
{ path: 'fdhopn', component: () => import('./Fdhopn/views'), name: 'Fdhopn', meta: { keepAlive: true, title: '非电汇汇出汇款',module: 'Remittance' } },
// { path: 'cptcpi', component: () => import('./Cptcpi/views'), name: 'cptcpi', meta: { keepAlive: true, title: '跨境人民币汇入汇款' } },
......
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