Commit 78b1724e by hulei
parents 845f4473 53f0175b
...@@ -287,11 +287,21 @@ ...@@ -287,11 +287,21 @@
line-height: 16px; line-height: 16px;
font-size: 12px; font-size: 12px;
} }
.el-table--border td.lastColumn{
border-right: 0!important;
}
.el-table__fixed, .el-table__fixed,
.el-table__fixed-right { .el-table__fixed-right {
height: 100% !important; height: 100% !important;
bottom:17px; bottom:17px;
} }
/* medium_button_change_small */
.medium_bcs{
padding: 8px 15px;
margin-top: 5px;
margin-left: 7px;
}
.busnavbar-items{
/*TODO完善按钮间隔等样式 */
margin-left:7px;
padding-left: 3px;
}
\ No newline at end of file
...@@ -21,7 +21,7 @@ export default { ...@@ -21,7 +21,7 @@ export default {
} }
}, },
highlight () { highlight () {
return this.$store.state.Status.highlights.indexOf(this.id) !== -1 return this.$store.state.Status.highlights.indexOf(this.id) !== -1 && this.showHighlight
}, },
highlightChanges () { highlightChanges () {
let flag = false let flag = false
......
...@@ -351,7 +351,7 @@ export default { ...@@ -351,7 +351,7 @@ export default {
background: #f0f9eb; background: #f0f9eb;
} }
.selectColumnClass .el-checkbox__label { .selectColumnClass .el-checkbox__label {
width: 60px; width: 67px;
font-size: 13px; font-size: 13px;
} }
.selectAllClass .el-checkbox__label { .selectAllClass .el-checkbox__label {
......
<template> <template>
<el-input :id="id" ref="form-item" v-model="model" v-bind="attrs" v-on="$listeners" v-bind:disabled="isDisable"/> <el-input :id="id" ref="form-item" v-model="model" v-bind="attrs" v-on="$listeners" v-bind:disabled="isDisable">
<template v-slot:suffix>
<slot name="suffix"></slot>
</template>
</el-input>
</template> </template>
<script> <script>
......
<template>
<div>
<el-popover
placement="bottom"
:width="width"
trigger="click"
popper-class="popoverInputClass"
v-model="popoverShow"
>
<ul class="el-select-dropdown__list">
<li
class="el-select-dropdown__item"
v-for="(item, idx) in liData"
:key="idx"
@click="selectItem(item)"
>
<span>{{ item }}</span>
</li>
</ul>
<c-input v-model="model" slot="reference">
<template v-slot:suffix>
<i
class="el-icon-arrow-down"
v-if="!popoverShow"
@click="popoverShow = false"
></i>
<i class="el-icon-arrow-up" v-else @click="popoverShow = true"></i>
</template>
</c-input>
</el-popover>
</div>
</template>
<script>
export default {
data() {
return {
popoverShow: false,
width: null,
};
},
props: {
value: {
type: [String, Number],
default: undefined,
},
liData: {
type: Array,
default: [],
},
},
computed: {
model: {
get() {
return this.value;
},
set(newVal) {
this.$emit("input", newVal);
},
},
},
mounted() {
this.width = this.$el.clientWidth;
},
methods: {
selectItem(val) {
this.popoverShow = false;
this.model = val;
},
},
};
</script>
<style>
.el-popper.popoverInputClass {
margin: 12px 0 5px;
padding: 0;
}
</style>
<style scoped>
.el-select-dropdown__list {
list-style: none;
padding: 6px 0;
margin: 0;
box-sizing: border-box;
padding-inline-start: 0;
}
.el-select-dropdown__item {
font-size: 14px;
padding: 0 20px;
position: relative;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
color: #606266;
height: 34px;
line-height: 34px;
box-sizing: border-box;
cursor: pointer;
}
</style>
\ No newline at end of file
...@@ -46,6 +46,7 @@ import FunctionBtn from "./FunctionBtn" ...@@ -46,6 +46,7 @@ import FunctionBtn from "./FunctionBtn"
import BusinessButon from "./BusinessButton" import BusinessButon from "./BusinessButton"
import InfSearchGroup from "./InfSearchGroup" import InfSearchGroup from "./InfSearchGroup"
import InputSelect from "./InputSelect"
export default { export default {
install(Vue) { install(Vue) {
...@@ -95,5 +96,6 @@ export default { ...@@ -95,5 +96,6 @@ export default {
Vue.component("c-bus-button", BusinessButon) Vue.component("c-bus-button", BusinessButon)
Vue.component("c-infsearch-group", InfSearchGroup) Vue.component("c-infsearch-group", InfSearchGroup)
Vue.component("c-codelabel", CodeLabel) Vue.component("c-codelabel", CodeLabel)
Vue.component("c-inputselect", InputSelect)
} }
} }
\ No newline at end of file
...@@ -5902,6 +5902,22 @@ const CodeTable = { ...@@ -5902,6 +5902,22 @@ const CodeTable = {
{label:'To Correct',value:'CTR'}, {label:'To Correct',value:'CTR'},
{label:'Done',value:'CAN'}, {label:'Done',value:'CAN'},
{label:'E Trade',value:'EJS'}, {label:'E Trade',value:'EJS'},
] ],
relstaEN:[
{label:'Closed',value:'M'},
{label:'Correct',value:'C'},
{label:'Entered',value:'E'},
{label:'External',value:'X'},
{label:'Final',value:'F'},
{label:'Picked up',value:'P'},
{label:'Rejected',value:'N'},
{label:'Released',value:'R'},
{label:'Waiting',value:'W'},
],
usgtxt:[
{label:'Custom manager',value:'CMT'},
{label:'Team 1',value:'TEA1'},
{label:'Team 2',value:'TEA2'},
],
} }
export default CodeTable; export default CodeTable;
\ No newline at end of file
...@@ -19,7 +19,7 @@ export default { ...@@ -19,7 +19,7 @@ export default {
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
"didgrp.cbs.opn1.amt":[ "didgrp.cbs.opn1.amt":[
{type: "number", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
...@@ -41,7 +41,7 @@ export default { ...@@ -41,7 +41,7 @@ export default {
], ],
"bddgrp.cbs.max.amt":[ "bddgrp.cbs.max.amt":[
{type: "number", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
...@@ -54,7 +54,7 @@ export default { ...@@ -54,7 +54,7 @@ export default {
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
"bddgrp.cbs.opn1.amt":[ "bddgrp.cbs.opn1.amt":[
{type: "number", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
...@@ -76,10 +76,10 @@ export default { ...@@ -76,10 +76,10 @@ export default {
"bddgrp.rec.matdat":[ "bddgrp.rec.matdat":[
{type: "date", required: false, message: "输入正确的日期"} {type: "date", required: false, message: "输入正确的日期"}
], ],
"bddgrp.rec.tenmaxday":[ // "bddgrp.rec.tenmaxday":[
{type: "string", required: false, message: "必输项"}, // {type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"} // {max: 3,message:"长度不能超过3"}
], // ],
"bddgrp.ben.pts.nam":[ "bddgrp.ben.pts.nam":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 40,message:"长度不能超过40"} {max: 40,message:"长度不能超过40"}
...@@ -104,7 +104,7 @@ export default { ...@@ -104,7 +104,7 @@ export default {
"setmod.redamt":[ "setmod.redamt":[
{type: "number", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
...@@ -113,12 +113,12 @@ export default { ...@@ -113,12 +113,12 @@ export default {
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
"setmod.docamt":[ "setmod.docamt":[
{type: "number", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
"setmod.setamt":[ "setmod.setamt":[
{type: "number", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
...@@ -280,7 +280,7 @@ export default { ...@@ -280,7 +280,7 @@ export default {
{max: 40,message:"长度不能超过40"} {max: 40,message:"长度不能超过40"}
], ],
"bddgrp.rec.skmc":[ "bddgrp.rec.skmc":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 40,message:"长度不能超过40"} {max: 40,message:"长度不能超过40"}
], ],
"fkhnum":[ "fkhnum":[
...@@ -303,7 +303,7 @@ export default { ...@@ -303,7 +303,7 @@ export default {
{max: 40,message:"长度不能超过40"} {max: 40,message:"长度不能超过40"}
], ],
"bddgrp.rec.skhmc":[ "bddgrp.rec.skhmc":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 40,message:"长度不能超过40"} {max: 40,message:"长度不能超过40"}
], ],
"khh":[ "khh":[
......
...@@ -2,11 +2,11 @@ import Api from "~/service/Api" ...@@ -2,11 +2,11 @@ import Api from "~/service/Api"
import Utils from "~/utils" import Utils from "~/utils"
export default { export default {
async onInfbutSearow () { async onInfbutSearow (callback) {
let rtnmsg = await this.executeRule("infbut.searow") let rtnmsg = await this.executeRule("infbut.searow")
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
this.model.infbut.dspstm = rtnmsg.data.infbut_dspstm.rows this.model.infbut.dspstm = rtnmsg.data.infbut_dspstm
this.$message({ this.$message({
type: 'success', type: 'success',
message: '获取成功!' message: '获取成功!'
...@@ -17,6 +17,7 @@ export default { ...@@ -17,6 +17,7 @@ export default {
else { else {
this.$notify.error({ title: '错误', message: '服务请求失败!' }); this.$notify.error({ title: '错误', message: '服务请求失败!' });
} }
callback();
}, },
async onInfbutDsp () { async onInfbutDsp () {
let rtnmsg = await this.executeRule("infbut.dsp") let rtnmsg = await this.executeRule("infbut.dsp")
......
...@@ -2,10 +2,10 @@ import Api from "~/service/Api" ...@@ -2,10 +2,10 @@ import Api from "~/service/Api"
import Utils from "~/utils" import Utils from "~/utils"
export default { export default {
async onInfbutSearow () { async onInfbutSearow (callback) {
let rtnmsg = await this.executeRule("infbut.searow") let rtnmsg = await this.executeRule("infbut.searow")
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
this.model.infbut.dspstm = rtnmsg.data.infbut_dspstm.rows this.model.infbut.dspstm = rtnmsg.data.infbut_dspstm
this.$message({ this.$message({
type: 'success', type: 'success',
message: '获取成功!' message: '获取成功!'
...@@ -14,6 +14,7 @@ export default { ...@@ -14,6 +14,7 @@ export default {
else { else {
this.$notify.error({ title: '错误', message: '服务请求失败!' }); this.$notify.error({ title: '错误', message: '服务请求失败!' });
} }
callback()
}, },
async onInfbutExi () { async onInfbutExi () {
let rtnmsg = await this.executeRule("infbut.exi") let rtnmsg = await this.executeRule("infbut.exi")
...@@ -29,7 +30,8 @@ export default { ...@@ -29,7 +30,8 @@ export default {
let rtnmsg = await this.executeRule("infbut.dsp") let rtnmsg = await this.executeRule("infbut.dsp")
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
this.updateModel(rtnmsg.data);
this.tabVal = "curp0"
} }
else { else {
this.$notify.error({ title: '错误', message: '服务请求失败!' }); this.$notify.error({ title: '错误', message: '服务请求失败!' });
......
...@@ -7,7 +7,8 @@ export default class Infcur { ...@@ -7,7 +7,8 @@ export default class Infcur {
cod: "", // CUR .cod cod: "", // CUR .cod
seanam: "", // Currency Description .seanam seanam: "", // Currency Description .seanam
infbut: { infbut: {
dspstm: "", // display stream .infbut.dspstm selrow: 0,
dspstm: {}, // display stream .infbut.dspstm
}, },
rec: { rec: {
cod: "", // Currency Code .rec.cod cod: "", // Currency Code .rec.cod
......
...@@ -2,11 +2,11 @@ import Api from "~/service/Api" ...@@ -2,11 +2,11 @@ import Api from "~/service/Api"
import Utils from "~/utils" import Utils from "~/utils"
export default { export default {
async onInfbutSearow () { async onInfbutSearow (callback) {
let rtnmsg = await this.executeRule("infbut.searow") let rtnmsg = await this.executeRule("infbut.searow")
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
this.model.infbut.dspstm = rtnmsg.data.infbut_dspstm.rows this.model.infbut.dspstm = rtnmsg.data.infbut_dspstm
this.$message({ this.$message({
type: 'success', type: 'success',
message: '获取成功!' message: '获取成功!'
...@@ -15,6 +15,7 @@ export default { ...@@ -15,6 +15,7 @@ export default {
else { else {
this.$notify.error({ title: '错误', message: '服务请求失败!' }); this.$notify.error({ title: '错误', message: '服务请求失败!' });
} }
callback();
}, },
async onInfbutDsp () { async onInfbutDsp () {
let rtnmsg = await this.executeRule("infbut.dsp") let rtnmsg = await this.executeRule("infbut.dsp")
......
...@@ -21,6 +21,7 @@ export default class Mtabut { ...@@ -21,6 +21,7 @@ export default class Mtabut {
extkey: "", // User ID .mtabut.coninf.usr.extkey extkey: "", // User ID .mtabut.coninf.usr.extkey
}, },
}, },
clsflg: "",
} }
} }
} }
\ No newline at end of file
...@@ -388,7 +388,7 @@ export default { ...@@ -388,7 +388,7 @@ export default {
// this.model.trncorco.trnstm = res.data.trncorco_trnstm; // this.model.trncorco.trnstm = res.data.trncorco_trnstm;
// }) // })
// } // }
const res = await this.executeRule("searow") const res = await this.executeRule("inftrnps,searow")
that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows; that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows;
this.model.trncorco.trnstm = res.data.trncorco_trnstm; this.model.trncorco.trnstm = res.data.trncorco_trnstm;
this.$store.commit("setTaskList", {key: "trnrel", val: this.stmData.data.length}); this.$store.commit("setTaskList", {key: "trnrel", val: this.stmData.data.length});
...@@ -404,7 +404,7 @@ export default { ...@@ -404,7 +404,7 @@ export default {
}, },
async trnfndhandleSearch() { async trnfndhandleSearch() {
const that = this.root; const that = this.root;
const res = await this.executeRule("searow") const res = await this.executeRule("inftrnps,searow")
that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows; that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows;
this.model.trncorco.trnstm = res.data.trncorco_trnstm; this.model.trncorco.trnstm = res.data.trncorco_trnstm;
......
...@@ -87,13 +87,13 @@ ...@@ -87,13 +87,13 @@
<c-col :span="11" :offset="1"> <c-col :span="11" :offset="1">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="收款银行账户名称" prop="bddgrp.rec.skmc"> <el-form-item label="收款银行账户名称" prop="bddgrp.rec.skmc">
<c-input type="textarea" v-model="model.bddgrp.rec.skmc" maxlength="40" show-word-limit placeholder="请输入收款银行�'�户名称" ></c-input> <c-input type="textarea" v-model="model.bddgrp.rec.skmc" maxlength="40" show-word-limit placeholder="请输入收款银行户名称" ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="收款银行账号" prop="bddgrp.rec.skzh"> <el-form-item label="收款银行账号" prop="bddgrp.rec.skzh">
<c-input v-model="model.bddgrp.rec.skzh" maxlength="35" placeholder="请输入收款银行�'�号"></c-input> <c-input v-model="model.bddgrp.rec.skzh" maxlength="35" placeholder="请输入收款银行号"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
...@@ -72,9 +72,9 @@ ...@@ -72,9 +72,9 @@
</el-tab-pane> </el-tab-pane>
<!--PD001139 --> <!--PD001139 -->
<el-tab-pane label="试算结果" name="shisuan"> <!-- <el-tab-pane label="试算结果" name="shisuan">
<m-shisuan :model="model" :codes="codes"/> <m-shisuan :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane> -->
<!--PD000001 --> <!--PD000001 -->
<el-tab-pane label="授信额度" name="limitbody"> <el-tab-pane label="授信额度" name="limitbody">
......
...@@ -81,11 +81,11 @@ ...@@ -81,11 +81,11 @@
</c-list-search> --> </c-list-search> -->
<el-row> <el-row>
<c-istream-table :list="stmData.data" :columns="stmData.columns"> <c-istream-table :list="stmData.data" :columns="stmData.columns" :showButtonFlg="true">
<el-table-column fixed="right" prop="op" label="操作" width="120px"> <el-table-column fixed="right" prop="op" label="操作" width="120px">
<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>
<c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col> <!-- <c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col> -->
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<a href="javascript:void(0)" @click="continueEdit(scope.row)" <a href="javascript:void(0)" @click="continueEdit(scope.row)"
......
...@@ -200,11 +200,11 @@ ...@@ -200,11 +200,11 @@
</c-row> </c-row>
<el-row> <el-row>
<c-istream-table :list="stmData.data" :columns="stmData.columns"> <c-istream-table :list="stmData.data" :columns="stmData.columns" :showButtonFlg="true">
<el-table-column fixed="right" prop="op" label="操作" width="200px"> <el-table-column fixed="right" prop="op" label="操作" width="200px">
<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>
<c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col> <!-- <c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col> -->
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<a href="javascript:void(0)" @click="continueEdit(scope.row)" <a href="javascript:void(0)" @click="continueEdit(scope.row)"
......
...@@ -98,7 +98,8 @@ import Betrcl from "./Betrcl" ...@@ -98,7 +98,8 @@ import Betrcl from "./Betrcl"
import InftrnpsDetail from "./Trnrel/InftrnpsDetail" import InftrnpsDetail from "./Trnrel/InftrnpsDetail"
import TrnfndsDetail from "./Trnrel/Trnfnd/TrnfndsDetail" import TrnfndsDetail from "./Trnrel/Trnfnd/TrnfndsDetail"
import Sptpopup from "./Sptsel/Sptpopup" import Sptpopup from "./Sptsel/Sptpopup"
import Infdet from "./Infdet"
import Infbfd from "./Infbfd"
/** /**
* 带有name的才会被添加进顶部的标签页里 * 带有name的才会被添加进顶部的标签页里
*/ */
...@@ -206,6 +207,8 @@ const BusRouter = [ ...@@ -206,6 +207,8 @@ const BusRouter = [
{ path: 'bdtcan', component: Bdtcan, name: 'Bdtcan', meta: { title: '买方信用证单据注销' } }, { path: 'bdtcan', component: Bdtcan, name: 'Bdtcan', meta: { title: '买方信用证单据注销' } },
{ path: 'ditdla', component: Ditdla, name: 'Ditdla', meta: { title: '买方信用证减额接受' } }, { path: 'ditdla', component: Ditdla, name: 'Ditdla', meta: { title: '买方信用证减额接受' } },
{ path: 'bdtset', component: Bdtset, name: 'Bdtset', meta: { title: '信用证付款' } }, { path: 'bdtset', component: Bdtset, name: 'Bdtset', meta: { title: '信用证付款' } },
{ path: 'infdet', component: Infdet, name: 'Infdet', meta: { title: '卖方信用证查询' } },
{ path: 'infbfd', component: Infbfd, name: 'Infbfd', meta: { title: '卖方信用证单据查询' } },
] ]
export default BusRouter export default BusRouter
...@@ -250,7 +250,7 @@ ...@@ -250,7 +250,7 @@
<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" :showButtonFlg="true">
<el-table-column <el-table-column
fixed="right" fixed="right"
prop="display" prop="display"
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
> >
<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>
<c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col> <!-- <c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col> -->
</template> </template>
<template> <template>
<c-button style="margin-left: 0" size="small"> <c-button style="margin-left: 0" size="small">
......
...@@ -2,14 +2,18 @@ ...@@ -2,14 +2,18 @@
<div class="eibs-tab"> <div class="eibs-tab">
<!-- =================左边====================== --> <!-- =================左边====================== -->
<c-col :span="11"> <c-col :span="11">
<el-form-item label="不符点"> <el-form-item label="不符点">
<c-col :span="21"> <c-col :span="21">
<c-input type="textarea" v-model="model.bddgrp.blk.docdis" :disabled="!model.bddgrp.blk.docdisflg" maxlength="50" show-word-limit <c-input
placeholder="请输入不符点"></c-input> type="textarea"
v-model="model.bddgrp.blk.docdis"
:disabled="!model.bddgrp.blk.docdisflg"
maxlength="50"
show-word-limit
placeholder="请输入不符点"
></c-input>
</c-col> </c-col>
<c-col :span="3" style="text-align: right"> <c-col :span="3" style="text-align: right">
<!-- <el-form-item label-width="0"> --> <!-- <el-form-item label-width="0"> -->
<c-button <c-button
...@@ -24,30 +28,41 @@ ...@@ -24,30 +28,41 @@
</c-col> </c-col>
</el-form-item> </el-form-item>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="注释和结论"> <el-form-item label="注释和结论">
<c-input type="textarea" v-model="model.bddgrp.blk.comcon" maxlength="65" show-word-limit <c-input
placeholder="请输入注释和结论"></c-input> type="textarea"
v-model="model.bddgrp.blk.comcon"
maxlength="65"
show-word-limit
placeholder="请输入注释和结论"
></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="到期付款确认备注"> <el-form-item label="到期付款确认备注">
<c-input type="textarea" v-model="model.bddgrp.blk.accrmk" maxlength="65" show-word-limit <c-input
placeholder="请输入到期付款确认备注"></c-input> type="textarea"
v-model="model.bddgrp.blk.accrmk"
maxlength="65"
show-word-limit
placeholder="请输入到期付款确认备注"
></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
<!-- =================右边====================== --> <!-- =================右边====================== -->
<c-col :span="11" :offset="1"> <c-col :span="11" :offset="1">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="" prop="bddgrp.rec.igndisflg"> <el-form-item label="" prop="bddgrp.rec.igndisflg">
<c-checkbox v-model="model.bddgrp.rec.igndisflg">忽略不符点</c-checkbox> <c-checkbox v-model="model.bddgrp.rec.igndisflg"
<c-checkbox v-model="model.bddgrp.blk.docdisflg">录入不符点</c-checkbox> >忽略不符点</c-checkbox
>
<c-checkbox v-model="model.bddgrp.blk.docdisflg"
>录入不符点</c-checkbox
>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -58,28 +73,42 @@ ...@@ -58,28 +73,42 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="收到的通知类型" prop="bddgrp.rec.advtyp"> <el-form-item label="收到的通知类型" prop="bddgrp.rec.advtyp">
<c-select v-model="model.bddgrp.rec.advtyp" style="width:100%" placeholder="请选择收到的通知类型"> <c-select
v-model="model.bddgrp.rec.advtyp"
style="width: 100%"
placeholder="请选择收到的通知类型"
>
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="付款日期" prop="bddgrp.rec.totdat"> <el-form-item label="付款日期" prop="bddgrp.rec.totdat">
<c-date-picker type="date" v-model="model.bddgrp.rec.totdat" style="width:100%" <c-date-picker
placeholder="请选择付款日期"></c-date-picker> type="date"
v-model="model.bddgrp.rec.totdat"
style="width: 100%"
placeholder="请选择付款日期"
></c-date-picker>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="不符点通知日期" prop="bddgrp.rec.disdat"> <el-form-item label="不符点通知日期" prop="bddgrp.rec.disdat">
<c-date-picker type="date" v-model="model.bddgrp.rec.disdat" style="width:100%" <c-date-picker
placeholder="请选择不符点通知日期"></c-date-picker> type="date"
v-model="model.bddgrp.rec.disdat"
style="width: 100%"
placeholder="请选择不符点通知日期"
></c-date-picker>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="" prop="bddgrp.rec.approvcod"> <el-form-item label="" prop="bddgrp.rec.approvcod">
<c-checkbox v-model="model.bddgrp.rec.approvcod">议付行担保协议</c-checkbox> <c-checkbox v-model="model.bddgrp.rec.approvcod"
>议付行担保协议</c-checkbox
>
<c-checkbox v-model="model.bdtp.cre732flg">Create MT 732</c-checkbox> <c-checkbox v-model="model.bdtp.cre732flg">Create MT 732</c-checkbox>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -99,44 +128,87 @@ ...@@ -99,44 +128,87 @@
<el-form-item label="" prop="bdtp.cre732flg"> <el-form-item label="" prop="bdtp.cre732flg">
</el-form-item> </el-form-item>
</c-col> --> </c-col> -->
</c-col> </c-col>
<!-- =================已交单据====================== --> <!-- =================已交单据====================== -->
<c-col :span="24"> <c-col :span="24">
<c-table
<c-table :border="true" :paginationShow="false" :list="model.bdtp.docgrdm.docgrd" style="width:80%,text-align:center"> :border="true"
<el-table-column prop="cmail1" label="1st" width="auto"> </el-table-column> :paginationShow="false"
<el-table-column prop="cmail2" label="2st" width="auto"> </el-table-column> :list="model.bdtp.docgrdm.docgrd"
<el-table-column prop="docnam" label="Document" width="auto"> </el-table-column> style="width:80%,text-align:center"
<el-table-column label="" prop="det" width="80px" fixed="right"> >
<template slot-scope="scope" slot="header"> <el-table-column prop="cmail1" label="1st" width="auto">
</el-table-column>
<el-table-column prop="cmail2" label="2st" width="auto">
</el-table-column>
<el-table-column prop="docnam" label="Document" width="auto">
</el-table-column>
<el-table-column label="操作" prop="det" width="80px" fixed="right">
<template slot="header">
<span>操作</span>
<el-button <el-button
circle circle
style="padding:4px" style="padding: 4px; margin-left: 9px"
class="el-icon-plus" class="el-icon-plus"
size="mini" size="mini"
@click="addRow(scope)" @click="addDialogVisible = true"
> >
</el-button> </el-button>
<el-button <!--
style="padding:4px" style="padding:4px"
circle circle
class="el-icon-minus" class="el-icon-minus"
size="mini" size="mini"
@click="removeRow(scope)" @click="removeRow(scope)"
> >
</el-button> </el-button> -->
</template>
<template slot-scope="scope">
<c-button
style="margin-left: 0"
size="small"
@click="removeRow(scope.$index)"
>
删除
</c-button>
</template> </template>
</el-table-column> </el-table-column>
</c-table> </c-table>
</c-col> </c-col>
<c-col>
<el-dialog :visible.sync="addDialogVisible" center width="500px">
<c-col :span="24">
<c-col :span="20">
<el-form-item label="1st" label-width="100px">
<c-input v-model="dialog.cmail1"></c-input>
</el-form-item>
</c-col>
</c-col>
<c-col :span="24">
<c-col :span="20">
<el-form-item label="2st" label-width="100px">
<c-input v-model="dialog.cmail2"></c-input>
</el-form-item>
</c-col>
</c-col>
<c-col :span="24">
<c-col :span="20">
<el-form-item label="Document" label-width="100px">
<!-- <c-select v-model="dialog.docnam" style="width:100%"></c-select> -->
<c-inputselect :liData="liData" v-model="dialog.docnam">
</c-inputselect>
</el-form-item>
</c-col>
</c-col>
<!-- <c-col :span="24"> -->
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="addRow">确定</el-button>
<el-button @click="addDialogVisible = false">取消</el-button>
</span>
<!-- </c-col> -->
</el-dialog>
</c-col>
</div> </div>
</template> </template>
<script> <script>
...@@ -150,10 +222,27 @@ export default { ...@@ -150,10 +222,27 @@ export default {
props: ["model", "codes"], props: ["model", "codes"],
mixins: [CommonProcess], mixins: [CommonProcess],
data() { data() {
return {}; return {
addDialogVisible: false,
dialog: {
cmail1: "",
cmail2: "",
docnam: "",
},
liData:["增值税发票","发票","装箱单","空运单","海运提单","铁路运单","货物收据","邮政收据","出库单","保险单","质检证","受益人证明"],
};
}, },
methods: { methods: {
...Event, ...Event,
addRow(){
this.addDialogVisible=false;
let newRow = {...this.dialog};
this.model.bdtp.docgrdm.docgrd.push(newRow);
},
removeRow(idx){
this.model.bdtp.docgrdm.docgrd.pop(idx);
}
}, },
created: function () {}, created: function () {},
}; };
......
<template> <template>
<div class="busnavbar"> <div class="busnavbar">
<div class="busnavbar-items"> <div class="busnavbar-items">
<c-button class="medium_bcs" size="medium" type="primary" v-for="(item,index) in codeList" v-bind:key="index" @click.native="onNarBtnClick(item.code,index)" :title="item.title" :disabled="item.isDis==='N'">{{item.label}}</c-button> <c-button style="margin-left:7px;" class="medium_bcs" size="medium" type="primary" v-for="(item,index) in codeList" v-bind:key="index" @click.native="onNarBtnClick(item.code,index)" :title="item.title" :disabled="item.isDis==='N'">{{item.label}}</c-button>
</div> </div>
</div> </div>
</template> </template>
...@@ -113,8 +113,5 @@ export default { ...@@ -113,8 +113,5 @@ export default {
} }
</script> </script>
<style> <style>
.busnavbar-items{
/*TODO完善按钮间隔等样式 */
margin-left:-10px;
}
</style> </style>
...@@ -143,18 +143,28 @@ ...@@ -143,18 +143,28 @@
<c-row style="margin-top:20px; padding: 0 10px 0 10px;"> <c-row style="margin-top:20px; padding: 0 10px 0 10px;">
<c-col> <c-col>
<c-button size="small" type="primary">导Excel</c-button> <c-button size="small" type="primary">导Excel</c-button>
<c-button size="small" type="primary">Display</c-button> <c-button size="small" type="primary"
@click="onInfbutDsp"
:disabled="model.infbut.selrow === 0"
>Display</c-button>
<c-button size="small" type="primary">Use</c-button> <c-button size="small" type="primary">Use</c-button>
</c-col> </c-col>
</c-row> </c-row>
<c-row style="margin-top:20px; padding: 0 10px 0 10px;"> <c-row style="margin-top:20px; padding: 0 10px 0 10px;">
<c-istream-table :list="stmData.data" :columns="stmData.columns"> <c-istream-table :border="true"
:list="tableData"
:columns="stmData.columns"
v-on:chooseRowEvent="chooseRowEvent"
style="width:80%,text-align:center">
<!--
<el-table-column prop="op" label="OP" width="100"> <el-table-column prop="op" label="OP" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<a href="javascript:void(0)" @click="continueEdit(scope.row)">操作</a> <a href="javascript:void(0)" @click="continueEdit(scope.row)">操作</a>
</template> </template>
</el-table-column> </el-table-column>
-->
</c-istream-table> </c-istream-table>
</c-row> </c-row>
...@@ -207,7 +217,19 @@ export default { ...@@ -207,7 +217,19 @@ export default {
}, },
} }
}, },
methods:{...Event}, computed: {
tableData() {
// "10000449\t2000007350\t2000007350-001\tBEIJING TESTTEST,BEIJING, CHINA\t\t100080\tBEIJING, CHINA\tTEST TEST1 CO.,LTD."
console.log(this.model.infbut.dspstm.rows)
return this.model.infbut.dspstm.rows;
},
},
methods:{
chooseRowEvent(row) {
this.model.infbut.selrow = row.IDX + 1;
},
...Event},
created:function(){ created:function(){
} }
......
...@@ -349,7 +349,16 @@ export default { ...@@ -349,7 +349,16 @@ export default {
} }
}, },
methods:{...Event}, methods:{
onSeainf()
{
},
onRecpanButgetref()
{
},
...Event},
created:function(){ created:function(){
} }
......
...@@ -10,70 +10,71 @@ ...@@ -10,70 +10,71 @@
<m-infsea :model="model" :codes="codes"/> <m-infsea :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000018 -->
<el-tab-pane label="内容" name="ovwp"> <el-tab-pane label="内容" name="ovwp">
<m-ovwp :model="model" :codes="codes"/> <m-ovwp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000000 --> <!--
<el-tab-pane label="附言" name="coninfp"> <el-tab-pane label="附言" name="coninfp">
<m-coninfp :model="model" :codes="codes"/> <m-coninfp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000013 -->
<el-tab-pane label="Transaction" name="trnpan"> <el-tab-pane label="Transaction" name="trnpan">
<m-trnpan :model="model" :codes="codes"/> <m-trnpan :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000019 -->
<el-tab-pane label="余额信息" name="cbsinfp"> <el-tab-pane label="余额信息" name="cbsinfp">
<m-cbsinfp :model="model" :codes="codes"/> <m-cbsinfp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000028 -->
<el-tab-pane label="发生额信息" name="cbeinfp"> <el-tab-pane label="发生额信息" name="cbeinfp">
<m-cbeinfp :model="model" :codes="codes"/> <m-cbeinfp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000111 -->
<el-tab-pane label="费用明细" name="fepinfp"> <el-tab-pane label="费用明细" name="fepinfp">
<m-fepinfp :model="model" :codes="codes"/> <m-fepinfp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000162 -->
<el-tab-pane label="临时账务" name="sepinfp"> <el-tab-pane label="临时账务" name="sepinfp">
<m-sepinfp :model="model" :codes="codes"/> <m-sepinfp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000177 -->
<el-tab-pane label="账务信息" name="gleinfp"> <el-tab-pane label="账务信息" name="gleinfp">
<m-gleinfp :model="model" :codes="codes"/> <m-gleinfp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000119 -->
<el-tab-pane label="面函、报文" name="smhinfp"> <el-tab-pane label="面函、报文" name="smhinfp">
<m-smhinfp :model="model" :codes="codes"/> <m-smhinfp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000130 -->
<el-tab-pane label="经办信息" name="peninfp"> <el-tab-pane label="经办信息" name="peninfp">
<m-peninfp :model="model" :codes="codes"/> <m-peninfp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000147 -->
<el-tab-pane label="表外信息" name="liainfp"> <el-tab-pane label="表外信息" name="liainfp">
<m-liainfp :model="model" :codes="codes"/> <m-liainfp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000005 -->
<el-tab-pane label="Print" name="prtpan"> <el-tab-pane label="Print" name="prtpan">
<m-prtpan :model="model" :codes="codes"/> <m-prtpan :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000185 -->
<el-tab-pane label="Order" name="ordpan"> <el-tab-pane label="Order" name="ordpan">
<m-ordpan :model="model" :codes="codes"/> <m-ordpan :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
-->
</c-tabs> </c-tabs>
</el-form> </el-form>
</div> </div>
......
...@@ -81,12 +81,14 @@ ...@@ -81,12 +81,14 @@
<c-row class="infrow" style="margin-top:20px;"> <c-row class="infrow" style="margin-top:20px;">
<c-col> <c-col>
<c-button size="small" type="primary">导Excel</c-button> <c-button size="small" type="primary">导Excel</c-button>
<c-button size="small" type="primary">Display</c-button> <c-button size="small" type="primary"
@click="onInfbutDsp"
:disabled="model.infbut.selrow === 0">Display</c-button>
<c-button size="small" type="primary">Use</c-button> <c-button size="small" type="primary">Use</c-button>
</c-col> </c-col>
</c-row> </c-row>
<!--
<c-row class="infrow" style="margin-top:20px;"> <c-row class="infrow" style="margin-top:20px;">
<c-istream-table :list="stmData.data" :columns="stmData.columns"> <c-istream-table :list="stmData.data" :columns="stmData.columns">
<el-table-column prop="op" label="操作" width="100"> <el-table-column prop="op" label="操作" width="100">
...@@ -96,6 +98,16 @@ ...@@ -96,6 +98,16 @@
</el-table-column> </el-table-column>
</c-istream-table> </c-istream-table>
</c-row> </c-row>
-->
<c-col :span="22" :offset="1">
<c-istream-table
:border="true"
:list="tableData"
:columns="stmData.columns"
v-on:chooseRowEvent="chooseRowEvent"
style="width:80%,text-align:center">
</c-istream-table>
</c-col>
</c-content> </c-content>
</template> </template>
...@@ -115,17 +127,29 @@ export default { ...@@ -115,17 +127,29 @@ export default {
columns: [ columns: [
"1 1 \"Currency\" 100 ", "1 1 \"Currency\" 100 ",
"2 2 \"Description\" 300", "2 2 \"Description\" 300",
],
data: [
] ]
}, },
} }
}, },
methods:{...Event}, computed: {
tableData() {
// "10000449\t2000007350\t2000007350-001\tBEIJING TESTTEST,BEIJING, CHINA\t\t100080\tBEIJING, CHINA\tTEST TEST1 CO.,LTD."
console.log(this.model.infbut.dspstm.rows);
return this.model.infbut.dspstm.rows;
}
},
methods:{
chooseRowEvent(row) {
this.model.infbut.selrow = row.IDX + 1;
},
...Event},
created:function(){ created:function(){
} }
} }
</script> </script>
<style> <style>
......
...@@ -75,14 +75,17 @@ ...@@ -75,14 +75,17 @@
<c-row> <c-row>
<c-col :span="11" :offset="1"> <c-col :span="11" :offset="1">
<c-col :span="12"> <c-col :span="12">
<el-form-item label="开立日期从" prop="infcon.opndatfrom"> <el-form-item label="开立日期从" prop="infcon.opndatfrom">
<c-date-picker type="date" v-model="model.infcon.opndatfrom" style="width:100%" placeholder="请选择Opening between"></c-date-picker> <c-date-picker type="date" v-model="model.infcon.opndatfrom" style="width:100%" placeholder="请选择Opening between" value-format="yyyy-MM-dd"></c-date-picker>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<el-form-item label="至" prop="infcon.opndatto"> <el-form-item label="至" prop="infcon.opndatto">
<c-date-picker type="date" v-model="model.infcon.opndatto" style="width:100%" placeholder="请选择Open Date to"></c-date-picker> <c-date-picker type="date" v-model="model.infcon.opndatto" style="width:100%" placeholder="请选择Open Date to"
value-format="yyyy-MM-dd"></c-date-picker>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -162,18 +165,28 @@ ...@@ -162,18 +165,28 @@
<c-row style="margin-top:20px; padding: 0 10px 0 10px;"> <c-row style="margin-top:20px; padding: 0 10px 0 10px;">
<c-col> <c-col>
<c-button size="small" type="primary">导Excel</c-button> <c-button size="small" type="primary">导Excel</c-button>
<c-button size="small" type="primary">Display</c-button> <c-button size="small" type="primary"
@click="onInfbutDsp"
:disabled="model.infbut.selrow === 0"
>Display</c-button>
<c-button size="small" type="primary">Use</c-button> <c-button size="small" type="primary">Use</c-button>
</c-col> </c-col>
</c-row> </c-row>
<c-row style="margin-top:20px; padding: 0 10px 0 10px;"> <c-row style="margin-top:20px; padding: 0 10px 0 10px;">
<c-istream-table :list="stmData.data" :columns="stmData.columns"> <c-istream-table
:border="true"
:list="tableData"
:columns="stmData.columns"
v-on:chooseRowEvent="chooseRowEvent"
style="width:80%,text-align:center">
<!--
<el-table-column prop="op" label="OP" width="100"> <el-table-column prop="op" label="OP" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<a href="javascript:void(0)" @click="continueEdit(scope.row)">操作</a> <a href="javascript:void(0)" @click="continueEdit(scope.row)">操作</a>
</template> </template>
</el-table-column> </el-table-column>
-->
</c-istream-table> </c-istream-table>
</c-row> </c-row>
...@@ -194,21 +207,21 @@ export default { ...@@ -194,21 +207,21 @@ export default {
stmData: { stmData: {
columns: [ columns: [
"1 1 \"Reference\" 100 ", "1 1 \"Reference\" 100 ",
"1 1 \"Resp. User\" 100", "2 1 \"Resp. User\" 100",
"1 1 \"Tenor day\" 100", "3 1 \"Tenor day\" 100",
"2 2 \"Party Number\" 150 ", "7 2 \"Party Number\" 150 ",
"2 2 \"Applicant\" 150 ", "8 2 \"Applicant\" 150 ",
"3 3 \"Party Number\" 150 ", "9 3 \"Party Number\" 150 ",
"3 3 \"'Beneficiary\" 150 ", "10 3 \"Beneficiary\" 150 ",
"4 4 \"Party Number\" 150 ", "11 4 \"Party Number\" 150 ",
"4 4 \"Issuing Bank\" 150 ", "12 4 \"Issuing Bank\" 150 ",
"5 5 \"Opened\" 150 ", "4 5 \"Opened\" 150 ",
"5 5 \"Expired\" 150 ", "5 5 \"Expired\" 150 ",
"5 5 \"Closed\" 150 ", "6 5 \"Closed\" 150 ",
"6 6 \"Cur\" 150 ", "13 6 \"Cur\" 150 ",
"6 6 \"Cur\" 150 ", "15 6 \"Cur\" 150 ",
"7 7 \"L/C Amount\" 150 ", "14 7 \"L/C Amount\" 150 ",
"7 7 \"Open Amount\" 150 ", "16 7 \"Open Amount\" 150 ",
], ],
data: [ data: [
...@@ -216,7 +229,20 @@ export default { ...@@ -216,7 +229,20 @@ export default {
}, },
} }
}, },
methods:{...Event}, computed: {
tableData() {
// "10000449\t2000007350\t2000007350-001\tBEIJING TESTTEST,BEIJING, CHINA\t\t100080\tBEIJING, CHINA\tTEST TEST1 CO.,LTD."
console.log(this.model.infbut.dspstm.rows)
return this.model.infbut.dspstm.rows;
}
},
methods:{
chooseRowEvent(row) {
this.model.infbut.selrow = row.IDX + 1;
},
...Event},
created:function(){ created:function(){
} }
......
<template> <template>
<c-content class="eibs-tab" :height="200"> <c-content class="eibs-tab" :height="200">
<!--
<div class="infTopBtn"> <div class="infTopBtn">
<el-button-group> <el-button-group>
<c-button size="small" type="primary" icon="el-icon-arrow-left"></c-button> <c-button size="small" type="primary" icon="el-icon-arrow-left"></c-button>
...@@ -9,10 +10,11 @@ ...@@ -9,10 +10,11 @@
<c-button size="small" type="primary">Use</c-button> <c-button size="small" type="primary">Use</c-button>
<c-button size="small" type="primary">Loginfo</c-button> <c-button size="small" type="primary">Loginfo</c-button>
</div> </div>
-->
<c-row> <c-row>
<c-col :span="12"> <c-col :span="12">
<c-col :span="12"> <c-col :span="23" :offset="1">
<el-form-item label="编号" prop="dedgrp.rec.ownref"> <el-form-item label="编号" prop="dedgrp.rec.ownref">
<c-input v-model="model.dedgrp.rec.ownref" maxlength="16" placeholder="请输入编号"></c-input> <c-input v-model="model.dedgrp.rec.ownref" maxlength="16" placeholder="请输入编号"></c-input>
</el-form-item> </el-form-item>
...@@ -24,6 +26,7 @@ ...@@ -24,6 +26,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
--> -->
<!--
<c-col :span="6"> <c-col :span="6">
<c-button size="small" type="primary" icon="el-icon-search" @click="onSeainf"> <c-button size="small" type="primary" icon="el-icon-search" @click="onSeainf">
</c-button> </c-button>
...@@ -33,9 +36,10 @@ ...@@ -33,9 +36,10 @@
获取 获取
</c-button> </c-button>
</c-col> </c-col>
-->
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<c-col :span="18"> <c-col :span="23" :offset="1">
<el-form-item label="摘要" prop="dedgrp.rec.nam"> <el-form-item label="摘要" prop="dedgrp.rec.nam">
<c-input v-model="model.dedgrp.rec.nam" maxlength="40" placeholder="请输入Externally Displayed Name to Identify the Contract"></c-input> <c-input v-model="model.dedgrp.rec.nam" maxlength="40" placeholder="请输入Externally Displayed Name to Identify the Contract"></c-input>
</el-form-item> </el-form-item>
...@@ -47,11 +51,13 @@ ...@@ -47,11 +51,13 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
--> -->
<!--
<c-col :span="6"> <c-col :span="6">
<c-button size="small" type="primary" @click="onRecpanButgetref"> <c-button size="small" type="primary" @click="onRecpanButgetref">
dadsnd dadsnd
</c-button> </c-button>
</c-col> </c-col>
-->
</c-col> </c-col>
</c-col> </c-col>
</c-row> </c-row>
...@@ -73,8 +79,10 @@ ...@@ -73,8 +79,10 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="6"> <c-col :span="6">
<c-button size="small" type="primary" icon="el-icon-search" @click="onSeainf"> <!--
<c-button size="small" type="primary" icon="el-icon-search" @click="">
</c-button> </c-button>
-->
</c-col> </c-col>
</c-col> </c-col>
...@@ -193,12 +201,13 @@ ...@@ -193,12 +201,13 @@
<c-input type="textarea" :rows="3" v-model="model.dedgrp.blk.dftat" maxlength="35" show-word-limit placeholder="请输入远期付款指示" ></c-input> <c-input type="textarea" :rows="3" v-model="model.dedgrp.blk.dftat" maxlength="35" show-word-limit placeholder="请输入远期付款指示" ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<!--
<c-col :span="6"> <c-col :span="6">
<c-button size="small" type="primary" icon="el-icon-search" @click="onLcrdftatButtxmsel"> <c-button size="small" type="primary" icon="el-icon-search" @click="onLcrdftatButtxmsel">
... ...
</c-button> </c-button>
</c-col> </c-col>
-->
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
...@@ -207,19 +216,20 @@ ...@@ -207,19 +216,20 @@
<c-input type="textarea" :rows="3" v-model="model.dedgrp.blk.preper" maxlength="35" show-word-limit placeholder="请输入交单期限" ></c-input> <c-input type="textarea" :rows="3" v-model="model.dedgrp.blk.preper" maxlength="35" show-word-limit placeholder="请输入交单期限" ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<!--
<c-col :span="6"> <c-col :span="6">
<c-button size="small" type="primary" icon="el-icon-search" @click="onPreperButtxmsel"> <c-button size="small" type="primary" icon="el-icon-search" @click="onPreperButtxmsel">
... ...
</c-button> </c-button>
</c-col> </c-col>
-->
</c-col> </c-col>
</c-col> </c-col>
<!-- 右边 --> <!-- 右边 -->
<c-col :span="11" offset="1"> <c-col :span="11" :offset="1">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="受益人 编号." prop="dedgrp.ben.pts.ref"> <el-form-item label="受益人 编号." prop="dedgrp.ben.pts.ref">
<c-input v-model="model.dedgrp.ben.pts.ref" maxlength="16" placeholder="请输入受益人 编号."></c-input> <c-input v-model="model.dedgrp.ben.pts.ref" maxlength="16" placeholder="请输入受益人 编号."></c-input>
...@@ -238,6 +248,7 @@ ...@@ -238,6 +248,7 @@
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<!--
<c-col :span="2"> <c-col :span="2">
<el-form-item label="" label-width="5px"> <el-form-item label="" label-width="5px">
<c-button <c-button
...@@ -245,8 +256,7 @@ ...@@ -245,8 +256,7 @@
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@click="onSeainf('dedgrp.ben.pts.extkey')" @click="onSeainf('dedgrp.ben.pts.extkey')"
></c-button ></c-button>
>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="4"> <c-col :span="4">
...@@ -256,6 +266,7 @@ ...@@ -256,6 +266,7 @@
</c-button> </c-button>
</el-form-item> </el-form-item>
</c-col> </c-col>
-->
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
...@@ -309,6 +320,7 @@ ...@@ -309,6 +320,7 @@
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<!--
<c-col :span="2"> <c-col :span="2">
<el-form-item label="" label-width="5px"> <el-form-item label="" label-width="5px">
<c-button <c-button
...@@ -318,6 +330,7 @@ ...@@ -318,6 +330,7 @@
@click="onSeainf('dedgrp.apl.pts.extkey')" @click="onSeainf('dedgrp.apl.pts.extkey')"
></c-button ></c-button
> >
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="4"> <c-col :span="4">
...@@ -327,6 +340,7 @@ ...@@ -327,6 +340,7 @@
</c-button> </c-button>
</el-form-item> </el-form-item>
</c-col> </c-col>
-->
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
......
...@@ -50,84 +50,85 @@ ...@@ -50,84 +50,85 @@
<m-ovwp :model="model" :codes="codes"/> <m-ovwp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000405 --> <!--
<el-tab-pane label="条款" name="detp"> <el-tab-pane label="条款" name="detp">
<m-detp :model="model" :codes="codes"/> <m-detp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000000 -->
<el-tab-pane label="附言" name="coninfp"> <el-tab-pane label="附言" name="coninfp">
<m-coninfp :model="model" :codes="codes"/> <m-coninfp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000013 -->
<el-tab-pane label="Transactions" name="trnpan"> <el-tab-pane label="Transactions" name="trnpan">
<m-trnpan :model="model" :codes="codes"/> <m-trnpan :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000019 -->
<el-tab-pane label="余额信息" name="cbsinfp"> <el-tab-pane label="余额信息" name="cbsinfp">
<m-cbsinfp :model="model" :codes="codes"/> <m-cbsinfp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000028 -->
<el-tab-pane label="发生额信息" name="cbeinfp"> <el-tab-pane label="发生额信息" name="cbeinfp">
<m-cbeinfp :model="model" :codes="codes"/> <m-cbeinfp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000111 -->
<el-tab-pane label="费用明细" name="fepinfp"> <el-tab-pane label="费用明细" name="fepinfp">
<m-fepinfp :model="model" :codes="codes"/> <m-fepinfp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000162 -->
<el-tab-pane label="临时账务" name="sepinfp"> <el-tab-pane label="临时账务" name="sepinfp">
<m-sepinfp :model="model" :codes="codes"/> <m-sepinfp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000177 -->
<el-tab-pane label="账务信息" name="gleinfp"> <el-tab-pane label="账务信息" name="gleinfp">
<m-gleinfp :model="model" :codes="codes"/> <m-gleinfp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000119 -->
<el-tab-pane label="面函、报文" name="smhinfp"> <el-tab-pane label="面函、报文" name="smhinfp">
<m-smhinfp :model="model" :codes="codes"/> <m-smhinfp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000130 -->
<el-tab-pane label="经办信息" name="peninfp"> <el-tab-pane label="经办信息" name="peninfp">
<m-peninfp :model="model" :codes="codes"/> <m-peninfp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000147 -->
<el-tab-pane label="表外信息" name="liainfp"> <el-tab-pane label="表外信息" name="liainfp">
<m-liainfp :model="model" :codes="codes"/> <m-liainfp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000005 -->
<el-tab-pane label="Print" name="prtpan"> <el-tab-pane label="Print" name="prtpan">
<m-prtpan :model="model" :codes="codes"/> <m-prtpan :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!-- -->
<el-tab-pane label="Order" name="ordpan"> <el-tab-pane label="Order" name="ordpan">
<m-ordpan :model="model" :codes="codes"/> <m-ordpan :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!-- -->
<el-tab-pane label="银行明细" name="detp1"> <el-tab-pane label="银行明细" name="detp1">
<m-detp1 :model="model" :codes="codes"/> <m-detp1 :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!-- -->
<el-tab-pane label="明细" name="detp2"> <el-tab-pane label="明细" name="detp2">
<m-detp2 :model="model" :codes="codes"/> <m-detp2 :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--PD000548 -->
<el-tab-pane label="声明" name="stament"> <el-tab-pane label="声明" name="stament">
<m-stament :model="model" :codes="codes"/> <m-stament :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
-->
</c-tabs> </c-tabs>
</el-form> </el-form>
</div> </div>
......
<template> <template>
<div class="busnavbar"> <div class="busnavbar">
<div class="busnavbar-items"> <div class="busnavbar-items">
<c-button class="medium_bcs" size="medium" type="primary" v-for="(item,index) in codeList" v-bind:key="index" @click.native="onNarBtnClick(item.code,index)" :title="item.title" :disabled="item.isDis==='N'">{{item.label}}</c-button> <c-button style="margin-left:7px;" size="medium" type="primary" class="medium_bcs" v-for="(item,index) in codeList" v-bind:key="index" @click.native="onNarBtnClick(item.code,index)" :title="item.title" :disabled="item.isDis==='N'">{{item.label}}</c-button>
</div> </div>
</div> </div>
</template> </template>
...@@ -83,9 +83,11 @@ export default { ...@@ -83,9 +83,11 @@ export default {
const length = this.model.cfgfil.btnstm.rows.length const length = this.model.cfgfil.btnstm.rows.length
let btnStr = this.model.cfgfil.btnstm.rows let btnStr = this.model.cfgfil.btnstm.rows
let j = 0; let j = 0;
let m = 0;
const buttonIndex = ['信用证修改','减额修改接受','到单','修改通知行']
for(let i=0; i < length; i++){ for(let i=0; i < length; i++){
//获取数组中每行的数据 //获取数组中每行的数据
if(!( btnStr[i].indexOf("保证金") >= 0)){ if(!( btnStr[i].indexOf("保证金") >= 0) && !(btnStr[i].indexOf("开立信用证") >= 0)){
let arr = btnStr[i].split("\t"); let arr = btnStr[i].split("\t");
let newList = { let newList = {
code:arr[0], code:arr[0],
...@@ -93,6 +95,11 @@ export default { ...@@ -93,6 +95,11 @@ export default {
isDis:arr[2], isDis:arr[2],
title:arr[3] title:arr[3]
} }
m++;
j = buttonIndex.indexOf(arr[1].replace(/(^\s*)|(\s*$)/g, ""));
if(j<0){
j = m;
}
//添加到navcode数组中 //添加到navcode数组中
this.navcode.splice(j,0,newList) this.navcode.splice(j,0,newList)
} }
...@@ -110,8 +117,6 @@ export default { ...@@ -110,8 +117,6 @@ export default {
} }
</script> </script>
<style> <style>
.busnavbar-items{
/*TODO完善按钮间隔等样式 */
margin-left:8px;
}
</style> </style>
...@@ -298,7 +298,7 @@ ...@@ -298,7 +298,7 @@
:columns="stmData.columns" :columns="stmData.columns"
:showButtonFlg="true" :showButtonFlg="true"
> >
<el-table-column fixed="right" prop="op" label="操作" width="165px" class-name="lastColumn"> <el-table-column fixed="right" prop="op" label="操作" width="165px">
<template slot="header"> <template slot="header">
<c-col style="text-align: left" <c-col style="text-align: left"
><span>操作</span> ><span>操作</span>
......
...@@ -280,11 +280,11 @@ ...@@ -280,11 +280,11 @@
</c-button> </c-button>
</c-col> --> </c-col> -->
<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" :showButtonFlg="true">
<el-table-column fixed="right" prop="op" label="操作" width="140px"> <el-table-column fixed="right" prop="op" label="操作" 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>
<c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col> <!-- <c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col> -->
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<c-button <c-button
...@@ -379,7 +379,8 @@ export default { ...@@ -379,7 +379,8 @@ export default {
'4 1 "交易代码" 70 ', '4 1 "交易代码" 70 ',
'5 2 "业务编号" 300', '5 2 "业务编号" 300',
'6 3 "交易名称" 180', '6 3 "交易名称" 180',
'1 4 "状态" 60 1 tdViewTypeEdit:0 1 SPT:STA', // '1 4 "状态" 60 1 tdViewTypeEdit:0 1 SPT:STA',
{index:1,position:4,width:100,pattern:'code',label:'状态',code:[{label:"Pending",value:"PEN"}]},
'17 5 "报文类型" 100', '17 5 "报文类型" 100',
'18 6 "对方银行BIC" 110', '18 6 "对方银行BIC" 110',
'7 7 "创建时间" 160 20 DateTime 1', '7 7 "创建时间" 160 20 DateTime 1',
......
...@@ -72,7 +72,6 @@ ...@@ -72,7 +72,6 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24">
<c-col :span="11"> <c-col :span="11">
<el-form-item label="Name" prop="spt.txt" style="width: 100%"> <el-form-item label="Name" prop="spt.txt" style="width: 100%">
<c-input <c-input
...@@ -84,10 +83,8 @@ ...@@ -84,10 +83,8 @@
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col>
<c-col :span="24"> <c-col :span="11" :offset="1">
<c-col :span="11">
<c-col :span="13"> <c-col :span="13">
<el-form-item label="Transaction " prop="spt.frm"> <el-form-item label="Transaction " prop="spt.frm">
<c-input <c-input
...@@ -112,7 +109,6 @@ ...@@ -112,7 +109,6 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
</c-col>
<c-col :span="11"> <c-col :span="11">
<el-form-item label="Responsible User " prop="spt.ownusr"> <el-form-item label="Responsible User " prop="spt.ownusr">
...@@ -211,7 +207,7 @@ ...@@ -211,7 +207,7 @@
</c-col> </c-col>
<c-col :span="24" style="height:24px;margin-top:8px"> <c-col :span="24" style="height:24px;margin-top:8px">
<el-form-item label="报文信息" class="messageLabel"> <el-form-item label="报文信息" class="messageLabel">
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24" style="height: 0px"> <c-col :span="24" style="height: 0px">
...@@ -353,7 +349,7 @@ ...@@ -353,7 +349,7 @@
</c-col> </c-col>
<c-col :span="24" style="height:24px;margin-top:20px"> <c-col :span="24" style="height:24px;margin-top:20px">
<el-form-item label="接口信息表" class="messageLabel"> <el-form-item label="工作流信息" class="messageLabel">
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24" style="height: 0px"> <c-col :span="24" style="height: 0px">
......
...@@ -396,16 +396,16 @@ ...@@ -396,16 +396,16 @@
> --> > -->
<el-row> <el-row>
<c-col :span="24"> <c-col :span="24">
<c-istream-table :list="stmData.data" :columns="stmData.columns" style="width:100%"> <c-istream-table :list="stmData.data" :columns="stmData.columns" style="width:100%" :showButtonFlg="true">
<el-table-column <el-table-column
fixed="right" fixed="right"
prop="display" prop="display"
label="操作" label="操作"
width="150px" 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>
<c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col> <!-- <c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col> -->
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <a :href="`/#/display/${scope.row['10'].toLowerCase()}?trn=${scope.row['1']}`" target="_blank" >显示快照</a>--> <!-- <a :href="`/#/display/${scope.row['10'].toLowerCase()}?trn=${scope.row['1']}`" target="_blank" >显示快照</a>-->
......
...@@ -385,16 +385,16 @@ ...@@ -385,16 +385,16 @@
> --> > -->
<el-row> <el-row>
<c-col :span="24"> <c-col :span="24">
<c-istream-table :list="stmData.data" :columns="stmData.columns" style="width:100%"> <c-istream-table :list="stmData.data" :columns="stmData.columns" style="width:100%" :showButtonFlg="true">
<el-table-column <el-table-column
fixed="right" fixed="right"
prop="display" prop="display"
label="操作" label="操作"
width="150px" 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>
<c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col> <!-- <c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col> -->
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<c-button <c-button
...@@ -412,7 +412,6 @@ ...@@ -412,7 +412,6 @@
<c-button <c-button
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
type="primary"
> >
冲正 冲正
</c-button> </c-button>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<el-table-column prop="matdat" label="Maturity" width="100px"> </el-table-column> <el-table-column prop="matdat" label="Maturity" width="100px"> </el-table-column>
<el-table-column prop="tenday" label="Tenor" width="70px"> </el-table-column> <el-table-column prop="tenday" label="Tenor" width="70px"> </el-table-column>
<el-table-column prop="rol" label="Dbt." width="70px"> </el-table-column> <el-table-column prop="rol" label="Dbt." width="70px"> </el-table-column>
<el-table-column prop="nam" label="Name" width="170px"> </el-table-column> <el-table-column prop="nam" label="Name" width="300"> </el-table-column>
<el-table-column prop="cdtrol" label="Cdt." width="70px"> </el-table-column> <el-table-column prop="cdtrol" label="Cdt." width="70px"> </el-table-column>
<el-table-column prop="cur" label="Cur" width="55px"> </el-table-column> <el-table-column prop="cur" label="Cur" width="55px"> </el-table-column>
<el-table-column prop="oldamt" label="Old Amount" width="150px"> <el-table-column prop="oldamt" label="Old Amount" width="150px">
......
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