Skip to content

V
vue-gjjs
Commit 8867bc02 by liuxin
Options

Merge branch 'master' of http://192.168.0.110:11080/fukai/vue-gjjs

parents c17e51ad 4e898428
Showing with 183 additions and 252 deletions
src/App.vue
...@@ -35,6 +35,9 @@ export default { ...@@ -35,6 +35,9 @@ export default {
.el-button--primary{ .el-button--primary{
margin-left: 10px; margin-left: 10px;
} }
.el-popover {
min-width: 60px;
}
/* .el-form-item--small{ /* .el-form-item--small{
margin-right: 30px; margin-right: 30px;
......
src/assets/css/common.css
...@@ -218,7 +218,11 @@ ...@@ -218,7 +218,11 @@
.el-checkbox__input.is-checked .el-checkbox__inner { .el-checkbox__input.is-checked .el-checkbox__inner {
background-color: #1561E0; background-color: #1561E0;
border-color: #1561E0; border-color: #1561E0;
} }
.el-checkbox__input.is-indeterminate .el-checkbox__inner {
background-color: #1561E0;
border-color: #1561E0;
}
.c-title { .c-title {
/* color: rgba(0, 0, 0, 0.65); */ /* color: rgba(0, 0, 0, 0.65); */
/* font-weight: 600; */ /* font-weight: 600; */
......
src/model/Ditopn/Event.js
...@@ -239,83 +239,6 @@ export default { ...@@ -239,83 +239,6 @@ export default {
}, },
async handleDisplay(index, row){
let cortyp = row.cortyp
let rtnmsg
if (cortyp == 'SWT' || cortyp == 'FMT' || cortyp == 'CMT') {
this.model.setmod.msgmod.doccod = row.id
rtnmsg = await Api.post('cptopn/msgmod_butshw', this.wrapper())
} else {
this.model.trnmod.trndoc.doccod = row.id
this.model.trnmod.trndoc.cortyp = cortyp
const params = {
index: index
}
rtnmsg = await Api.post("ditopn/executeDocpan", this.wrapper(params))
}
if (rtnmsg.respCode == SUCCESS) {
if (cortyp == 'SWT' || cortyp == 'FMT' || cortyp == 'CMT') {
let viewurl = rtnmsg.data.setmod_msgmod_docpth;
this.viewurl = viewurl
this.title = "报文"
//window.open(viewurl, 'newwindow', 'height=1200,width=800,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
else if (cortyp == 'ELC') {
Modal.info({
title: '电证报文', content: <div style={{ height: 400, overflow: 'auto' }}><ELCMessage mty={row.id} message={rtnmsg.data["\\trnmod\\trndoc\\docinf"]} /></div>,
width: 1000,
})
}
else {
// let url = rtnmsg.data.trnmod_trndoc_smh_docpth;
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 == "elcs.101.001.01") {
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
}
// 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');
}
this.dialogOpen = true
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败！' })
}
},
async handleDetail(index, row) {
const params = {
index: index
}
let rtnmsg = await Api.post("ditopn/executeDocpanDetail", this.wrapper(params))
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
this.title = row.pandsc
this.centerDialogVisible = true,
this.dialog = rtnmsg.data.trnmod_trndoc_doceot[index]
this.index = index
}
},
async BlurBennam(e) { async BlurBennam(e) {
let rtnmsg = await this.executeDefault("ditp.remark") let rtnmsg = await this.executeDefault("ditp.remark")
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
......
src/model/Sptsel/Event.js
...@@ -103,13 +103,13 @@ export default { ...@@ -103,13 +103,13 @@ export default {
const res = await this.executeDefault("sptstm") const res = await this.executeDefault("sptstm")
//TODO 处理数据逻辑 //TODO 处理数据逻辑
this.stmData.data = res.data.sptstm.rows; this.stmData.data = res.data.sptstm.rows;
if(res.data.sptstm.rows.length == 0){ // if(res.data.sptstm.rows.length == 0){
this.$notify({ // this.$notify({
title: '成功', // title: '成功',
message: '搜索完毕，无满足条件记录', // message: '搜索完毕，无满足条件记录',
type: 'success' // type: 'success'
}); // });
} // }
}, },
async sptfndHandleReset() { async sptfndHandleReset() {
...@@ -139,13 +139,13 @@ export default { ...@@ -139,13 +139,13 @@ export default {
// }) // })
const res = await this.executeDefault("sptstm") const res = await this.executeDefault("sptstm")
this.stmData.data = res.data.sptstm.rows; this.stmData.data = res.data.sptstm.rows;
if(res.data.sptstm.rows.length == 0){ // if(res.data.sptstm.rows.length == 0){
this.$notify({ // this.$notify({
title: '成功', // title: '成功',
message: '搜索完毕，无满足条件记录', // message: '搜索完毕，无满足条件记录',
type: 'success' // type: 'success'
}); // });
} // }
}, },
async onSptpButord(){ async onSptpButord(){
let rtnmsg = await this.executeRule("sptp.butord") let rtnmsg = await this.executeRule("sptp.butord")
......
src/model/Trnrel/Event.js
...@@ -375,44 +375,15 @@ export default { ...@@ -375,44 +375,15 @@ export default {
// }) // })
// } // }
const res = await this.executeRule("searow") const res = await this.executeRule("searow")
const arr=[]; that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows;
res.data.trncorco_trnstm.rows.forEach(element => {
switch (element.charAt(0)) {
case 'W':
arr.push("Waiting" + element.substring(1));
break;
case 'C':
arr.push("Correct" + element.substring(1));
break;
case 'P':
arr.push("Picked up" + element.substring(1));
break;
case 'N':
arr.push("Rejected" + element.substring(1));
break;
case 'E':
arr.push("Entered" + element.substring(1));
break;
case 'X':
arr.push("External" + element.substring(1));
break;
case 'M':
arr.push("Closed" + element.substring(1));
break;
default:
arr.push(element);
break;
}
});
that.$refs.inftrnps.stmData.data = arr;
this.model.trncorco.trnstm = res.data.trncorco_trnstm; this.model.trncorco.trnstm = res.data.trncorco_trnstm;
if (res.data.trncorco_trnstm.rows.length == 0) { // if (res.data.trncorco_trnstm.rows.length == 0) {
this.$notify({ // this.$notify({
title: '成功', // title: '成功',
message: '搜索完毕，无满足条件记录', // message: '搜索完毕，无满足条件记录',
type: 'success' // type: 'success'
}); // });
} // }
this.$refs.paramsForm.clearValidate(); this.$refs.paramsForm.clearValidate();
Utils.positioningErrorMsg(res.fieldErrors, this.$refs.paramsForm.fields) Utils.positioningErrorMsg(res.fieldErrors, this.$refs.paramsForm.fields)
}, },
......
src/views/Business/Sptsel/Menu.vue
...@@ -314,18 +314,23 @@ ...@@ -314,18 +314,23 @@
>详情 >详情
</c-button> </c-button>
<c-button <c-button
style="margin-left: 0;padding:0 12px" style="margin-left: 0"
size="small" size="small"
type="primary" type="primary"
@click="continueEdit(scope.row)" @click="continueEdit(scope.row)"
>TAKE >处理
</c-button> </c-button>
<el-popover placement="left" width="100" trigger="click"> <el-popover placement="top-start" width="50" trigger="click">
<c-button type="primary" size="small">指派</c-button> <!-- <c-button type="primary" size="small">指派</c-button>
<c-button type="primary" size="small">删除</c-button> <c-button type="primary" size="small">删除</c-button> -->
<!-- <el-button slot="reference" type="text">>>></el-button> -->
<a slot="reference" href="javascript:void(0)" style="text-decoration: none; color: #1561e0;font-family: '宋体';font-weight: bold;font-size: 14px;">>>></a <ul class="table-button-item-list">
> <li><c-button size="small" style="margin-left:0">指派</c-button></li>
<li><c-button size="small" style="margin-left:0">删除</c-button></li>
</ul>
<a slot="reference" href="javascript:void(0)" style="margin-left: 5px"
><i class="el-icon-more"></i
></a>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
...@@ -513,7 +518,9 @@ export default { ...@@ -513,7 +518,9 @@ export default {
saveColumnEvent() { saveColumnEvent() {
this.setColumnFlg = false; this.setColumnFlg = false;
this.saveColumnFlg = false; this.saveColumnFlg = false;
this.saveColumns = this.columnGroup.map((index)=>this.stmData.columns[index]); this.saveColumns = this.columnGroup.map(
(index) => this.stmData.columns[index]
);
}, },
setAll(val) { setAll(val) {
this.columnGroup = val ? this.setColumn.map((item) => item.index) : []; this.columnGroup = val ? this.setColumn.map((item) => item.index) : [];
...@@ -555,6 +562,19 @@ export default { ...@@ -555,6 +562,19 @@ export default {
padding: 0 20px 10px 20px; padding: 0 20px 10px 20px;
} }
.detailDialogClass >>> .el-dialog { .detailDialogClass >>> .el-dialog {
height: 400px; height: 650px;
}
.table-button-item-list{
padding: 0;
margin: 0;
} }
.table-button-item-list li {
list-style: none;
padding: 5px 0;
text-align: center;
color: #606266;
cursor: pointer;
}
</style> </style>
src/views/Business/Sptsel/Sptpopup.vue
...@@ -129,6 +129,44 @@ ...@@ -129,6 +129,44 @@
&Close &Close
</c-button> </c-button>
</c-col> --> </c-col> -->
<c-col :span="23">
<el-form-item>
<c-table
:paginationShow="false"
:border="true">
<el-table-column label="Seq.No" prop="groseq" width="auto"></el-table-column>
<el-table-column label="Msg.Type" prop="cortyp" width="auto"></el-table-column>
<el-table-column label="Message references" prop="nam" width="150px"></el-table-column>
<el-table-column label="User" prop="creusr" width="auto"></el-table-column>
<el-table-column label="Length" prop="msglen" width="auto"></el-table-column>
<el-table-column label="File name" prop="docfil" width="auto"></el-table-column>
<el-table-column label="File ext" prop="docfxt" width="auto"></el-table-column>
<el-table-column label="DB-INR" prop="inr" width="auto"></el-table-column>
<el-table-column label="CREFRM" prop="crefrm" width="auto"></el-table-column>
<el-table-column label="CREDATTIM" prop="credattim" width="120px"></el-table-column>
<el-table-column label="PARTFLG" prop="" width="partflg"></el-table-column>
<el-table-column label="MSGTYP" prop="msgtyp" width="auto"></el-table-column>
<el-table-column label="RELCUR" prop="relcur" width="auto"></el-table-column>
<el-table-column label="RELAMT" prop="relamt" width="auto"></el-table-column>
<el-table-column label="SYSNO" prop="sysno" width="auto"></el-table-column>
<el-table-column label="STAFLG" prop="staflg" width="auto"></el-table-column>
<el-table-column label="F20" prop="f20" width="auto"></el-table-column>
<el-table-column label="STP" prop="spt" width="auto"></el-table-column>
</c-table>
</el-form-item>
</c-col>
<c-col :span="23">
<el-form-item>
<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>
</el-form-item>
</c-col>
</div> </div>
</template> </template>
<script> <script>
......
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="auto" width="140px"
> >
<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>
......
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="200px" width="140px"
> >
<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>
...@@ -510,10 +510,10 @@ export default { ...@@ -510,10 +510,10 @@ export default {
'12 3 "币种" 70', '12 3 "币种" 70',
'13 4 "金额" 100', '13 4 "金额" 100',
'14 5 "创建时间" 170', '14 5 "创建时间" 170',
'9 6 "签名要求" 70', '9 6 "签名要求" 80',
'2 7 "签名状态" 70', '2 7 "签名状态" 80',
'16 8 "经办柜员" 70', '16 8 "经办柜员" 80',
'0 9 "业务状态" 70', '0 9 "业务状态" 80',
'15 10 "业务机构" 200', '15 10 "业务机构" 200',
], ],
data: [], data: [],
......
src/views/Public/Docpan.vue
<template> <template>
<div class="eibs-tab"> <div class="eibs-tab">
<!-- <c-col :span="12">
<el-form-item label="Correspondence"> </el-form-item>
</c-col> -->
<c-col :span="23" style="margin-left:9px"> <c-col :span="23" style="margin-left:9px">
<c-istream-table-docpan :list="stmData.data" :columns="stmData.columns"> <c-istream-table-docpan :list="stmData.data" :columns="stmData.columns">
<el-table-column label="报文格式"> <el-table-column label="报文格式">
...@@ -155,107 +151,9 @@ ...@@ -155,107 +151,9 @@
> >
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="">
<template slot-scope="scope">
<el-button
size="medium"
type="danger"
@click="handleDetail(scope.row.index, scope.row)"
>明细</el-button
>
</template>
</el-table-column> -->
</c-istream-table-docpan> </c-istream-table-docpan>
</c-col> </c-col>
<template>
<!-- <c-col :span="24">
<c-table :list="model.trnmod.trndoc.doceot" style="width:80%,text-align:center">
<el-table-column
label="Role"
width="auto"
>
</el-table-column>
<el-table-column
label="Description"
width="auto"
>
</el-table-column>
<el-table-column
label="CORTYP"
width="auto"
>
</el-table-column>
<el-table-column
label="DOCSNF"
width="auto"
>
</el-table-column>
<el-table-column
label="Lang."
width="auto"
>
</el-table-column>
<el-table-column
label="Form"
width="auto"
>
</el-table-column>
<el-table-column
label="Or."
width="auto"
>
</el-table-column>
<el-table-column
label="CC"
width="auto"
>
</el-table-column>
<el-table-column
label=".."
width="auto"
>
</el-table-column>
<el-table-column
label="Show"
width="auto"
>
</el-table-column>
<el-table-column
label="Details"
width="auto"
>
</el-table-column>
</c-table>
</c-col> -->
<!--
<c-col :span="12">
<span v-text="model.trnmod.trndoc.advlabel" data-path=".trnmod.trndoc.advlabel" > </span>
</c-col>
<c-col :span="12">
<el-form-item label="国内证落款">
<c-input v-model="model.trnmod.trndoc.advnam" maxlength="50" placeholder="请输入国内证落款"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="修改申请人名称">
<c-input type="textarea" v-model="model.trnmod.trndoc.amdapl" maxlength="50" show-word-limit placeholder="请输入修改申请人名称" ></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<span v-text="model.trnmod.trndoc.amdnam" data-path=".trnmod.trndoc.amdnam" > </span>
</c-col>
<c-col :span="12">
<el-form-item label="国内证通知书">
<c-input v-model="model.trnmod.trndoc.advdoc" maxlength="1" placeholder="请输入国内证通知书"></c-input>
</el-form-item>
</c-col>
--><template>
<el-dialog <el-dialog
:title="title" :title="title"
:visible.sync="centerDialogVisible" :visible.sync="centerDialogVisible"
...@@ -496,7 +394,6 @@ ...@@ -496,7 +394,6 @@
</template> </template>
<script> <script>
import CommonProcess from "~/mixin/CommonProcess"; import CommonProcess from "~/mixin/CommonProcess";
import Event from "~/model/Ditopn/Event";
import Api from "~/service/Api"; import Api from "~/service/Api";
import Utils from "~/utils/index"; import Utils from "~/utils/index";
export default { export default {
...@@ -544,7 +441,6 @@ export default { ...@@ -544,7 +441,6 @@ export default {
} }
}, },
methods: { methods: {
...Event,
saveDialog() { saveDialog() {
this.centerDialogVisible = false; this.centerDialogVisible = false;
console.log(this.model); console.log(this.model);
...@@ -558,6 +454,82 @@ export default { ...@@ -558,6 +454,82 @@ export default {
} }
}) })
}, },
async handleDisplay(index, row){
//后续要根据快照模式切换请求方式
let cortyp = row.cortyp
let rtnmsg
if (cortyp == 'SWT' || cortyp == 'FMT' || cortyp == 'CMT') {
this.model.setmod.msgmod.doccod = row.id
rtnmsg = await Api.post(`${this.declareParams.trnName}/msgmod_butshw`, this.wrapper())
} else {
this.model.trnmod.trndoc.doccod = row.id
this.model.trnmod.trndoc.cortyp = cortyp
const params = {
index: index
}
rtnmsg = await Api.post(`${this.declareParams.trnName}/executeDocpan`, this.wrapper(params))
}
if (rtnmsg.respCode == SUCCESS) {
if (cortyp == 'SWT' || cortyp == 'FMT' || cortyp == 'CMT') {
let viewurl = rtnmsg.data.setmod_msgmod_docpth;
this.viewurl = viewurl
this.title = "报文"
//window.open(viewurl, 'newwindow', 'height=1200,width=800,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
else if (cortyp == 'ELC') {
Modal.info({
title: '电证报文', content: <div style={{ height: 400, overflow: 'auto' }}><ELCMessage mty={row.id} message={rtnmsg.data["\\trnmod\\trndoc\\docinf"]} /></div>,
width: 1000,
})
}
else {
// let url = rtnmsg.data.trnmod_trndoc_smh_docpth;
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.")) {
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
}
// 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');
}
this.dialogOpen = true
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败！' })
}
},
async handleDetail(index, row) {
const params = {
index: index
}
let rtnmsg = await Api.post(`${this.declareParams.trnName}/executeDocpanDetail`, this.wrapper(params))
if (rtnmsg.respCode == SUCCESS) {
this.title = row.pandsc
this.centerDialogVisible = true,
this.dialog = rtnmsg.data.trnmod_trndoc_doceot[index]
this.index = index
}
},
}, },
created: function () {}, created: function () {},
}; };
......
src/views/TaskList/index.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<c-tabs :value="tabVal" type="card" @tab-click="tabClick"> <c-tabs :value="tabVal" type="card" @tab-click="tabClick">
<el-tab-pane label="待经办列表" name="sptsel"> <el-tab-pane label="待经办列表" name="sptsel">
<!-- <c-table :columnsConfig="tableColumns" :list="tableData"></c-table> --> <!-- <c-table :columnsConfig="tableColumns" :list="tableData"></c-table> -->
<c-content> <c-content :height="0">
<span slot="label"> <span slot="label">
待经办列表 待经办列表
<el-badge v-if="$store.state.Status.taskList.sptsel>0" :value="$store.state.Status.taskList.sptsel" :max="99"/> <el-badge v-if="$store.state.Status.taskList.sptsel>0" :value="$store.state.Status.taskList.sptsel" :max="99"/>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<t-sptbrk /> <t-sptbrk />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="到期提示" name="diasel"> <el-tab-pane label="到期提示" name="diasel">
<c-content> <c-content :height="0">
<t-diasel/> <t-diasel/>
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
......
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