Commit cae4eb96 by hulei

fix bugs

parent 54479695
......@@ -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> -->
......
......@@ -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> -->
......
......@@ -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> -->
......
<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() {
......
<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() {
......
<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() {
......
......@@ -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> -->
......
......@@ -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