Commit 07776e71 by zhoujunpeng

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

parents 26e4b637 43a8b8e6
......@@ -12420,28 +12420,7 @@ const CodeTable = {
{ label: "金融机构代码", value: "14" },
{ label: "其他", value: "99" },
],
stacod: [
{ label: "等待自动清分", value: "A" },
{ label: "等待手工清分", value: "X" },
{ label: "等待发送", value: "W" },
{ label: "等待交换", value: "M" },
{ label: "疑似黑名单", value: "B" },
{ label: "黑名单忽略", value: "F" },
{ label: "退回报文编辑", value: "C" },
{ label: "报文编辑丢弃", value: "G" },
{ label: "待报文复核", value: "V" },
{ label: "报文等待放行", value: "L" },
{ label: "挂账状态", value: "H" },
{ label: "已处理", value: "D" },
{ label: "废弃", value: "Q" },
{ label: "已拒绝", value: "1" },
{ label: "已排队", value: "2" },
{ label: "已清算", value: "3" },
{ label: "已退回", value: "4" },
{ label: "发送异常", value: "E" },
{ label: "无需复核", value: "O" },
{ label: "待退报复核", value: "T" },
],
cpsfiltyp: [
{ label: "公共参数数据文件", value: "9" },
{ label: "公共参数数据变更信息文件", value: "10" },
......
......@@ -3,7 +3,7 @@
<c-button class="medium_bcs" size="medium" style="margin-left: 0" type="primary" @click="handleList">
历史记录
</c-button>
<p style="margin-top: 20px;border: 1px solid #333333;padding-10px;width: 100%;min-height: 500px;" v-html="model.msgdtll"></p>
<pre style="margin-top: 20px;border: 1px solid #333333;padding-10px;width: 100%;min-height: 500px;">{{model.msgdtll}}</pre>
<el-dialog v-if="visible" v-dialogDrag :visible="visible" :modal-append-to-body="false" :close-on-click-modal="true"
title="历史记录" destroy-on-close width="50%" @close="visible = false">
......
......@@ -15,7 +15,7 @@
<c-button class="medium_bcs" size="medium" style="margin-left: 40px" type="primary" @click="handleReSkip">
取消忽略
</c-button>
<p style="margin-top: 20px;border: 1px solid #333333;padding-10px;width: 100%;min-height: 500px;" v-html="model.msgdtll"></p>
<pre style="margin-top: 20px;border: 1px solid #333333;padding-10px;width: 100%;min-height: 500px;">{{model.msgdtll}}</pre>
<el-dialog v-if="visible" v-dialogDrag :visible="visible" :modal-append-to-body="false" :close-on-click-modal="true"
title="历史记录" destroy-on-close width="50%" @close="visible = false">
......@@ -37,12 +37,12 @@
</el-table-column>
<el-table-column prop="prvsta" label="处理前状态" width="150">
<template slot-scope="scope">
<c-select-value-to-label v-model="scope.row.prvsta" :code="codes.msgsta"></c-select-value-to-label>
<c-select-value-to-label v-model="scope.row.prvsta" :code="codes.stacod"></c-select-value-to-label>
</template>
</el-table-column>
<el-table-column prop="sta" label="处理状态" width="150">
<template slot-scope="scope">
<c-select-value-to-label v-model="scope.row.sta" :code="codes.msgsta"></c-select-value-to-label>
<c-select-value-to-label v-model="scope.row.sta" :code="codes.stacod"></c-select-value-to-label>
</template>
</el-table-column>
<el-table-column prop="txt" label="备注">
......@@ -121,7 +121,7 @@ export default {
let params = {
mpsinr: this.$route.query.mpsinr || "",
}
const rtnmsg = await Api.post(`/${this.moduleRouter()}/${this.trnName}/msghis`, params);
const rtnmsg = await Api.post(`/${this.moduleRouter()}/msgdtl/msghis`, params);
if (rtnmsg.respCode === SUCCESS) {
this.visible = true
this.model.mdtp.mdtmod.mpelst = rtnmsg.data
......
......@@ -44,6 +44,7 @@ export default {
rules: Check,
codes: {
chncod: CodeTable.chncod,
stacod: CodeTable.stacod,
clrsys: CodeTable.clrsys,
gpicod: CodeTable.gpicod,
msgsta: CodeTable.msgsta,
......
......@@ -10,8 +10,8 @@
丢弃
</c-button>
<div style="width: 100%;height: calc(100% - 50px); display: flex;align-item: center;justify-content: space-between;">
<p style="margin-top: 20px;border: 1px solid #333333;width: 49%;height: 100%;overflow: auto;" v-html="model.msgdtll"></p>
<p style="margin-top: 20px;border: 1px solid #333333;width: 49%;height: 100%;overflow: auto;" v-html="model.msgdtlll"></p>
<pre style="margin-top: 20px;border: 1px solid #333333;width: 49%;height: 100%;overflow: auto;" >{{model.msgdtll}}</pre>
<pre style="margin-top: 20px;border: 1px solid #333333;width: 49%;height: 100%;overflow: auto;" >{{model.msgdtlll}}</pre>
</div>
<el-dialog v-if="visible" v-dialogDrag :visible="visible" :modal-append-to-body="false" :close-on-click-modal="true"
......@@ -34,12 +34,12 @@
</el-table-column>
<el-table-column prop="prvsta" label="处理前状态" width="150">
<template slot-scope="scope">
<c-select-value-to-label v-model="scope.row.prvsta" :code="codes.msgsta"></c-select-value-to-label>
<c-select-value-to-label v-model="scope.row.prvsta" :code="codes.stacod"></c-select-value-to-label>
</template>
</el-table-column>
<el-table-column prop="sta" label="处理状态" width="150">
<template slot-scope="scope">
<c-select-value-to-label v-model="scope.row.sta" :code="codes.msgsta"></c-select-value-to-label>
<c-select-value-to-label v-model="scope.row.sta" :code="codes.stacod"></c-select-value-to-label>
</template>
</el-table-column>
<el-table-column prop="txt" label="备注">
......@@ -102,7 +102,7 @@ export default {
let params = {
mpsinr: this.$route.query.mpsinr || "",
}
const rtnmsg = await Api.post(`/${this.moduleRouter()}/${this.trnName}/msghis`, params);
const rtnmsg = await Api.post(`/${this.moduleRouter()}/msgdtl/msghis`, params);
if (rtnmsg.respCode === SUCCESS) {
this.visible = true
this.model.mdtp.mdtmod.mpelst = rtnmsg.data
......
......@@ -44,6 +44,7 @@ export default {
rules: Check,
codes: {
chncod: CodeTable.chncod,
stacod: CodeTable.stacod,
clrsys: CodeTable.clrsys,
gpicod: CodeTable.gpicod,
msgsta: CodeTable.msgsta,
......
......@@ -10,7 +10,7 @@
丢弃
</c-button> -->
<p style="margin-top: 20px;border: 1px solid #333333;padding-10px;width: 100%;min-height: 500px;" v-html="model.msgdtll"></p>
<pre style="margin-top: 20px;border: 1px solid #333333;padding-10px;width: 100%;min-height: 500px;">{{model.msgdtll}}</pre>
<el-dialog v-if="visible" v-dialogDrag :visible="visible" :modal-append-to-body="false" :close-on-click-modal="true"
title="历史记录" destroy-on-close width="50%" @close="visible = false">
......@@ -32,12 +32,12 @@
</el-table-column>
<el-table-column prop="prvsta" label="处理前状态" width="150">
<template slot-scope="scope">
<c-select-value-to-label v-model="scope.row.prvsta" :code="codes.msgsta"></c-select-value-to-label>
<c-select-value-to-label v-model="scope.row.prvsta" :code="codes.stacod"></c-select-value-to-label>
</template>
</el-table-column>
<el-table-column prop="sta" label="处理状态" width="150">
<template slot-scope="scope">
<c-select-value-to-label v-model="scope.row.sta" :code="codes.msgsta"></c-select-value-to-label>
<c-select-value-to-label v-model="scope.row.sta" :code="codes.stacod"></c-select-value-to-label>
</template>
</el-table-column>
<el-table-column prop="txt" label="备注">
......@@ -100,7 +100,7 @@ export default {
let params = {
mpsinr: this.$route.query.mpsinr || "",
}
const rtnmsg = await Api.post(`/${this.moduleRouter()}/${this.trnName}/msghis`, params);
const rtnmsg = await Api.post(`/${this.moduleRouter()}/msgdtl/msghis`, params);
if (rtnmsg.respCode === SUCCESS) {
this.visible = true
this.model.mdtp.mdtmod.mpelst = rtnmsg.data
......
......@@ -44,6 +44,7 @@ export default {
rules: Check,
codes: {
chncod: CodeTable.chncod,
stacod: CodeTable.stacod,
clrsys: CodeTable.clrsys,
gpicod: CodeTable.gpicod,
msgsta: CodeTable.msgsta,
......
......@@ -9,7 +9,7 @@
<c-button class="medium_bcs" size="medium" style="margin-left: 40px" type="primary" @click="handleReject">
丢弃
</c-button>
<p style="margin-top: 20px;border: 1px solid #333333;padding-10px;width: 100%;min-height: 500px;" v-html="model.msgdtll"></p>
<pre style="margin-top: 20px;border: 1px solid #333333;padding-10px;width: 100%;min-height: 500px;">{{model.msgdtll}}</pre>
<el-dialog v-if="visible" v-dialogDrag :visible="visible" :modal-append-to-body="false" :close-on-click-modal="true"
title="历史记录" destroy-on-close width="50%" @close="visible = false">
......@@ -31,12 +31,12 @@
</el-table-column>
<el-table-column prop="prvsta" label="处理前状态" width="150">
<template slot-scope="scope">
<c-select-value-to-label v-model="scope.row.prvsta" :code="codes.msgsta"></c-select-value-to-label>
<c-select-value-to-label v-model="scope.row.prvsta" :code="codes.stacod"></c-select-value-to-label>
</template>
</el-table-column>
<el-table-column prop="sta" label="处理状态" width="150">
<template slot-scope="scope">
<c-select-value-to-label v-model="scope.row.sta" :code="codes.msgsta"></c-select-value-to-label>
<c-select-value-to-label v-model="scope.row.sta" :code="codes.stacod"></c-select-value-to-label>
</template>
</el-table-column>
<el-table-column prop="txt" label="备注">
......@@ -99,7 +99,7 @@ export default {
let params = {
mpsinr: this.$route.query.mpsinr || "",
}
const rtnmsg = await Api.post(`/${this.moduleRouter()}/${this.trnName}/msghis`, params);
const rtnmsg = await Api.post(`/${this.moduleRouter()}/msgdtl/msghis`, params);
if (rtnmsg.respCode === SUCCESS) {
this.visible = true
this.model.mdtp.mdtmod.mpelst = rtnmsg.data
......
......@@ -44,6 +44,7 @@ export default {
rules: Check,
codes: {
chncod: CodeTable.chncod,
stacod: CodeTable.stacod,
clrsys: CodeTable.clrsys,
gpicod: CodeTable.gpicod,
msgsta: CodeTable.msgsta,
......@@ -67,7 +68,7 @@ export default {
if (rtnmsg.respCode === SUCCESS) {
this.model.msgdtll = rtnmsg.data
}
}
}
}
</script>
<style></style>
import Api from "~/service/Api";
import getSubtyp from '~/page/Frontend/Rcvsel/event/getSubtyp.js';
import moment from "moment";
import Msgrtm from "../model";
import Utils from "~/utils";
export default {
mixins: [getSubtyp],
methods: {
......@@ -61,23 +62,9 @@ export default {
this.load = false;
},
async handleReset() {
this.model.sndp.msgtyp = "";
this.model.sndp.rcvdatsta = new Date();
this.model.sndp.rcvdatend = new Date();
this.model.sndp.subtyp = "";
this.model.sndp.sndbak = "";
this.model.sndp.revbak = "";
this.model.sndp.actbic = "";
this.model.sndp.othref = "";
this.model.sndp.ownref = "";
this.model.sndp.cur = "";
this.model.sndp.act = "";
this.model.sndp.amtmin = "";
this.model.sndp.amtmax = "";
this.model.sndp.chnipt = "";
this.model.sndp.rspsta = "";
this.model.sndp.dtlchg = "";
this.model.sndp.sta = "";
let resetModel = new Msgrtm().data
Utils.copyValueFromVoData(this.model, resetModel);
this.handleSearch();
},
// pageSize改变
handleSizeChange(val) {
......
import Utils from "~/utils"
export default {
"sndp.rcvdatsta": [
{ type: "date", required: false, message: "输入正确的日期" }
],
"sndp.rcvdatend": [
{ type: "date", required: false, message: "输入正确的日期" }
],
/**
* Sndsel Check规则
*/
let checkObj = {
"sndp.rcvdatend" :null,
"sndp.othref" :null,
"sndp.amtmax" :null,
"sndp.msgtyp" :null,
"sndp.ownref" :null,
"sndp.revbak" :null,
"sndp.sndbak" :null,
"sndp.actbic" :null,
"sndp.amtmin" :null,
"sndp.rcvdatsta" :null,
}
"sndp.sndbak": [
{ type: "string", required: false, message: "必输项" },
{ max: 0, message: "长度不能超过0" }
],
"sndp.revbak": [
{ type: "string", required: false, message: "必输项" },
{ max: 0, message: "长度不能超过0" }
],
"sndp.actbic": [
{ type: "string", required: false, message: "必输项" },
{ max: 0, message: "长度不能超过0" }
],
"sndp.ownref": [
{ type: "string", required: false, message: "必输项" },
{ max: 0, message: "长度不能超过0" }
],
"sndp.othref": [
{ type: "string", required: false, message: "必输项" },
{ max: 0, message: "长度不能超过0" }
],
for (const key in checkObj) {
if (Object.hasOwnProperty.call(checkObj, key)) {
checkObj[key] = checkObj[key] ? checkObj[key] : Utils.reflectCheck(key)
}
}
export default checkObj
"sndp.act": [
{ type: "string", required: false, message: "必输项" },
{ max: 0, message: "长度不能超过0" }
],
"sndp.amtmin": [
{ type: "string", required: false, message: "必输项" },
{ max: 18, message: "长度不能超过18" }
],
"sndp.amtmax": [
{ type: "string", required: false, message: "必输项" },
{ max: 18, message: "长度不能超过18" }
],
"sndp.usrnam": [
{ type: "string", required: false, message: "必输项" },
{ max: 0, message: "长度不能超过0" }
],
}
\ No newline at end of file
/**
* Sndsel Default规则
*/
import Api from "~/service/Api";
import Utils from "~/utils/index"
export default {
}
//你可以添加自动default处理
export default {
"sndp.rcvdatsta":[
{type: "date", required: false, message: "输入正确的日期"}
],
"sndp.rcvdatend":[
{type: "date", required: false, message: "输入正确的日期"}
],
"sndp.sndbak":[
{type: "string", required: false, message: "必输项"},
{max: 0,message:"长度不能超过0"}
],
"sndp.revbak":[
{type: "string", required: false, message: "必输项"},
{max: 0,message:"长度不能超过0"}
],
"sndp.actbic":[
{type: "string", required: false, message: "必输项"},
{max: 0,message:"长度不能超过0"}
],
"sndp.ownref":[
{type: "string", required: false, message: "必输项"},
{max: 0,message:"长度不能超过0"}
],
"sndp.othref":[
{type: "string", required: false, message: "必输项"},
{max: 0,message:"长度不能超过0"}
],
"sndp.act":[
{type: "string", required: false, message: "必输项"},
{max: 0,message:"长度不能超过0"}
],
"sndp.amtmin":[
{type: "string", required: false, message: "必输项"},
{max: 18,message:"长度不能超过18"}
],
"sndp.amtmax":[
{type: "string", required: false, message: "必输项"},
{max: 18,message:"长度不能超过18"}
],
"sndp.usrnam":[
{type: "string", required: false, message: "必输项"},
{max: 0,message:"长度不能超过0"}
],
}
\ No newline at end of file
import Api from "~/service/Api"
export default class Sndsel{
constructor () {
export default class Msgrtm {
constructor() {
this.data = {
sndp:{
sndp: {
rcvdatsta: new Date((new Date).getTime() - (3 * 24 * 60 * 60 * 1000)), // : 起始日期
rcvdatend: new Date(), // : 截止日期
msgtyp:"", // : 报文标准
subtyp:"", // : 报文类型
sndbak:"", // : 发报行BIC
revbak:"", // : 收报行BIC
actbic:"", // : 账户行
othref:"", // : 21域编号
ownref:"", // : 20域编
cur:"", // : 币种
act:"", // : 账号
amtmin:"", // : 金额下限
amtmax:"", // : 金额上限
chnipt:"", // 行内系统 .sndp.chnipt
rspsta:"", // 回执状态 .sndp.rspsta
tblrsp:"", // 回执状态标签 .sndp.tblrsp
tblrsm:"", // 回执状态标签 .sndp.tblrsm
usrnam:"", // 操作员 .sndp.usrnam
starsp:"", // 处理状态标签 .sndp.starsp
starsm:"", // 处理状态标签 .sndp.starsm
sta:"", // 处理状态 .sndp.sta
dtlchg:"", // : 费用明细
starsp1:"", // 处理状态标签1 .sndp.starsp1
starsm1:"", // 处理状态标签1 .sndp.starsm1
sta1:"", // 处理状态1 .sndp.sta1
expexl:"", // 导出 .sndp.expexl
expexl2:"", // 3910导出 .sndp.expexl2
msgtyp: "", // : 报文标准
subtyp: "", // : 报文类型
sndbak: "", // : 发报行BIC
revbak: "", // : 收报行BIC
actbic: "", // : 账户行
othref: "", // : 21域编号
ownref: "", // : 20域编
cur: "", // : 币种
act: "", // : 账号
amtmin: "", // : 金额下限
amtmax: "", // : 金额上限
chnipt: "", // 行内系统 .sndp.chnipt
rspsta: "", // 回执状态 .sndp.rspsta
tblrsp: "", // 回执状态标签 .sndp.tblrsp
tblrsm: "", // 回执状态标签 .sndp.tblrsm
usrnam: "", // 操作员 .sndp.usrnam
starsp: "", // 处理状态标签 .sndp.starsp
starsm: "", // 处理状态标签 .sndp.starsm
sta: "", // 处理状态 .sndp.sta
dtlchg: "", // : 费用明细
starsp1: "", // 处理状态标签1 .sndp.starsp1
starsm1: "", // 处理状态标签1 .sndp.starsm1
sta1: "", // 处理状态1 .sndp.sta1
expexl: "", // 导出 .sndp.expexl
expexl2: "", // 3910导出 .sndp.expexl2
},
msggrp:{
rcvlst:[], // .msggrp.rcvlst
msggrp: {
rcvlst: [], // .msggrp.rcvlst
},
pageId: "" // ctx的key
}
}
}
\ No newline at end of file
......@@ -7,7 +7,8 @@
<c-col :span="24">
<c-col :span="8">
<el-form-item label="报文标准" prop="msgtyp" style="width: 100%">
<c-select v-model="model.sndp.msgtyp" style="width: 100%" placeholder="请选择货押标识" :code="codes.msgtyp3" @change="getSubtyp(model.sndp.msgtyp, 'sndp.subtyp')">
<c-select v-model="model.sndp.msgtyp" style="width: 100%" placeholder="请选择货押标识" :code="codes.msgtyp3"
@change="getSubtyp(model.sndp.msgtyp, 'sndp.subtyp')">
</c-select>
</el-form-item>
</c-col>
......@@ -129,11 +130,11 @@
</c-list-search>
<el-col :span="24" style="margin-top: 2px;margin-bottom: 1px;">
<c-button :disabled="isFoldDisable" class="medium_bcs" size="medium" style="margin-left: 0"
type="primary" >{{ $t('public.归档') }}
<c-button :disabled="isFoldDisable" class="medium_bcs" size="medium" style="margin-left: 0" type="primary">{{
$t('public.归档') }}
</c-button>
<c-button :disabled="isRoutingDisable" class="medium_bcs" size="medium"
style="margin-left: 20" type="primary">ReRouting
<c-button :disabled="isRoutingDisable" class="medium_bcs" size="medium" style="margin-left: 20"
type="primary">ReRouting
</c-button>
<c-button class="medium_bcs" size="medium" style="margin-left: 20" type="primary">
{{ $t('public.导出Excel') }}
......@@ -146,15 +147,15 @@
<el-tabs v-model="activeTab" class="y-tabs">
<el-tab-pane label="发报查询" name="fb">
<el-table :data="stmData.data" :columns="stmData.columns" v-loading="load" style="width: 100%"
@selection-change="handleSelectionChange"
@row-dblclick="dbClickRow"
size="small" :border="true" height="calc(100vh - 420px)" :highlight-current-row="true">
@selection-change="handleSelectionChange" @row-dblclick="dbClickRow" size="small" :border="true"
height="calc(100vh - 420px)" :highlight-current-row="true">
<el-table-column type="selection" width="55">
</el-table-column>
<el-table-column v-for="(item, key) in stmData.columns" :key="key" :label="item.label" :prop="item.prop"
:min-width="item.width">
<template slot-scope="scope">
<c-select-value-to-label v-if="item.prop == 'sta'" v-model="scope.row.sta" :code="codes.stacod"></c-select-value-to-label>
<span v-else-if="item.prop == 'amt'">{{ moneyFormat(scope.row.amt, scope.row.cur) }}</span>
<span v-else>{{ scope.row[item.prop] }}</span>
</template>
</el-table-column>
......@@ -183,18 +184,18 @@ export default {
activeTab: 'fb',
load: false,
subtypCodes: [],
multipleSelection:[],
multipleSelection: [],
stmData: {
columns: [
{
label: "起息日",
prop: "valdat",
width: "150px"
width: "120px"
},
{
label: "20域编号",
prop: "ownref",
width: "150px"
width: "120px"
},
{
label: "21域名编号",
......@@ -204,17 +205,17 @@ export default {
{
label: "币种",
prop: "cur",
width: "100px"
width: "80px"
},
{
label: "金额",
prop: "amt",
width: "100px"
width: "120px"
},
{
label: "账号",
prop: "act",
width: "100px"
width: "150px"
},
{
label: "费用明细",
......@@ -259,17 +260,17 @@ export default {
{
label: "报文标准",
prop: "msgtyp",
width: "150px"
width: "120px"
},
{
label: "GPI标识",
prop: "gpi",
width: "150px"
width: "120px"
},
{
label: "子系统",
prop: "zxt",
width: "100px"
width: "120px"
},
{
label: "处理时间",
......@@ -287,11 +288,11 @@ export default {
},
};
},
computed:{
isFoldDisable: function(){
computed: {
isFoldDisable: function () {
return this.multipleSelection.length == 0;
} ,
isRoutingDisable:function(){
},
isRoutingDisable: function () {
return this.multipleSelection.length == 0;
}
},
......
......@@ -18,28 +18,26 @@
<script>
import CodeTable from "~/config/CodeTable";
import Sndsel from "../model";
import Msgrtm from "../model";
import event from "../event"
import Schpnl from "./Schpnl.vue"
export default {
name: "Msgrtm",
components:{
"m-schpnl" : Schpnl,
},
provide() {
return {
root: this
}
},
mixins: [event], // 里面包含了Default、Check等的公共处理
mixins: [event],
data(){
return {
tabVal: "schpnl",
trnName: "sndsel",
model: new Sndsel().data,
trnName: "msgrtm",
model: new Msgrtm().data,
rules: null,
codes:{...CodeTable},
};
......
import Api from "@/service/Api";
import getSubtyp from '~/page/Frontend/Rcvsel/event/getSubtyp.js';
import moment from "moment";
import Msgsep from "../model";
import Utils from "~/utils";
export default {
mixins: [getSubtyp],
methods: {
......@@ -61,23 +62,9 @@ export default {
this.load = false;
},
async handleReset() {
this.model.sndp.msgtyp = "";
this.model.sndp.rcvdatsta = new Date();
this.model.sndp.rcvdatend = new Date();
this.model.sndp.subtyp = "";
this.model.sndp.sndbak = "";
this.model.sndp.revbak = "";
this.model.sndp.actbic = "";
this.model.sndp.othref = "";
this.model.sndp.ownref = "";
this.model.sndp.cur = "";
this.model.sndp.act = "";
this.model.sndp.amtmin = "";
this.model.sndp.amtmax = "";
this.model.sndp.chnipt = "";
this.model.sndp.rspsta = "";
this.model.sndp.dtlchg = "";
this.model.sndp.sta = "";
let resetModel = new Msgsep().data
Utils.copyValueFromVoData(this.model, resetModel);
this.handleSearch();
},
// pageSize改变
handleSizeChange(val) {
......
......@@ -36,7 +36,6 @@ export default class Msgsep {
msggrp: {
rcvlst: [], // .msggrp.rcvlst
},
pageId: "" // ctx的key
}
}
}
\ No newline at end of file
......@@ -7,7 +7,8 @@
<c-col :span="24">
<c-col :span="8">
<el-form-item label="报文标准" prop="sndp.msgtyp" style="width: 100%">
<c-select v-model="model.sndp.msgtyp" style="width: 100%" placeholder="请选择货押标识" :code="codes.msgtyp3" @change="getSubtyp(model.sndp.msgtyp, 'sndp.subtyp')">
<c-select v-model="model.sndp.msgtyp" style="width: 100%" placeholder="请选择货押标识" :code="codes.msgtyp3"
@change="getSubtyp(model.sndp.msgtyp, 'sndp.subtyp')">
</c-select>
</el-form-item>
</c-col>
......@@ -129,11 +130,11 @@
</c-list-search>
<el-col :span="24" style="margin-top: 2px;margin-bottom: 1px;">
<c-button :disabled="isFoldDisable" class="medium_bcs" size="medium" style="margin-left: 0"
type="primary" >{{ $t('public.归档') }}
<c-button :disabled="isFoldDisable" class="medium_bcs" size="medium" style="margin-left: 0" type="primary">{{
$t('public.归档') }}
</c-button>
<c-button :disabled="isRoutingDisable" class="medium_bcs" size="medium"
style="margin-left: 20" type="primary">ReRouting
<c-button :disabled="isRoutingDisable" class="medium_bcs" size="medium" style="margin-left: 20"
type="primary">ReRouting
</c-button>
<c-button class="medium_bcs" size="medium" style="margin-left: 20" type="primary">
{{ $t('public.导出Excel') }}
......@@ -146,14 +147,14 @@
<el-tabs v-model="activeTab" class="y-tabs">
<el-tab-pane label="报文失败处理" name="fb">
<el-table :data="stmData.data" :columns="stmData.columns" v-loading="load" style="width: 100%"
@selection-change="handleSelectionChange"
@row-dblclick="dbClickRow"
size="small" :border="true" height="calc(100vh - 420px)" :highlight-current-row="true">
<el-table-column type="selection" width="55">
</el-table-column>
<el-table-column v-for="(item, key) in stmData.columns" :key="key" :label="item.label" :prop="item.prop" :min-width="item.width">
@selection-change="handleSelectionChange" @row-dblclick="dbClickRow" size="small" :border="true"
height="calc(100vh - 420px)" :highlight-current-row="true">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column v-for="(item, key) in stmData.columns" :key="key" :label="item.label" :prop="item.prop"
:min-width="item.width">
<template slot-scope="scope">
<c-select-value-to-label v-if="item.prop == 'sta'" v-model="scope.row.sta" :code="codes.stacod"></c-select-value-to-label>
<span v-else-if="item.prop == 'amt'">{{ moneyFormat(scope.row.amt, scope.row.cur) }}</span>
<span v-else>{{ scope.row[item.prop] }}</span>
</template>
</el-table-column>
......@@ -182,18 +183,18 @@ export default {
activeTab: 'fb',
load: false,
subtypCodes: [],
multipleSelection:[],
multipleSelection: [],
stmData: {
columns: [
{
label: "起息日",
prop: "valdat",
width: "150px"
width: "120px"
},
{
label: "20域编号",
prop: "ownref",
width: "150px"
width: "120px"
},
{
label: "21域名编号",
......@@ -203,17 +204,17 @@ export default {
{
label: "币种",
prop: "cur",
width: "100px"
width: "80px"
},
{
label: "金额",
prop: "amt",
width: "100px"
width: "120px"
},
{
label: "账号",
prop: "act",
width: "100px"
width: "150px"
},
{
label: "费用明细",
......@@ -223,7 +224,7 @@ export default {
{
label: "报文类型",
prop: "subtyp",
width: "120px"
width: "150px"
},
{
label: "行内系统",
......@@ -258,17 +259,17 @@ export default {
{
label: "报文标准",
prop: "msgtyp",
width: "150px"
width: "120px"
},
{
label: "GPI标识",
prop: "gpi",
width: "150px"
width: "120px"
},
{
label: "子系统",
prop: "zxt",
width: "150px"
width: "120px"
},
{
label: "处理时间",
......@@ -286,11 +287,11 @@ export default {
},
};
},
computed:{
isFoldDisable: function(){
computed: {
isFoldDisable: function () {
return this.multipleSelection.length == 0;
} ,
isRoutingDisable:function(){
},
isRoutingDisable: function () {
return this.multipleSelection.length == 0;
}
},
......
......@@ -22,19 +22,17 @@ import Msgsep from "../model";
import event from "../event"
import Mainp from "./Mainp.vue"
export default {
name: "Msgsep",
components:{
"m-mainp" : Mainp,
},
provide() {
return {
root: this
}
},
mixins: [event], // 里面包含了Default、Check等的公共处理
mixins: [event],
data(){
return {
tabVal: "mainp",
......
import Api from "~/service/Api";
import getSubtyp from '~/page/Frontend/Rcvsel/event/getSubtyp.js';
import moment from "moment";
import Rcvsel from "../model";
import Utils from "~/utils";
export default {
mixins: [getSubtyp],
methods: {
......@@ -26,7 +27,7 @@ export default {
this.load = true;
let rtnmsg = await Api.post("/frontend/msgsel/query", {
...this.model.rcvp,
dir: "<",
dir: ">",
querytyp: "rcvblk",
pageNum: this.pagination.pageNum,
pageSize: this.pagination.pageSize,
......@@ -61,24 +62,9 @@ export default {
this.load = false;
},
async handleReset() {
this.model.rcvp.msgtyp = "";
this.model.rcvp.rcvdatsta = new Date();
this.model.rcvp.rcvdatend = new Date();
this.model.rcvp.subtyp = "";
this.model.rcvp.sndbak = "";
this.model.rcvp.revbak = "";
this.model.rcvp.actbic = "";
this.model.rcvp.othref = "";
this.model.rcvp.ownref = "";
this.model.rcvp.cur = "";
this.model.rcvp.act = "";
this.model.rcvp.amtmin = "";
this.model.rcvp.amtmax = "";
this.model.rcvp.chnipt = "";
this.model.rcvp.rspsta = "";
this.model.rcvp.dtlchg = "";
this.model.rcvp.sta = "";
this.model.rcvp.gpi = "";
let resetModel = new Rcvsel().data
Utils.copyValueFromVoData(this.model, resetModel);
this.handleSearch();
},
// pageSize改变
handleSizeChange(val) {
......
import Utils from "~/utils"
export default {
/**
* Rcvselblk Check规则
*/
let checkObj = {
"rcvp.sndbak" :null,
"rcvp.actbic" :null,
"rcvp.revbak" :null,
"rcvp.msgtyp" :null,
"rcvp.othref" :null,
"rcvp.rcvdatend" :null,
"rcvp.ownref" :null,
"rcvp.amtmax" :null,
"rcvp.amtmin" :null,
"rcvp.rcvdatsta" :null,
"rcvp.rcvdatsta": [
{ type: "date", required: false, message: "输入正确的日期" }
],
"rcvp.rcvdatend": [
{ type: "date", required: false, message: "输入正确的日期" }
],
"rcvp.sndbak": [
{ type: "string", required: false, message: "必输项" },
{ max: 0, message: "长度不能超过0" }
],
"rcvp.revbak": [
{ type: "string", required: false, message: "必输项" },
{ max: 0, message: "长度不能超过0" }
],
"rcvp.actbic": [
{ type: "string", required: false, message: "必输项" },
{ max: 0, message: "长度不能超过0" }
],
"rcvp.othref": [
{ type: "string", required: false, message: "必输项" },
{ max: 0, message: "长度不能超过0" }
],
"rcvp.ownref": [
{ type: "string", required: false, message: "必输项" },
{ max: 0, message: "长度不能超过0" }
],
}
"rcvp.act": [
{ type: "string", required: false, message: "必输项" },
{ max: 0, message: "长度不能超过0" }
],
for (const key in checkObj) {
if (Object.hasOwnProperty.call(checkObj, key)) {
checkObj[key] = checkObj[key] ? checkObj[key] : Utils.reflectCheck(key)
}
"rcvp.amtmin": [
{ type: "string", required: false, message: "必输项" },
{ max: 18, message: "长度不能超过18" }
],
"rcvp.amtmax": [
{ type: "string", required: false, message: "必输项" },
{ max: 18, message: "长度不能超过18" }
],
}
\ No newline at end of file
export default checkObj
/**
* Rcvselblk Default规则
*/
import Api from "~/service/Api";
import Utils from "~/utils/index"
export default {
}
//你可以添加自动default处理
export default {
"rcvp.rcvdatsta":[
{type: "date", required: false, message: "输入正确的日期"}
],
"rcvp.rcvdatend":[
{type: "date", required: false, message: "输入正确的日期"}
],
"rcvp.sndbak":[
{type: "string", required: false, message: "必输项"},
{max: 0,message:"长度不能超过0"}
],
"rcvp.revbak":[
{type: "string", required: false, message: "必输项"},
{max: 0,message:"长度不能超过0"}
],
"rcvp.actbic":[
{type: "string", required: false, message: "必输项"},
{max: 0,message:"长度不能超过0"}
],
"rcvp.othref":[
{type: "string", required: false, message: "必输项"},
{max: 0,message:"长度不能超过0"}
],
"rcvp.ownref":[
{type: "string", required: false, message: "必输项"},
{max: 0,message:"长度不能超过0"}
],
"rcvp.act":[
{type: "string", required: false, message: "必输项"},
{max: 0,message:"长度不能超过0"}
],
"rcvp.amtmin":[
{type: "string", required: false, message: "必输项"},
{max: 18,message:"长度不能超过18"}
],
"rcvp.amtmax":[
{type: "string", required: false, message: "必输项"},
{max: 18,message:"长度不能超过18"}
],
}
\ No newline at end of file
......@@ -28,7 +28,6 @@ export default class Rcvsel {
msggrp: {
rcvlst: [], // .msggrp.rcvlst
},
pageId: "" // ctx的key
}
}
}
\ No newline at end of file
......@@ -7,7 +7,7 @@
<c-col :span="24">
<c-col :span="8">
<el-form-item label="报文标准" prop="msgtyp" style="width: 100%">
<c-select v-model="model.rcvp.msgtyp" style="width: 100%" placeholder="请选择货押标识" :code="codes.msgtyp3" @change="getSubtyp(model.rcvp.msgtyp, 'rcvp.subtyp')">
<c-select v-model="model.rcvp.msgtyp" style="width: 100%" placeholder="请选择报文标准" :code="codes.msgtyp3" @change="getSubtyp(model.rcvp.msgtyp, 'rcvp.subtyp')">
</c-select>
</el-form-item>
</c-col>
......@@ -153,7 +153,7 @@
<div>
<c-col :span="24">
<el-tabs v-model="activeTab" class="y-tabs">
<el-tab-pane label="报查询" name="sb">
<el-tab-pane label="报查询" name="sb">
<el-table :data="stmData.data" :columns="stmData.columns" v-loading="load" style="width: 100%"
@selection-change="handleSelectionChange"
@row-dblclick="dbClickRow"
......@@ -164,6 +164,7 @@
:min-width="item.width">
<template slot-scope="scope">
<c-select-value-to-label v-if="item.prop == 'sta'" v-model="scope.row.sta" :code="codes.stacod"></c-select-value-to-label>
<span v-else-if="item.prop == 'amt'">{{ moneyFormat(scope.row.amt, scope.row.cur) }}</span>
<span v-else>{{ scope.row[item.prop] }}</span>
</template>
</el-table-column>
......@@ -199,12 +200,12 @@ export default {
{
label: "起息日",
prop: "valdat",
width: "150px"
width: "120px"
},
{
label: "20域编号",
prop: "ownref",
width: "150px"
width: "120px"
},
{
label: "21域名编号",
......@@ -214,17 +215,17 @@ export default {
{
label: "币种",
prop: "cur",
width: "100px"
width: "80px"
},
{
label: "金额",
prop: "amt",
width: "100px"
width: "120px"
},
{
label: "账号",
prop: "act",
width: "100px"
width: "150px"
},
{
label: "费用明细",
......@@ -234,7 +235,7 @@ export default {
{
label: "报文类型",
prop: "subtyp",
width: "120px"
width: "150px"
},
{
label: "行内系统",
......@@ -269,17 +270,17 @@ export default {
{
label: "报文标准",
prop: "msgtyp",
width: "150px"
width: "120px"
},
{
label: "GPI标识",
prop: "gpi",
width: "150px"
width: "120px"
},
{
label: "子系统",
prop: "zxt",
width: "100px"
width: "120px"
},
{
label: "接收时间",
......
......@@ -18,28 +18,26 @@
<script>
import CodeTable from "~/config/CodeTable";
import Sndsel from "../model";
import Rcvsel from "../model";
import event from "../event"
import Schpnl from "./Schpnl.vue"
export default {
name: "Rcvselblk",
components:{
"m-schpnl" : Schpnl,
},
provide() {
return {
root: this
}
},
mixins: [event], // 里面包含了Default、Check等的公共处理
mixins: [event],
data(){
return {
tabVal: "schpnl",
trnName: "sndsel",
model: new Sndsel().data,
model: new Rcvsel().data,
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