Commit 2b8a6d08 by liuxin

待复核已完成详情页修改

parent b5c0d7fa
...@@ -99,13 +99,27 @@ export default { ...@@ -99,13 +99,27 @@ export default {
this.$router.push({ path: viewurl, query: { trn: row['INR'], operateId: operateId } }); this.$router.push({ path: viewurl, query: { trn: row['INR'], operateId: operateId } });
}, },
async onWaitDetail(idx, row) {
async onDetail(idx, row) {
let viewurl = "business/inftrnpsDetail"; let viewurl = "business/inftrnpsDetail";
const selIds = [idx + 1]; const selIds = [idx + 1];
const selDst = "trncorco.trnstm" //列表对应后台模型中的stream const selDst = "trncorco.trnstm" //列表对应后台模型中的stream
let params = { selDst, selIds }; let params = { selDst, selIds };
this.executeRule("dsp",params).then((res) => { this.executeRule("dsp,reldsp",params).then((res) => {
if ((res.respCode = SUCCESS)) {
Utils.copyValueFromVO(this.model, res.data);
sessionStorage.setItem('InftrnpsDetail', JSON.stringify(this.model));
// this.$router.push({ path: "business/inftrnpsDetail", query: { idx: idx}});
this.$router.push({ path: viewurl, query: {} });
}
});
},
async onFinishDetail(idx, row) {
let viewurl = "business/trnfndsDetail";
const selIds = [idx + 1];
const selDst = "trncorco.trnstm" //列表对应后台模型中的stream
let params = { selDst, selIds };
this.executeRule("dsp,reldsp",params).then((res) => {
if ((res.respCode = SUCCESS)) { if ((res.respCode = SUCCESS)) {
Utils.copyValueFromVO(this.model, res.data); Utils.copyValueFromVO(this.model, res.data);
sessionStorage.setItem('InftrnpsDetail', JSON.stringify(this.model)); sessionStorage.setItem('InftrnpsDetail', JSON.stringify(this.model));
......
...@@ -103,7 +103,6 @@ import Sptpopup from "./Sptsel/Sptpopup" ...@@ -103,7 +103,6 @@ import Sptpopup from "./Sptsel/Sptpopup"
* 带有name的才会被添加进顶部的标签页里 * 带有name的才会被添加进顶部的标签页里
*/ */
const BusRouter = [ const BusRouter = [
{ path: 'inftrnpsDetail', component: InftrnpsDetail, name: 'InftrnpsDetail', meta: { title: '详情' } },
{ path: 'sptpopup', component: Sptpopup, name: 'Sptpopup', meta: { title: '详情' } }, { path: 'sptpopup', component: Sptpopup, name: 'Sptpopup', meta: { title: '详情' } },
{ path: 'trnfndsDetail', component: TrnfndsDetail, name: 'TrnfndsDetail', meta: { title: '已完成详情' } }, { path: 'trnfndsDetail', component: TrnfndsDetail, name: 'TrnfndsDetail', meta: { title: '已完成详情' } },
{ path: 'inftrnpsDetail', component: InftrnpsDetail, name: 'InftrnpsDetail', meta: { title: '待复核详情' } }, { path: 'inftrnpsDetail', component: InftrnpsDetail, name: 'InftrnpsDetail', meta: { title: '待复核详情' } },
......
...@@ -401,7 +401,7 @@ ...@@ -401,7 +401,7 @@
fixed="right" fixed="right"
prop="display" prop="display"
label="操作" label="操作"
width="140px" width="auto"
> >
<template slot="header"> <template slot="header">
<c-col :span="11" style="text-align:left"><span>操作</span></c-col> <c-col :span="11" style="text-align:left"><span>操作</span></c-col>
...@@ -424,8 +424,7 @@ ...@@ -424,8 +424,7 @@
<c-button <c-button
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
type="primary" @click="onWaitDetail(scope.$index,scope.row)"
@click="onDetail(scope.$index,scope.row)"
> >
详情 详情
</c-button> </c-button>
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
<c-content> <c-content>
<!-- -------------------基础信息------------------- --> <!-- -------------------基础信息------------------- -->
<c-col :span="23"> <c-col :span="23">
<c-col :span="8"> <c-col :span="8">
<el-form-item label="Reference"> <el-form-item label="Reference">
...@@ -213,8 +212,9 @@ ...@@ -213,8 +212,9 @@
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<el-form-item> <el-form-item label-width="40%" label="Completion text">
<span style="text-align:center;display:block;" v-text="model.recpan.cpltxt" data-path=".recpan.cpltxt" > </span> <c-input style="font-weight:bold" v-model="model.recpan.cpltxt" disabled placeholder="请输入Based on Ident No."></c-input>
<!-- <span style="text-align:center;display:block;" v-text="model.recpan.cpltxt" data-path=".recpan.cpltxt" > </span> -->
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -254,13 +254,16 @@ ...@@ -254,13 +254,16 @@
Pending Item Pending Item
</c-button> </c-button>
</c-col> --> </c-col> -->
<c-col :span="23">
<c-col :span="23" style="margin-left:9px;height:25px"> <div style="border-bottom: 10px solid rgb(232, 232, 232);">
<el-divider></el-divider> </div>
</c-col> </c-col>
<!-- <c-col :span="23" style="margin-left:9px;height:25px">
<el-divider></el-divider>
</c-col> -->
<!-- -------------------document------------------- --> <!-- -------------------document------------------- -->
<c-col :span="23" style="height:14px;"> <c-col :span="23" style="height:14px;margin-top:5px">
<el-form-item class="formItemLabel" label="Documents:"> <el-form-item class="formItemLabel" label="Documents:">
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -452,11 +455,11 @@ ...@@ -452,11 +455,11 @@
<c-col :span="24"> <c-col :span="24">
<!-- <c-input v-model="model.recpan.wfestm" placeholder="请输入WFEs for transaction for display"></c-input> --> <!-- <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 <!-- <el-table-column
fixed="right" fixed="right"
prop="display" prop="display"
label="操作" label="操作"
width="auto" width="150px"
> >
<template slot="header"> <template slot="header">
<c-col :span="11" style="text-align:left"><span>操作</span></c-col> <c-col :span="11" style="text-align:left"><span>操作</span></c-col>
...@@ -480,7 +483,7 @@ ...@@ -480,7 +483,7 @@
处理 处理
</c-button> </c-button>
</template> </template>
</el-table-column> </el-table-column> -->
</c-istream-table> </c-istream-table>
</c-col> </c-col>
</c-col> </c-col>
...@@ -519,7 +522,7 @@ export default { ...@@ -519,7 +522,7 @@ export default {
columns: [ columns: [
'1 2:1 "User" 200', '1 2:1 "User" 200',
'2 3:1 "Date / Time" 200', '2 3:1 "Date / Time" 200',
'3 5:1 "Action" 200', '3 5:1 "Action" 400',
'4 1:1 "Type" 200' '4 1:1 "Type" 200'
], ],
data: [], data: [],
...@@ -531,8 +534,8 @@ export default { ...@@ -531,8 +534,8 @@ export default {
'3 3 "Status" 80 1 0:0 1 WFE:STA', '3 3 "Status" 80 1 0:0 1 WFE:STA',
'4 4 "Last Update" 102', '4 4 "Last Update" 102',
'5 5 "Retries" 100 1 0:1', '5 5 "Retries" 100 1 0:1',
'6 6 "Text" 300', '6 6 "Text" 500',
'7 7 "Contrary Text" 200', '7 7 "Contrary Text" 500',
'8 8 "Target Time" 200' '8 8 "Target Time" 200'
], ],
data: [], data: [],
......
...@@ -390,7 +390,7 @@ ...@@ -390,7 +390,7 @@
fixed="right" fixed="right"
prop="display" prop="display"
label="操作" label="操作"
width="140px" width="auto"
> >
<template slot="header"> <template slot="header">
<c-col :span="11" style="text-align:left"><span>操作</span></c-col> <c-col :span="11" style="text-align:left"><span>操作</span></c-col>
...@@ -400,8 +400,7 @@ ...@@ -400,8 +400,7 @@
<c-button <c-button
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
type="primary" @click="onFinishDetail(scope.$index,scope.row)"
@click="onDetail(scope.$index,scope.row)"
> >
详情 详情
</c-button> </c-button>
......
...@@ -2,11 +2,14 @@ ...@@ -2,11 +2,14 @@
<c-page title=""> <c-page title="">
<div class="eContainer"> <div class="eContainer">
<div class="eibs-tab"> <div class="eibs-tab">
<c-function-btn :hideFuncBtn="true" :handleStash="true" <c-col :span="23">
> <div style="float:right;margin-bottom:10px">
<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-button size="small" @click="exit">退出</el-button>
</div>
</c-col>
<!-- <c-col :span="12"> <!-- <c-col :span="12">
<el-form-item label="Drag Drop Sender"> <el-form-item label="Drag Drop Sender">
<c-input v-model="model.recpan.recget.sdamod.dadsnd" placeholder="请输入Drag Drop Sender"></c-input> <c-input v-model="model.recpan.recget.sdamod.dadsnd" placeholder="请输入Drag Drop Sender"></c-input>
...@@ -19,8 +22,11 @@ ...@@ -19,8 +22,11 @@
:validate-on-rule-change="false" :validate-on-rule-change="false"
label-width="150px" label-width="150px"
size="small" size="small"
style="margin-left:15px"
> >
<c-content> <c-content>
<!-- -------------------基础信息------------------- -->
<c-col :span="23"> <c-col :span="23">
<c-col :span="8"> <c-col :span="8">
<el-form-item label="Reference"> <el-form-item label="Reference">
...@@ -28,8 +34,12 @@ ...@@ -28,8 +34,12 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="1"> <c-col :span="1">
<c-button size="small" type="primary"> <c-button
i style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
>
<span style="font-size:15px;font-family:'宋体';font-weight:bold">i</span>
</c-button> </c-button>
</c-col> </c-col>
<!-- <c-col :span="12"> <!-- <c-col :span="12">
...@@ -55,12 +65,16 @@ ...@@ -55,12 +65,16 @@
</c-col> </c-col>
<c-col :span="1"> <c-col :span="1">
<c-button size="small" type="primary"> <c-button
i style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
>
<span style="font-size:15px;font-family:'宋体';font-weight:bold">i</span>
</c-button> </c-button>
</c-col> </c-col>
<c-col :span="6"> <c-col :span="7">
<c-input v-model="model.trn.objnam" maxlength="40" placeholder="请输入External Readable Object Identification"></c-input> <c-input v-model="model.trn.objnam" maxlength="40" placeholder="请输入External Readable Object Identification"></c-input>
</c-col> </c-col>
</c-col> </c-col>
...@@ -92,11 +106,19 @@ ...@@ -92,11 +106,19 @@
</c-col> --> </c-col> -->
<c-col :span="1"> <c-col :span="1">
<c-button size="small" type="primary"> <c-button
i style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
>
<span style="font-size:15px;font-family:'宋体';font-weight:bold">i</span>
</c-button> </c-button>
</c-col> </c-col>
<c-col :span="1">
&nbsp;
</c-col>
<c-col :span="14"> <c-col :span="14">
<c-input v-model="model.recpan.atp.cod" maxlength="6" placeholder="请输入Transaction ID"></c-input> <c-input v-model="model.recpan.atp.cod" maxlength="6" placeholder="请输入Transaction ID"></c-input>
</c-col> </c-col>
...@@ -115,7 +137,10 @@ ...@@ -115,7 +137,10 @@
<c-input v-model="model.trn.reloricur" maxlength="3" placeholder="请输入Relevant Amount"></c-input> <c-input v-model="model.trn.reloricur" maxlength="3" placeholder="请输入Relevant Amount"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="1">
&nbsp;
</c-col>
<c-col :span="11">
<c-input v-model="model.trn.reloriamt" placeholder="请输入Relevant Amount for Release in Original Currency"></c-input> <c-input v-model="model.trn.reloriamt" placeholder="请输入Relevant Amount for Release in Original Currency"></c-input>
</c-col> </c-col>
</c-row> </c-row>
...@@ -187,12 +212,18 @@ ...@@ -187,12 +212,18 @@
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<el-form-item> <el-form-item label-width="40%" label="Completion text">
<span style="text-align:center;display:block;" v-text="model.recpan.cpltxt" data-path=".recpan.cpltxt" > </span> <c-input style="font-weight:bold" v-model="model.recpan.cpltxt" disabled placeholder="请输入Based on Ident No."></c-input>
<!-- <span style="text-align:center;display:block;" v-text="model.recpan.cpltxt" data-path=".recpan.cpltxt" > </span> -->
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
<!-- <c-col :span="23" style="margin-left:9px;height:25px;margin-bottom:10px">
<el-divider></el-divider>
</c-col> -->
<!-- -------------------Entered by------------------- -->
<c-col :span="23"> <c-col :span="23">
<c-col :span="6"> <c-col :span="6">
<el-form-item label="Entered by"> <el-form-item label="Entered by">
...@@ -223,11 +254,23 @@ ...@@ -223,11 +254,23 @@
Pending Item Pending Item
</c-button> </c-button>
</c-col> --> </c-col> -->
<c-col :span="23">
<div style="border-bottom: 10px solid rgb(232, 232, 232);">
</div>
</c-col>
<!-- <c-col :span="23" style="margin-left:9px;height:25px">
<el-divider></el-divider>
</c-col> -->
<!-- -------------------document------------------- -->
<c-col :span="23" style="height:14px;margin-top:5px">
<el-form-item class="formItemLabel" label="Documents:">
</el-form-item>
</c-col>
<c-col :span="23"> <c-col :span="23">
<el-form-item label="Documents">
<!-- <c-input v-model="model.recpan.smhstm" placeholder="请输入Documents"></c-input> --> <!-- <c-input v-model="model.recpan.smhstm" placeholder="请输入Documents"></c-input> -->
<c-istream-table :list="documentsData.data" :columns="documentsData.columns" style="width:100%"> <c-col :span="24">
<c-istream-table :list="documentsData.data" :columns="documentsData.columns" :paginationShow="false" style="width:100%">
<el-table-column <el-table-column
fixed="right" fixed="right"
prop="display" prop="display"
...@@ -238,27 +281,23 @@ ...@@ -238,27 +281,23 @@
<c-col :span="11" style="text-align:left"><span>操作</span></c-col> <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="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col>
</template> </template>
<template slot-scope="scope"> <template>
<c-button <c-button
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
type="primary"
@click="onDetail(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"
@click="onHandle(scope.$index,scope.row)"
> >
处理 生成PDF
</c-button> </c-button>
</template> </template>
</el-table-column> </el-table-column>
</c-istream-table> </c-istream-table>
</el-form-item> </c-col>
</c-col> </c-col>
<!-- <c-col :span="12"> <!-- <c-col :span="12">
...@@ -289,24 +328,51 @@ ...@@ -289,24 +328,51 @@
</c-button> </c-button>
</c-col> --> </c-col> -->
<c-col :span="23"> <c-col :span="23" style="margin-left:9px;height:25px">
<c-col :span="16"> <el-divider></el-divider>
</c-col>
<!-- -------------------Infotext------------------- -->
<c-col :span="23" style="margin-top:10px">
<c-col :span="17">
<c-col :span="22">
<el-form-item label="Infotext"> <el-form-item label="Infotext">
<c-input type="textarea" v-model="model.trn.inftxt" maxlength="65" show-word-limit placeholder="请输入Infotext" ></c-input> <c-input type="textarea" v-model="model.trn.inftxt" maxlength="65" :rows="3" show-word-limit placeholder="请输入Infotext" ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="1"> <c-col :span="2">
<c-button size="small" type="primary"> <c-button
... style="margin:0 10px 0 10px;padding: 0 10px;"
</c-button> size="small"
icon="el-icon-search"
type="primary"
></c-button>
</c-col>
</c-col>
<c-col :span="7">
<c-col :span="24">
<el-form-item label-width="40%">
<!-- <c-input v-model="model.trn.infdsp" style="width:100%" placeholder="请选择Infoflag">
</c-input> -->
<el-select v-model="model.trn.infdsp" style="width: 100%">
<el-option
v-for="item in codes.infdsp"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</c-col> </c-col>
<c-col :span="6"> <c-col :span="24">
<el-form-item label-width="20%" label="Infoflag"> <el-form-item label-width="40%" label="Send for Repair to">
<c-input v-model="model.trn.infdsp" style="width:100%" placeholder="请选择Infoflag"> <c-input v-model="model.recpan.usr.extkey" disabled style="width:100%" placeholder="请选择extkey">
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
</c-col>
<!-- <c-col :span="12"> <!-- <c-col :span="12">
<el-form-item label="User ID"> <el-form-item label="User ID">
...@@ -320,11 +386,14 @@ ...@@ -320,11 +386,14 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
--> -->
<c-col :span="23" style="height:14px;">
<el-form-item class="formItemLabel" label="Signatures:">
</el-form-item>
</c-col>
<c-col :span="23"> <c-col :span="23">
<c-col :span="18">
<el-form-item label="Signatures">
<!-- <c-input v-model="model.recpan.trsstm" placeholder="请输入Signatures"></c-input> --> <!-- <c-input v-model="model.recpan.trsstm" placeholder="请输入Signatures"></c-input> -->
<c-istream-table :list="SignaturesData.data" :columns="SignaturesData.columns" style="width:100%"> <c-col :span="24">
<c-istream-table :list="SignaturesData.data" :columns="SignaturesData.columns" :paginationShow="false" style="width:100%">
<el-table-column <el-table-column
fixed="right" fixed="right"
prop="display" prop="display"
...@@ -335,7 +404,7 @@ ...@@ -335,7 +404,7 @@
<c-col :span="11" style="text-align:left"><span>操作</span></c-col> <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="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col>
</template> </template>
<template slot-scope="scope"> <!-- <template slot-scope="scope">
<c-button <c-button
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
...@@ -352,13 +421,18 @@ ...@@ -352,13 +421,18 @@
> >
处理 处理
</c-button> </c-button>
</template> </template> -->
</el-table-column> </el-table-column>
</c-istream-table> </c-istream-table>
</el-form-item>
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="23" style="margin-left:9px;height:25px;margin-bottom:10px">
<el-divider></el-divider>
</c-col>
<!-- -------------------workflow------------------- -->
<c-col :span="23"> <c-col :span="23">
<c-col :span="12"> <c-col :span="12">
<el-form-item label="Object"> <el-form-item label="Object">
...@@ -377,16 +451,15 @@ ...@@ -377,16 +451,15 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="23"> <c-col :span="23">
<el-form-item> <c-col :span="24">
<!-- <c-input v-model="model.recpan.wfestm" placeholder="请输入WFEs for transaction for display"></c-input> --> <!-- <c-input v-model="model.recpan.wfestm" placeholder="请输入WFEs for transaction for display"></c-input> -->
<c-istream-table :list="stmData.data" :columns="stmData.columns" style="width:100%"> <c-istream-table :list="stmData.data" :columns="stmData.columns" :paginationShow="false" style="width:100%">
<el-table-column <!-- <el-table-column
fixed="right" fixed="right"
prop="display" prop="display"
label="操作" label="操作"
width="auto" width="150px"
> >
<template slot="header"> <template slot="header">
<c-col :span="11" style="text-align:left"><span>操作</span></c-col> <c-col :span="11" style="text-align:left"><span>操作</span></c-col>
...@@ -410,9 +483,9 @@ ...@@ -410,9 +483,9 @@
处理 处理
</c-button> </c-button>
</template> </template>
</el-table-column> </el-table-column> -->
</c-istream-table> </c-istream-table>
</el-form-item> </c-col>
</c-col> </c-col>
</c-content> </c-content>
...@@ -447,10 +520,10 @@ export default { ...@@ -447,10 +520,10 @@ export default {
}, },
SignaturesData: { SignaturesData: {
columns: [ columns: [
'1 2:1 "User" 70 50', '1 2:1 "User" 200',
'2 3:1 "Date / Time" 200', '2 3:1 "Date / Time" 200',
'3 5:1 "Action" 120', '3 5:1 "Action" 400',
'4 1:1 "Type" 150' '4 1:1 "Type" 200'
], ],
data: [], data: [],
}, },
...@@ -461,15 +534,15 @@ export default { ...@@ -461,15 +534,15 @@ export default {
'3 3 "Status" 80 1 0:0 1 WFE:STA', '3 3 "Status" 80 1 0:0 1 WFE:STA',
'4 4 "Last Update" 102', '4 4 "Last Update" 102',
'5 5 "Retries" 100 1 0:1', '5 5 "Retries" 100 1 0:1',
'6 6 "Text" 300', '6 6 "Text" 500',
'7 7 "Contrary Text" 200', '7 7 "Contrary Text" 500',
'8 8 "Target Time" 200' '8 8 "Target Time" 200'
], ],
data: [], data: [],
}, },
codes: { infdsp: CodeTable.infdsp },
} }
}, },
methods:{...Event},
mounted() { mounted() {
this.loadData() this.loadData()
}, },
...@@ -480,10 +553,21 @@ export default { ...@@ -480,10 +553,21 @@ export default {
this.documentsData.data = this.model.recpan.smhstm.rows; this.documentsData.data = this.model.recpan.smhstm.rows;
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;
} },
exit(){
this.$store.dispatch("TagsView/delView", this.$route)
this.$router.history.push("/taskList");
},
...Event
} }
} }
</script> </script>
<style> <style scoped>
.el-col >>> .el-divider--horizontal {
margin-top: 10px;
}
.formItemLabel >>> .el-form-item__label{
text-align: left;
font-weight:bold;
}
</style> </style>
\ No newline at end of file
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