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 203 additions and 185 deletions
src/config/CodeTable/index.js
...@@ -5881,5 +5881,8 @@ const CodeTable = { ...@@ -5881,5 +5881,8 @@ const CodeTable = {
{ label: "Do not display", value: "" }, { label: "Do not display", value: "" },
{ label: "Automatically display", value: "1" }, { label: "Automatically display", value: "1" },
], ],
atptxt: [
{ label: "开立信用证", value: "DITOPN" },
],
} }
export default CodeTable; export default CodeTable;
\ No newline at end of file
src/model/Trnrel/Event.js
...@@ -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));
......
src/views/Business/Bdtdcr/index.vue
...@@ -7,8 +7,6 @@ ...@@ -7,8 +7,6 @@
:handleCheck="handleCheck" :handleCheck="handleCheck"
:handleStash="handleStash" :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> -->
......
src/views/Business/Bdtset/index.vue
...@@ -6,8 +6,6 @@ ...@@ -6,8 +6,6 @@
:handleCheck="handleCheck" :handleCheck="handleCheck"
:handleStash="handleStash" :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> -->
......
src/views/Business/Bdtudp/index.vue
...@@ -6,8 +6,6 @@ ...@@ -6,8 +6,6 @@
:handleCheck="handleCheck" :handleCheck="handleCheck"
:handleStash="handleStash" :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> -->
......
src/views/Business/Bttdcr/index.vue
<template> <template>
<div class="eContainer"> <div class="eContainer">
<c-function-btn <c-function-btn
:handleSubmit="handleSubmit" :handleSubmit="handleSubmit"
:handleCheck="handleCheck" :handleCheck="handleCheck"
:handleStash="handleStash" :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> --> <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-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"> <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"> <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
...@@ -26,27 +24,27 @@ ...@@ -26,27 +24,27 @@
</el-tab-pane> </el-tab-pane>
<!--PD000001 --> <!--PD000001 -->
<el-tab-pane label="表外" name="engp"> <el-tab-pane label="表外" name="engp">
<m-engp :model="model" :codes="codes"/> <m-engp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000000 --> <!--PD000000 -->
<el-tab-pane label="费用及账务" name="setpan"> <el-tab-pane label="费用及账务" name="setpan">
<m-setpan :model="model" :codes="codes"/> <m-setpan :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000001 --> <!--PD000001 -->
<el-tab-pane label="保证金" name="ccvpan"> <el-tab-pane label="保证金" name="ccvpan">
<m-ccvpan :model="model" :codes="codes"/> <m-ccvpan :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="Completion" name="coninfp"> <el-tab-pane label="Completion" name="coninfp">
<m-coninfp :model="model" :codes="codes"/> <m-coninfp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000529 --> <!--PD000529 -->
<el-tab-pane label="面函及报文" name="docpan"> <el-tab-pane label="面函及报文" name="docpan">
<m-docpan :model="model" :codes="codes"/> <m-docpan :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
</c-tabs> </c-tabs>
</el-form> </el-form>
...@@ -62,21 +60,21 @@ import Default from "~/model/Bttdcr/Default" ...@@ -62,21 +60,21 @@ import Default from "~/model/Bttdcr/Default"
import Pattern from "~/model/Bttdcr/Pattern" import Pattern from "~/model/Bttdcr/Pattern"
import Betdcrs from "./Betdcrs" import Betdcrs from "./Betdcrs"
import Glepan from "./Glepan" import Glepan from "./Glepan"
import Engp from "~/views/Public/Engp"; import Engp from "~/views/Public/Engp";
import Setpan from "~/views/Public/Setpan"; import Setpan from "~/views/Public/Setpan";
import Ccvpan from "~/views/Public/Ccvpan"; import Ccvpan from "~/views/Public/Ccvpan";
import Docpan from "~/views/Public/Docpan"; import Docpan from "~/views/Public/Docpan";
import Coninfp from "~/views/Public/Coninfp"; import Coninfp from "~/views/Public/Coninfp";
export default { export default {
components:{ components:{
"m-betdcrs" : Betdcrs, "m-betdcrs" : Betdcrs,
"m-engp" : Engp, "m-engp" : Engp,
"m-setpan" : Setpan, "m-setpan" : Setpan,
"m-ccvpan" : Ccvpan, "m-ccvpan" : Ccvpan,
"m-docpan" : Docpan, "m-docpan" : Docpan,
"m-coninfp" : Coninfp, "m-coninfp" : Coninfp,
}, },
provide() { provide() {
......
src/views/Business/Bttdrv/index.vue
<template> <template>
<div class="eContainer"> <div class="eContainer">
<c-function-btn <c-function-btn
:handleSubmit="handleSubmit" :handleSubmit="handleSubmit"
:handleCheck="handleCheck" :handleCheck="handleCheck"
:handleStash="handleStash" :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> --> <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-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"> <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"> <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
...@@ -28,30 +26,30 @@ ...@@ -28,30 +26,30 @@
<!--PD000027 --> <!--PD000027 -->
<el-tab-pane label="Amounts And Parties" name="adapan"> <el-tab-pane label="Amounts And Parties" name="adapan">
<m-adapan :model="model" :codes="codes"/> <m-adapan :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="表外" name="engp"> <el-tab-pane label="表外" name="engp">
<m-engp :model="model" :codes="codes"/> <m-engp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000000 --> <!--PD000000 -->
<el-tab-pane label="费用及账务" name="setpan"> <el-tab-pane label="费用及账务" name="setpan">
<m-setpan :model="model" :codes="codes"/> <m-setpan :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000001 --> <!--PD000001 -->
<el-tab-pane label="保证金" name="ccvpan"> <el-tab-pane label="保证金" name="ccvpan">
<m-ccvpan :model="model" :codes="codes"/> <m-ccvpan :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="Completion" name="coninfp"> <el-tab-pane label="Completion" name="coninfp">
<m-coninfp :model="model" :codes="codes"/> <m-coninfp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000529 --> <!--PD000529 -->
<el-tab-pane label="面函及报文" name="docpan"> <el-tab-pane label="面函及报文" name="docpan">
<m-docpan :model="model" :codes="codes"/> <m-docpan :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
</c-tabs> </c-tabs>
</el-form> </el-form>
...@@ -68,21 +66,21 @@ import Pattern from "~/model/Bttdrv/Pattern" ...@@ -68,21 +66,21 @@ import Pattern from "~/model/Bttdrv/Pattern"
import Drv from "./Drv" import Drv from "./Drv"
import Adapan from "./Adapan" import Adapan from "./Adapan"
import Engp from "~/views/Public/Engp"; import Engp from "~/views/Public/Engp";
import Setpan from "~/views/Public/Setpan"; import Setpan from "~/views/Public/Setpan";
import Ccvpan from "~/views/Public/Ccvpan"; import Ccvpan from "~/views/Public/Ccvpan";
import Docpan from "~/views/Public/Docpan"; import Docpan from "~/views/Public/Docpan";
import Coninfp from "~/views/Public/Coninfp"; import Coninfp from "~/views/Public/Coninfp";
export default { export default {
components:{ components:{
"m-drv" : Drv, "m-drv" : Drv,
"m-adapan" : Adapan, "m-adapan" : Adapan,
"m-engp" : Engp, "m-engp" : Engp,
"m-setpan" : Setpan, "m-setpan" : Setpan,
"m-ccvpan" : Ccvpan, "m-ccvpan" : Ccvpan,
"m-docpan" : Docpan, "m-docpan" : Docpan,
"m-coninfp" : Coninfp, "m-coninfp" : Coninfp,
}, },
provide() { provide() {
......
src/views/Business/Bttsnd/index.vue
<template> <template>
<c-page title="转让证单据寄单"> <c-page title="转让证单据寄单">
<div class="eContainer"> <div class="eContainer">
<c-function-btn <c-function-btn
:handleSubmit="handleSubmit" :handleSubmit="handleSubmit"
:handleCheck="handleCheck" :handleCheck="handleCheck"
:handleStash="handleStash" :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> --> <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> </c-function-btn>
<el-form <el-form
:model="model" :model="model"
:rules="rules" :rules="rules"
ref="modelForm" ref="modelForm"
label-width="160px" label-width="160px"
size="small" size="small"
label-position="left" label-position="left"
:validate-on-rule-change="false"> :validate-on-rule-change="false">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick"> <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
...@@ -49,10 +47,10 @@ ...@@ -49,10 +47,10 @@
<!--PD000001 --> <!--PD000001 -->
<el-tab-pane label="保证金" name="ccvpan"> <el-tab-pane label="保证金" name="ccvpan">
<m-ccvpan :model="model" :codes="codes"/> <m-ccvpan :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="Completion" name="coninfp"> <el-tab-pane label="Completion" name="coninfp">
<m-coninfp :model="model" :codes="codes"/> <m-coninfp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000529 --> <!--PD000529 -->
...@@ -61,7 +59,7 @@ ...@@ -61,7 +59,7 @@
</el-tab-pane> </el-tab-pane>
</c-tabs> </c-tabs>
</el-form> </el-form>
</div> </div>
</c-page> </c-page>
</template> </template>
<script> <script>
...@@ -77,11 +75,11 @@ import Dscins from "./Dscins" ...@@ -77,11 +75,11 @@ import Dscins from "./Dscins"
// import Engp from "./Engp" // import Engp from "./Engp"
// import Setpan from "./Setpan" // import Setpan from "./Setpan"
// import Ccvpan from "./Ccvpan" // import Ccvpan from "./Ccvpan"
// import Docpan from "./Docpan" // import Docpan from "./Docpan"
// import Coninfp from "./Coninfp"; // import Coninfp from "./Coninfp";
import Engp from "~/views/Public/Engp"; import Engp from "~/views/Public/Engp";
import Setpan from "~/views/Public/Setpan"; import Setpan from "~/views/Public/Setpan";
import Ccvpan from "~/views/Public/Ccvpan"; import Ccvpan from "~/views/Public/Ccvpan";
import Docpan from "~/views/Public/Docpan"; import Docpan from "~/views/Public/Docpan";
import Coninfp from "~/views/Public/Coninfp"; import Coninfp from "~/views/Public/Coninfp";
...@@ -92,7 +90,7 @@ export default { ...@@ -92,7 +90,7 @@ export default {
"m-engp" : Engp, "m-engp" : Engp,
"m-setpan" : Setpan, "m-setpan" : Setpan,
"m-ccvpan" : Ccvpan, "m-ccvpan" : Ccvpan,
"m-docpan" : Docpan, "m-docpan" : Docpan,
"m-coninfp" : Coninfp, "m-coninfp" : Coninfp,
}, },
provide() { provide() {
......
src/views/Business/BusRouter.js
...@@ -103,6 +103,7 @@ import Sptpopup from "./Sptsel/Sptpopup" ...@@ -103,6 +103,7 @@ import Sptpopup from "./Sptsel/Sptpopup"
* 带有name的才会被添加进顶部的标签页里 * 带有name的才会被添加进顶部的标签页里
*/ */
const BusRouter = [ const BusRouter = [
{ path: 'sptpopup', component: Sptpopup, name: 'Sptpopup', meta: { title: '详情' } },
// { path: 'inftrnpsDetail', component: InftrnpsDetail, name: 'InftrnpsDetail', meta: { title: '详情' } }, // { 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: '已完成详情' } },
......
src/views/Business/Ditopn/index.vue
...@@ -7,8 +7,6 @@ ...@@ -7,8 +7,6 @@
:handleCheck="handleCheck" :handleCheck="handleCheck"
:handleStash="handleStash" :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> -->
......
src/views/Business/Infdid/Fepinfp.vue
...@@ -184,12 +184,12 @@ export default { ...@@ -184,12 +184,12 @@ export default {
"3 1 \"Fee Code\" 0 ", "3 1 \"Fee Code\" 0 ",
"4 2 \"Fee Text\" 0 ", "4 2 \"Fee Text\" 0 ",
"11 3 \"Disposition\" 0 ", "11 3 \"Disposition\" 0 ",
"1 4 \"Role\" 0 ", "12 4 \"Role\" 0 ",
"5 5 \"Cur\" 0 ", "5 5 \"Cur\" 0 ",
"6 6 \"Amount\" 0 ", "6 6 \"Amount\" 0 ",
"1 7 \"Transaction/INR\" 0 ", "9 7 \"Transaction/INR\" 0 ",
"7 8 \"Entry Date\" 0 ", "7 8 \"Entry Date\" 0 ",
"1 9 \"Status\" 0 ", "10 9 \"Status\" 0 ",
], ],
fepstmData: [ fepstmData: [
...@@ -248,7 +248,8 @@ export default { ...@@ -248,7 +248,8 @@ export default {
} }
}, },
created:function(){ created:function(){
this.getInfconFcpfeecod();
this.getInfconFepfeecod();
} }
} }
</script> </script>
......
src/views/Business/Infdid/Infsea.vue
...@@ -296,10 +296,10 @@ ...@@ -296,10 +296,10 @@
</c-list-search> </c-list-search>
<c-col :span="24" style="margin-top: 10px"> <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> </c-col>
<el-row> <!-- <el-row> -->
<c-col :span="24"> <c-col :span="24">
<c-istream-table :list="stmData.data" :columns="stmData.columns"> <c-istream-table :list="stmData.data" :columns="stmData.columns">
<el-table-column fixed="right" prop="op" label="操作" width="200px"> <el-table-column fixed="right" prop="op" label="操作" width="200px">
...@@ -361,19 +361,19 @@ ...@@ -361,19 +361,19 @@
处理 处理
</c-button> </c-button>
<c-button <!-- <c-button
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
type="primary" type="primary"
@click="getDitSelInfo(scope.$index, scope.row)" @click="getDitSelInfo(scope.$index, scope.row)"
> >
info info
</c-button> </c-button> -->
</template> </template>
</el-table-column> </el-table-column>
</c-istream-table> </c-istream-table>
</c-col> </c-col>
</el-row> <!-- </el-row> -->
<el-dialog :visible.sync="initdialog" :title="'交易列表'" append-to-body> <el-dialog :visible.sync="initdialog" :title="'交易列表'" append-to-body>
<div class="m-list-btns"> <div class="m-list-btns">
...@@ -647,11 +647,11 @@ export default { ...@@ -647,11 +647,11 @@ export default {
let rtnmsgNew = await this.executeRule("infbut.dsp", params); let rtnmsgNew = await this.executeRule("infbut.dsp", params);
if(rtnmsgNew.respCode = SUCCESS){ if(rtnmsgNew.respCode = SUCCESS){
Utils.copyValueFromVO(this.model, rtnmsgNew.data); Utils.copyValueFromVO(this.model, rtnmsgNew.data);
// params = {selDst:"infcon.objinr",selIds:[idx+1]} params = {selDst:"infcon.objinr",selIds:[idx+1]}
// let rtnmsgObjinr = await this.executeDefault("infcon.objinr", params); let rtnmsgObjinr = await this.executeDefault("infcon.objinr", params);
// if(rtnmsgObjinr.respCode = SUCCESS){ if(rtnmsgObjinr.respCode = SUCCESS){
// Utils.copyValueFromVO(this.model, rtnmsgObjinr.data); Utils.copyValueFromVO(this.model, rtnmsgObjinr.data);
// } }
} }
} }
//触发父组件中updateShowPanel 事件，修改index中showPanel ，控制 index中组件的显示和隐藏 //触发父组件中updateShowPanel 事件，修改index中showPanel ，控制 index中组件的显示和隐藏
...@@ -671,6 +671,9 @@ export default { ...@@ -671,6 +671,9 @@ export default {
this.trnData.data = rtnmsg.data.infcon_trnstm.rows; this.trnData.data = rtnmsg.data.infcon_trnstm.rows;
} }
}, },
toDitopn(){
this.$router.history.push("/business/ditopn")
}
}, },
created: function () {}, created: function () {},
}; };
......
src/views/Business/Infdid/index.vue
...@@ -192,7 +192,7 @@ export default { ...@@ -192,7 +192,7 @@ export default {
if (!!rulePath) { if (!!rulePath) {
this.executeRule(rulePath).then(res => { this.executeRule(rulePath).then(res => {
if (res.respCode == SUCCESS) { if (res.respCode == SUCCESS) {
this.updateModel(res.data) this.updateModel(res.data);
} }
}) })
} }
......
src/views/Business/Trnrel/Inftrnps.vue
...@@ -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>
......
src/views/Business/Trnrel/Trnfnd/Inftrnps.vue
...@@ -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>
......
src/views/Layout/SideMenu.vue
...@@ -43,15 +43,15 @@ export default { ...@@ -43,15 +43,15 @@ export default {
{ inifrm: "cptopn", ininam: "汇出汇款", pntmiu: "1" }, { inifrm: "cptopn", ininam: "汇出汇款", pntmiu: "1" },
{ inifrm: "cptadv", ininam: "汇入汇款", pntmiu: "1" }, { inifrm: "cptadv", ininam: "汇入汇款", pntmiu: "1" },
{ inifrm: "2", ininam: "买方信用证", pntmiu: "" }, { inifrm: "2", ininam: "买方信用证", pntmiu: "" },
{ inifrm: "ditopn", ininam: "信用证开立", pntmiu: "2" }, // { inifrm: "ditopn", ininam: "信用证开立", pntmiu: "2" },
{ inifrm: "ditame", ininam: "信用证修改", pntmiu: "2" }, // { inifrm: "ditame", ininam: "信用证修改", pntmiu: "2" },
{ inifrm: "ditcan", ininam: "信用证注销", pntmiu: "2" }, // { inifrm: "ditcan", ininam: "信用证注销", pntmiu: "2" },
{ inifrm: "infdid", ininam: "信用证交易查询", pntmiu: "2" }, { inifrm: "infdid", ininam: "信用证交易查询", pntmiu: "2" },
{ inifrm: "infbdd", ininam: "信用证单据查询", pntmiu: "2" }, { inifrm: "infbdd", ininam: "信用证单据查询", pntmiu: "2" },
{ inifrm: "bdtudp", ininam: "信用证承兑", pntmiu: "2" }, // { inifrm: "bdtudp", ininam: "信用证承兑", pntmiu: "2" },
{ inifrm: "bdtdcr", ininam: "信用证不符点/拒付", pntmiu: "2" }, // { inifrm: "bdtdcr", ininam: "信用证不符点/拒付", pntmiu: "2" },
{ inifrm: "ditdck", ininam: "信用证到单", pntmiu: "2" }, // { inifrm: "ditdck", ininam: "信用证到单", pntmiu: "2" },
{ inifrm: "bdtset", ininam: "信用证付款", pntmiu: "2" }, // { inifrm: "bdtset", ininam: "信用证付款", pntmiu: "2" },
{ inifrm: "3", ininam: "出口信用证", pntmiu: "" }, { inifrm: "3", ininam: "出口信用证", pntmiu: "" },
{ inifrm: "letsel", ininam: "出口信用证查询", pntmiu: "3" }, { inifrm: "letsel", ininam: "出口信用证查询", pntmiu: "3" },
{ inifrm: "letopn", ininam: "出口信用证通知", pntmiu: "3" }, { inifrm: "letopn", ininam: "出口信用证通知", pntmiu: "3" },
......
src/views/Public/Docpan.vue
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
.pandsc == 'MT799' && .pandsc == 'MT799' &&
model.didgrp.rec.elcflg == 'Y' 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" icon="el-icon-search"
style="margin-left:0" style="margin-left:0"
></el-button ></el-button
...@@ -454,9 +454,11 @@ export default { ...@@ -454,9 +454,11 @@ export default {
} }
}) })
}, },
async handleDisplay(index, row){ async handleDisplay(index, row,doceot){
//后续要根据快照模式切换请求方式 //后续要根据快照模式切换请求方式
let cortyp = row.cortyp let cortyp = row.cortyp
let docnam = doceot.docnam||'';
docnam = docnam.substr(docnam.lastIndexOf("\\")+1).toLowerCase();
let rtnmsg let rtnmsg
if (cortyp == 'SWT' || cortyp == 'FMT' || cortyp == 'CMT') { if (cortyp == 'SWT' || cortyp == 'FMT' || cortyp == 'CMT') {
this.model.setmod.msgmod.doccod = row.id this.model.setmod.msgmod.doccod = row.id
...@@ -465,7 +467,8 @@ export default { ...@@ -465,7 +467,8 @@ export default {
this.model.trnmod.trndoc.doccod = row.id this.model.trnmod.trndoc.doccod = row.id
this.model.trnmod.trndoc.cortyp = cortyp this.model.trnmod.trndoc.cortyp = cortyp
const params = { const params = {
index: index index: index,
docnam: docnam
} }
rtnmsg = await Api.post(`${this.declareParams.trnName}/executeDocpan`, this.wrapper(params)) rtnmsg = await Api.post(`${this.declareParams.trnName}/executeDocpan`, this.wrapper(params))
} }
...@@ -480,7 +483,6 @@ export default { ...@@ -480,7 +483,6 @@ export default {
Modal.info({ Modal.info({
title: '电证报文', content: <div style={{ height: 400, overflow: 'auto' }}><ELCMessage mty={row.id} message={rtnmsg.data["\\trnmod\\trndoc\\docinf"]} /></div>, title: '电证报文', content: <div style={{ height: 400, overflow: 'auto' }}><ELCMessage mty={row.id} message={rtnmsg.data["\\trnmod\\trndoc\\docinf"]} /></div>,
width: 1000, width: 1000,
}) })
} }
else { else {
...@@ -488,26 +490,24 @@ export default { ...@@ -488,26 +490,24 @@ export default {
this.title = "面函" this.title = "面函"
let viewurl = "/#/docpan/show"; let viewurl = "/#/docpan/show";
let XMLdata; let XMLdata;
if (row.pandsc == "国内信用证") { if (row.pandsc.startsWith("elcs.")) {
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.")) {
window.sessionStorage.docXML = '' window.sessionStorage.docXML = ''
window.sessionStorage.docTXT = '' window.sessionStorage.docTXT = ''
rtnmsg.data.trnmod_trndoc_doceot[index].doctxt.rows.forEach(element => { rtnmsg.data.trnmod_trndoc_doceot[index].doctxt.rows.forEach(element => {
window.sessionStorage.docTXT += element + "\r\n" window.sessionStorage.docTXT += element + "\r\n"
}); });
} }
else if (row.pandsc == "MT799") { else if (row.pandsc == "MT799") {
window.sessionStorage.docTXT = '' window.sessionStorage.docTXT = ''
XMLdata = rtnmsg.data.litbenl1blk 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.docTXT);
// console.log( window.sessionStorage.docXML); // 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'); 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 { ...@@ -530,6 +530,17 @@ export default {
this.index = index 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 () {}, 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