Skip to content

V
vue-gjjs
Commit 7c963a70 by liushikai
Options

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

# Conflicts:
#	src/views/Business/BusRouter.js
parents a274fe29 8a5b2e15
Showing with 678 additions and 704 deletions
src/config/CodeTable/index.js
......@@ -5881,5 +5881,8 @@ const CodeTable = {
{ label: "Do not display", value: "" },
{ label: "Automatically display", value: "1" },
],
atptxt: [
{ label: "开立信用证", value: "DITOPN" },
],
}
export default CodeTable;
\ No newline at end of file
src/model/Trnrel/Event.js
......@@ -99,13 +99,27 @@ export default {
this.$router.push({ path: viewurl, query: { trn: row['INR'], operateId: operateId } });
},
async onDetail(idx, row) {
async onWaitDetail(idx, row) {
let viewurl = "business/inftrnpsDetail";
const selIds = [idx + 1];
const selDst = "trncorco.trnstm" //列表对应后台模型中的stream
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)) {
Utils.copyValueFromVO(this.model, res.data);
sessionStorage.setItem('InftrnpsDetail', JSON.stringify(this.model));
......
src/views/Business/Bdtdcr/index.vue
......@@ -7,8 +7,6 @@
:handleCheck="handleCheck"
:handleStash="handleStash"
>
<el-button size="small">流程附言</el-button>
<el-button size="small">交易历史</el-button>
<el-button size="small">备忘录</el-button>
<el-button size="small">影像信息</el-button>
<!-- <el-button size="small">保存模板</el-button> -->
......
src/views/Business/Bdtset/index.vue
......@@ -6,8 +6,6 @@
:handleCheck="handleCheck"
:handleStash="handleStash"
>
<el-button size="small">流程附言</el-button>
<el-button size="small">交易历史</el-button>
<el-button size="small">备忘录</el-button>
<el-button size="small">影像信息</el-button>
<!-- <el-button size="small">保存模板</el-button> -->
......
src/views/Business/Bdtudp/index.vue
......@@ -6,8 +6,6 @@
:handleCheck="handleCheck"
:handleStash="handleStash"
>
<el-button size="small">流程附言</el-button>
<el-button size="small">交易历史</el-button>
<el-button size="small">备忘录</el-button>
<el-button size="small">影像信息</el-button>
<!-- <el-button size="small">保存模板</el-button> -->
......
src/views/Business/Bttdcr/index.vue
<template>
<div class="eContainer">
<c-function-btn
:handleSubmit="handleSubmit"
:handleCheck="handleCheck"
:handleStash="handleStash"
>
<el-button size="small">流程附言</el-button>
<el-button size="small">交易历史</el-button>
<el-button size="small">备忘录</el-button>
<el-button size="small">影像信息</el-button>
<!-- <el-button size="small">保存模板</el-button> -->
<!-- <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>
<div class="eContainer">
<c-function-btn
:handleSubmit="handleSubmit"
:handleCheck="handleCheck"
:handleStash="handleStash"
>
<el-button size="small">备忘录</el-button>
<el-button size="small">影像信息</el-button>
<!-- <el-button size="small">保存模板</el-button> -->
<!-- <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-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="left" size="small" :validate-on-rule-change="false">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
......@@ -26,27 +24,27 @@
</el-tab-pane>
<!--PD000001 -->
<el-tab-pane label="表外" name="engp">
<m-engp :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000000 -->
<el-tab-pane label="费用及账务" name="setpan">
<m-setpan :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000001 -->
<el-tab-pane label="保证金" name="ccvpan">
<m-ccvpan :model="model" :codes="codes"/>
</el-tab-pane>
<el-tab-pane label="Completion" name="coninfp">
<m-coninfp :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000529 -->
<el-tab-pane label="面函及报文" name="docpan">
<m-docpan :model="model" :codes="codes"/>
<el-tab-pane label="表外" name="engp">
<m-engp :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000000 -->
<el-tab-pane label="费用及账务" name="setpan">
<m-setpan :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000001 -->
<el-tab-pane label="保证金" name="ccvpan">
<m-ccvpan :model="model" :codes="codes"/>
</el-tab-pane>
<el-tab-pane label="Completion" name="coninfp">
<m-coninfp :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000529 -->
<el-tab-pane label="面函及报文" name="docpan">
<m-docpan :model="model" :codes="codes"/>
</el-tab-pane>
</c-tabs>
</el-form>
......@@ -62,21 +60,21 @@ import Default from "~/model/Bttdcr/Default"
import Pattern from "~/model/Bttdcr/Pattern"
import Betdcrs from "./Betdcrs"
import Glepan from "./Glepan"
import Engp from "~/views/Public/Engp";
import Setpan from "~/views/Public/Setpan";
import Ccvpan from "~/views/Public/Ccvpan";
import Engp from "~/views/Public/Engp";
import Setpan from "~/views/Public/Setpan";
import Ccvpan from "~/views/Public/Ccvpan";
import Docpan from "~/views/Public/Docpan";
import Coninfp from "~/views/Public/Coninfp";
import Coninfp from "~/views/Public/Coninfp";
export default {
components:{
"m-betdcrs" : Betdcrs,
"m-engp" : Engp,
"m-setpan" : Setpan,
"m-ccvpan" : Ccvpan,
"m-docpan" : Docpan,
"m-engp" : Engp,
"m-setpan" : Setpan,
"m-ccvpan" : Ccvpan,
"m-docpan" : Docpan,
"m-coninfp" : Coninfp,
},
provide() {
......
src/views/Business/Bttdrv/index.vue
<template>
<div class="eContainer">
<c-function-btn
:handleSubmit="handleSubmit"
:handleCheck="handleCheck"
:handleStash="handleStash"
>
<el-button size="small">流程附言</el-button>
<el-button size="small">交易历史</el-button>
<el-button size="small">备忘录</el-button>
<el-button size="small">影像信息</el-button>
<!-- <el-button size="small">保存模板</el-button> -->
<!-- <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>
<div class="eContainer">
<c-function-btn
:handleSubmit="handleSubmit"
:handleCheck="handleCheck"
:handleStash="handleStash"
>
<el-button size="small">备忘录</el-button>
<el-button size="small">影像信息</el-button>
<!-- <el-button size="small">保存模板</el-button> -->
<!-- <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-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="left" size="small" :validate-on-rule-change="false">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
......@@ -28,30 +26,30 @@
<!--PD000027 -->
<el-tab-pane label="Amounts And Parties" name="adapan">
<m-adapan :model="model" :codes="codes"/>
</el-tab-pane>
<el-tab-pane label="表外" name="engp">
<m-engp :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000000 -->
<el-tab-pane label="费用及账务" name="setpan">
<m-setpan :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000001 -->
<el-tab-pane label="保证金" name="ccvpan">
<m-ccvpan :model="model" :codes="codes"/>
</el-tab-pane>
<el-tab-pane label="Completion" name="coninfp">
<m-coninfp :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000529 -->
<el-tab-pane label="面函及报文" name="docpan">
<m-docpan :model="model" :codes="codes"/>
</el-tab-pane>
</el-tab-pane>
<el-tab-pane label="表外" name="engp">
<m-engp :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000000 -->
<el-tab-pane label="费用及账务" name="setpan">
<m-setpan :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000001 -->
<el-tab-pane label="保证金" name="ccvpan">
<m-ccvpan :model="model" :codes="codes"/>
</el-tab-pane>
<el-tab-pane label="Completion" name="coninfp">
<m-coninfp :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000529 -->
<el-tab-pane label="面函及报文" name="docpan">
<m-docpan :model="model" :codes="codes"/>
</el-tab-pane>
</c-tabs>
</el-form>
......@@ -68,21 +66,21 @@ import Pattern from "~/model/Bttdrv/Pattern"
import Drv from "./Drv"
import Adapan from "./Adapan"
import Engp from "~/views/Public/Engp";
import Setpan from "~/views/Public/Setpan";
import Ccvpan from "~/views/Public/Ccvpan";
import Engp from "~/views/Public/Engp";
import Setpan from "~/views/Public/Setpan";
import Ccvpan from "~/views/Public/Ccvpan";
import Docpan from "~/views/Public/Docpan";
import Coninfp from "~/views/Public/Coninfp";
import Coninfp from "~/views/Public/Coninfp";
export default {
components:{
"m-drv" : Drv,
"m-adapan" : Adapan,
"m-engp" : Engp,
"m-setpan" : Setpan,
"m-ccvpan" : Ccvpan,
"m-docpan" : Docpan,
"m-adapan" : Adapan,
"m-engp" : Engp,
"m-setpan" : Setpan,
"m-ccvpan" : Ccvpan,
"m-docpan" : Docpan,
"m-coninfp" : Coninfp,
},
provide() {
......
src/views/Business/Bttsnd/index.vue
<template>
<template>
<c-page title="转让证单据寄单">
<div class="eContainer">
<c-function-btn
:handleSubmit="handleSubmit"
:handleCheck="handleCheck"
:handleStash="handleStash"
>
<el-button size="small">流程附言</el-button>
<el-button size="small">交易历史</el-button>
<el-button size="small">备忘录</el-button>
<el-button size="small">影像信息</el-button>
<!-- <el-button size="small">保存模板</el-button> -->
<!-- <el-button size="small">使用模板</el-button> -->
<el-button size="small">制裁信息</el-button>
<!-- <el-button size="small">拆分报文</el-button> -->
<el-button size="small">智能提示</el-button>
<div class="eContainer">
<c-function-btn
:handleSubmit="handleSubmit"
:handleCheck="handleCheck"
:handleStash="handleStash"
>
<el-button size="small">备忘录</el-button>
<el-button size="small">影像信息</el-button>
<!-- <el-button size="small">保存模板</el-button> -->
<!-- <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-form
:model="model"
:rules="rules"
ref="modelForm"
label-width="160px"
size="small"
label-position="left"
<el-form
:model="model"
:rules="rules"
ref="modelForm"
label-width="160px"
size="small"
label-position="left"
:validate-on-rule-change="false">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
......@@ -49,10 +47,10 @@
<!--PD000001 -->
<el-tab-pane label="保证金" name="ccvpan">
<m-ccvpan :model="model" :codes="codes"/>
</el-tab-pane>
<el-tab-pane label="Completion" name="coninfp">
<m-coninfp :model="model" :codes="codes"/>
</el-tab-pane>
<el-tab-pane label="Completion" name="coninfp">
<m-coninfp :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000529 -->
......@@ -61,7 +59,7 @@
</el-tab-pane>
</c-tabs>
</el-form>
</div>
</div>
</c-page>
</template>
<script>
......@@ -77,11 +75,11 @@ import Dscins from "./Dscins"
// import Engp from "./Engp"
// import Setpan from "./Setpan"
// import Ccvpan from "./Ccvpan"
// import Docpan from "./Docpan"
// import Coninfp from "./Coninfp";
import Engp from "~/views/Public/Engp";
import Setpan from "~/views/Public/Setpan";
import Ccvpan from "~/views/Public/Ccvpan";
// import Docpan from "./Docpan"
// import Coninfp from "./Coninfp";
import Engp from "~/views/Public/Engp";
import Setpan from "~/views/Public/Setpan";
import Ccvpan from "~/views/Public/Ccvpan";
import Docpan from "~/views/Public/Docpan";
import Coninfp from "~/views/Public/Coninfp";
......@@ -92,7 +90,7 @@ export default {
"m-engp" : Engp,
"m-setpan" : Setpan,
"m-ccvpan" : Ccvpan,
"m-docpan" : Docpan,
"m-docpan" : Docpan,
"m-coninfp" : Coninfp,
},
provide() {
......
src/views/Business/BusRouter.js
......@@ -103,6 +103,7 @@ import Sptpopup from "./Sptsel/Sptpopup"
* 带有name的才会被添加进顶部的标签页里
*/
const BusRouter = [
{ path: 'sptpopup', component: Sptpopup, name: 'Sptpopup', meta: { title: '详情' } },
// { path: 'inftrnpsDetail', component: InftrnpsDetail, name: 'InftrnpsDetail', meta: { title: '详情' } },
{ path: 'sptpopup', component: Sptpopup, name: 'Sptpopup', meta: { title: '待经办详情' } },
{ path: 'trnfndsDetail', component: TrnfndsDetail, name: 'TrnfndsDetail', meta: { title: '已完成详情' } },
......
src/views/Business/Ditopn/index.vue
......@@ -7,8 +7,6 @@
:handleCheck="handleCheck"
:handleStash="handleStash"
>
<el-button size="small">流程附言</el-button>
<el-button size="small">交易历史</el-button>
<el-button size="small">备忘录</el-button>
<el-button size="small">影像信息</el-button>
<!-- <el-button size="small">保存模板</el-button> -->
......
src/views/Business/Infdid/Fepinfp.vue
......@@ -184,12 +184,12 @@ export default {
"3 1 \"Fee Code\" 0 ",
"4 2 \"Fee Text\" 0 ",
"11 3 \"Disposition\" 0 ",
"1 4 \"Role\" 0 ",
"12 4 \"Role\" 0 ",
"5 5 \"Cur\" 0 ",
"6 6 \"Amount\" 0 ",
"1 7 \"Transaction/INR\" 0 ",
"9 7 \"Transaction/INR\" 0 ",
"7 8 \"Entry Date\" 0 ",
"1 9 \"Status\" 0 ",
"10 9 \"Status\" 0 ",
],
fepstmData: [
......@@ -248,7 +248,8 @@ export default {
}
},
created:function(){
this.getInfconFcpfeecod();
this.getInfconFepfeecod();
}
}
</script>
......
src/views/Business/Infdid/Infsea.vue
......@@ -296,10 +296,10 @@
</c-list-search>
<c-col :span="24" style="margin-top: 10px">
<c-button type="primary" size="small">信用证开立</c-button>
<c-button type="primary" size="small" @click="toDitopn">信用证开立</c-button>
</c-col>
<el-row>
<!-- <el-row> -->
<c-col :span="24">
<c-istream-table :list="stmData.data" :columns="stmData.columns">
<el-table-column fixed="right" prop="op" label="操作" width="200px">
......@@ -361,19 +361,19 @@
处理
</c-button>
<c-button
<!-- <c-button
style="margin-left: 0"
size="small"
type="primary"
@click="getDitSelInfo(scope.$index, scope.row)"
>
info
</c-button>
</c-button> -->
</template>
</el-table-column>
</c-istream-table>
</c-col>
</el-row>
<!-- </el-row> -->
<el-dialog :visible.sync="initdialog" :title="'交易列表'" append-to-body>
<div class="m-list-btns">
......@@ -647,11 +647,11 @@ export default {
let rtnmsgNew = await this.executeRule("infbut.dsp", params);
if(rtnmsgNew.respCode = SUCCESS){
Utils.copyValueFromVO(this.model, rtnmsgNew.data);
// params = {selDst:"infcon.objinr",selIds:[idx+1]}
// let rtnmsgObjinr = await this.executeDefault("infcon.objinr", params);
// if(rtnmsgObjinr.respCode = SUCCESS){
// Utils.copyValueFromVO(this.model, rtnmsgObjinr.data);
// }
params = {selDst:"infcon.objinr",selIds:[idx+1]}
let rtnmsgObjinr = await this.executeDefault("infcon.objinr", params);
if(rtnmsgObjinr.respCode = SUCCESS){
Utils.copyValueFromVO(this.model, rtnmsgObjinr.data);
}
}
}
//触发父组件中updateShowPanel 事件，修改index中showPanel ，控制 index中组件的显示和隐藏
......@@ -671,6 +671,9 @@ export default {
this.trnData.data = rtnmsg.data.infcon_trnstm.rows;
}
},
toDitopn(){
this.$router.history.push("/business/ditopn")
}
},
created: function () {},
};
......
src/views/Business/Infdid/index.vue
......@@ -192,7 +192,7 @@ export default {
if (!!rulePath) {
this.executeRule(rulePath).then(res => {
if (res.respCode == SUCCESS) {
this.updateModel(res.data)
this.updateModel(res.data);
}
})
}
......
src/views/Business/Trnrel/Inftrnps.vue
......@@ -401,7 +401,7 @@
fixed="right"
prop="display"
label="操作"
width="140px"
width="auto"
>
<template slot="header">
<c-col :span="11" style="text-align:left"><span>操作</span></c-col>
......@@ -424,8 +424,7 @@
<c-button
style="margin-left: 0"
size="small"
type="primary"
@click="onDetail(scope.$index,scope.row)"
@click="onWaitDetail(scope.$index,scope.row)"
>
详情
</c-button>
......
src/views/Business/Trnrel/InftrnpsDetail.vue
......@@ -15,6 +15,7 @@
<c-input v-model="model.recpan.recget.sdamod.dadsnd" placeholder="请输入Drag Drop Sender"></c-input>
</el-form-item>
</c-col> -->
<el-form
:model="model"
ref="modelForm"
......@@ -25,242 +26,183 @@
style="margin-left:15px"
>
<c-content>
<!-- -------------------基础信息------------------- -->
<c-col :span="23">
<c-col :span="8">
<el-form-item label="Reference">
<c-input v-model="model.trn.ownref" maxlength="16" placeholder="请输入Reference"></c-input>
</el-form-item>
</c-col>
<c-col :span="1">
<c-button
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-col>
<!-- <c-col :span="12">
<el-form-item label="Reference">
<c-input v-model="model.recpan.con" placeholder="请输入Reference"></c-input>
</el-form-item>
</c-col> -->
<!-- <c-col :span="12">
<el-form-item label="Transaction Key">
<c-input v-model="model.trn.inr" maxlength="8" placeholder="请输入Transaction Key"></c-input>
</el-form-item>
</c-col> -->
<c-col :span="6">
<el-form-item label-width="30%" label="Ident No.">
<c-input v-model="model.trn.inr" placeholder="请输入Ident No."></c-input>
</el-form-item>
</c-col>
<!-- ========================= Left ========================= -->
<c-col :span="10">
<c-col :span="24">
<c-col :span="22">
<el-form-item label="Reference">
<c-input v-model="model.trn.ownref" maxlength="16" disabled placeholder="请输入Reference"></c-input>
</el-form-item>
</c-col>
<c-col :span="2">
<c-button
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-col>
</c-col>
<c-col :span="1">
&nbsp;
</c-col>
<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>
</c-col>
<c-col :span="2">
<c-button
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-col>
</c-col>
<c-col :span="1">
<c-button
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-col :span="24">
<c-col :span="12">
<el-form-item label="Relevant Amount">
<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-input v-model="model.trn.reloriamt" disabled placeholder="请输入Relevant Amount for Release in Original Currency"></c-input>
</c-col>
</c-col>
<c-col :span="24">
<c-col :span="12">
<el-form-item label="Responsible">
<c-input v-model="model.trn.usr" maxlength="8" disabled placeholder="请输入Responsible"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label-width="35%" label="Group">
<c-input v-model="model.trn.usg" maxlength="6" disabled placeholder="请输入Responsible Group"></c-input>
</el-form-item>
</c-col>
</c-col>
<c-col :span="7">
<c-input v-model="model.trn.objnam" maxlength="40" placeholder="请输入External Readable Object Identification"></c-input>
<c-col :span="24">
<c-col :span="12">
<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>
</c-col>
<c-col :span="12">
<el-form-item label-width="35%" 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>
</c-col>
</c-col>
</c-col>
<!-- <c-col :span="12">
<c-button size="small" type="primary" @click="onRecpanDet">
详情
</c-button>
<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>
<c-col :span="12">
<el-form-item label="Drag Drop Sender">
<c-input v-model="model.recpan.atpget.sdamod.dadsnd" placeholder="请输入Drag Drop Sender"></c-input>
</el-form-item>
</c-col> -->
<c-col :span="23">
<c-col :span="8">
<el-form-item label="Transaction ID">
<c-input v-model="model.recpan.atp.cod" maxlength="6" placeholder="请输入Transaction ID"></c-input>
</el-form-item>
</c-col>
<!-- <c-col :span="12">
<el-form-item label="Transaction">
<c-input v-model="model.recpan.atpget.sdamod.seainf" placeholder="请输入Transaction"></c-input>
<!-- ========================= Right ========================= -->
<c-col :span="13">
<c-col :span="24">
<el-form-item label-width="40%" label="Ident No.">
<c-col :span="22">
<c-input v-model="model.trn.inr" disabled placeholder="请输入Ident No."></c-input>
</c-col>
<c-col :span="2">
<c-button
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-col>
</el-form-item>
</c-col> -->
<c-col :span="1">
<c-button
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-col>
<c-col :span="1">
&nbsp;
</c-col>
<c-col :span="24">
<el-form-item label-width="40%" label="Transaction ID">
<el-select v-model="model.recpan.atp.cod" style="width: 100%" disabled>
<el-option
v-for="item in codes.atptxt"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
<!-- <c-input v-model="model.recpan.atp.cod" maxlength="6" placeholder="请输入Transaction ID"></c-input> -->
</el-form-item>
</c-col>
<c-col :span="14">
<c-input v-model="model.recpan.atp.cod" maxlength="6" placeholder="请输入Transaction ID"></c-input>
</c-col>
</c-col>
<c-col :span="24">
<el-form-item label-width="40%" label="Drop Receiver">
<c-input v-model="model.trn.objnam" maxlength="40" disabled placeholder="请输入External Readable Object Identification"></c-input>
</el-form-item>
</c-col>
<!-- <c-col :span="12">
<c-button size="small" type="primary" @click="onSyswrnButshw">
&Warning
</c-button>
</c-col> -->
<c-col :span="23">
<c-col :span="12">
<c-row>
<c-col :span="12">
<el-form-item label="Relevant Amount">
<c-input v-model="model.trn.reloricur" maxlength="3" placeholder="请输入Relevant Amount"></c-input>
</el-form-item>
</c-col>
<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-col>
</c-row>
</c-col>
<c-col :span="12">
<c-col :span="24">
<el-form-item label-width="40%" label="Release Status of Transaction">
<c-input v-model="model.trn.relflg" style="width:100%" placeholder="请选择Release Status of Transaction">
<c-input v-model="model.trn.relflg" style="width:100%" disabled placeholder="请选择Release Status of Transaction">
</c-input>
</el-form-item>
</c-col>
</c-col>
<!-- <c-col :span="12">
<c-button size="small" type="primary" @click="onRecpanNotmap">
Unmapped
</c-button>
</c-col> -->
<c-col :span="23">
<c-col :span="6">
<el-form-item label="Responsible">
<c-input v-model="model.trn.usr" maxlength="8" placeholder="请输入Responsible"></c-input>
</el-form-item>
</c-col>
<c-col :span="6">
<el-form-item label-width="35%" label="Group">
<c-input v-model="model.trn.usg" maxlength="6" placeholder="请输入Responsible Group"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<c-col :span="24">
<el-form-item label-width="40%" label="Signatures Required/Obtained">
<c-row>
<c-col :span="11">
<c-input v-model="model.trn.relreq" maxlength="3" placeholder="请输入Signatures Required/Obtained"></c-input>
<c-input v-model="model.trn.relreq" maxlength="3" disabled placeholder="请输入Signatures Required/Obtained"></c-input>
</c-col>
<c-col :span="2">
<span style="margin-left:40%">/</span>
</c-col>
<c-col :span="11">
<c-input v-model="model.trn.relres" maxlength="3" placeholder="请输入Applied Signatures"></c-input>
<c-input v-model="model.trn.relres" maxlength="3" disabled placeholder="请输入Applied Signatures"></c-input>
</c-col>
</c-row>
</el-form-item>
</c-col>
</c-col>
<!-- <c-col :span="12">
<el-form-item label="Applied Signatures">
<c-input v-model="model.trn.relres" maxlength="3" placeholder="请输入Applied Signatures"></c-input>
</el-form-item>
</c-col> -->
<c-col :span="23">
<c-col :span="6">
<el-form-item label="Based on Ident No.">
<c-input v-model="model.trn.cortrninr" maxlength="8" placeholder="请输入Based on Ident No."></c-input>
</el-form-item>
</c-col>
<c-col :span="6">
<el-form-item label-width="35%" label="Execution Date">
<c-date-picker type="date" v-model="model.trn.exedat" style="width:100%" placeholder="请选择Execution Date"></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item>
<span style="text-align:center;display:block;" v-text="model.recpan.cpltxt" data-path=".recpan.cpltxt" > </span>
</el-form-item>
<c-col :span="24">
<el-form-item label-width="40%" label="Completion text">
<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>
<!-- <c-col :span="23" style="margin-left:9px;height:25px;margin-bottom:10px">
<el-divider></el-divider>
</c-col> -->
<!-- -------------------Entered by------------------- -->
</c-col>
<!-- -------------------分割线------------------- -->
<c-col :span="23">
<c-col :span="6">
<el-form-item label="Entered by">
<c-input v-model="model.recpan.cretrs.usr" maxlength="8" placeholder="请输入Entered by"></c-input>
</el-form-item>
</c-col>
<c-col :span="6">
<el-form-item label-width="35%" label="Timestamp">
<c-input v-model="model.recpan.cretrs.dattim" placeholder="请输入Timestamp"></c-input>
</el-form-item>
</c-col>
</c-col>
<!-- <c-col :span="12">
<el-form-item label="Send to SOP/CASmf reference">
<c-input v-model="model.recpan.ackgrp.rec.sndref" maxlength="40" placeholder="请输入Send to SOP/CASmf reference"></c-input>
</el-form-item>
</c-col> -->
<!-- <c-col :span="12">
<span v-text="model.recpan.spt.sta" data-path=".recpan.spt.sta" > </span>
</c-col> -->
<!-- <c-col :span="12">
<c-button size="small" type="primary" @click="onRecpanButspt">
Pending Item
</c-button>
</c-col> -->
<c-col :span="23" style="margin-left:9px;height:25px">
<el-divider></el-divider>
<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;">
<c-col :span="23" style="height:14px;margin-top:5px">
<el-form-item class="formItemLabel" label="Documents:">
</el-form-item>
</c-col>
......@@ -296,34 +238,6 @@
</c-istream-table>
</c-col>
</c-col>
<!-- <c-col :span="12">
<c-button size="small" type="primary" @click="onRecpanInc">
Show &Incoming
</c-button>
</c-col> -->
<!-- <c-col :span="12">
<c-button size="small" type="primary" @click="onRecpanButord">
Order
</c-button>
</c-col> -->
<!-- <c-col :span="12">
<span v-text="model.recpan.ord.sta" data-path=".recpan.ord.sta" > </span>
</c-col> -->
<!-- <c-col :span="12">
<c-button size="small" type="primary" @click="onImgmod1Image">
imgyge
</c-button>
</c-col>
<c-col :span="12">
<c-button size="small" type="primary" @click="onRecpanIncben">
Inc to Ben
</c-button>
</c-col> -->
<c-col :span="23" style="margin-left:9px;height:25px">
<el-divider></el-divider>
......@@ -391,6 +305,19 @@
<!-- <c-input v-model="model.recpan.trsstm" placeholder="请输入Signatures"></c-input> -->
<c-col :span="24">
<c-istream-table :list="SignaturesData.data" :columns="SignaturesData.columns" :paginationShow="false" style="width:100%">
<el-table-column label="Action" width="400px">
<template slot-scope="scope">
<!-- <span>{{JSON.stringify(scope.row)}}</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>
</template>
</el-table-column>
<el-table-column
fixed="right"
prop="display"
......@@ -434,17 +361,17 @@
<c-col :span="12">
<el-form-item label="Object">
<c-col :span="10">
<c-input v-model="model.wfmmod.wfs.objtyp" style="width:100%" placeholder="请选择Table Used to Store Associated Object"></c-input>
<c-input v-model="model.wfmmod.wfs.objtyp" disabled style="width:100%" placeholder="请选择Table Used to Store Associated Object"></c-input>
</c-col>
<c-col :span="10">
<c-input v-model="model.wfmmod.wfs.objinr" maxlength="8" placeholder="请输入Object"></c-input>
<c-input v-model="model.wfmmod.wfs.objinr" disabled maxlength="8" placeholder="请输入Object"></c-input>
</c-col>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Object Name">
<c-input v-model="model.wfmmod.wfs.objnam" maxlength="40" placeholder="请输入External Readable Object Identification"></c-input>
<c-input v-model="model.wfmmod.wfs.objnam" maxlength="40" disabled placeholder="请输入External Readable Object Identification"></c-input>
</el-form-item>
</c-col>
</c-col>
......@@ -452,11 +379,11 @@
<c-col :span="24">
<!-- <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
<!-- <el-table-column
fixed="right"
prop="display"
label="操作"
width="auto"
width="150px"
>
<template slot="header">
<c-col :span="11" style="text-align:left"><span>操作</span></c-col>
......@@ -480,10 +407,10 @@
处理
</c-button>
</template>
</el-table-column>
</el-table-column> -->
</c-istream-table>
</c-col>
</c-col>
</c-col>
</c-content>
</el-form>
......@@ -519,7 +446,7 @@ export default {
columns: [
'1 2:1 "User" 200',
'2 3:1 "Date / Time" 200',
'3 5:1 "Action" 200',
// '3 5:1 "Action" 400',
'4 1:1 "Type" 200'
],
data: [],
......@@ -531,13 +458,16 @@ export default {
'3 3 "Status" 80 1 0:0 1 WFE:STA',
'4 4 "Last Update" 102',
'5 5 "Retries" 100 1 0:1',
'6 6 "Text" 300',
'7 7 "Contrary Text" 200',
'6 6 "Text" 500',
'7 7 "Contrary Text" 500',
'8 8 "Target Time" 200'
],
data: [],
},
codes: { infdsp: CodeTable.infdsp },
codes: { infdsp: CodeTable.infdsp,
flg : CodeTable.flg,
atptxt : CodeTable.atptxt },
action:[],
}
},
mounted() {
......@@ -550,6 +480,13 @@ export default {
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];
const items = d.split("\t");
this.action[i] = items[items.length - 2];
}
console.log(this.action)
},
exit(){
this.$store.dispatch("TagsView/delView", this.$route)
......
src/views/Business/Trnrel/Trnfnd/Inftrnps.vue
......@@ -390,7 +390,7 @@
fixed="right"
prop="display"
label="操作"
width="140px"
width="auto"
>
<template slot="header">
<c-col :span="11" style="text-align:left"><span>操作</span></c-col>
......@@ -400,8 +400,7 @@
<c-button
style="margin-left: 0"
size="small"
type="primary"
@click="onDetail(scope.$index,scope.row)"
@click="onFinishDetail(scope.$index,scope.row)"
>
详情
</c-button>
......
src/views/Business/Trnrel/Trnfnd/TrnfndsDetail.vue
......@@ -2,16 +2,20 @@
<c-page title="">
<div class="eContainer">
<div class="eibs-tab">
<c-function-btn :hideFuncBtn="true" :handleStash="true"
>
<el-button size="small">交易快照</el-button>
<el-button size="small">智能提示</el-button>
</c-function-btn>
<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" @click="exit">退出</el-button>
</div>
</c-col>
<!-- <c-col :span="12">
<el-form-item label="Drag Drop Sender">
<c-input v-model="model.recpan.recget.sdamod.dadsnd" placeholder="请输入Drag Drop Sender"></c-input>
</el-form-item>
</c-col> -->
<el-form
:model="model"
ref="modelForm"
......@@ -19,215 +23,193 @@
:validate-on-rule-change="false"
label-width="150px"
size="small"
style="margin-left:15px"
>
<c-content>
<c-col :span="23">
<c-col :span="8">
<el-form-item label="Reference">
<c-input v-model="model.trn.ownref" maxlength="16" placeholder="请输入Reference"></c-input>
</el-form-item>
</c-col>
<c-col :span="1">
<c-button size="small" type="primary">
i
</c-button>
</c-col>
<!-- <c-col :span="12">
<el-form-item label="Reference">
<c-input v-model="model.recpan.con" placeholder="请输入Reference"></c-input>
</el-form-item>
</c-col> -->
<!-- <c-col :span="12">
<el-form-item label="Transaction Key">
<c-input v-model="model.trn.inr" maxlength="8" placeholder="请输入Transaction Key"></c-input>
</el-form-item>
</c-col> -->
<c-col :span="6">
<el-form-item label-width="30%" label="Ident No.">
<c-input v-model="model.trn.inr" placeholder="请输入Ident No."></c-input>
</el-form-item>
</c-col>
<!-- -------------------基础信息------------------- -->
<c-col :span="1">
&nbsp;
</c-col>
<!-- ========================= Left ========================= -->
<c-col :span="10">
<c-col :span="24">
<c-col :span="22">
<el-form-item label="Reference">
<c-input v-model="model.trn.ownref" maxlength="16" disabled placeholder="请输入Reference"></c-input>
</el-form-item>
</c-col>
<c-col :span="2">
<c-button
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-col>
</c-col>
<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>
</c-col>
<c-col :span="2">
<c-button
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-col>
</c-col>
<c-col :span="24">
<c-col :span="12">
<el-form-item label="Relevant Amount">
<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-input v-model="model.trn.reloriamt" disabled placeholder="请输入Relevant Amount for Release in Original Currency"></c-input>
</c-col>
</c-col>
<c-col :span="1">
<c-button size="small" type="primary">
i
</c-button>
</c-col>
<c-col :span="24">
<c-col :span="12">
<el-form-item label="Responsible">
<c-input v-model="model.trn.usr" maxlength="8" disabled placeholder="请输入Responsible"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label-width="35%" label="Group">
<c-input v-model="model.trn.usg" maxlength="6" disabled placeholder="请输入Responsible Group"></c-input>
</el-form-item>
</c-col>
</c-col>
<c-col :span="6">
<c-input v-model="model.trn.objnam" maxlength="40" placeholder="请输入External Readable Object Identification"></c-input>
<c-col :span="24">
<c-col :span="12">
<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>
</c-col>
<c-col :span="12">
<el-form-item label-width="35%" 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>
</c-col>
</c-col>
</c-col>
<!-- <c-col :span="12">
<c-button size="small" type="primary" @click="onRecpanDet">
详情
</c-button>
<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>
<c-col :span="12">
<el-form-item label="Drag Drop Sender">
<c-input v-model="model.recpan.atpget.sdamod.dadsnd" placeholder="请输入Drag Drop Sender"></c-input>
</el-form-item>
</c-col> -->
<c-col :span="23">
<c-col :span="8">
<el-form-item label="Transaction ID">
<c-input v-model="model.recpan.atp.cod" maxlength="6" placeholder="请输入Transaction ID"></c-input>
</el-form-item>
</c-col>
<!-- <c-col :span="12">
<el-form-item label="Transaction">
<c-input v-model="model.recpan.atpget.sdamod.seainf" placeholder="请输入Transaction"></c-input>
<!-- ========================= Right ========================= -->
<c-col :span="13">
<c-col :span="24">
<el-form-item label-width="40%" label="Ident No.">
<c-col :span="22">
<c-input v-model="model.trn.inr" disabled placeholder="请输入Ident No."></c-input>
</c-col>
<c-col :span="2">
<c-button
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-col>
</el-form-item>
</c-col> -->
</c-col>
<c-col :span="1">
<c-button size="small" type="primary">
i
</c-button>
</c-col>
<c-col :span="24">
<el-form-item label-width="40%" label="Transaction ID">
<el-select v-model="model.recpan.atp.cod" style="width: 100%" disabled>
<el-option
v-for="item in codes.atptxt"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
<!-- <c-input v-model="model.recpan.atp.cod" maxlength="6" placeholder="请输入Transaction ID"></c-input> -->
</el-form-item>
</c-col>
<c-col :span="14">
<c-input v-model="model.recpan.atp.cod" maxlength="6" placeholder="请输入Transaction ID"></c-input>
</c-col>
</c-col>
<c-col :span="24">
<el-form-item label-width="40%" label="Drop Receiver">
<c-input v-model="model.trn.objnam" maxlength="40" disabled placeholder="请输入External Readable Object Identification"></c-input>
</el-form-item>
</c-col>
<!-- <c-col :span="12">
<c-button size="small" type="primary" @click="onSyswrnButshw">
&Warning
</c-button>
</c-col> -->
<c-col :span="23">
<c-col :span="12">
<c-row>
<c-col :span="12">
<el-form-item label="Relevant Amount">
<c-input v-model="model.trn.reloricur" maxlength="3" placeholder="请输入Relevant Amount"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<c-input v-model="model.trn.reloriamt" placeholder="请输入Relevant Amount for Release in Original Currency"></c-input>
</c-col>
</c-row>
</c-col>
<c-col :span="12">
<c-col :span="24">
<el-form-item label-width="40%" label="Release Status of Transaction">
<c-input v-model="model.trn.relflg" style="width:100%" placeholder="请选择Release Status of Transaction">
<c-input v-model="model.trn.relflg" style="width:100%" disabled placeholder="请选择Release Status of Transaction">
</c-input>
</el-form-item>
</c-col>
</c-col>
<!-- <c-col :span="12">
<c-button size="small" type="primary" @click="onRecpanNotmap">
Unmapped
</c-button>
</c-col> -->
<c-col :span="23">
<c-col :span="6">
<el-form-item label="Responsible">
<c-input v-model="model.trn.usr" maxlength="8" placeholder="请输入Responsible"></c-input>
</el-form-item>
</c-col>
<c-col :span="6">
<el-form-item label-width="35%" label="Group">
<c-input v-model="model.trn.usg" maxlength="6" placeholder="请输入Responsible Group"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<c-col :span="24">
<el-form-item label-width="40%" label="Signatures Required/Obtained">
<c-row>
<c-col :span="11">
<c-input v-model="model.trn.relreq" maxlength="3" placeholder="请输入Signatures Required/Obtained"></c-input>
<c-input v-model="model.trn.relreq" maxlength="3" disabled placeholder="请输入Signatures Required/Obtained"></c-input>
</c-col>
<c-col :span="2">
<span style="margin-left:40%">/</span>
</c-col>
<c-col :span="11">
<c-input v-model="model.trn.relres" maxlength="3" placeholder="请输入Applied Signatures"></c-input>
<c-input v-model="model.trn.relres" maxlength="3" disabled placeholder="请输入Applied Signatures"></c-input>
</c-col>
</c-row>
</el-form-item>
</c-col>
</c-col>
<!-- <c-col :span="12">
<el-form-item label="Applied Signatures">
<c-input v-model="model.trn.relres" maxlength="3" placeholder="请输入Applied Signatures"></c-input>
</el-form-item>
</c-col> -->
<c-col :span="23">
<c-col :span="6">
<el-form-item label="Based on Ident No.">
<c-input v-model="model.trn.cortrninr" maxlength="8" placeholder="请输入Based on Ident No."></c-input>
</el-form-item>
</c-col>
<c-col :span="6">
<el-form-item label-width="35%" label="Execution Date">
<c-date-picker type="date" v-model="model.trn.exedat" style="width:100%" placeholder="请选择Execution Date"></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item>
<span style="text-align:center;display:block;" v-text="model.recpan.cpltxt" data-path=".recpan.cpltxt" > </span>
</el-form-item>
<c-col :span="24">
<el-form-item label-width="40%" label="Completion text">
<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>
</c-col>
<!-- -------------------分割线------------------- -->
<c-col :span="23">
<c-col :span="6">
<el-form-item label="Entered by">
<c-input v-model="model.recpan.cretrs.usr" maxlength="8" placeholder="请输入Entered by"></c-input>
</el-form-item>
</c-col>
<c-col :span="6">
<el-form-item label-width="35%" label="Timestamp">
<c-input v-model="model.recpan.cretrs.dattim" placeholder="请输入Timestamp"></c-input>
</el-form-item>
</c-col>
</c-col>
<!-- <c-col :span="12">
<el-form-item label="Send to SOP/CASmf reference">
<c-input v-model="model.recpan.ackgrp.rec.sndref" maxlength="40" placeholder="请输入Send to SOP/CASmf reference"></c-input>
</el-form-item>
</c-col> -->
<!-- <c-col :span="12">
<span v-text="model.recpan.spt.sta" data-path=".recpan.spt.sta" > </span>
</c-col> -->
<!-- <c-col :span="12">
<c-button size="small" type="primary" @click="onRecpanButspt">
Pending Item
</c-button>
<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">
<el-form-item label="Documents">
<!-- <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
fixed="right"
prop="display"
......@@ -238,73 +220,68 @@
<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>
<c-button
style="margin-left: 0"
size="small"
>
Show
</c-button>
<c-button
style="margin-left: 0"
size="small"
>
生成PDF
</c-button>
</template>
</el-table-column>
</c-istream-table>
</el-form-item>
</c-col>
</c-col>
<!-- <c-col :span="12">
<c-button size="small" type="primary" @click="onRecpanInc">
Show &Incoming
</c-button>
</c-col> -->
<!-- <c-col :span="12">
<c-button size="small" type="primary" @click="onRecpanButord">
Order
</c-button>
</c-col> -->
<!-- <c-col :span="12">
<span v-text="model.recpan.ord.sta" data-path=".recpan.ord.sta" > </span>
</c-col> -->
<!-- <c-col :span="12">
<c-button size="small" type="primary" @click="onImgmod1Image">
imgyge
</c-button>
<c-col :span="23" style="margin-left:9px;height:25px">
<el-divider></el-divider>
</c-col>
<c-col :span="12">
<c-button size="small" type="primary" @click="onRecpanIncben">
Inc to Ben
</c-button>
</c-col> -->
<c-col :span="23">
<c-col :span="16">
<el-form-item label="Infotext">
<c-input type="textarea" v-model="model.trn.inftxt" maxlength="65" show-word-limit placeholder="请输入Infotext" ></c-input>
</el-form-item>
</c-col>
<c-col :span="1">
<c-button size="small" type="primary">
...
</c-button>
<!-- -------------------Infotext------------------- -->
<c-col :span="23" style="margin-top:10px">
<c-col :span="17">
<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>
</c-col>
<c-col :span="2">
<c-button
style="margin:0 10px 0 10px;padding: 0 10px;"
size="small"
icon="el-icon-search"
type="primary"
></c-button>
</c-col>
</c-col>
<c-col :span="6">
<el-form-item label-width="20%" label="Infoflag">
<c-input v-model="model.trn.infdsp" style="width:100%" placeholder="请选择Infoflag">
</c-input>
</el-form-item>
<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 :span="24">
<el-form-item label-width="40%" label="Send for Repair to">
<c-input v-model="model.recpan.usr.extkey" disabled style="width:100%" placeholder="请选择extkey">
</c-input>
</el-form-item>
</c-col>
</c-col>
</c-col>
......@@ -320,11 +297,27 @@
</el-form-item>
</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="18">
<el-form-item label="Signatures">
<!-- <c-input v-model="model.recpan.trsstm" placeholder="请输入Signatures"></c-input> -->
<c-istream-table :list="SignaturesData.data" :columns="SignaturesData.columns" style="width:100%">
<!-- <c-input v-model="model.recpan.trsstm" placeholder="请输入Signatures"></c-input> -->
<c-col :span="24">
<c-istream-table :list="SignaturesData.data" :columns="SignaturesData.columns" :paginationShow="false" style="width:100%">
<el-table-column label="Action" width="400px">
<template slot-scope="scope">
<!-- <span>{{JSON.stringify(scope.row)}}</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>
</template>
</el-table-column>
<el-table-column
fixed="right"
prop="display"
......@@ -335,58 +328,62 @@
<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>
<!-- <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>
</el-form-item>
</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="12">
<el-form-item label="Object">
<c-col :span="10">
<c-input v-model="model.wfmmod.wfs.objtyp" style="width:100%" placeholder="请选择Table Used to Store Associated Object"></c-input>
<c-input v-model="model.wfmmod.wfs.objtyp" disabled style="width:100%" placeholder="请选择Table Used to Store Associated Object"></c-input>
</c-col>
<c-col :span="10">
<c-input v-model="model.wfmmod.wfs.objinr" maxlength="8" placeholder="请输入Object"></c-input>
<c-input v-model="model.wfmmod.wfs.objinr" disabled maxlength="8" placeholder="请输入Object"></c-input>
</c-col>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Object Name">
<c-input v-model="model.wfmmod.wfs.objnam" maxlength="40" placeholder="请输入External Readable Object Identification"></c-input>
<c-input v-model="model.wfmmod.wfs.objnam" maxlength="40" disabled placeholder="请输入External Readable Object Identification"></c-input>
</el-form-item>
</c-col>
</c-col>
<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-istream-table :list="stmData.data" :columns="stmData.columns" style="width:100%">
<el-table-column
<c-istream-table :list="stmData.data" :columns="stmData.columns" :paginationShow="false" style="width:100%">
<!-- <el-table-column
fixed="right"
prop="display"
label="操作"
width="auto"
width="150px"
>
<template slot="header">
<c-col :span="11" style="text-align:left"><span>操作</span></c-col>
......@@ -410,10 +407,10 @@
处理
</c-button>
</template>
</el-table-column>
</el-table-column> -->
</c-istream-table>
</el-form-item>
</c-col>
</c-col>
</c-col>
</c-content>
</el-form>
......@@ -447,10 +444,10 @@ export default {
},
SignaturesData: {
columns: [
'1 2:1 "User" 70 50',
'1 2:1 "User" 200',
'2 3:1 "Date / Time" 200',
'3 5:1 "Action" 120',
'4 1:1 "Type" 150'
// '3 5:1 "Action" 400',
'4 1:1 "Type" 200'
],
data: [],
},
......@@ -461,15 +458,18 @@ export default {
'3 3 "Status" 80 1 0:0 1 WFE:STA',
'4 4 "Last Update" 102',
'5 5 "Retries" 100 1 0:1',
'6 6 "Text" 300',
'7 7 "Contrary Text" 200',
'6 6 "Text" 500',
'7 7 "Contrary Text" 500',
'8 8 "Target Time" 200'
],
data: [],
},
codes: { infdsp: CodeTable.infdsp,
flg : CodeTable.flg,
atptxt : CodeTable.atptxt },
action:[],
}
},
methods:{...Event},
mounted() {
this.loadData()
},
......@@ -480,10 +480,28 @@ export default {
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];
const items = d.split("\t");
this.action[i] = items[items.length - 2];
}
console.log(this.action)
},
exit(){
this.$store.dispatch("TagsView/delView", this.$route)
this.$router.history.push("/taskList");
},
...Event
}
}
</script>
<style>
<style scoped>
.el-col >>> .el-divider--horizontal {
margin-top: 10px;
}
.formItemLabel >>> .el-form-item__label{
text-align: left;
font-weight:bold;
}
</style>
\ No newline at end of file
src/views/Layout/SideMenu.vue
......@@ -43,15 +43,15 @@ export default {
{ inifrm: "cptopn", ininam: "汇出汇款", pntmiu: "1" },
{ inifrm: "cptadv", ininam: "汇入汇款", pntmiu: "1" },
{ inifrm: "2", ininam: "买方信用证", pntmiu: "" },
{ inifrm: "ditopn", ininam: "信用证开立", pntmiu: "2" },
{ inifrm: "ditame", ininam: "信用证修改", pntmiu: "2" },
{ inifrm: "ditcan", ininam: "信用证注销", pntmiu: "2" },
// { inifrm: "ditopn", ininam: "信用证开立", pntmiu: "2" },
// { inifrm: "ditame", ininam: "信用证修改", pntmiu: "2" },
// { inifrm: "ditcan", ininam: "信用证注销", pntmiu: "2" },
{ inifrm: "infdid", ininam: "信用证交易查询", pntmiu: "2" },
{ inifrm: "infbdd", ininam: "信用证单据查询", pntmiu: "2" },
{ inifrm: "bdtudp", ininam: "信用证承兑", pntmiu: "2" },
{ inifrm: "bdtdcr", ininam: "信用证不符点/拒付", pntmiu: "2" },
{ inifrm: "ditdck", ininam: "信用证到单", pntmiu: "2" },
{ inifrm: "bdtset", ininam: "信用证付款", pntmiu: "2" },
// { inifrm: "bdtudp", ininam: "信用证承兑", pntmiu: "2" },
// { inifrm: "bdtdcr", ininam: "信用证不符点/拒付", pntmiu: "2" },
// { inifrm: "ditdck", ininam: "信用证到单", pntmiu: "2" },
// { inifrm: "bdtset", ininam: "信用证付款", pntmiu: "2" },
{ inifrm: "3", ininam: "出口信用证", pntmiu: "" },
{ inifrm: "letsel", ininam: "出口信用证查询", pntmiu: "3" },
{ inifrm: "letopn", ininam: "出口信用证通知", pntmiu: "3" },
......
src/views/Public/Docpan.vue
......@@ -136,7 +136,7 @@
.pandsc == 'MT799' &&
model.didgrp.rec.elcflg == 'Y'
"
@click="handleDisplay(scope.row.index, scope.row)"
@click="handleDisplay(scope.row.index, scope.row,model.trnmod.trndoc.doceot[scope.row.index])"
icon="el-icon-search"
style="margin-left:0"
></el-button
......@@ -454,9 +454,11 @@ export default {
}
})
},
async handleDisplay(index, row){
async handleDisplay(index, row,doceot){
//后续要根据快照模式切换请求方式
let cortyp = row.cortyp
let docnam = doceot.docnam||'';
docnam = docnam.substr(docnam.lastIndexOf("\\")+1).toLowerCase();
let rtnmsg
if (cortyp == 'SWT' || cortyp == 'FMT' || cortyp == 'CMT') {
this.model.setmod.msgmod.doccod = row.id
......@@ -465,7 +467,8 @@ export default {
this.model.trnmod.trndoc.doccod = row.id
this.model.trnmod.trndoc.cortyp = cortyp
const params = {
index: index
index: index,
docnam: docnam
}
rtnmsg = await Api.post(`${this.declareParams.trnName}/executeDocpan`, this.wrapper(params))
}
......@@ -480,7 +483,6 @@ export default {
Modal.info({
title: '电证报文', content: <div style={{ height: 400, overflow: 'auto' }}><ELCMessage mty={row.id} message={rtnmsg.data["\\trnmod\\trndoc\\docinf"]} /></div>,
width: 1000,
})
}
else {
......@@ -488,26 +490,24 @@ export default {
this.title = "面函"
let viewurl = "/#/docpan/show";
let XMLdata;
if (row.pandsc == "国内信用证") {
window.sessionStorage.docTXT = ''
window.sessionStorage.docXML = rtnmsg.data.litbenl1blk;
}
else if (row.pandsc == "开立国内信用证备查表") {
window.sessionStorage.docTXT = ''
window.sessionStorage.docXML = rtnmsg.data.litapll1blk
}
else if (row.pandsc.startsWith("elcs.")) {
if (row.pandsc.startsWith("elcs.")) {
window.sessionStorage.docXML = ''
window.sessionStorage.docTXT = ''
rtnmsg.data.trnmod_trndoc_doceot[index].doctxt.rows.forEach(element => {
window.sessionStorage.docTXT += element + "\r\n"
});
}
else if (row.pandsc == "MT799") {
window.sessionStorage.docTXT = ''
XMLdata = rtnmsg.data.litbenl1blk
}
else{
//参考后台Doceot.butshw order=1000
let execution = 'P', structure = 'l'
let attr = this.getDocAttribute(docnam,structure,execution)
window.sessionStorage.docTXT = ''
window.sessionStorage.docXML = rtnmsg.data[attr];
}
// console.log( window.sessionStorage.docTXT);
// console.log( window.sessionStorage.docXML);
window.open(viewurl, 'newwindow', 'height=1200,width=800,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
......@@ -530,6 +530,17 @@ export default {
this.index = index
}
},
//此用于获取返回的面函模板所在vo属性，参考后台Doceot.getDocRul实现。
getDocAttribute(docnam,structure,execution){
let pfx = docnam.substring(0,docnam.length-1);
let idx = docnam.substr(docnam.length-1);
let attr = '';
switch(execution){
case 'P':
attr = pfx + structure + idx;
}
return attr+'blk';
}
},
created: function () {},
};
......
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