Commit 2b1737d0 by Wuyuqiu

Merge branch 'bochk-poc-1113' of http://192.168.0.110:11080/fukai/vue-gjjs into bochk-poc-1113

parents 729c6c9e 7aca8cd3
...@@ -241,8 +241,15 @@ ...@@ -241,8 +241,15 @@
<!-- <div style="height: 90%"> <!-- <div style="height: 90%">
<c-col :span="24"> <c-col :span="24">
<el-table <el-table
:data="stmData.data" :data="stmData.data"
:columns="stmData.columns" :columns="stmData.columns"
:showButtonFlg="true"
:header-cell-style="{
background: 'rgb(235, 235, 235)',
color: 'rgb(51, 51, 51)',
}"
style="width:100%"
:highlight-current-row="true"
> >
<el-table-column <el-table-column
v-for="(item, key) in stmData.columns" v-for="(item, key) in stmData.columns"
...@@ -250,6 +257,9 @@ ...@@ -250,6 +257,9 @@
:label="item.label" :label="item.label"
:prop="item.prop" :prop="item.prop"
:formatter="item.rounding" :formatter="item.rounding"
:width="item.width"
show-overflow-tooltip="true"
sortable
></el-table-column> ></el-table-column>
<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">
...@@ -282,6 +292,7 @@ ...@@ -282,6 +292,7 @@
:key="key" :key="key"
:label="item.label" :label="item.label"
:prop="item.prop" :prop="item.prop"
:formatter="item.rounding"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row[item.prop] }}</div> <div>{{ scope.row[item.prop] }}</div>
...@@ -393,50 +404,60 @@ export default { ...@@ -393,50 +404,60 @@ export default {
columns: [ columns: [
{ {
label: '信用证编号', label: '信用证编号',
prop: 'seaownref' prop: 'seaownref',
width: '120px'
}, },
{ {
label: '客户经理', label: '客户经理',
prop: 'ownusr' prop: 'ownusr',
width: '100px'
}, },
{ {
label: '币种', label: '币种',
prop: 'seacur' prop: 'seacur',
width: '100px'
}, },
{ {
label: '金额', label: '金额',
prop: 'maxamt', prop: 'maxamt',
rounding:this.rounding rounding:this.rounding,
width: '100px'
}, },
{ {
label: '余额', label: '余额',
prop: 'opnamt' prop: 'opnamt',
width: '100px'
}, },
{ {
label: '开立日期', label: '开立日期',
prop: 'opndat' prop: 'opndat',
width: '100px'
}, },
{ {
label: '申请人编号', label: '申请人编号',
prop: 'aplextkey', prop: 'aplextkey',
width: '120px'
}, },
{ {
label: '申请人名称', label: '申请人名称',
prop: 'aplnam' prop: 'aplnam',
width: '120px'
}, },
{ {
label: '通知银行BIC编码', label: '通知银行BIC编码',
prop: 'seapty' prop: 'seapty',
width: '150px'
}, },
{ {
label: '受益人名称', label: '受益人名称',
prop: 'benefi' prop: 'benefi',
width: '120px'
}, },
{ {
label: '远离期限', label: '远离期限',
prop: 'tenmaxday' prop: 'tenmaxday',
width: '100px'
}, },
], ],
data: [], data: [],
...@@ -474,8 +495,9 @@ export default { ...@@ -474,8 +495,9 @@ export default {
prop: 'reloricur' prop: 'reloricur'
}, },
{ {
label: '相关金额', label: '相关金额1',
prop: 'reloriamt' prop: 'reloriamt',
rounding:this.rounding
}, },
{ {
label: '标识', label: '标识',
......
...@@ -89,23 +89,17 @@ ...@@ -89,23 +89,17 @@
<div style="border-bottom: 10px solid rgb(232, 232, 232)"></div> <div style="border-bottom: 10px solid rgb(232, 232, 232)"></div>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-table <c-paging-table
:data="stmData.data" :data="stmData.data"
:columns="stmData.columns" :columns="stmData.columns"
:showButtonFlg="true" :pageNumber="pagination.pageNum"
> :pageSize="pagination.pageSize"
<el-table-column :total="pagination.total"
v-for="(item, key) in stmData.columns" v-on:queryFunc="queryFunc"
:key="key" >
:label="item.label" <c-table-column fixed="right" prop="op" label="操作" width="250px" >
:prop="item.prop" <template slot-scope="{ scope }">
></el-table-column> <c-button style="margin-left: 0" size="small" @click="onDetails(scope.row)">详情
<el-table-column fixed="right" prop="op" label="操作" width="250px" >
<template slot="header">
<c-col :span="11" style="text-align:center"><span>操作</span></c-col>
</template>
<template slot-scope="scope">
<c-button style="margin-left: 0" size="small" @click="onDetails(scope.$index, scope.row)">详情
</c-button> </c-button>
<c-button style="margin-left: 5px" size="small" type="primary" @click="continueEdit(scope.row)">处理 <c-button style="margin-left: 5px" size="small" type="primary" @click="continueEdit(scope.row)">处理
</c-button> </c-button>
...@@ -125,20 +119,8 @@ ...@@ -125,20 +119,8 @@
<a slot="reference" href="javascript:void(0)" style="margin-left: 5px"><i class="el-icon-more"></i></a> <a slot="reference" href="javascript:void(0)" style="margin-left: 5px"><i class="el-icon-more"></i></a>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </c-table-column>
</el-table> </c-paging-table>
<div class="pagination-box">
<el-pagination
style="margin-right: 30px;"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="pagination.pageIndex"
:page-sizes="[10, 20, 50, 100, 500]"
:page-size="pagination.pageSize"
layout="sizes, prev, pager, next"
:total="pagination.total">
</el-pagination>
</div>
</c-col> </c-col>
<el-dialog :visible.sync="initdialog" :title="'交易列表'" append-to-body> <el-dialog :visible.sync="initdialog" :title="'交易列表'" append-to-body>
<div class="m-list-btns"></div> <div class="m-list-btns"></div>
...@@ -242,6 +224,9 @@ export default { ...@@ -242,6 +224,9 @@ export default {
let datetime = new Date(); let datetime = new Date();
datetime = datetime.setDate(datetime.getDate() - 10); datetime = datetime.setDate(datetime.getDate() - 10);
this.model.inidatfro = new Date(datetime); this.model.inidatfro = new Date(datetime);
},
handleCurrentChange(val) {
this.currentRow = val;
} }
}, },
created: function () { created: function () {
...@@ -250,6 +235,13 @@ export default { ...@@ -250,6 +235,13 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped>
.tableClass .cell{
padding: 0!important;
height: 40px;
line-height: 30px!important;
text-align: center;
}
.table-button-item-list { .table-button-item-list {
padding: 0; padding: 0;
margin: 0; margin: 0;
......
...@@ -98,14 +98,27 @@ ...@@ -98,14 +98,27 @@
</c-col> </c-col>
<el-row> <el-row>
<c-col :span="24" style=""> <c-col :span="24" style="margin-top:20px;">
<el-table :data="stmData.data" :columns="stmData.columns" style="width:100%"> <el-table
:data="stmData.data"
:header-cell-style="{
background: 'rgb(235, 235, 235)',
color: 'rgb(51, 51, 51)',
}"
style="width:100%"
:highlight-current-row="true"
>
<el-table-column <el-table-column
v-for="(item, key) in stmData.columns" v-for="(item, key) in stmData.columns"
:key="key" :key="key"
:label="item.label" :label="item.label"
:prop="item.prop" :prop="item.prop"
:formatter="item.rounding" :formatter="item.rounding"
:header-align="item.headerAlign"
:align="item.align"
:width="item.width"
show-overflow-tooltip="true"
sortable
> >
</el-table-column> </el-table-column>
...@@ -114,10 +127,10 @@ ...@@ -114,10 +127,10 @@
<c-col :span="11" style="text-align:center"><span>操作</span></c-col> <c-col :span="11" style="text-align:center"><span>操作</span></c-col>
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<c-button style="margin-left: 0" size="small" @click="onWaitDetail(scope.$index,scope.row)"> <c-button style="margin-left: 0" size="small" @click="onWaitDetail(scope.$index,scope.row)">
详情 详情
</c-button> </c-button>
<c-button :disabled="scope.row.relflg != 'W'" style="margin-left: 5px" size="small" type="primary" @click="onHandle(scope.$index,scope.row)"> <c-button :disabled="scope.row.relflg != 'W'" style="margin-left: 5px" size="small" type="primary" @click="onHandle(scope.$index,scope.row)">
处理 处理
</c-button> </c-button>
</template> </template>
...@@ -163,17 +176,17 @@ ...@@ -163,17 +176,17 @@
}, },
stmData: { stmData: {
columns: [ columns: [
{ label: "交易代码", prop: "inifrm" }, { label: "交易代码", prop: "inifrm", width: "100px" },
{ label: "业务编号", prop: "ownref" }, { label: "业务编号", prop: "ownref" , width: "100px"},
{ label: "摘要信息", prop: "addtxt" }, { label: "摘要信息", prop: "addtxt" , width: "200px"},
{ label: "币种", prop: "reloricur" }, { label: "币种", prop: "reloricur", width: "70px" },
{ label: "金额", prop: "reloriamt",rounding:this.rounding }, { label: "金额1", prop: "reloriamt",rounding:this.rounding,headerAlign:"right",align:"right", width: "70px" },
{ label: "创建时间", prop: "inidattim" }, { label: "创建时间", prop: "inidattim", width: "100px" },
{ label: "签名要求", prop: "relreq" }, { label: "签名要求", prop: "relreq", width: "100px" },
{ label: "签名状态", prop: "relres" }, { label: "签名状态", prop: "relres", width: "100px" },
{ label: "经办柜员", prop: "iniusr" }, { label: "经办柜员", prop: "iniusr", width: "100px" },
{ label: "业务状态", prop: "relflg" }, { label: "业务状态", prop: "relflg" , width: "100px"},
{ label: "业务机构", prop: "bchname" }, { label: "业务机构", prop: "bchname", width: "100px" },
], ],
data: [], data: [],
}, },
...@@ -223,6 +236,21 @@ ...@@ -223,6 +236,21 @@
} }
}; };
</script> </script>
<style> <style scoped>
</style> .el-scrollbar_warp{
overflow-y: auto;
}
.el-table >>> th.is-left div{
text-align:left;
}
.el-table >>> th.is-right div{
text-align:right;
}
.el-table >>> td.is-left div{
text-align:left;
}
.el-table >>> td.is-right div{
text-align:right;
}
</style>
\ No newline at end of file
...@@ -127,24 +127,30 @@ export default { ...@@ -127,24 +127,30 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
.greenClass /deep/ .el-input__inner { .greenClass /deep/ .el-input__inner {
border-color: green; border-color: green;
border-width: medium;
} }
.greenClass /deep/ .el-textarea__inner { .greenClass /deep/ .el-textarea__inner {
border-color: green; border-color: green;
border-width: medium;
} }
.yellowClass /deep/ .el-input__inner { .yellowClass /deep/ .el-input__inner {
border-color: blue; border-color: blue;
border-width: medium;
} }
.yellowClass /deep/ .el-textarea__inner { .yellowClass /deep/ .el-textarea__inner {
border-color: blue; border-color: blue;
border-width: medium;
} }
.redClass /deep/ .el-input__inner { .redClass /deep/ .el-input__inner {
border-color: red; border-color: red;
border-width: medium;
} }
.redClass /deep/ .el-textarea__inner { .redClass /deep/ .el-textarea__inner {
border-color: red; border-color: red;
border-width: medium;
}</style> }</style>
\ No newline at end of file
...@@ -143,26 +143,32 @@ export default { ...@@ -143,26 +143,32 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
.greenClass /deep/ .el-input__inner { .greenClass /deep/ .el-input__inner {
border-color: green; border-color: green;
border-width: medium;
} }
.greenClass /deep/ .el-textarea__inner { .greenClass /deep/ .el-textarea__inner {
border-color: green; border-color: green;
border-width: medium;
} }
.yellowClass /deep/ .el-input__inner { .yellowClass /deep/ .el-input__inner {
border-color: blue; border-color: blue;
border-width: medium;
} }
.yellowClass /deep/ .el-textarea__inner { .yellowClass /deep/ .el-textarea__inner {
border-color: blue; border-color: blue;
border-width: medium;
} }
.redClass /deep/ .el-input__inner { .redClass /deep/ .el-input__inner {
border-color: red; border-color: red;
border-width: medium;
} }
.redClass /deep/ .el-textarea__inner { .redClass /deep/ .el-textarea__inner {
border-color: red; border-color: red;
border-width: medium;
} }
/* /*
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
:width="item.width" :width="item.width"
:formatter="item.rounding" :formatter="item.rounding"
sortable sortable
:show-overflow-tooltip="true"
> >
<template v-slot="{ scope }"> <template v-slot="{ scope }">
<span>{{ scope.row[item.prop] }}</span> <span>{{ scope.row[item.prop] }}</span>
......
...@@ -220,23 +220,29 @@ export default { ...@@ -220,23 +220,29 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
.greenClass /deep/ .el-input__inner { .greenClass /deep/ .el-input__inner {
border-color: green; border-color: green;
border-width: medium;
} }
.greenClass /deep/ .el-textarea__inner { .greenClass /deep/ .el-textarea__inner {
border-color: green; border-color: green;
border-width: medium;
} }
.yellowClass /deep/ .el-input__inner { .yellowClass /deep/ .el-input__inner {
border-color: blue; border-color: blue;
border-width: medium;
} }
.yellowClass /deep/ .el-textarea__inner { .yellowClass /deep/ .el-textarea__inner {
border-color: blue; border-color: blue;
border-width: medium;
} }
.redClass /deep/ .el-input__inner { .redClass /deep/ .el-input__inner {
border-color: red; border-color: red;
border-width: medium;
} }
.redClass /deep/ .el-textarea__inner { .redClass /deep/ .el-textarea__inner {
border-color: red; border-color: red;
border-width: medium;
} }
</style> </style>
<template> <template>
<div class="eContainer"> <div class="eContainer">
<c-page title="申报"> <c-page style="margin-top:20px;" title="申报">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick" > <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick" >
<el-tab-pane label="申报信息" name="selp"> <el-tab-pane label="申报信息" name="selp">
<c-content> <c-content>
......
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