Skip to content

V
vue-gjjs
Commit 85bb1f16 by 潘际乾
Options

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

parents 4835f891 9fcba26d
Showing with 166 additions and 136 deletions
src/components/IStreamTable.vue
......@@ -161,6 +161,7 @@ export default {
it.srcStr = d;
arr.push(it);
}
this.currentPage=1
return arr;
},
},
......
src/model/Infbed/Event.js
......@@ -79,6 +79,18 @@ export default {
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
async onDocdisButtxmsel(){
let rtnmsg = await this.executeRule("docdis.buttxmsel")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
async onInfconButshw(){
let rtnmsg = await this.executeRule("infcon.butshw")
if(rtnmsg.respCode == SUCCESS)
......@@ -103,5 +115,22 @@ export default {
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
async handleReset() {
},
async handleSearch() {
let rtnmsg = await this.executeRule("infbut.searow")
if(rtnmsg.respCode == SUCCESS)
{
this.stmData.data = rtnmsg.data.infbut_dspstm.rows;
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
}
\ No newline at end of file
src/model/Letcan/index.js
......@@ -66,6 +66,12 @@ export default class Letcan{
},
zmqacclab:"", // 主�'�号LABEL .setmod.zmqacclab
zmqacc:"", // 自�'�区主�'�号 .setmod.zmqacc
setfog:{
setfol:[]
},
setfeg:{
setfel:[]
}
},
mtabut:{
coninf:{
......
src/views/Business/Bdtset/Utlp.vue
......@@ -13,7 +13,7 @@
></c-input>
</el-form-item>
</c-col>
<c-col :span="1" style="text-align: right;">
<c-col :span="1" style="text-align: right;margin-left:10px">
<c-button
style="margin:0;padding: 0 14px;"
size="small"
......@@ -23,7 +23,7 @@
</c-button>
</c-col>
<c-col :span="11">
<c-col :span="11" style="margin-left:-10px">
<el-form-item
label="到期日"
prop="didgrp.rec.expdat"
......@@ -51,9 +51,8 @@
></c-input>
</el-form-item>
</c-col>
<c-col :span="1">&nbsp;</c-col>
<c-col :span="11">
<el-form-item label="" prop="didgrp.cbs.opn1.amt" label-width="0">
<c-col :span="12">
<el-form-item label="" prop="didgrp.cbs.opn1.amt" label-width="2%">
<c-input
v-model="model.didgrp.cbs.opn1.amt"
placeholder="请输入Balance"
......@@ -64,7 +63,7 @@
</c-col>
</c-col>
<c-col :span="24" style="height:24px">
<c-col :span="24" style="height:24px;margin-top:-10px">
<el-form-item label="单据信息" class="messageLabel">
</el-form-item>
</c-col>
......@@ -120,11 +119,8 @@
</c-select>
</el-form-item>
</c-col>
<c-col :span="1">
&nbsp;
</c-col>
<c-col :span="11">
<el-form-item label="" prop="bddgrp.cbs.max.amt" label-width="0">
<c-col :span="12">
<el-form-item label="" prop="bddgrp.cbs.max.amt" label-width="2%">
<c-input
v-model="model.bddgrp.cbs.max.amt"
placeholder="请输入单据金额"
......@@ -144,11 +140,8 @@
></c-select>
</el-form-item>
</c-col>
<c-col :span="1">
&nbsp;
</c-col>
<c-col :span="11">
<el-form-item label="" prop="bddgrp.cbs.opn1.amt" label-width="0">
<c-col :span="12">
<el-form-item label="" prop="bddgrp.cbs.opn1.amt" label-width="2%">
<c-input
v-model="model.bddgrp.cbs.opn1.amt"
placeholder="请输入Balance"
......@@ -330,7 +323,7 @@
</c-col> -->
<!-- =========bottom-left======== -->
<c-col :span="24" style="height:24px">
<c-col :span="24" style="height:24px;margin-top:-10px">
<el-form-item label="付款信息" class="messageLabel">
</el-form-item>
</c-col>
......@@ -357,9 +350,8 @@
></c-input>
</el-form-item>
</c-col>
<c-col :span="1">&nbsp;</c-col>
<c-col :span="11">
<el-form-item label="" prop="setmod.docamt" label-width="0">
<c-col :span="12">
<el-form-item label="" prop="setmod.docamt" label-width="2%">
<c-input
v-model="model.setmod.docamt"
placeholder="请输入document amount"
......@@ -379,9 +371,8 @@
></c-input>
</el-form-item>
</c-col>
<c-col :span="1">&nbsp;</c-col>
<c-col :span="11">
<el-form-item label="" prop="setmod.redamt" label-width="0">
<c-col :span="12">
<el-form-item label="" prop="setmod.redamt" label-width="2%">
<c-input
v-model="model.setmod.redamt"
placeholder="请输入扣减金额"
......@@ -402,9 +393,8 @@
></c-input>
</el-form-item>
</c-col>
<c-col :span="1">&nbsp;</c-col>
<c-col :span="11">
<el-form-item label="" prop="setmod.setamt" label-width="0">
<c-col :span="12">
<el-form-item label="" prop="setmod.setamt" label-width="2%">
<c-input
v-model="model.setmod.setamt"
placeholder="请输入扣费后付款金额"
......@@ -533,7 +523,7 @@
></c-ptapdome> -->
</c-col>
<c-col :span="24" style="height:24px">
<c-col :span="24" style="height:24px;margin-top:-10px">
<el-form-item label="表外信息" class="messageLabel">
</el-form-item>
</c-col>
......
src/views/Business/Ditame/Amep.vue
......@@ -112,8 +112,7 @@
style="width: 48%"
disabled
></c-input>
<label style="display: inline-block; width: 2%; text-align: center"
>-</label>
<label style="display:inline-block;width:calc(3% - 4px);text-align:center;">-</label>
<c-input
v-model="model.olddidgrp.rec.nomton"
style="width: 48%"
......@@ -235,7 +234,7 @@
v-model="model.trnmod.swiadd.newnomtopame"
style="width: 48%"
></c-input>
<label style="display: inline-block; width: 2%; text-align: center">-</label>
<label style="display:inline-block;width:calc(3% - 4px);text-align:center;">-</label>
<c-input
v-model="model.trnmod.swiadd.newnomtoname"
style="width: 48%"
......
src/views/Business/Ditame/Ovwp.vue
......@@ -145,7 +145,7 @@
disabled
placeholder="请输入Amount Tolerance - Positive"
></c-input>
<label style="display:inline-block;width:2%;text-align:center;">-</label>
<label style="display:inline-block;width:calc(3% - 4px);text-align:center;">-</label>
<c-input
v-model="model.didgrp.rec.nomton"
maxlength="9"
......
src/views/Business/Ditopn/Detp.vue
......@@ -10,9 +10,13 @@
</c-select>
</el-form-item>
<c-col :span="24">
<c-col :span="11">
<el-form-item label="付款期限" prop="didgrp.rec.tenmaxday" >
<c-input :disabled="model.didgrp.rec.avbby == 'P'" v-model.number="model.didgrp.rec.tenmaxday" placeholder="请输入" style="width:17%" maxlength="3"></c-input>
<c-input :disabled="model.didgrp.rec.avbby == 'P'" v-model.number="model.didgrp.rec.tenmaxday" placeholder="请输入" style="width:100%" maxlength="3"></c-input>
</el-form-item>
</c-col>
</c-col>
<el-form-item label="远期付款指示" prop="didgrp.blk.defdet">
<c-col :span="21">
......@@ -38,15 +42,17 @@
<c-checkbox v-model="model.didgrp.blk.preperflg" :click="preperflgExtkeyEvent()">修改交单期限文本</c-checkbox>
</el-form-item>
<c-col :span="24">
<c-col :span="11">
<el-form-item label="货物运输/交货/服务方式" prop="didgrp.rec.tratyp">
<c-col :span="10">
<c-select v-model="model.didgrp.rec.tratyp" style="width:90%" placeholder="请选择" @change="recTratypChange" :disabled="model.didgrp.rec.mytype == 'F'">
<c-select v-model="model.didgrp.rec.tratyp" style="width:100%" placeholder="请选择" @change="recTratypChange" :disabled="model.didgrp.rec.mytype == 'F'">
<el-option v-for="item in codes.tratyp" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</c-select>
</c-col>
</el-form-item>
</c-col>
</c-col>
<el-form-item v-if="model.didgrp.rec.mytype == 'H'" label="手输运输方式" prop="didgrp.rec.sdsrfs">
<c-input type="textarea" v-model="model.didgrp.rec.sdsrfs" :disabled="this.mytypeFlag" maxlength="140" show-word-limit placeholder="请输入"></c-input>
......@@ -63,16 +69,20 @@
<c-input v-model="model.didgrp.rec.conno" maxlength="35" placeholder="请输入"></c-input>
</el-form-item>
<c-col :span="11">
<el-form-item label="合同金额" prop="didgrp.rec.conamt">
<c-col :span="10">
<c-select v-model="model.didgrp.rec.concur" style="width:90%" placeholder="请选择">
<el-option label="CNY 人民币" value="CNY"></el-option>
</c-select>
<c-select v-model="model.didgrp.rec.concur" style="width:100%" placeholder="请选择">
<el-option label="CNY" value="CNY">
<span style="float: left">{{ "CNY 人民币" }}</span>
</el-option>
</c-select>
</el-form-item>
</c-col>
<c-col :span="14">
<c-col :span="13">
<el-form-item label-width="5px" prop="didgrp.rec.conamt">
<c-input v-model="model.didgrp.rec.conamt" placeholder="请输入"></c-input>
</c-col>
</el-form-item>
</c-col>
</c-col>
<!-- ========================= Right ========================= -->
......
src/views/Business/Infbed/index.vue
......@@ -6,109 +6,95 @@
:rules="rules"
ref="modelForm"
label-width="150px"
label-position="left"
label-position="right"
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" class="infbedTab">
<!--选择 -->
<el-tab-pane label="选择" name="infsea">
<c-content>
<!-- <el-tab-pane label="选择" name="infsea"> -->
<!-- <c-content> -->
<m-infsea :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!-- </c-content> -->
<!-- </el-tab-pane> -->
<!--内容 -->
<el-tab-pane label="内容" name="ovwp">
<!-- <el-tab-pane label="内容" name="ovwp">
<c-content>
<m-ovwp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--附言 -->
<el-tab-pane label="附言" name="coninfp">
<c-content>
<m-coninfp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--Transactions -->
<el-tab-pane label="Transactions" name="trnpan">
<c-content>
<m-trnpan :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--CBS Info -->
<el-tab-pane label="CBS Info" name="cbsinfp">
<c-content>
<m-cbsinfp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--CBE Info -->
<el-tab-pane label="CBE Info" name="cbeinfp">
<c-content>
<m-cbeinfp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--FEP /FCP Info -->
<el-tab-pane label="FEP /FCP Info" name="fepinfp">
<c-content>
<m-fepinfp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--SEP Info -->
<el-tab-pane label="SEP Info" name="sepinfp">
<c-content>
<m-sepinfp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--GLE Bookings -->
<el-tab-pane label="分录信息" name="gleinfp">
<c-content>
<m-gleinfp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--SMH Info -->
<el-tab-pane label="报文信息" name="smhinfp">
<c-content>
<m-smhinfp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--SPT /DIA Info -->
<el-tab-pane label="经办信息" name="peninfp">
<c-content>
<m-peninfp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--Engagement -->
<el-tab-pane label="Engagement" name="liainfp">
<c-content>
<m-liainfp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--Print -->
<el-tab-pane label="Print" name="prtpan">
<c-content>
<m-prtpan :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--Order -->
<el-tab-pane label="Order" name="ordpan">
<c-content>
<m-ordpan :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
</el-tab-pane> -->
</c-tabs>
</el-form>
</div>
......@@ -139,6 +125,7 @@ import Coninfp from "./Coninfp"
// import Coninfp from "~/views/Public/Coninfp";
export default {
name: 'Infbed',
components:{
"m-infsea" : Infsea,
"m-ovwp" : Ovwp,
......@@ -185,6 +172,7 @@ export default {
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
this.updateModel(rtnmsg.data)
}
else
......@@ -195,5 +183,24 @@ export default {
}
</script>
<style>
.infbedTab .el-tabs__content {
padding: 10px 0 10px 0;
}
.infbedTab .infrow {
padding: 0 10px 0 10px;
}
.infTopBtn {
position: absolute;
top: 0;
z-index: 5;
width: 100%;
height: 30px;
padding: 10px 0 10px 30px;
background-color: #f7faff;
}
.eContainer {
padding: 3px 15px;
}
</style>
src/views/Business/Letcan/Docpan.vue
......@@ -9,7 +9,7 @@
<span v-text="model.trnmod.trndoc.amdnam" data-path=".trnmod.trndoc.amdnam" > </span>
</c-col>
<c-col :span="22" style="margin-bottom: 18px" :offset="1">
<!-- <c-col :span="22" style="margin-bottom: 18px" :offset="1">
<c-table
style="text-align: center"
:list="model.trnmod.trncod.doceot"
......@@ -43,7 +43,7 @@
</c-table>
</c-col>
</c-col> -->
......
src/views/Business/Letcan/index.vue
......@@ -6,12 +6,12 @@
:model="model"
:rules="rules"
ref="modelForm"
label-width="150px"
label-width="120px"
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" class="letcanTab">
<!--PD000016 -->
<el-tab-pane label="Cancelation" name="canp">
......@@ -61,19 +61,22 @@
</template>
<script>
import Api from "~/service/Api"
import Utils from "~/utils/index";
import CodeTable from "~/config/CodeTable"
import Letcan from "~/model/Letcan"
import CommonProcess from "~/mixin/CommonProcess"
import CommonFuncs from "~/mixin/CommonFuncs";
import Check from "~/model/Letcan/Check"
import Default from "~/model/Letcan/Default"
import Pattern from "~/model/Letcan/Pattern"
import Canp from "./Canp"
import Setpan from "./Setpan"
// import Setpan from "./Setpan"
import Coninfp from "./Coninfp"
import Docpan from "./Docpan"
import Doctre from "./Doctre"
import Limitbody from "./Limitbody"
// import Setpan from "~/views/Public/Setpan";
import Setpan from "~/views/Public/Setpan";
export default {
......@@ -90,7 +93,7 @@ export default {
root: this
}
},
mixins: [CommonProcess], // 里面包含了Default、Check等的公共处理
mixins: [CommonProcess, CommonFuncs], // 里面包含了Default、Check等的公共处理
data(){
return {
tabVal: "canp",
......@@ -127,5 +130,11 @@ export default {
}
</script>
<style>
.infcanTab .el-tabs__content {
padding: 10px 0 10px 0;
}
.infcanTab .infrow {
padding: 0 10px 0 10px;
}
</style>
src/views/Business/Trnrel/InftrnpsDetail.vue
......@@ -31,7 +31,7 @@
<el-form-item label="基本信息" class="messageLabel">
</el-form-item>
</c-col>
<c-col :span="10" style="text-align:right;">
<c-col :span="11" style="text-align:right;">
<c-button size="small" type="primary" style="margin-left:0" @click="display">交易快照</c-button>
<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>
......@@ -86,11 +86,10 @@
<c-input v-model="model.trn.reloricur" maxlength="3" disabled placeholder="请输入Relevant Amount"></c-input>
</el-form-item>
</c-col>
<c-col :span="1">
&nbsp;
</c-col>
<c-col :span="11">
<c-col :span="12">
<el-form-item label="" label-width="2%">
<c-input v-model="model.trn.reloriamt" disabled placeholder="请输入Relevant Amount for Release in Original Currency"></c-input>
</el-form-item>
</c-col>
</c-col>
......@@ -299,12 +298,12 @@
>
Show
</c-button>
<c-button
<!-- <c-button
style="margin-left: 0"
size="small"
>
生成PDF
</c-button>
</c-button> -->
</template>
</el-table-column>
</c-istream-table>
......@@ -348,17 +347,6 @@
</el-select> -->
</template>
</el-table-column>
<!-- <el-table-column
fixed="right"
prop="display"
label="操作"
width="200px"
>
<template slot="header">
<c-col :span="11" style="text-align:left"><span>操作</span></c-col>
<c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col>
</template>
</el-table-column> -->
</c-istream-table>
</c-col>
</c-col>
......@@ -373,37 +361,7 @@
</c-col>
<c-col :span="23">
<c-col :span="23" :offset="1">
<!-- <c-input v-model="model.recpan.wfestm" placeholder="请输入WFEs for transaction for display"></c-input> -->
<c-istream-table :list="stmData.data" :columns="stmData.columns" :paginationShow="false" style="width:100%">
<!-- <el-table-column
fixed="right"
prop="display"
label="操作"
width="150px"
>
<template slot="header">
<c-col :span="11" style="text-align:left"><span>操作</span></c-col>
<c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col>
</template>
<template slot-scope="scope">
<c-button
style="margin-left: 0"
size="small"
type="primary"
@click="onDetail(scope.$index,scope.row)"
>
详情
</c-button>
<c-button
style="margin-left: 0"
size="small"
type="primary"
@click="onHandle(scope.$index,scope.row)"
>
处理
</c-button>
</template>
</el-table-column> -->
</c-istream-table>
</c-col>
</c-col>
......@@ -447,11 +405,32 @@ export default {
],
data: [],
},
codes: { infdsp: CodeTable.infdsp,
flg : CodeTable.flg,
atptxt : CodeTable.atptxt,
relstaEN : CodeTable.relstaEN,
usgtxt : CodeTable.usgtxt,
wfetrssta : CodeTable.wfetrssta },
stmData: {
columns: [
'1 1 "ID" 100',
'2 2 "Service" 125',
'3 3 "Status" 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',
'5 5 "Retries" 100',
'6 6 "Text" 300',
......@@ -460,12 +439,6 @@ export default {
],
data: [],
},
codes: { infdsp: CodeTable.infdsp,
flg : CodeTable.flg,
atptxt : CodeTable.atptxt,
relstaEN : CodeTable.relstaEN,
usgtxt : CodeTable.usgtxt,
wfetrssta : CodeTable.wfetrssta },
action:[],
}
},
......@@ -481,17 +454,22 @@ export default {
this.SignaturesData.data = this.model.recpan.trsstm.rows;
this.stmData.data = this.model.recpan.wfestm.rows;
var code = this.codes.flg;
for (let i = 0; i < this.SignaturesData.data.length; i++) {
const d = this.SignaturesData.data[i];
this.action = this.CalCode(this.SignaturesData.data, code, 3);
},
CalCode(table, code, index){
var result = [];
for (let i = 0; i < table.length; i++) {
const d = table[i];
const items = d.split("\t");
this.action[i] = items[items.length - 2];
result[i] = items[index];
for(let j = 0; j < code.length; j++){
if(code[j].value === this.action[i]){
this.action[i] = code[j].label;
if(code[j].value === result[i]){
result[i] = code[j].label;
continue;
}
}
}
return result;
},
exit(){
this.$store.dispatch("TagsView/delView", this.$route)
......
src/views/Layout/Header.vue
......@@ -140,7 +140,7 @@ export default {
dialogOpen: false,
loading: false,
count: "",
accDate: window.sessionStorage.accDate || "",
accDate: window.sessionStorage.accDate || new Date().toLocaleDateString(),
noticeboardData: [],
langSelectVisible: false,
languageOptions: [
......
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