Skip to content

V
vue-gjjs
Commit 2b01c064 by hulei
Options

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

parents 59fd7fb9 c6ede4f6
Showing with 50 additions and 28 deletions
src/mixin/commonApi.js
...@@ -137,7 +137,12 @@ export default { ...@@ -137,7 +137,12 @@ export default {
return return
const loading = this.loading("快照数据加载中") const loading = this.loading("快照数据加载中")
let data = await Api.post("display/" + inr) let data = await Api.post("display/" + inr)
Utils.copyValueFromVO(this.model, JSON.parse(data.data)) if(data.data)
{
Utils.copyValueFromVO(this.model, JSON.parse(data.data))
}else{
this.$notify.error({title: '错误',message: '快照文件加载失败！'});
}
loading.close() loading.close()
}, },
async executeNotify(params) { async executeNotify(params) {
......
src/model/Trnrel/Event.js
...@@ -388,6 +388,9 @@ export default { ...@@ -388,6 +388,9 @@ export default {
// this.model.trncorco.trnstm = res.data.trncorco_trnstm; // this.model.trncorco.trnstm = res.data.trncorco_trnstm;
// }) // })
// } // }
if(this.model.trncorco.relflg == ''){
this.model.trncorco.relflg = '0';
}
const res = await this.executeRule("inftrnps,searow") const res = await this.executeRule("inftrnps,searow")
that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows; that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows;
this.model.trncorco.trnstm = res.data.trncorco_trnstm; this.model.trncorco.trnstm = res.data.trncorco_trnstm;
...@@ -404,6 +407,9 @@ export default { ...@@ -404,6 +407,9 @@ export default {
}, },
async trnfndhandleSearch() { async trnfndhandleSearch() {
const that = this.root; const that = this.root;
if(this.model.trncorco.relflg == ''){
this.model.trncorco.relflg = '1';
}
const res = await this.executeRule("inftrnps,searow") const res = await this.executeRule("inftrnps,searow")
that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows; that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows;
this.model.trncorco.trnstm = res.data.trncorco_trnstm; this.model.trncorco.trnstm = res.data.trncorco_trnstm;
......
src/views/Business/Bdtset/Utlp.vue
...@@ -703,7 +703,7 @@ export default { ...@@ -703,7 +703,7 @@ export default {
computed: { computed: {
crefinflg: { crefinflg: {
get() { get() {
return this.model.trtcre.crefinflg == 'X' || this.model.trtcre.crefinflg == 'O' return this.model.trtcre.crefinflg != ''
}, },
set(val) { set(val) {
this.model.trtcre.crefinflg = val ? "X" : "" this.model.trtcre.crefinflg = val ? "X" : ""
...@@ -711,7 +711,7 @@ export default { ...@@ -711,7 +711,7 @@ export default {
}, },
clsflg: { clsflg: {
get() { get() {
return this.model.mtabut.clsflg == 'X' || this.model.mtabut.clsflg == 'O' return this.model.mtabut.clsflg != ''
}, },
set(val) { set(val) {
this.model.mtabut.clsflg = val ? "X" : "" this.model.mtabut.clsflg = val ? "X" : ""
...@@ -719,7 +719,7 @@ export default { ...@@ -719,7 +719,7 @@ export default {
}, },
paypsb: { paypsb: {
get() { get() {
return this.model.paypsb == 'X' || this.model.paypsb == 'O' return this.model.paypsb != ''
}, },
set(val) { set(val) {
this.model.paypsb = val ? "X" : "" this.model.paypsb = val ? "X" : ""
...@@ -727,7 +727,7 @@ export default { ...@@ -727,7 +727,7 @@ export default {
}, },
frepayflg: { frepayflg: {
get() { get() {
return this.model.bddgrp.rec.frepayflg == 'X' || this.model.bddgrp.rec.frepayflg == 'O' return this.model.bddgrp.rec.frepayflg != ''
}, },
set(val) { set(val) {
this.model.bddgrp.rec.frepayflg = val ? "X" : "" this.model.bddgrp.rec.frepayflg = val ? "X" : ""
...@@ -735,7 +735,7 @@ export default { ...@@ -735,7 +735,7 @@ export default {
}, },
dfflag: { dfflag: {
get() { get() {
return this.model.dftcre.dfflag == 'X' || this.model.dftcre.dfflag == 'O' return this.model.dftcre.dfflag != ''
}, },
set(val) { set(val) {
this.model.dftcre.dfflag = val ? "X" : "" this.model.dftcre.dfflag = val ? "X" : ""
......
src/views/Business/Trnrel/Inftrnps.vue
...@@ -546,14 +546,18 @@ export default { ...@@ -546,14 +546,18 @@ export default {
columns: [ columns: [
'10 1 "交易代码" 80', '10 1 "交易代码" 80',
'11 2 "业务编号" 150', '11 2 "业务编号" 150',
'11 3 "摘要信息" 150', '17 3 "摘要信息" 300',
'12 4 "币种" 50', '12 4 "币种" 50',
'13 5 "金额" 100', '13 5 "金额" 100',
'14 6 "创建时间" 170', '14 6 "创建时间" 170',
'9 7 "签名要求" 70', '9 7 "签名要求" 70',
'2 8 "签名状态" 70', '2 8 "签名状态" 70',
'16 9 "经办柜员" 70', '16 9 "经办柜员" 70',
'0 10 "业务状态" 80', // '0 10 "业务状态" 80',
{index:0,position:10,width:80,pattern:'code',label:'业务状态',code:[{label: "Waiting", value: "W"},
{ label: "Correct", value: "C" },
{ label: "Picked up", value: "P" },
{ label: "Rejected", value: "N" },]},
'15 11 "业务机构" 120', '15 11 "业务机构" 120',
], ],
data: [], data: [],
......
src/views/Business/Trnrel/InftrnpsDetail.vue
...@@ -293,16 +293,18 @@ ...@@ -293,16 +293,18 @@
<c-button <c-button
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
type="primary"
@click="show(scope.$index,scope.row)" @click="show(scope.$index,scope.row)"
> >
Show 显示
</c-button> </c-button>
<!-- <c-button <c-button
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
type="primary"
> >
生成PDF 打印
</c-button> --> </c-button>
</template> </template>
</el-table-column> </el-table-column>
</c-istream-table> </c-istream-table>
......
src/views/Business/Trnrel/Trnfnd/Inftrnps.vue
...@@ -493,14 +493,17 @@ export default { ...@@ -493,14 +493,17 @@ export default {
columns: [ columns: [
'10 1 "交易代码" 80', '10 1 "交易代码" 80',
'11 2 "业务编号" 170', '11 2 "业务编号" 170',
'12 3 "币种" 70', '17 3 "摘要信息" 300',
'13 4 "金额" 100', '12 4 "币种" 70',
'14 5 "创建时间" 170', '13 5 "金额" 100',
'9 6 "签名要求" 80', '14 6 "创建时间" 170',
'2 7 "签名状态" 80', '9 7 "签名要求" 80',
'16 8 "经办柜员" 80', '2 8 "签名状态" 80',
'0 9 "业务状态" 80', '16 9 "经办柜员" 80',
'15 10 "业务机构" 200', // '0 10 "业务状态" 80',
{index:0,position:10,width:80,pattern:'code',label:'业务状态',code:[{ label: "Final", value: "F" },
{ label: "Released", value: "R" },]},
'15 11 "业务机构" 200',
], ],
data: [], data: [],
}, },
......
src/views/Business/Trnrel/Trnfnd/TrnfndsDetail.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<c-page title=""> <c-page title="">
<!-- <div class="eContainer"> --> <!-- <div class="eContainer"> -->
<c-content :height="120"> <c-content :height="120">
<div class="eibs-tab" style="margin-left:9px;padding:5px 5px 5px 5px"> <div class="eibs-tab">
<!-- <c-col :span="23"> <!-- <c-col :span="23">
<div style="float:right;margin-bottom:10px"> <div style="float:right;margin-bottom:10px">
<el-button size="small">交易快照</el-button> <el-button size="small">交易快照</el-button>
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
size="small" size="small"
> >
<c-content> <c-content>
<c-col :span="23" style="margin:0 0 5px 0"> <!-- <c-col :span="23" style="margin:0 0 5px 0"> -->
<c-col :span="13" style="height:24px;"> <c-col :span="12" style="height:24px;">
<el-form-item label="基本信息" class="messageLabel"> <el-form-item label="基本信息" class="messageLabel">
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<c-button size="small" type="primary" style="margin-left:0">智能提示</c-button> <c-button size="small" type="primary" style="margin-left:0">智能提示</c-button>
<c-button size="small" @click="exit" type="primary" style="margin-left:0">返回</c-button> <c-button size="small" @click="exit" type="primary" style="margin-left:0">返回</c-button>
</c-col> </c-col>
</c-col> <!-- </c-col> -->
<c-col :span="23" style="height: 10px;margin-bottom:10px"> <c-col :span="23" style="height: 10px;margin-bottom:10px">
<el-divider></el-divider> <el-divider></el-divider>
</c-col> </c-col>
...@@ -293,16 +293,18 @@ ...@@ -293,16 +293,18 @@
<c-button <c-button
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
type="primary"
@click="show(scope.$index,scope.row)" @click="show(scope.$index,scope.row)"
> >
Show 显示
</c-button> </c-button>
<!-- <c-button <c-button
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
type="primary"
> >
生成PDF 打印
</c-button> --> </c-button>
</template> </template>
</el-table-column> </el-table-column>
</c-istream-table> </c-istream-table>
......
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