Commit afa59899 by nanrui

SPTSEL、TRNREL交易UI问题解决,以及之前负责交易微调

parent 64632e83
......@@ -139,7 +139,10 @@
<c-col :span="24">
<c-istream-table :list="stmData.data" :columns="stmData.columns" :showButtonFlg="true">
<el-table-column fixed="right" prop="op" label="操作" width="150px">
<el-table-column fixed="right" prop="op" width="140px">
<template slot="header">
<c-col :span="11" style="text-align: center"><span>操作</span></c-col>
</template>
<template slot-scope="scope">
<el-popover placement="top-start" title="历史信息" width="800" trigger="click"
:ref="'popover_' + scope.row.IDX">
......
......@@ -140,7 +140,7 @@
<c-col :span="24">
<c-istream-table :list="stmData.data" :columns="stmData.columns" :showButtonFlg="true">
<el-table-column fixed="right" prop="op" label="操作" width="140px">
<el-table-column fixed="right" prop="op" width="140px">
<template slot="header">
<c-col :span="11" style="text-align: center"><span>操作</span></c-col>
</template>
......
......@@ -83,7 +83,7 @@
<c-select
v-model="model.sta"
style="width: 100%"
placeholder="请选择Status"
placeholder="请选择交易状态"
>
<el-option
v-for="item in this.sta"
......@@ -213,7 +213,7 @@
@click.native="onOperate('relrow')"
:disabled=this.flag
title="Release">
Release
释放
</c-button>
<c-button
style="margin-left: 7px"
......@@ -223,7 +223,7 @@
@click.native="onOperate('reprow')"
:disabled=this.flag
title="Repair">
Repair
纠正
</c-button>
<c-button
......@@ -235,7 +235,7 @@
title="Reject"
:disabled=this.flag
>
Reject
拒绝
</c-button>
</div>
</div>
......
......@@ -40,7 +40,7 @@
<c-select
v-model="model.spt.hldflg"
style="width: 100%"
placeholder="请选择Hold Flag"
placeholder="请选择交易状态"
:code="codes.hldflg"
disabled
>
......@@ -61,12 +61,12 @@
</c-col>
<c-col :span="11" :offset="1">
<el-form-item label="Ident No" prop="spt.inr" style="width: 100%">
<el-form-item label="身份证号" prop="spt.inr" style="width: 100%">
<c-input
v-model="model.spt.inr"
maxlength="8"
style="width: 100%"
placeholder="请输入Internal Unique ID of Pending Transaction"
placeholder="请输入身份证号"
disabled
></c-input>
</el-form-item>
......@@ -86,7 +86,7 @@
<c-col :span="11" :offset="1">
<c-col :span="13">
<el-form-item label="交易 " prop="spt.frm">
<el-form-item label="交易" prop="spt.frm">
<c-input
v-model="model.spt.frm"
maxlength="6"
......@@ -111,22 +111,22 @@
</c-col>
<c-col :span="11">
<el-form-item label="Responsible User " prop="spt.ownusr">
<el-form-item label="客户经理代码" prop="spt.ownusr">
<c-input
v-model="model.spt.ownusr"
maxlength="8"
placeholder="请输入Responsible User "
placeholder="请输入客户经理代码 "
disabled
></c-input>
</el-form-item>
</c-col>
<c-col :span="11" :offset="1">
<el-form-item label="Responsible Group" prop="spt.ownusg">
<el-form-item label="责任小组" prop="spt.ownusg">
<c-select
v-model="model.spt.ownusg"
style="width: 100%"
placeholder="请选择Responsible Group"
placeholder="请选择责任小组"
disabled
>
</c-select>
......@@ -135,14 +135,14 @@
<c-col :span="11">
<c-col :span="19">
<el-form-item label="Infotext" prop="spt.inftxt">
<el-form-item label="信息文本" prop="spt.inftxt">
<c-input
type="textarea"
v-model="model.spt.inftxt"
maxlength="65"
style="width: 100%"
show-word-limit
placeholder="请输入Infotext"
placeholder="请输入信息文本"
disabled
></c-input>
</el-form-item>
......@@ -152,7 +152,7 @@
<c-select
v-model="model.spt.infdsp"
style="width: 100%; padding-left: 0px"
placeholder="请选择Infotext"
placeholder="请选择信息文本"
:code="codes.infdsp"
disabled
>
......@@ -174,7 +174,7 @@
</c-col>
<c-col :span="7">
<el-form-item label="at" prop="spt.dattim" label-width="50px">
<el-form-item label="" prop="spt.dattim" label-width="50px">
<c-input
v-model="model.spt.dattim"
placeholder="请输入创建时间"
......@@ -196,10 +196,10 @@
</c-col>
<c-col :span="24">
<c-col :span="11">
<el-form-item label="Target for Completion" prop="spt.tardattim">
<el-form-item label="完成目标" prop="spt.tardattim">
<c-input
v-model="model.spt.tardattim"
placeholder="请输入Target for Completion"
placeholder="请输入完成目标"
disabled
></c-input>
</el-form-item>
......@@ -320,19 +320,8 @@
</c-col>
<c-col :span="24" style="">
<!-- <el-form-item label-width="500px"> -->
<!-- <c-table :paginationShow="false" :border="true">
<el-table-column label="Start" width="auto"></el-table-column>
<el-table-column label="Type" width="auto"></el-table-column>
<el-table-column label="User" width="auto"></el-table-column>
<el-table-column label="TRN" width="auto"></el-table-column>
<el-table-column label="End" width="auto"></el-table-column>
<el-table-column label="Text" width="auto"></el-table-column>
</c-table> -->
<!-- </el-form-item> -->
<c-istream-table :list="stmData2.data" :columns="stmData2.columns" :paginationShow="false" style="width:100%">
</c-istream-table>
</c-col>
</el-form>
</div>
......@@ -358,14 +347,14 @@ export default {
stmData2:{
columns:[
// "7 1 \"Start\" 0",
{index:1,position:1,width:140,pattern:'time',label:'Start'},
{index:1,position:1,width:140,pattern:'time',label:'开始时间'},
// "2 2 \"类型\" 0",
{index:2,position:2,width:'auto',pattern:'code',label:'类型',code:CodeTable.sptDetSta},
"3 3 \"User\" auto",
"3 3 \"用户\" auto",
"4 4 \"交易代码\" auto",
// "7 5 \"End\" 0",
{index:5,position:5,width:140,pattern:'time',label:'End'},
"8 6 \"Text\" auto",
{index:5,position:5,width:140,pattern:'time',label:'结束时间'},
"8 6 \"文本\" auto",
],
data:[],
}
......
......@@ -51,8 +51,8 @@
<c-col :span="24">
<c-col :span="22">
<el-form-item label="Transaction ID">
<c-input v-model="model.recpan.atp.cod" maxlength="6" disabled placeholder="请输入Transaction ID"></c-input>
<el-form-item label="交易代码">
<c-input v-model="model.recpan.atp.cod" maxlength="6" disabled placeholder="请输入交易代码"></c-input>
</el-form-item>
</c-col>
<c-col :span="2" style="text-align: right">
......@@ -68,7 +68,7 @@
<c-col :span="24">
<c-col :span="13">
<el-form-item label="Relevant Amount">
<el-form-item label="相关金额">
<c-input v-model="model.trn.reloricur" maxlength="3" disabled placeholder="请输入Relevant Amount"></c-input>
</el-form-item>
</c-col>
......@@ -81,14 +81,14 @@
<c-col :span="24">
<c-col :span="13">
<el-form-item label="Responsible">
<c-input v-model="model.trn.usr" maxlength="8" disabled placeholder="请输入Responsible"></c-input>
<el-form-item label="经办柜员">
<c-input v-model="model.trn.usr" maxlength="8" disabled placeholder="请输入经办柜员"></c-input>
</el-form-item>
</c-col>
<c-col :span="11">
<el-form-item label-width="40%" label="Group">
<!-- <c-input v-model="model.trn.usg" maxlength="6" disabled placeholder="请输入Responsible Group"></c-input> -->
<el-form-item label-width="40%" label="责任小组">
<!-- <c-input v-model="model.trn.usg" maxlength="6" disabled placeholder="请输入责任小组"></c-input> -->
<el-select v-model="model.trn.usg" style="width: 100%" disabled>
<el-option
v-for="item in codes.usgtxt"
......@@ -103,22 +103,22 @@
<c-col :span="24">
<c-col :span="24">
<el-form-item label="Based on Ident No.">
<c-input v-model="model.trn.cortrninr" maxlength="8" disabled placeholder="请输入Based on Ident No."></c-input>
<el-form-item label="根据识别号">
<c-input v-model="model.trn.cortrninr" maxlength="8" disabled placeholder="请输入根据识别号"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Execution Date">
<c-date-picker type="date" v-model="model.trn.exedat" style="width:100%" disabled placeholder="请选择Execution Date"></c-date-picker>
<el-form-item label="执行日期">
<c-date-picker type="date" v-model="model.trn.exedat" style="width:100%" disabled placeholder="请选择执行日期"></c-date-picker>
</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>
<el-form-item label="信息文本">
<c-input type="textarea" v-model="model.trn.inftxt" maxlength="65" :rows="3" show-word-limit placeholder="请输入信息文本" ></c-input>
</el-form-item>
</c-col>
<c-col :span="2" style="text-align: right">
......@@ -137,8 +137,8 @@
<c-col :span="11" :offset="1">
<c-col :span="24">
<c-col :span="22">
<el-form-item label="Ident No.">
<c-input v-model="model.trn.inr" disabled placeholder="请输入Ident No."></c-input>
<el-form-item label="身份证号">
<c-input v-model="model.trn.inr" disabled placeholder="请输入身份证号"></c-input>
</el-form-item>
</c-col>
<c-col :span="2" style="text-align: right">
......@@ -153,7 +153,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="Transaction ID">
<el-form-item label="交易代码">
<!-- <el-select v-model="model.recpan.atp.cod" style="width: 100%" disabled>
<el-option
v-for="item in codes.atptxt"
......@@ -162,7 +162,7 @@
:value="item.value"
/>
</el-select> -->
<c-input v-model="this.atptxt" maxlength="6" disabled placeholder="请输入Transaction ID"></c-input>
<c-input v-model="this.atptxt" maxlength="6" disabled placeholder="请输入交易代码"></c-input>
</el-form-item>
</c-col>
......@@ -173,8 +173,8 @@
</c-col>
<c-col :span="24">
<el-form-item label="Release Status">
<!-- <c-input v-model="model.trn.relflg" style="width:100%" disabled placeholder="请选择Release Status of Transaction">
<el-form-item label="发布状态">
<!-- <c-input v-model="model.trn.relflg" style="width:100%" disabled placeholder="请选择交易的发布状态">
</c-input> -->
<el-select v-model="model.trn.relflg" style="width: 100%" disabled>
<el-option
......@@ -196,14 +196,14 @@
</c-col>
<c-col :span="24">
<el-form-item label="Timestamp">
<c-input v-model="model.recpan.cretrs.dattim" disabled placeholder="请输入Timestamp"></c-input>
<el-form-item label="时间戳">
<c-input v-model="model.recpan.cretrs.dattim" disabled placeholder="请输入时间戳"></c-input>
</el-form-item>
</c-col>
</c-col>
<c-col :span="24">
<el-form-item label="Infoflag">
<el-form-item label="信息标志">
<el-select v-model="model.trn.infdsp" style="width: 100%">
<el-option
v-for="item in codes.infdsp"
......@@ -216,8 +216,8 @@
</c-col>
<c-col :span="24">
<el-form-item label="Send for Repair to">
<c-input v-model="model.recpan.usr.extkey" disabled style="width:100%" placeholder="请选择extkey">
<el-form-item label="发送退回至">
<c-input v-model="model.recpan.usr.extkey" disabled style="width:100%" placeholder="">
</c-input>
</el-form-item>
</c-col>
......@@ -243,16 +243,16 @@
</c-col>
<c-col :span="24">
<!-- <c-input v-model="model.recpan.smhstm" placeholder="请输入Documents"></c-input> -->
<c-istream-table :list="documentsData.data" :columns="documentsData.columns" :paginationShow="false" style="width:100%">
<c-istream-table :list="documentsData.data" :columns="documentsData.columns" :paginationShow="false">
<el-table-column
fixed="right"
prop="display"
label="操作"
width="170px"
width="140px"
>
<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>
<c-col :span="11" style="text-align:center"><span style="line-height: 30px;">操作</span></c-col>
<c-col :span="12" style="text-align:center"><c-button icon="el-icon-s-tools"></c-button></c-col>
</template>
<template slot-scope="scope">
<c-button
......@@ -264,7 +264,7 @@
显示
</c-button>
<c-button
style="margin-left: 0"
style="margin-left: 5px"
size="small"
type="primary"
>
......@@ -343,16 +343,16 @@ export default {
documentsData: {
columns: [
"1 1 \"类型\" 300 1 0:0 1 CORTYP",
"2 2 \"External Key\" 300",
"3 3 \"Document\" auto",
"2 2 \"外部密钥\" 300",
"3 3 \"文档\" auto",
],
data: [],
},
SignaturesData: {
columns: [
'1 2:1 "User" 300',
'1 2:1 "用户" 300',
// '2 3:1 "Date / Time" 300',
{index:2,position:3,width:300,pattern:'time',label:'Date / Time'},
{index:2,position:3,width:300,pattern:'time',label:'日期/时间'},
// '3 5:1 "Action" 400',
'4 1:1 "类型" 300'
],
......@@ -366,16 +366,16 @@ export default {
wfetrssta : CodeTable.wfetrssta },
stmData: {
columns: [
'1 1 "ID" 100',
'2 2 "Service" 100',
'1 1 "编号" 100',
'2 2 "服务" 100',
// '3 3 "交易状态" 100',
{index:3,position:3,width:100,pattern:'code',label:'交易状态',code: CodeTable.wfetrssta},
'4 4 "Last Update" 100',
'5 5 "Retries" 100',
'6 6 "Text" 200',
'7 7 "Contrary Text" 200',
'4 4 "最新更新" 120',
'5 5 "重试" 100',
'6 6 "文本" 200',
'7 7 "相反文本" 200',
// '8 8 "Target Time" auto'
{index:8,position:8,width:'auto',pattern:'dateFormat',label:'Target Time'},
{index:8,position:8,width:'auto',pattern:'dateFormat',label:'目标时间'},
],
data: [],
},
......
......@@ -33,7 +33,7 @@
type="date"
v-model="model.trncorco.inidatfro"
style="width: 100%"
placeholder="请选择Date of entry of Transaction"
placeholder="请选择开始时间"
></c-date-picker>
</c-col>
<c-col :span="2" style="text-align: center">
......@@ -44,7 +44,7 @@
type="date"
v-model="model.trncorco.inidattil"
style="width: 100%"
placeholder="请选择Date of entry of Transaction until"
placeholder="请选择结束时间"
></c-date-picker>
</c-col>
</el-form-item>
......@@ -212,7 +212,7 @@
width="140px"
>
<template slot="header">
<c-col :span="11" style="text-align:left"><span>操作</span></c-col>
<c-col :span="11" style="text-align:center"><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">
......@@ -266,18 +266,18 @@ export default {
},
stmData: {
columns: [
'10 1 "交易代码" 80',
'10 1 "交易代码" 100',
'11 2 "业务编号" 170',
'17 3 "摘要信息" 300',
'12 4 "币种" 70',
'13 5 "金额" 100',
// '14 6 "创建时间" 170',
{index:14,position:6,width:140,pattern:'time',label:'创建时间'},
'9 7 "签名要求" 80',
'2 8 "签名状态" 80',
'16 9 "经办柜员" 80',
'9 7 "签名要求" 100',
'2 8 "签名状态" 100',
'16 9 "经办柜员" 100',
// '0 10 "业务状态" 80',
{index:0,position:10,width:80,pattern:'code',label:'业务状态',code:[{ label: "Final", value: "F" },
{index:0,position:10,width:100,pattern:'code',label:'业务状态',code:[{ label: "Final", value: "F" },
{ label: "Released", value: "R" },]},
'15 11 "业务机构" 200',
],
......@@ -298,8 +298,15 @@ export default {
// return this.multipleSelection.map((idx) => this.stmData.data[idx]);
// },
...Event,
getInidatfro(){
let datetime = new Date();
datetime = datetime.setDate(datetime.getDate() - 1);
this.model.trncorco.inidatfro = new Date(datetime);
}
},
created: function () {
this.getInidatfro();
},
created: function () {},
mounted() {
this.relflgCodes = [
{ label: "ALL", value: "1" }, //已完成列表业务状态All
......
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