Skip to content

I
isc-web-vue
Commit 704f562e by 李少勇
Options

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

parents 94ab0267 55919015
Showing with 171 additions and 79 deletions
src/page/Frontend/Bsnsel/event/index.js
......@@ -6,6 +6,38 @@ export default {
mixins: [getSubtyp],
methods: {
async handleSearch() {
this.load = true;
let rtnmsg = await Api.post("/frontend/bsnsel/sel", {
...this.model.bsnp,
pageNum: this.pagination.pageNum,
pageSize: this.pagination.pageSize,
});
if (rtnmsg.respCode == SUCCESS) {
this.load = false;
this.model.bsngrp.rcvlst = [];
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.model.bsngrp.rcvlst = 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() {
......
src/page/Frontend/Bsnsel/views/Mainpl.vue
<template>
<div class="eibs-tab">
<c-list-search @form-reset="handleReset" @form-search="formSubmit">
<c-list-search @form-reset="handleReset" @form-search="handleSearch">
<!-- 持续展示区 -->
<template v-slot="searchSlot">
<el-form class="m-table-search-form" ref="paramsForm" label-position="right" label-width="110px" size="small"
......@@ -146,10 +146,12 @@
</div>
</template>
<script>
import event from "../event";
export default {
inject: ["root"],
props: ["model", "codes"],
mixins: [],
mixins: [event],
components: {
},
data() {
......
src/page/Funds/Fxtfop/event/index.js
......@@ -77,7 +77,7 @@ export default {
},
async onMaxamtChange(){
debugger
if (this.model.fxdgrp.cbs.max.amt > 0 && this.model.fxdgrp.rec.rat >0 ) {
this.defaultCalculateN1100();
......@@ -85,7 +85,7 @@ export default {
},
async onRatChange(){
debugger
if (this.model.fxdgrp.cbs.max.amt > 0 && this.model.fxdgrp.rec.rat >0 ) {
this.defaultCalculateN1100();
}
......
src/page/Funds/Fxtlop/event/index.js
......@@ -23,56 +23,72 @@ export default {
this.model.fxdgrp.rec.ownref = res.data;
},
async defaultAccAndRate() {
this.defaultRateN1000();
console.log("defaultAccAndRate")
this.defaultCalculateN1100();
},
async defaultCalculateN1100() {
console.log("defaultCalculateN1100")
if (this.model.fxdgrp.rec.rat == "") {
return;
}
async defaultRateN1000() {
if (this.model.fxdgrp.cbs.max.cur == "") {
return;
return;
}
if (this.model.fxdgrp.cbs.max.amt == "" || this.model.fxdgrp.cbs.max.amt == 0) {
return;
if (this.model.fxdgrp.cbs.nom1.cur == "") {
return;
}
const loading = this.loading();
console.log( this.model);
let res = await Api.post(`/${this.moduleRouter()}/fxtlop/defaultCalculateN1100`, this.model);
let res = await Api.post(`/${this.moduleRouter()}/fxtlop/defaultRateN1000`, this.model);
loading.close();
if (res.respCode !== SUCCESS) {
this.$message.error(res.respMsg);
return;
this.$message.error(res.respMsg);
return;
}
this.model.fxdgrp.cbs.max.amt = res.data.fxdgrp.cbs.max.amt;
this.model.fxdgrp.cbs.nom1.amt = res.data.fxdgrp.cbs.nom1.amt;
},
// this.updateValueSet(res.codeSet);
this.model.fxdgrp.rec.midrat =res.data.fxdgrp.rec.midrat;
},
async defaultRateN1000() {
if (this.model.fxdgrp.rec.fxtyp == "") {
return;
}
async defaultCalculateN1100() {
if (this.model.fxdgrp.cbs.max.cur == "") {
return;
return;
}
if (this.model.fxdgrp.apl.pts.ptyinr == "") {
return;
if (this.model.fxdgrp.cbs.nom1.cur == "") {
return;
}
const loading = this.loading();
let res = await Api.post(`/${this.moduleRouter()}/fxtlop/defaultRateN1000`, this.model);
let res = await Api.post(`/${this.moduleRouter()}/fxtlop/defaultCalculateN1100`, this.model);
loading.close();
if (res.respCode !== SUCCESS) {
this.$message.error(res.respMsg);
return;
this.$message.error(res.respMsg);
return;
}
this.model.fxdgrp.rec.rat = res.data.fxdgrp.rec.rat;
this.model.fxdgrp.rec.midrat = res.data.fxdgrp.rec.midrat;
},
// this.updateValueSet(res.codeSet);
this.model.fxdgrp.cbs.nom1.amt =res.data.fxdgrp.cbs.nom1.amt;
},
async onMaxcurChange(){
console.log(this.model);
if (this.model.fxdgrp.cbs.max.cur !== "" && this.model.fxdgrp.cbs.nom1.cur !== null) {
console.log("@@@");
this.defaultRateN1000();
}
},
async onNom1curChange(){
if (this.model.fxdgrp.cbs.max.cur !== "" && this.model.fxdgrp.cbs.nom1.cur !== null) {
this.defaultRateN1000();
}
},
async onMaxamtChange(){
if (this.model.fxdgrp.cbs.max.amt > 0 && this.model.fxdgrp.rec.rat >0 ) {
this.defaultCalculateN1100();
}
},
async onRatChange(){
if (this.model.fxdgrp.cbs.max.amt > 0 && this.model.fxdgrp.rec.rat >0 ) {
this.defaultCalculateN1100();
}
},
},
};
src/page/Funds/Fxtlop/views/Regp.vue
......@@ -51,7 +51,7 @@
v-model="model.fxdgrp.cbs.max.cur"
style="width: 100%"
dbCode="curtxt"
@change="defaultAccAndRate"
@change="onMaxcurChange"
>
</c-select-cur>
</el-form-item>
......@@ -61,6 +61,7 @@
<c-input-currency
:currency="model.fxdgrp.cbs.max.cur"
v-model="model.fxdgrp.cbs.max.amt"
@change="onMaxamtChange"
></c-input-currency>
</el-form-item>
</c-col>
......@@ -73,6 +74,7 @@
style="width: 100%"
:code="codes.bopcur"
disabled
>
</c-select-cur>
</el-form-item>
......@@ -91,6 +93,7 @@
<c-form-item label="平盘牌价" prop="fxdgrp.rec.rat">
<c-input-currency
v-model="model.fxdgrp.rec.rat"
@change="onRatChange"
style="width: 100%"
:precision="6"
placeholder="请输入平盘牌价"
......@@ -199,8 +202,10 @@ export default {
},
defaultNam950: function () {
let amount = this.moneyFormat(this.model.fxdgrp.cbs.max.amt, this.model.fxdgrp.cbs.max.cur)
return this.getCodelabel(this.model.fxdgrp.rec.fxtyp, "fxt_fxtyp") + ","
let nam=this.getCodelabel(this.model.fxdgrp.rec.fxtyp, "fxt_fxtyp") + ","
+ this.model.fxdgrp.cbs.max.cur + " " + amount;
this.model.fxdgrp.rec.nam=nam;
return nam;
},
},
methods: {
......
src/page/Funds/Infftd/event/index.js
......@@ -24,7 +24,7 @@ export default {
}
this.load = true;
let rtnmsg = await Api.post("/funds/ftdsel/query", {
let rtnmsg = await Api.post("/funds/ftdsel/query"+this.activeTab, {
...this.model.infcon,
dir: ">",
pageNum: this.pagination.pageNum,
......@@ -35,7 +35,12 @@ export default {
if (rtnmsg.respCode == SUCCESS) {
this.load = false;
this.stmData.data = [];
this.stmData.data = rtnmsg.data.list;
if(this.activeTab === "tcdb"){
this.stmDatatcdb.data = rtnmsg.data.list;
}else if(this.activeTab === "zjcj"){
this.stmData.data = rtnmsg.data.list;
}
this.pagination = {
pageNum: rtnmsg.data.pageNum || 1,
pageSize: rtnmsg.data.pageSize || 10,
......@@ -99,11 +104,6 @@ export default {
}
},
// closeDisplayDialog(){
// if(this.oldRefId){
// this.$refs[this.oldRefId].showPopper = false;
// }
// },
// 处理
async handler(row) {
this.handleModel = row;
......@@ -156,33 +156,6 @@ export default {
this.initdialog = false;
},
// /**
// * 打开快照页面头寸调拨
// */
// display(row) {
// if(this.oldRefId){
// this.$refs[this.oldRefId].showPopper = false;
// }
// // 历史快照
// if (row.inr.length == 8) {
// this.routerPush({
// path: '/business/HistoryRecord',
// query: {
// businessInr: row.inr,
// businessType: 'TRN',
// type:'view'
// }
// })
// } else if (row.inr.length == 4) {//TODO：修改为16 本地测试：4
// this.routerPush({
// path: `/display/fttpcm`,//${row.inifrm.toLowerCase()}
// query: {
// businessInr: row.inr,
// businessType: 'TRN'
// }
// });
// }
// },
/**
* 打开快照页面资金拆借
*/
......@@ -261,6 +234,27 @@ export default {
path: '/business/fttfcm',
});
},
//获取码表数据
getCodeTable(tbl,uil,value){
if(uil){
uil='EN'
}
let localCodes = localStorage.getItem('localCodes');
if (localCodes) {
let codeobj = JSON.parse(localCodes)[tbl + '_' + uil + '_COD'];
if(codeobj){
let codeobj = codeobj.filter(m => m.value === value);
return codeobj ? codeobj.label : value;
}else{
return value;
}
}else{
return value;
}
},
},
};
src/page/Funds/Infftd/model/index.js
......@@ -8,7 +8,7 @@ export default class infftd {
nam: "", // Name客户名称 .infcon.nam
opndatfrom: new Date((new Date).getTime() - (7 * 24 * 60 * 60 * 1000)), // 有效日期自 .infcon.opndatfrom
opndatto: new Date(), // Open Date to .infcon.opndatto
opndat: "",
seacur: "", // 币种 .infcon.seacur
seaamtfr: "", // 金额自 .infcon.seaamtfr
seaamtto: "", // Amount to .infcon.seaamtto
......
src/page/Funds/Infftd/views/Infsea.vue
......@@ -202,8 +202,8 @@
<el-tab-pane label="头寸调拨查询" name="tcdb">
<el-table
:data="stmData.data"
:columns="stmData.columns"
:data="stmDatatcdb.data"
:columns="stmDatatcdb.columns"
v-loading="load"
style="width: 100%"
size="small"
......@@ -212,7 +212,7 @@
:highlight-current-row="true"
>
<el-table-column
v-for="(item, key) in stmData.columns"
v-for="(item, key) in stmDatatcdb.columns"
:key="key"
:label="item.label"
:prop="item.prop"
......@@ -368,6 +368,46 @@ export default {
],
data:[],
},
stmDatatcdb:{
columns:[
{
label: "头寸调拨编号",
prop: "ownref",
width: "180px",
},
{
label: "业务名称",
prop: "nam",
width: "180px",
},
{
label: "开立日期",
prop: "opndat",
width: "120px",
},
{
label: "起息日",
prop: "valdat",
width: "120px",
},
{
label: "资金部负责人",
prop: "usr",
width: "120px",
},
{
label: "清算中心负责人",
prop: "usr",
width: "140px",
},
{
label: "定存拆借类型",
prop: "fttyp",
width: "120px",
},
],
data:[],
},
stmData: {
columns: [
{
......
src/page/Statics/Xxdinf/event/index.js
......@@ -220,6 +220,9 @@ export default {
case 'FXD':
trnUrl = '/funds/fxtsel'
break;
case 'FTD':
trnUrl = '/funds/ftdsel'
break;
default:
break;
}
......
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