Skip to content

I
isc-web-vue
Commit 018e0ce9 by zhoujunpeng
Options

资金拆借界面修改

parent 8540ea43
Showing with 148 additions and 110 deletions
src/page/Display/DisplayRouter.js
...@@ -2058,7 +2058,7 @@ const DisplayRouter = [ ...@@ -2058,7 +2058,7 @@ const DisplayRouter = [
name: "DisplayFttfcm", name: "DisplayFttfcm",
path: "fttfcm", path: "fttfcm",
component: () => import("./Funds/DisplayFttfcm.vue"), component: () => import("./Funds/DisplayFttfcm.vue"),
meta: {keepAlive: true, title: "交易快照-资金调拨"} meta: {keepAlive: true, title: "交易快照-资金拆借"}
}, },
{ {
......
src/page/Funds/Infftd/event/index.js
...@@ -160,13 +160,39 @@ export default { ...@@ -160,13 +160,39 @@ export default {
this.initdialog = false; 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'
// }
// });
// }
// },
/** /**
* 打开快照页面 * 打开快照页面资金拆借
* @param {string} inr
*/ */
display(row) { display(row) {
if(this.oldRefId){ if(this.oldRefId){
this.$refs[this.oldRefId].showPopper = true; this.$refs[this.oldRefId].showPopper = false;
} }
// 历史快照 // 历史快照
if (row.inr.length == 8) { if (row.inr.length == 8) {
...@@ -178,9 +204,9 @@ export default { ...@@ -178,9 +204,9 @@ export default {
type:'view' type:'view'
} }
}) })
} else if (row.inr.length == 4) {//TODO：修改为16 本地测试：4 } else if (row.inr.length == 16) {
this.routerPush({ this.routerPush({
path: `/display/fttpcm`,//${row.inifrm.toLowerCase()},fttpcm 本地测试写死 path: `/display/${row.inifrm.toLowerCase()}`,
query: { query: {
businessInr: row.inr, businessInr: row.inr,
businessType: 'TRN' businessType: 'TRN'
...@@ -197,7 +223,14 @@ export default { ...@@ -197,7 +223,14 @@ export default {
//Info //Info
toInfo(row,objtyp,subobjtyp,paytyp){ toInfo(row,objtyp,subobjtyp,paytyp){
this.routerPush({ this.routerPush({
path: "/business/fttpcm", path: "/business/fttpcminf",
query: { inr: row.inr,objtyp:objtyp,pntinr:row.pntinr,subobjtyp:subobjtyp,paytyp:paytyp}
});
},
//InfoZJCJ
toInfoZJCJ(row,objtyp,subobjtyp,paytyp){
this.routerPush({
path: "/business/fttfcminf",
query: { inr: row.inr,objtyp:objtyp,pntinr:row.pntinr,subobjtyp:subobjtyp,paytyp:paytyp} query: { inr: row.inr,objtyp:objtyp,pntinr:row.pntinr,subobjtyp:subobjtyp,paytyp:paytyp}
}); });
}, },
...@@ -219,6 +252,13 @@ export default { ...@@ -219,6 +252,13 @@ export default {
const codeobj = this.model.dbCodes[codenam].find(obj => obj.value === value) const codeobj = this.model.dbCodes[codenam].find(obj => obj.value === value)
return codeobj ? codeobj.label : value; return codeobj ? codeobj.label : value;
}, },
//进入头寸调拨交易
toFttpcm() {
this.routerPush({
path: '/business/fttpcm',
});
},
}, },
}; };
\ No newline at end of file
src/page/Funds/Infftd/views/Infsea.vue
...@@ -106,12 +106,21 @@ ...@@ -106,12 +106,21 @@
</el-form> </el-form>
</template> </template>
</c-list-search> </c-list-search>
<!--
<c-col :span="24" style="margin-top: 10px; margin-bottom: 10px">
<c-button class="medium_bcs" size="medium" type="primary" style="margin-top: 10px; margin-bottom: 10px" title="FTTPCM"
@click="toFttpcm">
头寸调拨登记确认
</c-button>
</c-col>
<el-col :span="24" style="margin-top: 10px"> <el-col :span="24" style="margin-top: 10px">
<div style="height: 90%"> <div style="height: 90%">
<c-col :span="24"> <c-col :span="24">
<el-tabs v-model="activeTab" class="y-tabs"> <el-tabs v-model="activeTab" class="y-tabs">
<el-tab-pane label="资金调拨查询" name="zjdb"> <el-tab-pane label="资金拆借查询" name="zjcj">
<el-table <el-table
:data="stmData.data" :data="stmData.data"
:columns="stmData.columns" :columns="stmData.columns"
...@@ -130,47 +139,74 @@ ...@@ -130,47 +139,74 @@
:min-width="item.width" :min-width="item.width"
> >
</el-table-column> </el-table-column>
<el-table-column fixed="right" prop="op" label="操作" width="180px">
<template slot="header">
<c-col :span="11" style="text-align: center">
<span>操作</span>
</c-col>
</template>
<template slot-scope="scope">
<c-button style="margin-right: 5px" size="small" type="text"
@click="handler(scope.row)">
处理
</c-button>
<span> </span>
<el-popover
trigger="manual"
v-clickOutside="closeDisplayDialog" placement="top-end" title="历史信息" width="1200" :ref="'popover_' + scope.row.inr">
<div style="text-align: right;margin-top: -30px;margin-right: 5px;font-size: 16px;">
<span class="el-icon-close" style="cursor: pointer" @click="closeDetailsDialog('popover_' + scope.row.inr)"></span>
</div>
<el-table :data="trnData.data" :columns="trnData.columns" :showButtonFlg="true">
<el-table-column v-for="(item, key) in trnData.columns" :key="key" :label="item.label" :prop="item.prop" :width="item.width">
<template slot-scope="scope">
<div>{{ scope.row[item.prop] }}</div>
</template>
</el-table-column>
<el-table-column fixed="right" prop="op" label="操作" width="100px">
<template slot-scope="scope">
<c-button style="margin-left: 0" size="small" @click="display(scope.row)">快照
</c-button>
</template>
</el-table-column>
</el-table> </el-table>
<c-button style="margin-left: 0" type="text" size="small" slot="reference" @click="details(scope.row)">
快照
</c-button>
<c-button style="margin-left: 0" type="text" size="small" slot="reference" @click="toInfoZJCJ(scope.row,'FTD')">
Info
</c-button>
</el-popover>
</template>
</el-table-column>
</el-table>
<div class="pagination-box"
style="display:block">
<el-pagination <el-pagination
layout="total, sizes, prev, pager, next, jumper"
:total="pagination.total"
:page-size="pagination.pageSize"
:current-page.sync="pagination.pageNum"
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page.sync="pagination.pageIndex"
:page-sizes="[10, 20, 50, 100, 500]"
:page-size="pagination.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="pagination.total">
> >
</el-pagination> </el-pagination>
</el-tab-pane>
</el-tabs>
</c-col>
</div> </div>
</el-col>
-->
<el-col :span="24" style="margin-top: 10px">
<div style="height: 90%">
<c-col :span="24">
<el-tabs v-model="activeTab" class="y-tabs">
<el-tab-pane label="资金调拨查询" name="zjdb">
</el-tab-pane> </el-tab-pane>
</el-tabs>
</c-col>
</div>
<div style="height: 90%"> <el-tab-pane label="头寸调拨查询" name="tcdb">
<c-col :span="24">
<c-tabs v-model="activeTab" type="card" ref="elment">
<el-table <el-table
v-loading="load"
:data="stmData.data" :data="stmData.data"
height="calc(100vh - 480px)"
border
:columns="stmData.columns" :columns="stmData.columns"
:showButtonFlg="true" v-loading="load"
style="width: 100%"
size="small"
:border="true"
height="calc(100vh - 480px)"
:highlight-current-row="true" :highlight-current-row="true"
@row-dblclick="TableDblRow"
> >
<el-table-column <el-table-column
v-for="(item, key) in stmData.columns" v-for="(item, key) in stmData.columns"
...@@ -179,101 +215,49 @@ ...@@ -179,101 +215,49 @@
:prop="item.prop" :prop="item.prop"
:min-width="item.width" :min-width="item.width"
> >
</el-table-column> </el-table-column>
<!-- 自定义组件里加了最右边的一列”操作“ -->
<el-table-column fixed="right" prop="op" label="操作" width="180px"> <el-table-column fixed="right" prop="op" label="操作" width="180px">
<template slot="header"> <template slot="header">
<!-- 插槽里放了一个文字 一个按钮 --> <c-col :span="11" style="text-align: center">
<c-col :span="11" style="text-align: center" <span>操作</span>
><span>操作</span>
</c-col> </c-col>
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<c-button <c-button style="margin-right: 5px" size="small" type="text"
style="margin-right: 7px" @click="handler(scope.row)">
size="small" 处理
type="text"
@click="handler(scope.row)"
>处理
</c-button> </c-button>
<!-- 申请一个弹出主键放在插槽，加工已渲染的数据 --> <span> </span>
<el-popover <el-popover
placement="top-start"
title="历史信息"
width="1200"
trigger="manual" trigger="manual"
v-clickOutside="closeDisplayDialog" v-clickOutside="closeDisplayDialog" placement="top-end" title="历史信息" width="1200" :ref="'popover_' + scope.row.inr">
:ref="'popover_' + scope.row.inr" <div style="text-align: right;margin-top: -30px;margin-right: 5px;font-size: 16px;">
> <span class="el-icon-close" style="cursor: pointer" @click="closeDetailsDialog('popover_' + scope.row.inr)"></span>
<div
style="
text-align: right;
margin-top: -30px;
margin-right: 5px;
font-size: 16px;
"
>
<span
class="el-icon-close"
style="cursor: pointer"
@click="closeDetailsDialog('popover_' + scope.row.inr)"
></span>
</div> </div>
<!--stmData改为trnData--> <el-table :data="trnData.data" :columns="trnData.columns" :showButtonFlg="true">
<el-table <el-table-column v-for="(item, key) in trnData.columns" :key="key" :label="item.label" :prop="item.prop" :width="item.width">
:data="stmData.data"
:columns="stmData.columns"
:showButtonFlg="true"
>
<el-table-column
v-for="(item, key) in trnData.columns"
:key="key"
:label="item.label"
:prop="item.prop"
:width="item.width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row[item.prop] }}</div> <div>{{ scope.row[item.prop] }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column fixed="right" prop="op" label="操作" width="100px">
fixed="right"
prop="op"
label="操作"
width="100px"
>
<template slot-scope="scope"> <template slot-scope="scope">
<c-button <c-button style="margin-left: 0" size="small" @click="display(scope.row)">快照
style="margin-left: 0" </c-button>
size="small"
@click="display(scope.row)"
>快照</c-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<c-button <c-button style="margin-left: 0" type="text" size="small" slot="reference" @click="details(scope.row)">
style="margin-left: 0px"
size="small"
type="text"
@click="details(scope.row)"
slot="reference"
>
快照 快照
</c-button> </c-button>
<c-button <c-button style="margin-left: 0" type="text" size="small" slot="reference" @click="toInfo(scope.row,'FTD')">
style="margin-left: 0"
type="text"
size="small"
slot="reference"
@click="toInfo(scope.row,'CPD','','I')">
Info Info
</c-button> </c-button>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="pagination-box" <div class="pagination-box"
style="display:block"> style="display:block">
...@@ -285,10 +269,16 @@ ...@@ -285,10 +269,16 @@
:page-size="pagination.pageSize" :page-size="pagination.pageSize"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="pagination.total"> :total="pagination.total">
>
</el-pagination> </el-pagination>
</div> </div>
</c-tabs> </el-tab-pane>
</el-tabs>
</c-col> </c-col>
</div>
</el-col>
<!-- 点击处理ba弹框 --> <!-- 点击处理ba弹框 -->
<el-dialog <el-dialog
...@@ -311,8 +301,8 @@ ...@@ -311,8 +301,8 @@
</div> </div>
</el-col> <!-- </el-col>
</div> </div> -->
</template> </template>
<script> <script>
import event from "../event"; import event from "../event";
......
src/page/Info/InfoRouter.js
...@@ -115,7 +115,7 @@ const DisplayRouter = [ ...@@ -115,7 +115,7 @@ const DisplayRouter = [
}, },
{ {
name: "InfoFtd", name: "InfoFtd",
path: "fttfcm", path: "fttfcminf",
component: () => import("./InfoFtd.vue"), component: () => import("./InfoFtd.vue"),
meta: {keepAlive: true, title: "Info-资金拆借"} meta: {keepAlive: true, title: "Info-资金拆借"}
}, },
...@@ -125,6 +125,12 @@ const DisplayRouter = [ ...@@ -125,6 +125,12 @@ const DisplayRouter = [
component: () => import("./InfoFxd.vue"), component: () => import("./InfoFxd.vue"),
meta: {keepAlive: true, title: "Info-结售汇/兑换平盘交易"} meta: {keepAlive: true, title: "Info-结售汇/兑换平盘交易"}
}, },
{
name: "InfoFtd",
path: "fttpcminf",
component: () => import("./InfoFtd.vue"),
meta: {keepAlive: true, title: "Info-头寸调拨"}
},
]; ];
export default DisplayRouter; export default DisplayRouter;
\ No newline at end of file
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