Skip to content

V
vue-gjjs
Commit a128a8c4 by liuxin
Options

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

parent 2e13eaae
Showing with 56 additions and 88 deletions
src/views/Business/Bdtset/Utlp.vue
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="1" style="text-align: right;"> <c-col :span="1" style="text-align: right;margin-left:10px">
<c-button <c-button
style="margin:0;padding: 0 14px;" style="margin:0;padding: 0 14px;"
size="small" size="small"
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</c-button> </c-button>
</c-col> </c-col>
<c-col :span="11"> <c-col :span="11" style="margin-left:-10px">
<el-form-item <el-form-item
label="到期日" label="到期日"
prop="didgrp.rec.expdat" prop="didgrp.rec.expdat"
...@@ -51,9 +51,8 @@ ...@@ -51,9 +51,8 @@
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="1">&nbsp;</c-col> <c-col :span="12">
<c-col :span="11"> <el-form-item label="" prop="didgrp.cbs.opn1.amt" label-width="2%">
<el-form-item label="" prop="didgrp.cbs.opn1.amt" label-width="0">
<c-input <c-input
v-model="model.didgrp.cbs.opn1.amt" v-model="model.didgrp.cbs.opn1.amt"
placeholder="请输入Balance" placeholder="请输入Balance"
...@@ -64,7 +63,7 @@ ...@@ -64,7 +63,7 @@
</c-col> </c-col>
</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 label="单据信息" class="messageLabel">
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -120,11 +119,8 @@ ...@@ -120,11 +119,8 @@
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="1"> <c-col :span="12">
&nbsp; <el-form-item label="" prop="bddgrp.cbs.max.amt" label-width="2%">
</c-col>
<c-col :span="11">
<el-form-item label="" prop="bddgrp.cbs.max.amt" label-width="0">
<c-input <c-input
v-model="model.bddgrp.cbs.max.amt" v-model="model.bddgrp.cbs.max.amt"
placeholder="请输入单据金额" placeholder="请输入单据金额"
...@@ -144,11 +140,8 @@ ...@@ -144,11 +140,8 @@
></c-select> ></c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="1"> <c-col :span="12">
&nbsp; <el-form-item label="" prop="bddgrp.cbs.opn1.amt" label-width="2%">
</c-col>
<c-col :span="11">
<el-form-item label="" prop="bddgrp.cbs.opn1.amt" label-width="0">
<c-input <c-input
v-model="model.bddgrp.cbs.opn1.amt" v-model="model.bddgrp.cbs.opn1.amt"
placeholder="请输入Balance" placeholder="请输入Balance"
...@@ -330,7 +323,7 @@ ...@@ -330,7 +323,7 @@
</c-col> --> </c-col> -->
<!-- =========bottom-left======== --> <!-- =========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 label="付款信息" class="messageLabel">
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -357,9 +350,8 @@ ...@@ -357,9 +350,8 @@
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="1">&nbsp;</c-col> <c-col :span="12">
<c-col :span="11"> <el-form-item label="" prop="setmod.docamt" label-width="2%">
<el-form-item label="" prop="setmod.docamt" label-width="0">
<c-input <c-input
v-model="model.setmod.docamt" v-model="model.setmod.docamt"
placeholder="请输入document amount" placeholder="请输入document amount"
...@@ -379,9 +371,8 @@ ...@@ -379,9 +371,8 @@
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="1">&nbsp;</c-col> <c-col :span="12">
<c-col :span="11"> <el-form-item label="" prop="setmod.redamt" label-width="2%">
<el-form-item label="" prop="setmod.redamt" label-width="0">
<c-input <c-input
v-model="model.setmod.redamt" v-model="model.setmod.redamt"
placeholder="请输入扣减金额" placeholder="请输入扣减金额"
...@@ -402,9 +393,8 @@ ...@@ -402,9 +393,8 @@
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="1">&nbsp;</c-col> <c-col :span="12">
<c-col :span="11"> <el-form-item label="" prop="setmod.setamt" label-width="2%">
<el-form-item label="" prop="setmod.setamt" label-width="0">
<c-input <c-input
v-model="model.setmod.setamt" v-model="model.setmod.setamt"
placeholder="请输入扣费后付款金额" placeholder="请输入扣费后付款金额"
...@@ -533,7 +523,7 @@ ...@@ -533,7 +523,7 @@
></c-ptapdome> --> ></c-ptapdome> -->
</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 label="表外信息" class="messageLabel">
</el-form-item> </el-form-item>
</c-col> </c-col>
......
src/views/Business/Trnrel/InftrnpsDetail.vue
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<el-form-item label="基本信息" class="messageLabel"> <el-form-item label="基本信息" class="messageLabel">
</el-form-item> </el-form-item>
</c-col> </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" @click="display">交易快照</c-button>
<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>
...@@ -86,11 +86,10 @@ ...@@ -86,11 +86,10 @@
<c-input v-model="model.trn.reloricur" maxlength="3" disabled placeholder="请输入Relevant Amount"></c-input> <c-input v-model="model.trn.reloricur" maxlength="3" disabled placeholder="请输入Relevant Amount"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="1"> <c-col :span="12">
&nbsp; <el-form-item label="" label-width="2%">
</c-col>
<c-col :span="11">
<c-input v-model="model.trn.reloriamt" disabled placeholder="请输入Relevant Amount for Release in Original Currency"></c-input> <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>
</c-col> </c-col>
...@@ -299,12 +298,12 @@ ...@@ -299,12 +298,12 @@
> >
Show Show
</c-button> </c-button>
<c-button <!-- <c-button
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
> >
生成PDF 生成PDF
</c-button> </c-button> -->
</template> </template>
</el-table-column> </el-table-column>
</c-istream-table> </c-istream-table>
...@@ -348,17 +347,6 @@ ...@@ -348,17 +347,6 @@
</el-select> --> </el-select> -->
</template> </template>
</el-table-column> </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-istream-table>
</c-col> </c-col>
</c-col> </c-col>
...@@ -373,37 +361,7 @@ ...@@ -373,37 +361,7 @@
</c-col> </c-col>
<c-col :span="23"> <c-col :span="23">
<c-col :span="23" :offset="1"> <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%"> <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-istream-table>
</c-col> </c-col>
</c-col> </c-col>
...@@ -447,11 +405,32 @@ export default { ...@@ -447,11 +405,32 @@ export default {
], ],
data: [], data: [],
}, },
codes: { infdsp: CodeTable.infdsp,
flg : CodeTable.flg,
atptxt : CodeTable.atptxt,
relstaEN : CodeTable.relstaEN,
usgtxt : CodeTable.usgtxt,
wfetrssta : CodeTable.wfetrssta },
stmData: { stmData: {
columns: [ columns: [
'1 1 "ID" 100', '1 1 "ID" 100',
'2 2 "Service" 125', '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', '4 4 "Last Update" 125',
'5 5 "Retries" 100', '5 5 "Retries" 100',
'6 6 "Text" 300', '6 6 "Text" 300',
...@@ -460,12 +439,6 @@ export default { ...@@ -460,12 +439,6 @@ export default {
], ],
data: [], data: [],
}, },
codes: { infdsp: CodeTable.infdsp,
flg : CodeTable.flg,
atptxt : CodeTable.atptxt,
relstaEN : CodeTable.relstaEN,
usgtxt : CodeTable.usgtxt,
wfetrssta : CodeTable.wfetrssta },
action:[], action:[],
} }
}, },
...@@ -481,17 +454,22 @@ export default { ...@@ -481,17 +454,22 @@ export default {
this.SignaturesData.data = this.model.recpan.trsstm.rows; this.SignaturesData.data = this.model.recpan.trsstm.rows;
this.stmData.data = this.model.recpan.wfestm.rows; this.stmData.data = this.model.recpan.wfestm.rows;
var code = this.codes.flg; var code = this.codes.flg;
for (let i = 0; i < this.SignaturesData.data.length; i++) { this.action = this.CalCode(this.SignaturesData.data, code, 3);
const d = this.SignaturesData.data[i]; },
CalCode(table, code, index){
var result = [];
for (let i = 0; i < table.length; i++) {
const d = table[i];
const items = d.split("\t"); const items = d.split("\t");
this.action[i] = items[items.length - 2]; result[i] = items[index];
for(let j = 0; j < code.length; j++){ for(let j = 0; j < code.length; j++){
if(code[j].value === this.action[i]){ if(code[j].value === result[i]){
this.action[i] = code[j].label; result[i] = code[j].label;
continue; continue;
} }
} }
} }
return result;
}, },
exit(){ exit(){
this.$store.dispatch("TagsView/delView", this.$route) this.$store.dispatch("TagsView/delView", this.$route)
......
src/views/Layout/Header.vue
...@@ -140,7 +140,7 @@ export default { ...@@ -140,7 +140,7 @@ export default {
dialogOpen: false, dialogOpen: false,
loading: false, loading: false,
count: "", count: "",
accDate: window.sessionStorage.accDate || "", accDate: window.sessionStorage.accDate || new Date().toLocaleDateString(),
noticeboardData: [], noticeboardData: [],
langSelectVisible: false, langSelectVisible: false,
languageOptions: [ 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