Skip to content

I
isc-web-vue
Commit 6d4f7420 by fukai
Options

Merge remote-tracking branch 'origin/develop' into develop

parents 14c97404 94b2e93e
Showing with 411 additions and 44 deletions
src/config/CodeTable/index.js
...@@ -9799,6 +9799,13 @@ const CodeTable = { ...@@ -9799,6 +9799,13 @@ const CodeTable = {
{label: "04特殊监管区", value: "0004"}, {label: "04特殊监管区", value: "0004"},
{label: "05离岸转手买卖", value: "0005"}, {label: "05离岸转手买卖", value: "0005"},
{label: "06其他未纳入海关统计的货物贸易", value: "0000"}, {label: "06其他未纳入海关统计的货物贸易", value: "0000"},
] ],
fttyp:[
{label:"资金拆入",value:"LI" },
{label:"定存吸存",value:"DI" },
{label:"定存存出",value:"DO" },
{label:"头寸调拨",value:"PT" },
{label:"资金拆出",value:"LO" },
],
}; };
export default CodeTable; export default CodeTable;
src/page/Business/BusRouter.js
...@@ -268,7 +268,7 @@ const Rmbmod2135 = () => import("./Rmb/2135/Tcpame/views"); ...@@ -268,7 +268,7 @@ const Rmbmod2135 = () => import("./Rmb/2135/Tcpame/views");
const Rmbinf2135 = () => import("./Rmb/2135/Tcpinf/views"); const Rmbinf2135 = () => import("./Rmb/2135/Tcpinf/views");
const Rmbdel2135 = () => import("./Rmb/2135/Tcpdel/views"); const Rmbdel2135 = () => import("./Rmb/2135/Tcpdel/views");
// const Rcvsel = () => import('./Rcvsel/views'); // const Rcvselblk = () => import('./Rcvselblk/views');
// const Sndsel = () => import('./Sndsel/views'); // const Sndsel = () => import('./Sndsel/views');
// const Dbdinf = () => import("./Bop/Dbdinf/views") // const Dbdinf = () => import("./Bop/Dbdinf/views")
......
src/page/Business/Rcvsel/model/Check.js
import Utils from "~/utils" import Utils from "~/utils"
/** /**
* Rcvsel Check规则 * Rcvselblk Check规则
*/ */
let checkObj = { let checkObj = {
"rcvp.sndbak" :null, "rcvp.sndbak" :null,
......
src/page/Business/Rcvsel/model/Default.js
/** /**
* Rcvsel Default规则 * Rcvselblk Default规则
*/ */
import Api from "~/service/Api"; import Api from "~/service/Api";
import Utils from "~/utils/index" import Utils from "~/utils/index"
......
src/page/Frontend/Dotopn/event/index.js
...@@ -9,19 +9,5 @@ export default { ...@@ -9,19 +9,5 @@ export default {
async handleReset() { async handleReset() {
}, },
// pageSize改变
handleSizeChange(val) {
this.pagination.pageNum = 1;
this.pagination.pageSize = val;
this.handleSearch();
},
// 页码改变
handleCurrentChange(val) {
this.pagination.pageNum = val;
this.handleSearch();
},
handleSelectionChange(val){
this.multipleSelection = val;
}
}, },
}; };
src/page/Frontend/FTRouter.js
...@@ -32,7 +32,7 @@ const BusRouter = [ ...@@ -32,7 +32,7 @@ const BusRouter = [
{ path: 'pngsel', component: ()=>import("./Pngsel/views"), name: 'Pngsel', meta: { title: 'Pngsel' } ,module:'frontend'}, { path: 'pngsel', component: ()=>import("./Pngsel/views"), name: 'Pngsel', meta: { title: 'Pngsel' } ,module:'frontend'},
{ path: 'qrtmgs', component: ()=>import("./Qrtmgs/views"), name: 'Qrtmgs', meta: { title: 'Qrtmgs' } ,module:'frontend'}, { path: 'qrtmgs', component: ()=>import("./Qrtmgs/views"), name: 'Qrtmgs', meta: { title: 'Qrtmgs' } ,module:'frontend'},
{ path: 'qrtsel', component: ()=>import("./Qrtsel/views"), name: 'Qrtsel', meta: { title: 'Qrtsel' } ,module:'frontend'}, { path: 'qrtsel', component: ()=>import("./Qrtsel/views"), name: 'Qrtsel', meta: { title: 'Qrtsel' } ,module:'frontend'},
// { path: 'rcvsel', component: ()=>import("./Rcvsel/views"), name: 'Rcvsel', meta: { title: 'Rcvsel' } ,module:'frontend'}, { path: 'rcvselblk', component: ()=>import("./Rcvselblk/views"), name: 'Rcvselblk', meta: { title: 'Rcvselblk' } ,module:'frontend'},
{ path: 'rptgen', component: ()=>import("./Rptgen/views"), name: 'Rptgen', meta: { title: 'Rptgen' } ,module:'frontend'}, { path: 'rptgen', component: ()=>import("./Rptgen/views"), name: 'Rptgen', meta: { title: 'Rptgen' } ,module:'frontend'},
{ path: 'smdsel', component: ()=>import("./Smdsel/views"), name: 'Smdsel', meta: { title: 'Smdsel' } ,module:'frontend'}, { path: 'smdsel', component: ()=>import("./Smdsel/views"), name: 'Smdsel', meta: { title: 'Smdsel' } ,module:'frontend'},
{ path: 'smtame', component: ()=>import("./Smtame/views"), name: 'Smtame', meta: { title: 'Smtame' } ,module:'frontend'}, { path: 'smtame', component: ()=>import("./Smtame/views"), name: 'Smtame', meta: { title: 'Smtame' } ,module:'frontend'},
......
src/page/Frontend/Rcvsel/model/Check.js
import Utils from "~/utils" import Utils from "~/utils"
/** /**
* Rcvsel Check规则 * Rcvselblk Check规则
*/ */
let checkObj = { let checkObj = {
"rcvp.sndbak" :null, "rcvp.sndbak" :null,
......
src/page/Frontend/Rcvsel/model/Default.js
/** /**
* Rcvsel Default规则 * Rcvselblk Default规则
*/ */
import Api from "~/service/Api"; import Api from "~/service/Api";
import Utils from "~/utils/index" import Utils from "~/utils/index"
......
src/page/Frontend/Rcvselblk/event/index.js 0 → 100644
import Api from "~/service/Api";
import moment from "moment";
export default {
methods: {
async handleSearch() {
let rcvdatsta = this.model.rcvp.rcvdatsta;
if (!rcvdatsta || rcvdatsta == "") {
this.$notify.error({
title: this.$t("financing.错误"),
message: this.$t("financing.查询开始日期必输！"),
});
return;
}
let rcvdatend = this.model.rcvp.rcvdatend;
if (!rcvdatend || rcvdatend == "") {
this.$notify.error({
title: this.$t("financing.错误"),
message: this.$t("financing.查询结束日期必输！"),
});
return;
}
this.load = true;
let rtnmsg = await Api.post("/webapi/gjzf/msgsel/query", {
...this.model.rcvp,
dir: "<",
pageNum: this.pagination.pageNum,
pageSize: this.pagination.pageSize,
rcvdatsta: moment(rcvdatsta).format("YYYY-MM-DD"),
rcvdatend: moment(rcvdatend).format("YYYY-MM-DD"),
});
if (rtnmsg.respCode == SUCCESS) {
this.load = false;
this.stmData.data = [];
const {list} = rtnmsg.data;
const {codes:{sta1}} = this;
list.forEach(v=>{
for(let i in sta1){
if(sta1[i].value == v.sta){
v.sta = sta1[i].label;
}
}
})
this.stmData.data = list;
this.pagination = {
pageNum: rtnmsg.data.pageNum || 1,
pageSize: rtnmsg.data.pageSize || 10,
total: parseInt(rtnmsg.data.total),
};
} else {
this.$notify.error({
title: this.$t("financing.错误"),
message: this.$t("financing.服务请求失败！"),
});
}
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="";
},
// pageSize改变
handleSizeChange(val) {
this.pagination.pageNum = 1;
this.pagination.pageSize = val;
this.handleSearch();
},
// 页码改变
handleCurrentChange(val) {
this.pagination.pageNum = val;
this.handleSearch();
},
handleSelectionChange(val){
this.multipleSelection = val;
}
},
};
src/page/Frontend/Rcvselblk/model/Check.js 0 → 100644
import Utils from "~/utils"
/**
* 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,
}
for (const key in checkObj) {
if (Object.hasOwnProperty.call(checkObj, key)) {
checkObj[key] = checkObj[key] ? checkObj[key] : Utils.reflectCheck(key)
}
}
export default checkObj
src/page/Frontend/Rcvselblk/model/Default.js 0 → 100644
/**
* Rcvselblk Default规则
*/
import Api from "~/service/Api";
import Utils from "~/utils/index"
export default {
}
//你可以添加自动default处理
src/page/Frontend/Rcvselblk/model/Pattern.js 0 → 100644
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
src/page/Frontend/Rcvselblk/model/index.js 0 → 100644
export default class Rcvsel{
constructor () {
this.data = {
rcvp:{
rcvdatsta:"", // : 起始日期 .rcvp.rcvdatsta
rcvdatend:"", // : 终止日期 .rcvp.rcvdatend
msgtyp:"", // : 报文标准 .rcvp.msgtyp
subtyp:"", // : 报文类型 .rcvp.subtyp
sndbak:"", // : 发报行BIC .rcvp.sndbak
revbak:"", // : 收报行BIC .rcvp.revbak
actbic:"", // : 账户行BIC .rcvp.actbic
othref:"", // : 20域编号 .rcvp.othref
ownref:"", // : 21域编号 .rcvp.ownref
cur:"", // : 币种 .rcvp.cur
act:"", // : 账号 .rcvp.act
amtmin:"", // : 金额下限 .rcvp.amtmin
amtmax:"", // : 金额上限 .rcvp.amtmax
chnipt:"", // 行内系统 .rcvp.chnipt
tblvis:"", // 行内系统标签 .rcvp.tblvis
tblvim:"", // 活动标签 .rcvp.tblvim
blksta:"", // 黑名单状态 .rcvp.blksta
dtlchg:"", // : 费用明细 .rcvp.dtlchg
sta:"", // : 处理状态 .rcvp.sta
gpi:"", // GPI标识 .rcvp.gpi
expexl:"", // 导出 .rcvp.expexl
},
msggrp:{
rcvlst:[], // .msggrp.rcvlst
},
pageId: "" // ctx的key
}
}
}
\ No newline at end of file
src/page/Frontend/Rcvselblk/views/index.vue 0 → 100644
<template>
<div class="eContainer-search">
<el-form
:model="model"
:rules="rules"
ref="modelForm"
label-width="120px"
label-position="right"
size="small"
:validate-on-rule-change="false"
>
<c-content>
<m-schpnl :model="model" :codes="codes" ref="schpnl"/>
</c-content>
</el-form>
</div>
</template>
<script>
import CodeTable from "~/config/CodeTable";
import Sndsel from "../model";
import event from "../event"
import Schpnl from "./Schpnl.vue"
export default {
name: "Sndsel",
components:{
"m-schpnl" : Schpnl,
},
provide() {
return {
root: this
}
},
mixins: [event], // 里面包含了Default、Check等的公共处理
data(){
return {
tabVal: "schpnl",
trnName: "sndsel",
model: new Sndsel().data,
rules: null,
codes:{...CodeTable},
};
},
methods:{},
created:async function() {},
};
</script>
<style scoped>
</style>
src/page/Funds/Infftd1/event/index.js
...@@ -58,6 +58,16 @@ export default { ...@@ -58,6 +58,16 @@ export default {
this.model.infcon.seacur = ""; this.model.infcon.seacur = "";
this.model.infcon.eaamtfr = ""; this.model.infcon.eaamtfr = "";
this.model.infcon.eaamtto = ""; this.model.infcon.eaamtto = "";
this.model.infcon.searef = "";
this.model.infcon.ptyextkey = "";
this.model.infcon.ptynam = "";
this.model.infcon.seapty = "";
this.model.infcon.searol = "";
this.model.infcon.usrextkey = "";
this.model.infcon.seasta = "";
this.model.infcon.accmng = "";
this.model.infcon.fttyp = "";
}, },
// pageSize改变 // pageSize改变
......
src/page/Funds/Infftd1/model/index.js
import Api from "~/service/Api" import Api from "~/service/Api"
export default class infftd{ export default class infftd {
constructor () { constructor() {
this.data = { this.data = {
infcon:{ infcon: {
seaownref:"", // 业务编号 .infcon.seaownref seaownref: "", // 业务编号 .infcon.seaownref
nam:"", // Name客户名称 .infcon.nam nam: "", // Name客户名称 .infcon.nam
opndatfrom:"", // 有效日期自 .infcon.opndatfrom opndatfrom: "", // 有效日期自 .infcon.opndatfrom
opndatto:"", // Open Date to .infcon.opndatto opndatto: "", // Open Date to .infcon.opndatto
seacur:"", // 币种 .infcon.seacur seacur: "", // 币种 .infcon.seacur
seaamtfr:"", // 金额自 .infcon.seaamtfr seaamtfr: "", // 金额自 .infcon.seaamtfr
seaamtto:"", // Amount to .infcon.seaamtto seaamtto: "", // Amount to .infcon.seaamtto
}, searef: "", //参与方参考号
infbut:{
dspstm:"", // display stream .infbut.dspstm ptyextkey: "", // 选择一个参与方 .infcon.pty.extkey
}, ptynam: "", // External Visible Name .infcon.pty.nam
fttyp:"", // Funds Trans. Type .fttyp
pageId: "" // ctx的key seapty: "", // 参与方名称/BIC .infcon.seapty
} searol: "",
}
usrextkey: "", // User ID .infcon.usr.extkey
seasta: "", // Status .infcon.seasta
accmng: "", // Account manager .infcon.accmng
fttyp: "", //类型
},
infbut: {
dspstm: "", // display stream .infbut.dspstm
},
//fttyp: "", // Funds Trans. Type .fttyp
pageId: "" // ctx的key
}
}
} }
\ No newline at end of file
src/page/Funds/Infftd1/views/Infsea.vue
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</c-col> </c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item <el-form-item
label="交易有效日期" label="开立有效日期"
prop="opndatfrom" prop="opndatfrom"
style="width: 100%" style="width: 100%"
> >
...@@ -92,7 +92,81 @@ ...@@ -92,7 +92,81 @@
</c-col> </c-col>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="8">
<el-form-item
label="参与方参考号"
prop="searef"
style="width: 100%"
>
<c-input
v-model="model.infcon.searef"
maxlength="40"
placeholder="请输入参与方参考号"
>
</c-input>
</el-form-item>
</c-col>
</c-col>
<c-col :span="24">
<c-col :span="8">
<el-form-item
label="Account manager" prop="accmng" style="width: 100%">
<c-input v-model="model.infcon.accmng" maxlength="40" placeholder="请输入Account manager">
</c-input>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item
label="参与方名称" prop="seapty" style="width: 100%">
<c-input v-model="model.infcon.seapty" maxlength="40" placeholder="请输入参与方名称">
</c-input>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item label="角色" prop="searol" style="width: 100%">
<c-select
v-model="model.infcon.searol"
style="width: 100%"
placeholder="请选择角色"
:code="codes.searol"
>
</c-select>
</el-form-item>
</c-col>
</c-col>
<c-col :span="24">
<c-col :span="8">
<el-form-item
label="角色ID" prop="usrextkey" style="width: 100%">
<c-input v-model="model.infcon.usrextkey" maxlength="40" placeholder="请输入角色ID">
</c-input>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item label="状态" prop="seasta" style="width: 100%">
<c-select
v-model="model.infcon.seasta"
style="width: 100%"
placeholder="请选择状态"
:code="codes.seasta">
</c-select>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item label="定存拆借类型" prop="fttyp" style="width: 100%">
<c-select
v-model="model.infcon.fttyp"
style="width: 100%"
placeholder="请选择定存拆借类型"
:code="codes.fttyp">
</c-select>
</el-form-item>
</c-col>
</c-col> </c-col>
</el-row> </el-row>
</template> </template>
</c-list-search> </c-list-search>
......
src/page/Funds/Inffxd/model/index.js
...@@ -30,7 +30,7 @@ export default class inffxd { ...@@ -30,7 +30,7 @@ export default class inffxd {
infbut: { infbut: {
dspstm: "", // display stream .infbut.dspstm dspstm: "", // display stream .infbut.dspstm
}, },
fttyp: "", // Funds Trans. Type .fttyp //fttyp: "", // Funds Trans. Type .fttyp
pageId: "" // ctx的key pageId: "" // ctx的key
} }
} }
......
src/page/login.vue
...@@ -656,11 +656,11 @@ export default { ...@@ -656,11 +656,11 @@ export default {
width: 70px; width: 70px;
height:42px; height:42px;
opacity: 1; opacity: 1;
background-image: url("../assets/icons/logo/cmn_logo-circle.svg");
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: contain; background-size: contain;
margin-right: 10px; margin-right: 10px;
} }
// background-image: url("../assets/icons/logo/cmn_logo-circle.svg");
.loginBox .loginBoxTitle .smallTitle { .loginBox .loginBoxTitle .smallTitle {
width: 285px; width: 285px;
......
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