Skip to content

V
vue-gjjs
Commit d07e563b by fukai
Options

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

parents 6a179b49 315283e0
Showing with 115 additions and 103 deletions
src/components/SearchInput.vue
......@@ -258,7 +258,7 @@ export default {
position: relative;
}
.search-wrapper >>> .el-input {
z-index: 2001;
/* z-index: 2001; */
}
.search-wrapper >>> .el-input .el-input__inner {
height: 30px;
......
src/views/Business/Bdtset/Utlp.vue
<template>
<div class="eibs-tab">
<div class="eibs-tab" style="margin-left:9px;">
<c-col :span="24">
<c-col :span="11">
......@@ -530,7 +530,7 @@
<c-col :span="23" style="height: 0px">
<el-divider></el-divider>
</c-col>
<c-col :span="22" :offset="1">
<c-col :span="23" :offset="0">
<c-istream-table :list="stmData.data" :columns="stmData.columns" :paginationShow="false" :showSelection="true">
</c-istream-table>
</c-col>
......@@ -542,7 +542,7 @@
<c-col :span="23" style="height: 0px">
<el-divider></el-divider>
</c-col>
<c-col :span="22" :offset="1">
<c-col :span="23" :offset="0">
<div class="e-table-wrapper">
<c-table :data="model.bptbck.bptbckg" style="width: 100%" :paginationShow="false">
<el-table-column prop="ownref" label="Reference" width="auto">
......
src/views/Business/Ditopn/Ovwp.vue
......@@ -76,13 +76,14 @@
</c-fullbox>
</el-form-item>
</c-col>
<c-col :span="11">
<c-col :span="13">
<c-form-item label="信用证金额" prop="didgrp.cbs.nom1.cur" previewLabel="信用证币种">
<c-select
disabled
v-model="model.didgrp.cbs.nom1.cur"
placeholder="请选择Currency"
@keyup.enter.native="nom1CurEvent"
style="width:100%"
>
<el-option
v-for="item in codes.cur"
......@@ -94,16 +95,15 @@
</c-select>
</c-form-item>
</c-col>
<c-col :span="13">
<c-col :span="11">
<c-form-item
previewLabel="信用证金额"
style="text-align: left"
style="text-align: left;"
label-width="5px"
prop="didgrp.cbs.nom1.amt"
>
<c-input-currency
v-model="model.didgrp.cbs.nom1.amt"
style="text-align: left; width: 100%"
placeholder="请输入信用证金额"
@keyup.enter.native="defaultFunction('didgrp.cbs.nom1.amt', model.didgrp.cbs.nom1.amt)"
></c-input-currency>
......@@ -120,21 +120,28 @@
</el-form-item>
</c-col>
<c-col :span="24">
<c-col :span="13">
<c-form-item label="上下浮动限额" prop="didgrp.rec.nomtop">
<c-input
v-model="model.didgrp.rec.nomtop"
maxlength="9"
style="width: 48%"
style="width: 100%"
placeholder="请输入Amount Tolerance - Positive"
></c-input>
</c-form-item>
</c-col>
<c-col :span="1" style="text-align:center">
<label style="display:inline-block;width:calc(3% - 4px);text-align:center;">-</label>
</c-col>
<c-col :span="10">
<c-input
v-model="model.didgrp.rec.nomton"
maxlength="9"
style="width: 48%"
style="width: 100%"
placeholder="请输入Amount Tolerance - Negative"
></c-input>
</c-form-item>
</c-col>
</c-col>
<!-- <c-col :span="12" style="text-align: left">
<el-form-item
......@@ -153,7 +160,7 @@
<!-- <c-col> &nbsp; </c-col> -->
<c-col :span="11">
<c-col :span="13">
<el-form-item label="信用证最大金额" prop="didgrp.cbs.max.cur">
<c-select
v-model="model.didgrp.cbs.max.cur"
......@@ -172,7 +179,7 @@
</el-form-item>
</c-col>
<c-col :span="13">
<c-col :span="11">
<el-form-item label="" label-width="5px" prop="didgrp.cbs.max.amt">
<c-input
v-model="model.didgrp.cbs.max.amt"
......@@ -308,7 +315,7 @@
</el-form-item>
</c-col>
<c-col :span="11">
<el-form-item label="报文类型">
<el-form-item label="报文类型" label-width="40%" style="text-align:right">
<c-select v-model="model.ditp.msgtyp" placeholder="请选择报文类型"
:code="getValues('ditp.msgtyp')"
:disabled="model.didgrp.rec.elcflg!='Y'" />
......
src/views/Business/Infdid/Infsea.vue
......@@ -296,7 +296,7 @@
</c-list-search>
<c-col :span="24" style="margin-top: 10px">
<c-button class="medium_bcs" size="medium" type="primary" @click="toDitopn">信用证开立</c-button>
<c-button class="medium_bcs" size="medium" style="margin-left: 0px" type="primary" @click="toDitopn">信用证开立</c-button>
</c-col>
<!-- <el-row> -->
......
src/views/Business/Sptsel/Menu.vue
......@@ -428,11 +428,11 @@ export default {
// setColumn: [],
stmData: {
columns: [
'4 1 "交易代码" 70 ',
'4 1 "交易代码" 80 ',
'5 2 "业务编号" 300',
'6 3 "交易名称" 140',
'6 3 "交易名称" 150',
//'1 4 "状态" 60 1 tdViewTypeEdit:0 1 SPT:STA',
{index:1,position:4,width:100,pattern:'code',label:'状态',code:this.codes.sptrelstatus},
{index:1,position:4,width:110,pattern:'code',label:'状态',code:this.codes.sptrelstatus},
'17 5 "报文类型" 100',
'18 6 "对方银行BIC" 110',
'7 7 "创建时间" 160 20 DateTime 1',
......
src/views/Business/Sptsel/Sptbrk/Menu.vue
......@@ -380,7 +380,7 @@ export default {
},
stmData: {
columns: [
'4 1 "交易代码" 70 ',
'4 1 "交易代码" 80 ',
'5 2 "业务编号" 300',
'6 3 "交易名称" 180',
// '1 4 "状态" 60 1 tdViewTypeEdit:0 1 SPT:STA',
......
src/views/Business/Sptsel/Sptpopup.vue
......@@ -16,7 +16,7 @@
</el-form-item>
</c-col>
<c-col :span="2" style="text-align:right">
<c-button size="small" @click="exit">返回</c-button>
<c-button type="primary" size="small" @click="exit">返回</c-button>
</c-col>
<c-col :span="24" style="height: 10px">
<el-divider></el-divider>
......
src/views/Business/Trnrel/InftrnpsDetail.vue
......@@ -26,8 +26,8 @@
size="small"
>
<c-content>
<c-col :span="23" style="margin:0 0 5px 0">
<c-col :span="13" style="height:24px;">
<!-- <c-col :span="23" style="margin:0 0 5px 0"> -->
<c-col :span="12" style="height:24px;">
<el-form-item label="基本信息" class="messageLabel">
</el-form-item>
</c-col>
......@@ -36,7 +36,7 @@
<c-button size="small" type="primary" style="margin-left:0">智能提示</c-button>
<c-button size="small" @click="exit" type="primary" style="margin-left:0">返回</c-button>
</c-col>
</c-col>
<!-- </c-col> -->
<c-col :span="23" style="height: 10px;margin-bottom:10px">
<el-divider></el-divider>
</c-col>
......@@ -168,15 +168,15 @@
<c-col :span="24">
<el-form-item label="Transaction ID">
<el-select v-model="model.recpan.atp.cod" style="width: 100%" disabled>
<!-- <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-select> -->
<c-input v-model="this.atptxt" maxlength="6" disabled placeholder="请输入Transaction ID"></c-input>
</el-form-item>
</c-col>
......@@ -269,16 +269,15 @@
</c-col> -->
<!-- -------------------document------------------- -->
<c-col :span="24" style="height:24px">
<c-col :span="23" style="height:24px">
<el-form-item label="面函/报文" class="messageLabel">
</el-form-item>
</c-col>
<c-col :span="23" style="height: 0px">
<c-col :span="23" style="height: 0px;margin-top:-5px">
<el-divider></el-divider>
</c-col>
<c-col :span="23">
<!-- <c-input v-model="model.recpan.smhstm" placeholder="请输入Documents"></c-input> -->
<c-col :span="23" :offset="1">
<c-istream-table :list="documentsData.data" :columns="documentsData.columns" :paginationShow="false" style="width:100%">
<el-table-column
fixed="right"
......@@ -308,8 +307,6 @@
</el-table-column>
</c-istream-table>
</c-col>
</c-col>
<!-- <c-col :span="12">
<el-form-item label="User ID">
......@@ -323,20 +320,20 @@
</el-form-item>
</c-col>
-->
<c-col :span="24" style="height:24px;margin-top:30px">
<c-col :span="24" style="height:24px;margin-top:20px">
<el-form-item label="经办/复核" class="messageLabel">
</el-form-item>
</c-col>
<c-col :span="23" style="height:0px;">
<c-col :span="23" style="height:0px;margin-top:-5px">
<el-divider></el-divider>
</c-col>
<c-col :span="23">
<!-- <c-input v-model="model.recpan.trsstm" placeholder="请输入Signatures"></c-input> -->
<c-col :span="23" :offset="1">
<c-col :span="24" :offset="0">
<c-istream-table :list="SignaturesData.data" :columns="SignaturesData.columns" :paginationShow="false" style="width:100%">
<el-table-column label="Action" width="auto">
<template slot-scope="scope">
<span>{{action[scope.row.IDX]}}</span>
<span>{{flg[scope.row.IDX]}}</span>
<!-- <el-select v-model="action[scope.row.IDX]" style="100%" disabled>
<el-option
v-for="item in codes.flg"
......@@ -352,15 +349,15 @@
</c-col>
<!-- -------------------workflow------------------- -->
<c-col :span="24" style="height:24px;margin-top:30px">
<c-col :span="24" style="height:24px;margin-top:20px">
<el-form-item label="工作流服务" class="messageLabel">
</el-form-item>
</c-col>
<c-col :span="23" style="height:0px;">
<c-col :span="23" style="height:0px;margin-top:-5px">
<el-divider></el-divider>
</c-col>
<c-col :span="23">
<c-col :span="23" :offset="1">
<c-col :span="24" :offset="0">
<c-istream-table :list="stmData.data" :columns="stmData.columns" :paginationShow="false" style="width:100%">
</c-istream-table>
</c-col>
......@@ -414,32 +411,21 @@ export default {
stmData: {
columns: [
'1 1 "ID" 100',
'2 2 "Service" 125',
'2 2 "Service" 100',
// '3 3 "Status" 100',
{index:3,position:3,width:100,pattern:'code',label:'Status',code:[{ label: "Done", value: "D" },
{ label: "Released", value: "1" },
{ label: "Cancel", value: "C" },
{ label: "Error", value: "E" },
{ label: "Open", value: "O" },
{ label: "Created", value: "6" },
{ label: "Waiting", value: "W" },
{ label: "Reject", value: "2" },
{ label: "Active", value: "A" },
{ label: "External confirmation", value: "5" },
{ label: "Skip", value: "S" },
{ label: "Correction required", value: "3" },
{ label: "Signed at creation", value: "4" },
{ label: "Retry", value: "R" },]},
// {index:1,position:4,width:100,pattern:'code',label:'状态',code:this.codes.sptrelstatus},
'4 4 "Last Update" 125',
{index:3,position:3,width:100,pattern:'code',label:'Status',code: CodeTable.wfetrssta},
'4 4 "Last Update" 100',
'5 5 "Retries" 100',
'6 6 "Text" 300',
'7 7 "Contrary Text" 300',
'8 8 "Target Time" 200'
'6 6 "Text" 200',
'7 7 "Contrary Text" 200',
'8 8 "Target Time" auto'
],
data: [],
},
action:[],
flg:[],
atptxt:'',
relstaEN:'',
usgtxt:'',
}
},
mounted() {
......@@ -453,10 +439,26 @@ 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;
var code = this.codes.flg;
this.action = this.CalCode(this.SignaturesData.data, code, 3);
this.flg = this.ArrCalCode(this.SignaturesData.data, this.codes.flg, 3);
this.atptxt = this.strCalCode(this.model.recpan.atp.cod, this.codes.atptxt);
this.relstaEN = this.strCalCode(this.model.trn.relflg, this.codes.relstaEN);
this.usgtxt = this.strCalCode(this.model.trn.usg, this.codes.usgtxt);
},
strCalCode(str, code){
var result = '';
for(let i = 0; i < code.length; i++){
if(code[i].value === code){
result = code[i].label;
continue;
}
}
if(result === ''){
return str;
}else{
return result;
}
},
CalCode(table, code, index){
ArrCalCode(table, code, index){
var result = [];
for (let i = 0; i < table.length; i++) {
const d = table[i];
......
src/views/Business/Trnrel/Trnfnd/TrnfndsDetail.vue
......@@ -2,7 +2,7 @@
<c-page title="">
<!-- <div class="eContainer"> -->
<c-content :height="120">
<div class="eibs-tab">
<div class="eibs-tab" style="margin-left:9px;padding:5px 5px 5px 5px">
<!-- <c-col :span="23">
<div style="float:right;margin-bottom:10px">
<el-button size="small">交易快照</el-button>
......@@ -168,15 +168,15 @@
<c-col :span="24">
<el-form-item label="Transaction ID">
<el-select v-model="model.recpan.atp.cod" style="width: 100%" disabled>
<!-- <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-select> -->
<c-input v-model="this.atptxt" maxlength="6" disabled placeholder="请输入Transaction ID"></c-input>
</el-form-item>
</c-col>
......@@ -269,16 +269,15 @@
</c-col> -->
<!-- -------------------document------------------- -->
<c-col :span="24" style="height:24px">
<c-col :span="23" style="height:24px">
<el-form-item label="面函/报文" class="messageLabel">
</el-form-item>
</c-col>
<c-col :span="23" style="height: 0px">
<c-col :span="23" style="height: 0px;margin-top:-5px">
<el-divider></el-divider>
</c-col>
<c-col :span="23">
<!-- <c-input v-model="model.recpan.smhstm" placeholder="请输入Documents"></c-input> -->
<c-col :span="23" :offset="1">
<c-istream-table :list="documentsData.data" :columns="documentsData.columns" :paginationShow="false" style="width:100%">
<el-table-column
fixed="right"
......@@ -308,8 +307,6 @@
</el-table-column>
</c-istream-table>
</c-col>
</c-col>
<!-- <c-col :span="12">
<el-form-item label="User ID">
......@@ -323,20 +320,20 @@
</el-form-item>
</c-col>
-->
<c-col :span="24" style="height:24px;margin-top:30px">
<c-col :span="24" style="height:24px;margin-top:20px">
<el-form-item label="经办/复核" class="messageLabel">
</el-form-item>
</c-col>
<c-col :span="23" style="height:0px;">
<c-col :span="23" style="height:0px;margin-top:-5px">
<el-divider></el-divider>
</c-col>
<c-col :span="23">
<!-- <c-input v-model="model.recpan.trsstm" placeholder="请输入Signatures"></c-input> -->
<c-col :span="23" :offset="1">
<c-col :span="24" :offset="0">
<c-istream-table :list="SignaturesData.data" :columns="SignaturesData.columns" :paginationShow="false" style="width:100%">
<el-table-column label="Action" width="auto">
<template slot-scope="scope">
<span>{{action[scope.row.IDX]}}</span>
<span>{{flg[scope.row.IDX]}}</span>
<!-- <el-select v-model="action[scope.row.IDX]" style="100%" disabled>
<el-option
v-for="item in codes.flg"
......@@ -352,15 +349,15 @@
</c-col>
<!-- -------------------workflow------------------- -->
<c-col :span="24" style="height:24px;margin-top:30px">
<c-col :span="24" style="height:24px;margin-top:20px">
<el-form-item label="工作流服务" class="messageLabel">
</el-form-item>
</c-col>
<c-col :span="23" style="height:0px;">
<c-col :span="23" style="height:0px;margin-top:-5px">
<el-divider></el-divider>
</c-col>
<c-col :span="23">
<c-col :span="23" :offset="1">
<c-col :span="24" :offset="0">
<c-istream-table :list="stmData.data" :columns="stmData.columns" :paginationShow="false" style="width:100%">
</c-istream-table>
</c-col>
......@@ -414,32 +411,21 @@ export default {
stmData: {
columns: [
'1 1 "ID" 100',
'2 2 "Service" 125',
'2 2 "Service" 100',
// '3 3 "Status" 100',
{index:3,position:3,width:100,pattern:'code',label:'Status',code:[{ label: "Done", value: "D" },
{ label: "Released", value: "1" },
{ label: "Cancel", value: "C" },
{ label: "Error", value: "E" },
{ label: "Open", value: "O" },
{ label: "Created", value: "6" },
{ label: "Waiting", value: "W" },
{ label: "Reject", value: "2" },
{ label: "Active", value: "A" },
{ label: "External confirmation", value: "5" },
{ label: "Skip", value: "S" },
{ label: "Correction required", value: "3" },
{ label: "Signed at creation", value: "4" },
{ label: "Retry", value: "R" },]},
// {index:1,position:4,width:100,pattern:'code',label:'状态',code:this.codes.sptrelstatus},
'4 4 "Last Update" 125',
{index:3,position:3,width:100,pattern:'code',label:'Status',code: CodeTable.wfetrssta},
'4 4 "Last Update" 100',
'5 5 "Retries" 100',
'6 6 "Text" 300',
'7 7 "Contrary Text" 300',
'8 8 "Target Time" 200'
'6 6 "Text" 200',
'7 7 "Contrary Text" 200',
'8 8 "Target Time" auto'
],
data: [],
},
action:[],
flg:[],
atptxt:'',
relstaEN:'',
usgtxt:'',
}
},
mounted() {
......@@ -453,10 +439,26 @@ 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;
var code = this.codes.flg;
this.action = this.CalCode(this.SignaturesData.data, code, 3);
this.flg = this.ArrCalCode(this.SignaturesData.data, this.codes.flg, 3);
this.atptxt = this.strCalCode(this.model.recpan.atp.cod, this.codes.atptxt);
this.relstaEN = this.strCalCode(this.model.trn.relflg, this.codes.relstaEN);
this.usgtxt = this.strCalCode(this.model.trn.usg, this.codes.usgtxt);
},
strCalCode(str, code){
var result = '';
for(let i = 0; i < code.length; i++){
if(code[i].value === code){
result = code[i].label;
continue;
}
}
if(result === ''){
return str;
}else{
return result;
}
},
CalCode(table, code, index){
ArrCalCode(table, code, index){
var result = [];
for (let i = 0; i < table.length; i++) {
const d = table[i];
......
src/views/Layout/Header.vue
......@@ -180,7 +180,8 @@ export default {
this.langSelectVisible = false;
},
showLogoutDialog(flg) {
this.$refs.logoutform.show(flg);
// this.$refs.logoutform.show(flg);
this.$store.dispatch("TagsView/delAllViews").then(() => this.$router.push("/login"))
},
showChgPwdDialog() {
this.$refs["chgPwdForm"].dialogOpen = true;
......
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