Commit 5e9b7d46 by 李少勇

msgrtm和rcvselblk交易优化修改

parent 05e59a00
import Api from "~/service/Api"; import Api from "~/service/Api";
import getSubtyp from '~/page/Frontend/Rcvsel/event/getSubtyp.js'; import getSubtyp from '~/page/Frontend/Rcvsel/event/getSubtyp.js';
import moment from "moment"; import moment from "moment";
import Msgrtm from "../model";
import Utils from "~/utils";
export default { export default {
mixins: [getSubtyp], mixins: [getSubtyp],
methods: { methods: {
...@@ -61,23 +62,9 @@ export default { ...@@ -61,23 +62,9 @@ export default {
this.load = false; this.load = false;
}, },
async handleReset() { async handleReset() {
this.model.sndp.msgtyp = ""; let resetModel = new Msgrtm().data
this.model.sndp.rcvdatsta = new Date(); Utils.copyValueFromVoData(this.model, resetModel);
this.model.sndp.rcvdatend = new Date(); this.handleSearch();
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 = "";
}, },
// pageSize改变 // pageSize改变
handleSizeChange(val) { handleSizeChange(val) {
......
import Utils from "~/utils" export default {
"sndp.rcvdatsta": [
{ type: "date", required: false, message: "输入正确的日期" }
],
"sndp.rcvdatend": [
{ type: "date", required: false, message: "输入正确的日期" }
],
/** "sndp.sndbak": [
* Sndsel Check规则 { type: "string", required: false, message: "必输项" },
*/ { max: 0, message: "长度不能超过0" }
let checkObj = { ],
"sndp.rcvdatend" :null, "sndp.revbak": [
"sndp.othref" :null, { type: "string", required: false, message: "必输项" },
"sndp.amtmax" :null, { max: 0, message: "长度不能超过0" }
"sndp.msgtyp" :null, ],
"sndp.ownref" :null, "sndp.actbic": [
"sndp.revbak" :null, { type: "string", required: false, message: "必输项" },
"sndp.sndbak" :null, { max: 0, message: "长度不能超过0" }
"sndp.actbic" :null, ],
"sndp.amtmin" :null, "sndp.ownref": [
"sndp.rcvdatsta" :null, { 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) { "sndp.act": [
if (Object.hasOwnProperty.call(checkObj, key)) { { type: "string", required: false, message: "必输项" },
checkObj[key] = checkObj[key] ? checkObj[key] : Utils.reflectCheck(key) { max: 0, message: "长度不能超过0" }
} ],
}
export default checkObj
"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" import Api from "~/service/Api"
export default class Sndsel{ export default class Msgrtm {
constructor () { constructor() {
this.data = { this.data = {
sndp:{ sndp: {
rcvdatsta: new Date((new Date).getTime() - (3 * 24 * 60 * 60 * 1000)), // : 起始日期 rcvdatsta: new Date((new Date).getTime() - (3 * 24 * 60 * 60 * 1000)), // : 起始日期
rcvdatend: new Date(), // : 截止日期 rcvdatend: new Date(), // : 截止日期
msgtyp:"", // : 报文标准 msgtyp: "", // : 报文标准
subtyp:"", // : 报文类型 subtyp: "", // : 报文类型
sndbak:"", // : 发报行BIC sndbak: "", // : 发报行BIC
revbak:"", // : 收报行BIC revbak: "", // : 收报行BIC
actbic:"", // : 账户行 actbic: "", // : 账户行
othref:"", // : 21域编号 othref: "", // : 21域编号
ownref:"", // : 20域编 ownref: "", // : 20域编
cur:"", // : 币种 cur: "", // : 币种
act:"", // : 账号 act: "", // : 账号
amtmin:"", // : 金额下限 amtmin: "", // : 金额下限
amtmax:"", // : 金额上限 amtmax: "", // : 金额上限
chnipt:"", // 行内系统 .sndp.chnipt chnipt: "", // 行内系统 .sndp.chnipt
rspsta:"", // 回执状态 .sndp.rspsta rspsta: "", // 回执状态 .sndp.rspsta
tblrsp:"", // 回执状态标签 .sndp.tblrsp tblrsp: "", // 回执状态标签 .sndp.tblrsp
tblrsm:"", // 回执状态标签 .sndp.tblrsm tblrsm: "", // 回执状态标签 .sndp.tblrsm
usrnam:"", // 操作员 .sndp.usrnam usrnam: "", // 操作员 .sndp.usrnam
starsp:"", // 处理状态标签 .sndp.starsp starsp: "", // 处理状态标签 .sndp.starsp
starsm:"", // 处理状态标签 .sndp.starsm starsm: "", // 处理状态标签 .sndp.starsm
sta:"", // 处理状态 .sndp.sta sta: "", // 处理状态 .sndp.sta
dtlchg:"", // : 费用明细 dtlchg: "", // : 费用明细
starsp1:"", // 处理状态标签1 .sndp.starsp1 starsp1: "", // 处理状态标签1 .sndp.starsp1
starsm1:"", // 处理状态标签1 .sndp.starsm1 starsm1: "", // 处理状态标签1 .sndp.starsm1
sta1:"", // 处理状态1 .sndp.sta1 sta1: "", // 处理状态1 .sndp.sta1
expexl:"", // 导出 .sndp.expexl expexl: "", // 导出 .sndp.expexl
expexl2:"", // 3910导出 .sndp.expexl2 expexl2: "", // 3910导出 .sndp.expexl2
}, },
msggrp:{ msggrp: {
rcvlst:[], // .msggrp.rcvlst rcvlst: [], // .msggrp.rcvlst
}, },
pageId: "" // ctx的key
}
} }
}
} }
\ No newline at end of file
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
<c-col :span="24"> <c-col :span="24">
<c-col :span="8"> <c-col :span="8">
<el-form-item label="报文标准" prop="msgtyp" style="width: 100%"> <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> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -129,16 +130,16 @@ ...@@ -129,16 +130,16 @@
</c-list-search> </c-list-search>
<el-col :span="24" style="margin-top: 2px;margin-bottom: 1px;"> <el-col :span="24" style="margin-top: 2px;margin-bottom: 1px;">
<c-button :disabled="isFoldDisable" class="medium_bcs" size="medium" style="margin-left: 0" <c-button :disabled="isFoldDisable" class="medium_bcs" size="medium" style="margin-left: 0" type="primary">{{
type="primary" >{{ $t('public.归档') }} $t('public.归档') }}
</c-button> </c-button>
<c-button :disabled="isRoutingDisable" class="medium_bcs" size="medium" <c-button :disabled="isRoutingDisable" class="medium_bcs" size="medium" style="margin-left: 20"
style="margin-left: 20" type="primary">ReRouting type="primary">ReRouting
</c-button> </c-button>
<c-button class="medium_bcs" size="medium" style="margin-left: 20" type="primary"> <c-button class="medium_bcs" size="medium" style="margin-left: 20" type="primary">
{{ $t('public.导出Excel') }} {{ $t('public.导出Excel') }}
</c-button> </c-button>
</el-col> </el-col>
<el-col :span="24" style="margin-top: 10px"> <el-col :span="24" style="margin-top: 10px">
<div> <div>
...@@ -146,15 +147,15 @@ ...@@ -146,15 +147,15 @@
<el-tabs v-model="activeTab" class="y-tabs"> <el-tabs v-model="activeTab" class="y-tabs">
<el-tab-pane label="发报查询" name="fb"> <el-tab-pane label="发报查询" name="fb">
<el-table :data="stmData.data" :columns="stmData.columns" v-loading="load" style="width: 100%" <el-table :data="stmData.data" :columns="stmData.columns" v-loading="load" style="width: 100%"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange" @row-dblclick="dbClickRow" size="small" :border="true"
@row-dblclick="dbClickRow" height="calc(100vh - 420px)" :highlight-current-row="true">
size="small" :border="true" height="calc(100vh - 420px)" :highlight-current-row="true"> <el-table-column type="selection" width="55">
<el-table-column type="selection" width="55">
</el-table-column> </el-table-column>
<el-table-column v-for="(item, key) in stmData.columns" :key="key" :label="item.label" :prop="item.prop" <el-table-column v-for="(item, key) in stmData.columns" :key="key" :label="item.label" :prop="item.prop"
:min-width="item.width"> :min-width="item.width">
<template slot-scope="scope"> <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> <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> <span v-else>{{ scope.row[item.prop] }}</span>
</template> </template>
</el-table-column> </el-table-column>
...@@ -183,18 +184,18 @@ export default { ...@@ -183,18 +184,18 @@ export default {
activeTab: 'fb', activeTab: 'fb',
load: false, load: false,
subtypCodes: [], subtypCodes: [],
multipleSelection:[], multipleSelection: [],
stmData: { stmData: {
columns: [ columns: [
{ {
label: "起息日", label: "起息日",
prop: "valdat", prop: "valdat",
width: "150px" width: "120px"
}, },
{ {
label: "20域编号", label: "20域编号",
prop: "ownref", prop: "ownref",
width: "150px" width: "120px"
}, },
{ {
label: "21域名编号", label: "21域名编号",
...@@ -204,17 +205,17 @@ export default { ...@@ -204,17 +205,17 @@ export default {
{ {
label: "币种", label: "币种",
prop: "cur", prop: "cur",
width: "100px" width: "80px"
}, },
{ {
label: "金额", label: "金额",
prop: "amt", prop: "amt",
width: "100px" width: "120px"
}, },
{ {
label: "账号", label: "账号",
prop: "act", prop: "act",
width: "100px" width: "150px"
}, },
{ {
label: "费用明细", label: "费用明细",
...@@ -259,17 +260,17 @@ export default { ...@@ -259,17 +260,17 @@ export default {
{ {
label: "报文标准", label: "报文标准",
prop: "msgtyp", prop: "msgtyp",
width: "150px" width: "120px"
}, },
{ {
label: "GPI标识", label: "GPI标识",
prop: "gpi", prop: "gpi",
width: "150px" width: "120px"
}, },
{ {
label: "子系统", label: "子系统",
prop: "zxt", prop: "zxt",
width: "100px" width: "120px"
}, },
{ {
label: "处理时间", label: "处理时间",
...@@ -287,16 +288,16 @@ export default { ...@@ -287,16 +288,16 @@ export default {
}, },
}; };
}, },
computed:{ computed: {
isFoldDisable: function(){ isFoldDisable: function () {
return this.multipleSelection.length == 0; return this.multipleSelection.length == 0;
} , },
isRoutingDisable:function(){ isRoutingDisable: function () {
return this.multipleSelection.length == 0; return this.multipleSelection.length == 0;
} }
}, },
watch: { watch: {
}, },
methods: { methods: {
dbClickRow(row) { dbClickRow(row) {
......
...@@ -18,28 +18,26 @@ ...@@ -18,28 +18,26 @@
<script> <script>
import CodeTable from "~/config/CodeTable"; import CodeTable from "~/config/CodeTable";
import Sndsel from "../model"; import Msgrtm from "../model";
import event from "../event" import event from "../event"
import Schpnl from "./Schpnl.vue" import Schpnl from "./Schpnl.vue"
export default { export default {
name: "Msgrtm", name: "Msgrtm",
components:{ components:{
"m-schpnl" : Schpnl, "m-schpnl" : Schpnl,
}, },
provide() { provide() {
return { return {
root: this root: this
} }
}, },
mixins: [event], // 里面包含了Default、Check等的公共处理 mixins: [event],
data(){ data(){
return { return {
tabVal: "schpnl", tabVal: "schpnl",
trnName: "sndsel", trnName: "msgrtm",
model: new Sndsel().data, model: new Msgrtm().data,
rules: null, rules: null,
codes:{...CodeTable}, codes:{...CodeTable},
}; };
......
import Api from "~/service/Api"; import Api from "~/service/Api";
import getSubtyp from '~/page/Frontend/Rcvsel/event/getSubtyp.js'; import getSubtyp from '~/page/Frontend/Rcvsel/event/getSubtyp.js';
import moment from "moment"; import moment from "moment";
import Rcvsel from "../model";
import Utils from "~/utils";
export default { export default {
mixins: [getSubtyp], mixins: [getSubtyp],
methods: { methods: {
...@@ -61,24 +62,9 @@ export default { ...@@ -61,24 +62,9 @@ export default {
this.load = false; this.load = false;
}, },
async handleReset() { async handleReset() {
this.model.rcvp.msgtyp = ""; let resetModel = new Rcvsel().data
this.model.rcvp.rcvdatsta = new Date(); Utils.copyValueFromVoData(this.model, resetModel);
this.model.rcvp.rcvdatend = new Date(); this.handleSearch();
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 = "";
}, },
// pageSize改变 // pageSize改变
handleSizeChange(val) { handleSizeChange(val) {
......
import Utils from "~/utils" export default {
/** "rcvp.rcvdatsta": [
* Rcvselblk Check规则 { type: "date", required: false, message: "输入正确的日期" }
*/ ],
let checkObj = { "rcvp.rcvdatend": [
"rcvp.sndbak" :null, { type: "date", required: false, message: "输入正确的日期" }
"rcvp.actbic" :null, ],
"rcvp.revbak" :null, "rcvp.sndbak": [
"rcvp.msgtyp" :null, { type: "string", required: false, message: "必输项" },
"rcvp.othref" :null, { max: 0, message: "长度不能超过0" }
"rcvp.rcvdatend" :null, ],
"rcvp.ownref" :null, "rcvp.revbak": [
"rcvp.amtmax" :null, { type: "string", required: false, message: "必输项" },
"rcvp.amtmin" :null, { max: 0, message: "长度不能超过0" }
"rcvp.rcvdatsta" :null, ],
"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" }
],
for (const key in checkObj) { "rcvp.act": [
if (Object.hasOwnProperty.call(checkObj, key)) { { type: "string", required: false, message: "必输项" },
checkObj[key] = checkObj[key] ? checkObj[key] : Utils.reflectCheck(key) { max: 0, message: "长度不能超过0" }
} ],
}
export default checkObj
"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
/**
* 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 { ...@@ -28,7 +28,6 @@ export default class Rcvsel {
msggrp: { msggrp: {
rcvlst: [], // .msggrp.rcvlst rcvlst: [], // .msggrp.rcvlst
}, },
pageId: "" // ctx的key
} }
} }
} }
\ No newline at end of file
...@@ -164,6 +164,7 @@ ...@@ -164,6 +164,7 @@
:min-width="item.width"> :min-width="item.width">
<template slot-scope="scope"> <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> <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> <span v-else>{{ scope.row[item.prop] }}</span>
</template> </template>
</el-table-column> </el-table-column>
...@@ -199,12 +200,12 @@ export default { ...@@ -199,12 +200,12 @@ export default {
{ {
label: "起息日", label: "起息日",
prop: "valdat", prop: "valdat",
width: "150px" width: "120px"
}, },
{ {
label: "20域编号", label: "20域编号",
prop: "ownref", prop: "ownref",
width: "150px" width: "120px"
}, },
{ {
label: "21域名编号", label: "21域名编号",
...@@ -214,17 +215,17 @@ export default { ...@@ -214,17 +215,17 @@ export default {
{ {
label: "币种", label: "币种",
prop: "cur", prop: "cur",
width: "100px" width: "80px"
}, },
{ {
label: "金额", label: "金额",
prop: "amt", prop: "amt",
width: "100px" width: "120px"
}, },
{ {
label: "账号", label: "账号",
prop: "act", prop: "act",
width: "100px" width: "150px"
}, },
{ {
label: "费用明细", label: "费用明细",
...@@ -234,7 +235,7 @@ export default { ...@@ -234,7 +235,7 @@ export default {
{ {
label: "报文类型", label: "报文类型",
prop: "subtyp", prop: "subtyp",
width: "120px" width: "150px"
}, },
{ {
label: "行内系统", label: "行内系统",
...@@ -269,17 +270,17 @@ export default { ...@@ -269,17 +270,17 @@ export default {
{ {
label: "报文标准", label: "报文标准",
prop: "msgtyp", prop: "msgtyp",
width: "150px" width: "120px"
}, },
{ {
label: "GPI标识", label: "GPI标识",
prop: "gpi", prop: "gpi",
width: "150px" width: "120px"
}, },
{ {
label: "子系统", label: "子系统",
prop: "zxt", prop: "zxt",
width: "100px" width: "120px"
}, },
{ {
label: "接收时间", label: "接收时间",
......
...@@ -18,28 +18,26 @@ ...@@ -18,28 +18,26 @@
<script> <script>
import CodeTable from "~/config/CodeTable"; import CodeTable from "~/config/CodeTable";
import Sndsel from "../model"; import Rcvsel from "../model";
import event from "../event" import event from "../event"
import Schpnl from "./Schpnl.vue" import Schpnl from "./Schpnl.vue"
export default { export default {
name: "Rcvselblk", name: "Rcvselblk",
components:{ components:{
"m-schpnl" : Schpnl, "m-schpnl" : Schpnl,
}, },
provide() { provide() {
return { return {
root: this root: this
} }
}, },
mixins: [event], // 里面包含了Default、Check等的公共处理 mixins: [event],
data(){ data(){
return { return {
tabVal: "schpnl", tabVal: "schpnl",
trnName: "sndsel", trnName: "sndsel",
model: new Sndsel().data, model: new Rcvsel().data,
rules: null, rules: null,
codes:{...CodeTable}, 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