Skip to content

V
vue-gjjs
Commit a128a8c4 by liuxin
Options

待复核已完成付款页面调整

parent 2e13eaae
Showing with 149 additions and 175 deletions
src/views/Business/Bdtset/Utlp.vue
......@@ -13,7 +13,7 @@
></c-input>
</el-form-item>
</c-col>
<c-col :span="1" style="text-align: right;">
<c-col :span="1" style="text-align: right;margin-left:10px">
<c-button
style="margin:0;padding: 0 14px;"
size="small"
......@@ -23,7 +23,7 @@
</c-button>
</c-col>
<c-col :span="11">
<c-col :span="11" style="margin-left:-10px">
<el-form-item
label="到期日"
prop="didgrp.rec.expdat"
......@@ -51,9 +51,8 @@
></c-input>
</el-form-item>
</c-col>
<c-col :span="1">&nbsp;</c-col>
<c-col :span="11">
<el-form-item label="" prop="didgrp.cbs.opn1.amt" label-width="0">
<c-col :span="12">
<el-form-item label="" prop="didgrp.cbs.opn1.amt" label-width="2%">
<c-input
v-model="model.didgrp.cbs.opn1.amt"
placeholder="请输入Balance"
......@@ -64,7 +63,7 @@
</c-col>
</c-col>
<c-col :span="24" style="height:24px">
<c-col :span="24" style="height:24px;margin-top:-10px">
<el-form-item label="单据信息" class="messageLabel">
</el-form-item>
</c-col>
......@@ -120,11 +119,8 @@
</c-select>
</el-form-item>
</c-col>
<c-col :span="1">
&nbsp;
</c-col>
<c-col :span="11">
<el-form-item label="" prop="bddgrp.cbs.max.amt" label-width="0">
<c-col :span="12">
<el-form-item label="" prop="bddgrp.cbs.max.amt" label-width="2%">
<c-input
v-model="model.bddgrp.cbs.max.amt"
placeholder="请输入单据金额"
......@@ -144,11 +140,8 @@
></c-select>
</el-form-item>
</c-col>
<c-col :span="1">
&nbsp;
</c-col>
<c-col :span="11">
<el-form-item label="" prop="bddgrp.cbs.opn1.amt" label-width="0">
<c-col :span="12">
<el-form-item label="" prop="bddgrp.cbs.opn1.amt" label-width="2%">
<c-input
v-model="model.bddgrp.cbs.opn1.amt"
placeholder="请输入Balance"
......@@ -330,7 +323,7 @@
</c-col> -->
<!-- =========bottom-left======== -->
<c-col :span="24" style="height:24px">
<c-col :span="24" style="height:24px;margin-top:-10px">
<el-form-item label="付款信息" class="messageLabel">
</el-form-item>
</c-col>
......@@ -357,9 +350,8 @@
></c-input>
</el-form-item>
</c-col>
<c-col :span="1">&nbsp;</c-col>
<c-col :span="11">
<el-form-item label="" prop="setmod.docamt" label-width="0">
<c-col :span="12">
<el-form-item label="" prop="setmod.docamt" label-width="2%">
<c-input
v-model="model.setmod.docamt"
placeholder="请输入document amount"
......@@ -379,9 +371,8 @@
></c-input>
</el-form-item>
</c-col>
<c-col :span="1">&nbsp;</c-col>
<c-col :span="11">
<el-form-item label="" prop="setmod.redamt" label-width="0">
<c-col :span="12">
<el-form-item label="" prop="setmod.redamt" label-width="2%">
<c-input
v-model="model.setmod.redamt"
placeholder="请输入扣减金额"
......@@ -402,9 +393,8 @@
></c-input>
</el-form-item>
</c-col>
<c-col :span="1">&nbsp;</c-col>
<c-col :span="11">
<el-form-item label="" prop="setmod.setamt" label-width="0">
<c-col :span="12">
<el-form-item label="" prop="setmod.setamt" label-width="2%">
<c-input
v-model="model.setmod.setamt"
placeholder="请输入扣费后付款金额"
......@@ -533,7 +523,7 @@
></c-ptapdome> -->
</c-col>
<c-col :span="24" style="height:24px">
<c-col :span="24" style="height:24px;margin-top:-10px">
<el-form-item label="表外信息" class="messageLabel">
</el-form-item>
</c-col>
......
src/views/Business/Trnrel/InftrnpsDetail.vue
......@@ -31,7 +31,7 @@
<el-form-item label="基本信息" class="messageLabel">
</el-form-item>
</c-col>
<c-col :span="10" style="text-align:right;">
<c-col :span="11" style="text-align:right;">
<c-button size="small" type="primary" style="margin-left:0" @click="display">交易快照</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>
......@@ -86,11 +86,10 @@
<c-input v-model="model.trn.reloricur" maxlength="3" disabled placeholder="请输入Relevant Amount"></c-input>
</el-form-item>
</c-col>
<c-col :span="1">
&nbsp;
</c-col>
<c-col :span="11">
<c-col :span="12">
<el-form-item label="" label-width="2%">
<c-input v-model="model.trn.reloriamt" disabled placeholder="请输入Relevant Amount for Release in Original Currency"></c-input>
</el-form-item>
</c-col>
</c-col>
......@@ -299,12 +298,12 @@
>
Show
</c-button>
<c-button
<!-- <c-button
style="margin-left: 0"
size="small"
>
生成PDF
</c-button>
</c-button> -->
</template>
</el-table-column>
</c-istream-table>
......@@ -348,17 +347,6 @@
</el-select> -->
</template>
</el-table-column>
<!-- <el-table-column
fixed="right"
prop="display"
label="操作"
width="200px"
>
<template slot="header">
<c-col :span="11" style="text-align:left"><span>操作</span></c-col>
<c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col>
</template>
</el-table-column> -->
</c-istream-table>
</c-col>
</c-col>
......@@ -373,37 +361,7 @@
</c-col>
<c-col :span="23">
<c-col :span="23" :offset="1">
<!-- <c-input v-model="model.recpan.wfestm" placeholder="请输入WFEs for transaction for display"></c-input> -->
<c-istream-table :list="stmData.data" :columns="stmData.columns" :paginationShow="false" style="width:100%">
<!-- <el-table-column
fixed="right"
prop="display"
label="操作"
width="150px"
>
<template slot="header">
<c-col :span="11" style="text-align:left"><span>操作</span></c-col>
<c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col>
</template>
<template slot-scope="scope">
<c-button
style="margin-left: 0"
size="small"
type="primary"
@click="onDetail(scope.$index,scope.row)"
>
详情
</c-button>
<c-button
style="margin-left: 0"
size="small"
type="primary"
@click="onHandle(scope.$index,scope.row)"
>
处理
</c-button>
</template>
</el-table-column> -->
</c-istream-table>
</c-col>
</c-col>
......@@ -447,11 +405,32 @@ export default {
],
data: [],
},
codes: { infdsp: CodeTable.infdsp,
flg : CodeTable.flg,
atptxt : CodeTable.atptxt,
relstaEN : CodeTable.relstaEN,
usgtxt : CodeTable.usgtxt,
wfetrssta : CodeTable.wfetrssta },
stmData: {
columns: [
'1 1 "ID" 100',
'2 2 "Service" 125',
'3 3 "Status" 100',
// '3 3 "Status" 100',
{index:3,position:3,width:100,pattern:'code',label:'Status',code:[{ label: "Done", value: "D" },
{ label: "Released", value: "1" },
{ label: "Cancel", value: "C" },
{ label: "Error", value: "E" },
{ label: "Open", value: "O" },
{ label: "Created", value: "6" },
{ label: "Waiting", value: "W" },
{ label: "Reject", value: "2" },
{ label: "Active", value: "A" },
{ label: "External confirmation", value: "5" },
{ label: "Skip", value: "S" },
{ label: "Correction required", value: "3" },
{ label: "Signed at creation", value: "4" },
{ label: "Retry", value: "R" },]},
// {index:1,position:4,width:100,pattern:'code',label:'状态',code:this.codes.sptrelstatus},
'4 4 "Last Update" 125',
'5 5 "Retries" 100',
'6 6 "Text" 300',
......@@ -460,12 +439,6 @@ export default {
],
data: [],
},
codes: { infdsp: CodeTable.infdsp,
flg : CodeTable.flg,
atptxt : CodeTable.atptxt,
relstaEN : CodeTable.relstaEN,
usgtxt : CodeTable.usgtxt,
wfetrssta : CodeTable.wfetrssta },
action:[],
}
},
......@@ -481,17 +454,22 @@ export default {
this.SignaturesData.data = this.model.recpan.trsstm.rows;
this.stmData.data = this.model.recpan.wfestm.rows;
var code = this.codes.flg;
for (let i = 0; i < this.SignaturesData.data.length; i++) {
const d = this.SignaturesData.data[i];
this.action = this.CalCode(this.SignaturesData.data, code, 3);
},
CalCode(table, code, index){
var result = [];
for (let i = 0; i < table.length; i++) {
const d = table[i];
const items = d.split("\t");
this.action[i] = items[items.length - 2];
result[i] = items[index];
for(let j = 0; j < code.length; j++){
if(code[j].value === this.action[i]){
this.action[i] = code[j].label;
if(code[j].value === result[i]){
result[i] = code[j].label;
continue;
}
}
}
return result;
},
exit(){
this.$store.dispatch("TagsView/delView", this.$route)
......
src/views/Business/Trnrel/Trnfnd/TrnfndsDetail.vue
......@@ -26,20 +26,22 @@
size="small"
>
<c-content>
<c-col :span="13" style="height:24px">
<c-col :span="23" style="margin:0 0 5px 0">
<c-col :span="13" style="height:24px;">
<el-form-item label="基本信息" class="messageLabel">
</el-form-item>
</c-col>
<c-col :span="10" style="text-align:right">
<c-col :span="11" style="text-align:right;">
<c-button size="small" type="primary" style="margin-left:0" @click="display">交易快照</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-col>
</c-col>
<c-col :span="23" style="height: 10px;margin-bottom:10px">
<el-divider></el-divider>
</c-col>
<!-- -------------------基础信息------------------- -->
<!-- ========================= Left ========================= -->
......@@ -84,11 +86,10 @@
<c-input v-model="model.trn.reloricur" maxlength="3" disabled placeholder="请输入Relevant Amount"></c-input>
</el-form-item>
</c-col>
<c-col :span="1">
&nbsp;
</c-col>
<c-col :span="11">
<c-col :span="12">
<el-form-item label="" label-width="2%">
<c-input v-model="model.trn.reloriamt" disabled placeholder="请输入Relevant Amount for Release in Original Currency"></c-input>
</el-form-item>
</c-col>
</c-col>
......@@ -129,20 +130,6 @@
</c-col>
<c-col :span="24">
<c-col :span="12">
<el-form-item label="Entered by">
<c-input v-model="model.recpan.cretrs.usr" maxlength="8" disabled placeholder="请输入Entered by"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label-width="35%" label="Timestamp">
<c-input v-model="model.recpan.cretrs.dattim" disabled placeholder="请输入Timestamp"></c-input>
</el-form-item>
</c-col>
</c-col>
<c-col :span="24">
<c-col :span="22">
<el-form-item label="Infotext">
<c-input type="textarea" v-model="model.trn.inftxt" maxlength="65" :rows="3" show-word-limit placeholder="请输入Infotext" ></c-input>
......@@ -236,6 +223,19 @@
<c-input style="font-weight:bold" v-model="model.recpan.cpltxt" disabled placeholder="请输入Based on Ident No."></c-input>
</el-form-item>
</c-col> -->
<c-col :span="24">
<c-col :span="12">
<el-form-item label="Entered by">
<c-input v-model="model.recpan.cretrs.usr" maxlength="8" disabled placeholder="请输入Entered by"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label-width="35%" label="Timestamp">
<c-input v-model="model.recpan.cretrs.dattim" disabled placeholder="请输入Timestamp"></c-input>
</el-form-item>
</c-col>
</c-col>
<c-col :span="24">
<el-form-item label="Infoflag">
......@@ -278,7 +278,7 @@
</c-col>
<c-col :span="23">
<!-- <c-input v-model="model.recpan.smhstm" placeholder="请输入Documents"></c-input> -->
<c-col :span="24">
<c-col :span="23" :offset="1">
<c-istream-table :list="documentsData.data" :columns="documentsData.columns" :paginationShow="false" style="width:100%">
<el-table-column
fixed="right"
......@@ -290,19 +290,20 @@
<c-col :span="11" style="text-align:left"><span>操作</span></c-col>
<c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col>
</template>
<template>
<template slot-scope="scope">
<c-button
style="margin-left: 0"
size="small"
@click="show(scope.$index,scope.row)"
>
Show
</c-button>
<c-button
<!-- <c-button
style="margin-left: 0"
size="small"
>
生成PDF
</c-button>
</c-button> -->
</template>
</el-table-column>
</c-istream-table>
......@@ -331,32 +332,21 @@
</c-col>
<c-col :span="23">
<!-- <c-input v-model="model.recpan.trsstm" placeholder="请输入Signatures"></c-input> -->
<c-col :span="24">
<c-col :span="23" :offset="1">
<c-istream-table :list="SignaturesData.data" :columns="SignaturesData.columns" :paginationShow="false" style="width:100%">
<el-table-column label="Action" width="auto">
<template slot-scope="scope">
<!-- <span>{{JSON.stringify(scope.row)}}</span> -->
<el-select v-model="action[scope.row.IDX]" style="100%" disabled>
<span>{{action[scope.row.IDX]}}</span>
<!-- <el-select v-model="action[scope.row.IDX]" style="100%" disabled>
<el-option
v-for="item in codes.flg"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-select> -->
</template>
</el-table-column>
<!-- <el-table-column
fixed="right"
prop="display"
label="操作"
width="200px"
>
<template slot="header">
<c-col :span="11" style="text-align:left"><span>操作</span></c-col>
<c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col>
</template>
</el-table-column> -->
</c-istream-table>
</c-col>
</c-col>
......@@ -370,38 +360,8 @@
<el-divider></el-divider>
</c-col>
<c-col :span="23">
<c-col :span="24">
<!-- <c-input v-model="model.recpan.wfestm" placeholder="请输入WFEs for transaction for display"></c-input> -->
<c-col :span="23" :offset="1">
<c-istream-table :list="stmData.data" :columns="stmData.columns" :paginationShow="false" style="width:100%">
<!-- <el-table-column
fixed="right"
prop="display"
label="操作"
width="150px"
>
<template slot="header">
<c-col :span="11" style="text-align:left"><span>操作</span></c-col>
<c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col>
</template>
<template slot-scope="scope">
<c-button
style="margin-left: 0"
size="small"
type="primary"
@click="onDetail(scope.$index,scope.row)"
>
详情
</c-button>
<c-button
style="margin-left: 0"
size="small"
type="primary"
@click="onHandle(scope.$index,scope.row)"
>
处理
</c-button>
</template>
</el-table-column> -->
</c-istream-table>
</c-col>
</c-col>
......@@ -420,6 +380,7 @@ import Api from "~/service/Api"
import CommonProcess from "~/mixin/CommonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "~/model/Trnrel/Event"
import DocUtils from '~/utils/DocUtils'
export default {
name: "InftrnpsDetail",
......@@ -429,11 +390,9 @@ export default {
model: new Trnrel().data,
documentsData: {
columns: [
"1 1 \"Type\" 100 1 0:0 1 CORTYP",
"1 1 \"Type\" 300 1 0:0 1 CORTYP",
"2 2 \"External Key\" 300",
"3 3 \"Document\" 300",
"4 4 \"Show\" 200 5 6:1 0 A",
"5 5 \"GenPDF\" auto 5 6:1 0 B"
"3 3 \"Document\" auto",
],
data: [],
},
......@@ -446,11 +405,32 @@ export default {
],
data: [],
},
codes: { infdsp: CodeTable.infdsp,
flg : CodeTable.flg,
atptxt : CodeTable.atptxt,
relstaEN : CodeTable.relstaEN,
usgtxt : CodeTable.usgtxt,
wfetrssta : CodeTable.wfetrssta },
stmData: {
columns: [
'1 1 "ID" 100',
'2 2 "Service" 125',
'3 3 "Status" 100',
// '3 3 "Status" 100',
{index:3,position:3,width:100,pattern:'code',label:'Status',code:[{ label: "Done", value: "D" },
{ label: "Released", value: "1" },
{ label: "Cancel", value: "C" },
{ label: "Error", value: "E" },
{ label: "Open", value: "O" },
{ label: "Created", value: "6" },
{ label: "Waiting", value: "W" },
{ label: "Reject", value: "2" },
{ label: "Active", value: "A" },
{ label: "External confirmation", value: "5" },
{ label: "Skip", value: "S" },
{ label: "Correction required", value: "3" },
{ label: "Signed at creation", value: "4" },
{ label: "Retry", value: "R" },]},
// {index:1,position:4,width:100,pattern:'code',label:'状态',code:this.codes.sptrelstatus},
'4 4 "Last Update" 125',
'5 5 "Retries" 100',
'6 6 "Text" 300',
......@@ -459,11 +439,6 @@ export default {
],
data: [],
},
codes: { infdsp: CodeTable.infdsp,
flg : CodeTable.flg,
atptxt : CodeTable.atptxt,
relstaEN : CodeTable.relstaEN,
usgtxt : CodeTable.usgtxt },
action:[],
}
},
......@@ -471,19 +446,30 @@ export default {
this.loadData()
},
methods: {
...Event,
loadData() {
// const { data } = this.$route.query
this.model = JSON.parse(sessionStorage.getItem('InftrnpsDetail'));
this.documentsData.data = this.model.recpan.smhstm.rows;
this.SignaturesData.data = this.model.recpan.trsstm.rows;
this.stmData.data = this.model.recpan.wfestm.rows;
console.log(this.SignaturesData.data)
for (let i = 0; i < this.SignaturesData.data.length; i++) {
const d = this.SignaturesData.data[i];
var code = this.codes.flg;
this.action = this.CalCode(this.SignaturesData.data, code, 3);
},
CalCode(table, code, index){
var result = [];
for (let i = 0; i < table.length; i++) {
const d = table[i];
const items = d.split("\t");
this.action[i] = items[items.length - 2];
result[i] = items[index];
for(let j = 0; j < code.length; j++){
if(code[j].value === result[i]){
result[i] = code[j].label;
continue;
}
}
}
console.log(this.action)
return result;
},
exit(){
this.$store.dispatch("TagsView/delView", this.$route)
......@@ -500,7 +486,27 @@ export default {
}
});
},
...Event
async show(idx,row){
var params = {selDst:"recpan.smhstm",selIds:[idx+1],selBtnId:"A"}
let rtnmsg = await Api.post(`trnrel/executeRule/recpan.smhstm`, this.wrapper(params))
if (rtnmsg.respCode == SUCCESS) {
this.title = "面函"
let viewurl = "/#/docpan/show";
let XMLdata;
if (row.Type == 'LET') {
window.sessionStorage.docXML = ''
window.sessionStorage.docXML = rtnmsg.data.docimm_xmldocblk;
}
else if (row.pandsc == "MT799") {
window.sessionStorage.docTXT = ''
XMLdata = rtnmsg.data.litbenl1blk
}
window.open(viewurl, 'newwindow', 'height=1200,width=800,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败！' })
}
}
}
}
</script>
......
src/views/Layout/Header.vue
......@@ -140,7 +140,7 @@ export default {
dialogOpen: false,
loading: false,
count: "",
accDate: window.sessionStorage.accDate || "",
accDate: window.sessionStorage.accDate || new Date().toLocaleDateString(),
noticeboardData: [],
langSelectVisible: false,
languageOptions: [
......
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