Skip to content

V
vue-gjjs
Commit 4a76d959 by 潘际乾
Options

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

parents 3794ff13 7c963a70
Showing with 197 additions and 80 deletions
src/config/CodeTable/index.js
......@@ -3246,6 +3246,9 @@ const CodeTable = {
{ label: "Waiting for SRVCOM", value: "R" },
{ label: "Waiting for ReDo in SPTREL", value: "S" },
],
frm: [
{label:"Advising / Confirming",value:"LETOPN"},
],
hndtyp: [
{ label: "Receive to issue", value: "FR" },
{ label: "Transfer", value: "OT" },
......@@ -5878,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/Sptsel/Event.js
......@@ -53,17 +53,27 @@ export default {
this.$notify.error({ title: '错误', message: '服务请求失败！' });
}
},
async onDetails() {
this.$router.push({ path: "business/sptpopup", query: { inr: '111' }});
this.detailDialog=true;
let rtnmsg = await this.executeRule("details")
async onDetails(idx, row) {
let viewurl = "business/sptpopup";
const selIds= [idx + 1];
const selDst= "sptstm";
let params = {selIds,selDst};
this.executeRule("sptstm,butspt",params).then((res) => {
if (res.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, res.data);
sessionStorage.setItem('Sptpopup', JSON.stringify(this.model));
this.$router.push({ path: viewurl, query: {}});
}else {
this.$notify.error({ title: '错误', message: '服务请求失败！' });
}
})
/* let rtnmsg = await this.executeRule("details")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败！' });
}
} */
},
async continueEdit(row) {
//let rtnmsg = await Api.post("getPendingData",{params:{'selsptinr':row[0]}})
......
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
......@@ -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/Bttdrv/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/Bttsnd/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/BusRouter.js
......@@ -103,8 +103,9 @@ import Sptpopup from "./Sptsel/Sptpopup"
* 带有name的才会被添加进顶部的标签页里
*/
const BusRouter = [
{ path: 'inftrnpsDetail', component: InftrnpsDetail, name: 'InftrnpsDetail', meta: { title: '详情' } },
{ 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: '已完成详情' } },
{ path: 'inftrnpsDetail', component: InftrnpsDetail, name: 'InftrnpsDetail', meta: { title: '待复核详情' } },
{ path: 'cltdav', component: Cltdav, name: 'Cltdav', 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/Sptsel/Menu.vue
......@@ -311,7 +311,7 @@
></c-col> -->
</template>
<template slot-scope="scope">
<c-button style="margin-left: 0" size="small" @click="onDetails"
<c-button style="margin-left: 0" size="small" @click="onDetails(scope.$index,scope.row)"
>详情
</c-button>
<c-button
......
src/views/Business/Sptsel/Sptpopup.vue
<template>
<c-page title="">
<c-page title="">
<c-content :height="120">
<div class="eibs-tab">
<el-form
:model="model"
......@@ -9,12 +10,26 @@
label-width="150px"
size="small"
>
<c-col :span="21" style="height:24px">
<el-form-item label="基本信息" class="messageLabel">
</el-form-item>
</c-col>
<c-col :span="2" style="text-align:right">
<c-button size="small" @click="exit">返回</c-button>
</c-col>
<c-col :span="24" style="height: 10px">
<el-divider></el-divider>
</c-col>
<c-col :span="11">
<el-form-item label="Type" prop="spt.sta" style="width: 100%">
<c-select
v-model="model.spt.sta"
style="width: 100%"
placeholder="请选择Type"
disabled
>
</c-select>
</el-form-item>
......@@ -26,6 +41,8 @@
v-model="model.spt.hldflg"
style="width: 100%"
placeholder="请选择Hold Flag"
:code="codes.hldflg"
disabled
>
</c-select>
</el-form-item>
......@@ -38,6 +55,7 @@
maxlength="40"
style="width: 100%"
placeholder="请输入Reference"
disabled
></c-input>
</el-form-item>
</c-col>
......@@ -49,6 +67,7 @@
maxlength="8"
style="width: 100%"
placeholder="请输入Internal Unique ID of Pending Transaction"
disabled
></c-input>
</el-form-item>
</c-col>
......@@ -61,6 +80,7 @@
maxlength="40"
style="width: 100%"
placeholder="请输入Name"
disabled
></c-input>
</el-form-item>
</c-col>
......@@ -75,16 +95,20 @@
maxlength="6"
style="width: 95%"
placeholder="请输入Transaction "
disabled
></c-input>
</el-form-item>
</c-col>
<c-col :span="11">
<el-form-item label="" prop="spt.frm" label-width="0">
<c-input
<c-select
v-model="model.spt.frm"
maxlength="16"
placeholder="请输入Transaction "
></c-input>
:code="codes.frm"
style="width:100%"
disabled
></c-select>
</el-form-item>
</c-col>
</c-col>
......@@ -96,6 +120,7 @@
v-model="model.spt.ownusr"
maxlength="8"
placeholder="请输入Responsible User "
disabled
></c-input>
</el-form-item>
</c-col>
......@@ -106,6 +131,7 @@
v-model="model.spt.ownusg"
style="width: 100%"
placeholder="请选择Responsible Group"
disabled
>
</c-select>
</el-form-item>
......@@ -121,6 +147,7 @@
style="width: 100%"
show-word-limit
placeholder="请输入Infotext"
disabled
></c-input>
</el-form-item>
</c-col>
......@@ -130,6 +157,8 @@
v-model="model.spt.infdsp"
style="width: 100%; padding-left: 0px"
placeholder="请选择Infotext"
:code="codes.infdsp"
disabled
>
</c-select>
</el-form-item>
......@@ -143,6 +172,7 @@
v-model="model.spt.usr"
maxlength="8"
placeholder="请输入Entered by"
disabled
></c-input>
</el-form-item>
</c-col>
......@@ -152,6 +182,7 @@
<c-input
v-model="model.spt.dattim"
placeholder="请输入Time of Creation"
disabled
></c-input>
</el-form-item>
</c-col>
......@@ -162,6 +193,7 @@
v-model="model.spt.cretrn"
maxlength="6"
placeholder="请输入Creating Transaction ID"
disabled
></c-input>
</el-form-item>
</c-col>
......@@ -169,12 +201,20 @@
<c-col :span="24">
<c-col :span="11">
<el-form-item label="Target for Completion" prop="spt.tardattim">
<c-input v-model="model.spt.tardattim" placeholder="请输入Target for Completion"></c-input>
<c-input
v-model="model.spt.tardattim"
placeholder="请输入Target for Completion"
disabled
></c-input>
</el-form-item>
</c-col>
</c-col>
<c-col :span="24" style="height:20px">
<c-col :span="24" style="height:24px;margin-top:8px">
<el-form-item label="报文信息表" class="messageLabel">
</el-form-item>
</c-col>
<c-col :span="24" style="height: 0px">
<el-divider></el-divider>
</c-col>
......@@ -215,7 +255,7 @@
&Close
</c-button>
</c-col> -->
<c-col :span="23" style="height:24px;margin-left:9px">
<c-col :span="23" style="margin-left: 9px">
<!-- <el-form-item label-width="500px"> -->
<c-table :paginationShow="false" :border="true">
<el-table-column
......@@ -311,21 +351,34 @@
</c-table>
<!-- </el-form-item> -->
</c-col>
<c-col :span="23" style="height:24px;margin-left:9px">
<c-col :span="24" style="height:24px;margin-top:20px">
<el-form-item label="接口信息表" class="messageLabel">
</el-form-item>
</c-col>
<c-col :span="24" style="height: 0px">
<el-divider></el-divider>
</c-col>
<c-col :span="23" style="margin-left: 9px">
<!-- <el-form-item label-width="500px"> -->
<c-table :paginationShow="false" :border="true">
<!-- <c-table :paginationShow="false" :border="true">
<el-table-column label="Start" width="auto"></el-table-column>
<el-table-column label="Type" width="auto"></el-table-column>
<el-table-column label="User" width="auto"></el-table-column>
<el-table-column label="TRN" width="auto"></el-table-column>
<el-table-column label="End" width="auto"></el-table-column>
<el-table-column label="Text" width="auto"></el-table-column>
</c-table>
</c-table> -->
<!-- </el-form-item> -->
<c-istream-table :list="stmData2.data" :columns="stmData2.columns" :paginationShow="false" style="width:100%">
</c-istream-table>
</c-col>
</el-form>
</div>
</c-page>
</c-content>
</c-page>
</template>
<script>
import Sptsel from "~/Model/Sptsel";
......@@ -341,15 +394,48 @@ export default {
data() {
return {
model: new Sptsel().data,
codes: { ...CodeTable },
codes: { hldflg: CodeTable.hldflg ,...CodeTable},
trnName:"sptsel",
stmData2:{
columns:[
"7 1 \"Start\" 0",
"1 2 \"Type\" 0",
"8 3 \"User\" 0",
"4 4 \"TRN\" 0",
"7 5 \"End\" 0",
"6 6 \"Text\" 0",
],
data:[],
}
};
},
methods: { ...Event },
mounted() {
this.loadData();
},
methods: {
...Event,
loadData() {
this.model = JSON.parse(sessionStorage.getItem("Sptpopup"));
this.executeRule("sptp.ordp0.butore").then((res) => {
this.stmData2.data=res.data.sptstm.rows;
});
},
exit() {
this.$store.dispatch("TagsView/delView", this.$route);
this.$router.history.push("/taskList");
},
},
created: function () {},
};
</script>
<style scoped>
.el-col >>> .el-divider--horizontal {
margin-top: 1px;
margin-top: 5px;
}
.messageLabel >>> .el-form-item__label{
text-align: left;
font-weight:bold;
font-size: 12px;
}
</style>
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/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/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