Skip to content

V
vue-gjjs
Commit ee49aada by liuxin
Options

Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

parents 731310c8 02c8b0c2
Showing with 133 additions and 12 deletions
src/config/CodeTable/index.js
......@@ -5923,6 +5923,24 @@ const CodeTable = {
{label:'automatic',value:''},
{label:'Selling Rate',value:'S'},
{label:'Buying Rate',value:'B'},
]
],
sptDetSta:[
{label:'Ord Waiting',value:'CRE'},
{label:'Waiting',value:'TRN'},
{label:'Correction',value:'COR'},
{label:'Delete',value:'DEL'},
{label:'Confirm',value:'FIN'},
{label:'订单取消',value:'CAN'},
{label:'Confirm',value:'REL'},
{label:'ORD Delete',value:'DES'},
{label:'Break',value:'BRK'},
{label:'报文接收',value:'INC'},
{label:'ORD Confirm',value:'SPT'},
{label:'复核',value:'SIG'},
{label:'ORD Break',value:'CMB'},
{label:'总行退回',value:'CTR'},
{label:'ORD Correction',value:'CMR'},
{label:'ReRouting',value:'ROU'},
],
}
export default CodeTable;
\ No newline at end of file
src/model/Infbed/Event.js
......@@ -120,6 +120,18 @@ export default {
},
async handleSearch() {
this.stmData.data = [];
let opndatfrom = this.model.infcon.opndatfrom;
if(!opndatfrom || opndatfrom == ''){
this.$notify.error({ title: '错误', message: '查询开始日期必输！' });
return;
}
let opndatto = this.model.infcon.opndatto;
if(!opndatto || opndatto == ''){
this.$notify.error({ title: '错误', message: '查询结束日期必输！' });
return;
}
let rtnmsg = await this.executeRule("infbut.searow")
if(rtnmsg.respCode == SUCCESS)
......@@ -132,5 +144,15 @@ export default {
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
display(index, row) {
debugger;
Api.post("getTrnNameByInr", { inr:row['INR'] }).then((res) => {
if (res.respCode == SUCCESS) {
const trnName = res.data.toLowerCase();
let viewurl = "/#/display/" + trnName + "?trn=" + row['INR']
window.open(viewurl, 'newwindow', 'height=1200,width=900,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
});
},
}
\ No newline at end of file
src/model/Infbed/index.js
......@@ -66,6 +66,7 @@ export default class Infbed{
diastm:"", // stream for diaries to selected contract .infcon.diastm
liastm:"", // Stream for all engagements to selected contract .infcon.liastm
ordstm:"", // Stream for Orders for Contract .infcon.ordstm
objinr:"",
},
seadoctypcod:"", // Document Type .seadoctypcod
infbut:{
......@@ -89,6 +90,8 @@ export default class Infbed{
ledgrp:{
rec:{
ownref:"", // 参考号 .ledgrp.rec.ownref
expdat:"", // Date of Expiry .didgrp.rec.expdat
inr:"",
},
cbs:{
opn1:{
......
src/views/Business/Ditdck/index.vue
......@@ -7,6 +7,13 @@
:handleCheck="handleCheck"
:handleStash="handleStash"
>
<el-button size="small">备忘录</el-button>
<el-button size="small">影像信息</el-button>
<!-- <el-button size="small">保存模板</el-button> -->
<!-- <el-button size="small">使用模板</el-button> -->
<el-button size="small">制裁信息</el-button>
<!-- <el-button size="small">拆分报文</el-button> -->
<el-button size="small">智能提示</el-button>
</c-function-btn>
<el-form
:model="model"
......@@ -49,7 +56,9 @@
</el-tab-pane>
<el-tab-pane label="费用及账务" name="setpan">
<c-content>
<m-setpan :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!-- <el-tab-pane label="分录" name="glepan">
......
src/views/Business/Infbed/Infsea.vue
......@@ -170,12 +170,48 @@
</template>
<template slot-scope="scope">
<c-button
<!-- <c-button
style="margin-left: 0"
size="small"
>
详情
</c-button>
</c-button> -->
<el-popover
placement="top-start"
title="历史信息"
width="800"
trigger="click"
:ref="'popover_' + scope.row.IDX"
>
<div style="text-align: right; margin-top: -30px; margin-right: 5px; font-size: 16px;">
<span class="el-icon-close" @click="closeTrn('popover_' + scope.row.IDX)"/>
</div>
<c-istream-table
:list="trnData.data"
:columns="trnData.columns"
>
<el-table-column prop="op" label="操作" width="0">
<template slot-scope="scope">
<c-button
style="margin-left: 0"
size="small"
type="primary"
@click="display(scope.$index, scope.row)"
>
查看详情
</c-button>
</template>
</el-table-column>
</c-istream-table>
<c-button
style="margin-left: 0"
size="small"
@click="getTrnInfo(scope.$index, scope.row)"
slot="reference"
>
详情
</c-button>
</el-popover>
<c-button
style="margin-left: 0"
size="small"
......@@ -223,6 +259,17 @@ export default {
return {
ownref:"",
initdialog:false,
trnData: {
columns: [
'1 1 "编号" 200',
'2 2 "交易名称" 100',
'3 3 "日期" 200',
'4 4 "状态" 50',
'5 5 "币种" 80',
'6 6 "金额" 80',
],
data: [],
},
stmData: {
columns: [
// '1 1 "Reference" 100',
......@@ -289,8 +336,25 @@ export default {
//跳转交易
this.$router.history.push("/business/" + code)
this.initdialog = false
},
closeTrn(refId){
this.$refs[refId].doClose();
},
async getTrnInfo(idx, row) {
this.model.infcon.objinr = row["INR"];
this.model.ledgrp.rec.inr = row["INR"];
this.model.infcon.chksubcon = "X";
this.dialogTableVisible = true;
let rtnmsg = await this.executeDefault("infcon.chksubcon");
if ((rtnmsg.respCode = SUCCESS)) {
this.trnData.data = rtnmsg.data.infcon_trnstm.rows;
}
},
},
},
created: function () {},
};
</script>
......
src/views/Business/Sptsel/Sptpopup.vue
......@@ -390,18 +390,19 @@ export default {
data() {
return {
model: new Sptsel().data,
codes: { hldflg: CodeTable.hldflg ,...CodeTable},
codes:{ hldflg: CodeTable.hldflg ,...CodeTable},
trnName:"sptsel",
stmData2:{
columns:[
// "7 1 \"Start\" 0",
{index:7,position:1,width:140,pattern:'timeFormat',label:'Start'},
"1 2 \"Type\" 0",
"8 3 \"User\" 0",
"4 4 \"TRN\" 0",
{index:1,position:1,width:140,pattern:'time',label:'Start'},
// "2 2 \"Type\" 0",
{index:2,position:2,width:'auto',pattern:'code',label:'Type',code:CodeTable.sptDetSta},
"3 3 \"User\" auto",
"4 4 \"TRN\" auto",
// "7 5 \"End\" 0",
{index:7,position:5,width:140,pattern:'timeFormat',label:'End'},
"6 6 \"Text\" 0",
{index:5,position:5,width:140,pattern:'time',label:'End'},
"8 6 \"Text\" auto",
],
data:[],
}
......@@ -414,8 +415,10 @@ export default {
...Event,
loadData() {
this.model = JSON.parse(sessionStorage.getItem("Sptpopup"));
// let rtnmsg1 = this.executeRule("inc")
let rtnmsg2 = this.executeRule("sptp.butord")
this.executeRule("sptp.ordp0.butore").then((res) => {
this.stmData2.data=res.data.sptstm.rows;
this.stmData2.data=res.data.vals.rows;
});
},
......
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