Commit 713a1681 by 闫泽浩

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
parents dfde60b6 bf251d8d
...@@ -187,9 +187,10 @@ ...@@ -187,9 +187,10 @@
line-height: var(--lineheight); line-height: var(--lineheight);
font-size: var(--normalfont); font-size: var(--normalfont);
} }
/* input框去除margin值 */ /* input框去除margin值 */
.el-input--prefix .el-input__inner{ .el-input--prefix .el-input__inner {
padding-right:0px; padding-right: 0px;
} }
.el-form-item--small .el-form-item__content, .el-form-item--small .el-form-item__content,
...@@ -313,7 +314,6 @@ ...@@ -313,7 +314,6 @@
} }
.el-dialog__body .el-dialog__body
/* form 必填项的内容区域颜色突出显示 * /* form 必填项的内容区域颜色突出显示 *
暂时封掉 暂时封掉
.el-form-item.is-required .el-form-item__content .el-input__inner, .el-form-item.is-required .el-form-item__content .el-input__inner,
...@@ -367,13 +367,16 @@ ...@@ -367,13 +367,16 @@
} }
/* 表格中去除下边距 */ /* 表格中去除下边距 */
.el-table__row .cell .el-form-item--mini.el-form-item,.el-table__row .cell .el-form-item--small.el-form-item{ .el-table__row .cell .el-form-item--mini.el-form-item,
.el-table__row .cell .el-form-item--small.el-form-item {
margin-bottom: 0px; margin-bottom: 0px;
} }
/* 表格按钮居中 */ /* 表格按钮居中 */
.cell{ .cell {
text-align: center; text-align: center;
} }
.el-tooltip__popper.is-dark { .el-tooltip__popper.is-dark {
max-width: 600px; max-width: 600px;
} }
...@@ -418,25 +421,25 @@ ...@@ -418,25 +421,25 @@
border-bottom: 0px solid #fff; border-bottom: 0px solid #fff;
} }
.el-collapse .el-collapse-item__wrap{ .el-collapse .el-collapse-item__wrap {
/* background-color: var(--bgcolor); */ /* background-color: var(--bgcolor); */
border-bottom: 0px solid #fff; border-bottom: 0px solid #fff;
} }
.el-collapse-item__header{ .el-collapse-item__header {
/* background-color: var(--bgcolor); */ /* background-color: var(--bgcolor); */
font-size: 15px; font-size: 15px;
font-weight: bold; font-weight: bold;
border-bottom: 0px solid #fff; border-bottom: 0px solid #fff;
} }
.el-collapse-item__header.is-active{ .el-collapse-item__header.is-active {
font-size: 15px; font-size: 15px;
font-weight: bold; font-weight: bold;
color:#1561E0; color: #1561E0;
} }
.el-collapse-item__arrow.is-active{ .el-collapse-item__arrow.is-active {
transform: rotate(0deg); transform: rotate(0deg);
} }
...@@ -448,9 +451,9 @@ ...@@ -448,9 +451,9 @@
padding-left: 20px; padding-left: 20px;
} }
.el-button{ .el-button {
height: 32px; height: 32px;
padding:0px 15px !important; padding: 0px 15px !important;
} }
...@@ -465,89 +468,92 @@ ...@@ -465,89 +468,92 @@
} }
/* 表格内+、-调整 */ /* 表格内+、-调整 */
.el-table__fixed-header-wrapper .cell .el-button{ .el-table__fixed-header-wrapper .cell .el-button {
width: 32px; width: 32px;
padding:0px !important; padding: 0px !important;
} }
/* 去除按钮默认圆角 */ /* 去除按钮默认圆角 */
.el-button{ .el-button {
border-radius:0px; border-radius: 0px;
} }
/* 去除input框默认圆角 */ /* 去除input框默认圆角 */
.el-input__inner{ .el-input__inner {
border-radius:0px; border-radius: 0px;
} }
/* 去除勾选框默认圆角 */ /* 去除勾选框默认圆角 */
.el-checkbox__inner{ .el-checkbox__inner {
border-radius:0px; border-radius: 0px;
} }
/* 去除文本框默认圆角 */ /* 去除文本框默认圆角 */
.el-textarea__inner{ .el-textarea__inner {
border-radius:0px; border-radius: 0px;
} }
/* 去除tabs标签默认圆角 */ /* 去除tabs标签默认圆角 */
.el-tabs--card>.el-tabs__header .el-tabs__nav{ .el-tabs--card>.el-tabs__header .el-tabs__nav {
border-radius:0px; border-radius: 0px;
margin-bottom: -1px; margin-bottom: -1px;
} }
/* 去除表格左右滑动默认圆角 */ /* 去除表格左右滑动默认圆角 */
.el-pagination.is-background .btn-next, .el-pagination.is-background .btn-prev, .el-pagination.is-background .el-pager li{ .el-pagination.is-background .btn-next,
border-radius:0px; .el-pagination.is-background .btn-prev,
.el-pagination.is-background .el-pager li {
border-radius: 0px;
} }
@media screen and (min-width: 2561px) { @media screen and (min-width: 2561px) {
#business_container .eibs-tab{ #business_container .eibs-tab {
padding: 25px 28px; padding: 25px 28px;
} }
} }
@media screen and (min-width: 1921px) and (max-width: 2560px) { @media screen and (min-width: 1921px) and (max-width: 2560px) {
#business_container .eibs-tab{ #business_container .eibs-tab {
padding: 20px 23px; padding: 20px 23px;
} }
} }
@media screen and (min-width: 1441px) and (max-width: 1920px) { @media screen and (min-width: 1441px) and (max-width: 1920px) {
#business_container .eibs-tab{ #business_container .eibs-tab {
padding: 20px 18px; padding: 20px 18px;
} }
} }
@media screen and (min-width: 1200px) and (max-width: 1440px) { @media screen and (min-width: 1200px) and (max-width: 1440px) {
#business_container .eibs-tab{ #business_container .eibs-tab {
padding: 20px 15px; padding: 20px 15px;
} }
} }
@media screen and (max-width: 1199px) { @media screen and (max-width: 1199px) {
#business_container .eibs-tab{ #business_container .eibs-tab {
padding: 20px 10px; padding: 20px 10px;
} }
} }
/* checkbox右对齐 */ /* checkbox右对齐 */
.el-checkbox{ .el-checkbox {
float: right; float: right;
text-align: center; text-align: center;
} }
/* checkbox左对齐 */ /* checkbox左对齐 */
.checkbox-left{ .checkbox-left {
float: left; float: left;
text-align: center; text-align: center;
} }
/* .el-checkbox:last-of-type{ /* .el-checkbox:last-of-type{
margin-right:30px; margin-right:30px;
} */ } */
...@@ -558,22 +564,23 @@ margin-left: 120px; ...@@ -558,22 +564,23 @@ margin-left: 120px;
} }
/* 去除工具条默认圆角 */ /* 去除工具条默认圆角 */
.toolbar-core{ .toolbar-core {
border-radius:0px; border-radius: 0px;
} }
/* 改变折叠面板箭头样式 */ /* 改变折叠面板箭头样式 */
.el-icon-arrow-right:before{ .el-icon-arrow-right:before {
content: ""; content: "";
display: inline-block; display: inline-block;
color: #ecf5ff; color: #ecf5ff;
width: 97%; /* width: 97%;
height: 5px; height: 5px; */
border-top: 2px solid; border-top: 2px solid;
margin-right: 10px; margin-right: 10px;
flex: 1;
} }
.el-icon-arrow-right:after{ .el-icon-arrow-right:after {
content: "\e791"; content: "\e791";
} }
...@@ -582,11 +589,11 @@ margin-left: 120px; ...@@ -582,11 +589,11 @@ margin-left: 120px;
} }
/* 左箭头 */ /* 左箭头 */
.el-icon-arrow-left:before{ .el-icon-arrow-left:before {
content: "\e792"; content: "\e792";
} }
.el-collapse-item__arrow{ .el-collapse-item__arrow {
border-bottom: 0px solid #fff; border-bottom: 0px solid #fff;
color: var(--themecolor); color: var(--themecolor);
margin: 0 10px 0 10px; margin: 0 10px 0 10px;
...@@ -594,6 +601,8 @@ margin-left: 120px; ...@@ -594,6 +601,8 @@ margin-left: 120px;
font-weight: 300; font-weight: 300;
content: ''; content: '';
flex: 1; flex: 1;
display: flex;
align-items: center;
} }
/* .el-input__inner { /* .el-input__inner {
...@@ -612,12 +621,11 @@ margin-left: 120px; ...@@ -612,12 +621,11 @@ margin-left: 120px;
} }
} */ } */
/* 更改文本框的placeholder的颜色 */ /* 更改文本框的placeholder的颜色 */
/* input[type=text]::placeholder { /* input[type=text]::placeholder {
color: blue; color: blue;
} */ } */
/* .el-input__inner::placeholder { /* .el-input__inner::placeholder {
color: blue; color: blue;
} */ } */
\ No newline at end of file
<template> <template>
<div class="clearfix"> <div class="clearfix">
<c-col :span="isAdd ? 21 : 22" style="margin-bottom: 18px" :offset="1"> <c-col :span="isAdd ? 24 : 24" style="margin-bottom: 18px" >
<c-table <c-table
style="text-align: center" style="text-align: center"
:ref="urls" :ref="urls"
...@@ -44,14 +44,48 @@ ...@@ -44,14 +44,48 @@
</el-table-column> </el-table-column>
</template> </template>
<slot></slot> <slot></slot>
</c-table> <el-table-column v-if="isAdd" :span="1" :offset="1" label="" prop="det" width="150px" fixed="right">
</c-col> <template slot-scope="scope" slot="header">
<c-col v-if="isAdd" :span="1" :offset="1"> <c-button
<div class="button_contains" > circle
style="padding: 4px"
class="el-icon-plus"
size="mini"
@click="handleAdd(scope)"
>
</c-button>
<c-button
style="padding: 4px"
circle
class="el-icon-minus"
size="mini"
@click="handleDelete(scope)"
>
</c-button>
</template>
<template slot-scope="scoped">
<c-button
style="margin-left: 0"
size="small"
type="primary"
icon="el-icon-info"
@click="detail1(scoped.$index, scoped.row)"
></c-button>
</template>
</el-table-column>
<!--div class="button_contains" >
<span class="add_del_button add_button" @click="handleAdd" >+</span> <span class="add_del_button add_button" @click="handleAdd" >+</span>
<span class="add_del_button" @click="handleDelete" >-</span> <span class="add_del_button" @click="handleDelete" >-</span>
</div> </div-->
</c-table>
</c-col> </c-col>
</div> </div>
</template> </template>
<script> <script>
......
...@@ -56,7 +56,8 @@ ...@@ -56,7 +56,8 @@
appenD-to-body appenD-to-body
v-if="showButtonFlg" v-if="showButtonFlg"
> >
<el-form-item label-width="0"> <el-form-item label-width="0" style="display: flex;
align-items: center;">
<el-checkbox-group v-model="columnGroup" @change="handleColumnChange"> <el-checkbox-group v-model="columnGroup" @change="handleColumnChange">
<el-checkbox <el-checkbox
class="selectColumnClass checkbox-left" class="selectColumnClass checkbox-left"
......
...@@ -2426,6 +2426,7 @@ const CodeTable = { ...@@ -2426,6 +2426,7 @@ const CodeTable = {
{ label: "N/A(仅限汇总填报时使用)", value: "N/A" }, { label: "N/A(仅限汇总填报时使用)", value: "N/A" },
{ label: "瑞典克朗", value: "SEK" }, { label: "瑞典克朗", value: "SEK" },
{ label: "新西兰元", value: "NZD" }, { label: "新西兰元", value: "NZD" },
], ],
curcod: [ curcod: [
{ label: "GHC - 加纳塞地", value: "GHC" }, { label: "GHC - 加纳塞地", value: "GHC" },
...@@ -7414,5 +7415,24 @@ const CodeTable = { ...@@ -7414,5 +7415,24 @@ const CodeTable = {
{ label: "国内证包买单据", value: "G" }, { label: "国内证包买单据", value: "G" },
{ label: "国内证第三方风险参贷", value: "V" }, { label: "国内证第三方风险参贷", value: "V" },
], ],
recgrptyp: [
{ label: "AR 暂收款项帐", value: "AR" },
{ label: "AS 应收款项帐", value: "AS" },
{ label: "BF 国结融资过渡帐", value: "BF" },
{ label: "CC 客户保证金帐", value: "CC" },
{ label: "CI 清算汇入帐", value: "CI" },
{ label: "CO 清算汇出帐", value: "CO" },
{ label: "FI 金融机构存款", value: "FI" },
{ label: "FX 外汇买卖类款", value: "FX" },
{ label: "IN 利息收入帐", value: "IN" },
{ label: "LA 应付款项帐", value: "LA" },
{ label: "LO 客户往来账", value: "LO" },
{ label: "NO 存放上级/国外账", value: "NO" },
{ label: "OB 表外类款", value: "OB" },
{ label: "PL 损益类账", value: "PL" },
{ label: "SC 其他客户保证金帐", value: "SC" },
{ label: "SP 国结专户", value: "SP" },
{ label: "TP 国际结算临时帐", value: "TP" },
],
} }
export default CodeTable; export default CodeTable;
...@@ -7,6 +7,7 @@ export default { ...@@ -7,6 +7,7 @@ export default {
if(rtnmsg.respCode == SUCCESS) if(rtnmsg.respCode == SUCCESS)
{ {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
this.updateModel(rtnmsg.data);
 this.stmData.data = rtnmsg.data.infbut_dspstm.rows;  this.stmData.data = rtnmsg.data.infbut_dspstm.rows;
} }
else else
...@@ -14,7 +15,7 @@ export default { ...@@ -14,7 +15,7 @@ export default {
this.$notify.error({title: '错误',message: '服务请求失败!'}); this.$notify.error({title: '错误',message: '服务请求失败!'});
} }
}, },
async onInfbutDsp(index,row){ async onInfbutDsp(idx,row){
const selIds= [idx + 1]; const selIds= [idx + 1];
const selDst= "dspstm";//dspstm是数据流 const selDst= "dspstm";//dspstm是数据流
let params = {selIds,selDst}; let params = {selIds,selDst};
...@@ -24,7 +25,7 @@ export default { ...@@ -24,7 +25,7 @@ export default {
{ {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
this.updateModel(rtnmsg.data); this.updateModel(rtnmsg.data);
this.tabVal = "actp0" this.root.tabVal = "actp0"
} }
else else
{ {
......
...@@ -14,6 +14,7 @@ export default class Infact{ ...@@ -14,6 +14,7 @@ export default class Infact{
cur:"", // Currency .cur cur:"", // Currency .cur
infbut:{ infbut:{
dspstm:"", // display stream .infbut.dspstm dspstm:"", // display stream .infbut.dspstm
selrow: 0,
}, },
recpan:{ recpan:{
pty:{ pty:{
......
...@@ -7,7 +7,8 @@ export default { ...@@ -7,7 +7,8 @@ export default {
if(rtnmsg.respCode == SUCCESS) if(rtnmsg.respCode == SUCCESS)
{ {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
 this.stmData.data = rtnmsg.data.infbut_dspstm.rows; this.updateModel(rtnmsg.data);
this.stmData.data = rtnmsg.data.infbut_dspstm.rows;
} }
else else
{ {
...@@ -73,5 +74,31 @@ export default { ...@@ -73,5 +74,31 @@ export default {
this.$notify.error({title: '错误',message: '服务请求失败!'}); this.$notify.error({title: '错误',message: '服务请求失败!'});
} }
}, },
// async pre(idx){
// const selIds= [idx + 1];
// const selDst= "dspstm";
// let params = {selIds,selDst};
// this.model.infbut.selrow = idx ;
// let rtnmsg = await this.executeRule("infbut.dsp", params)
// //TODO 处理数据逻辑
// //console.log(selrow)
// this.updateModel(rtnmsg.data);
// },
// async next(idx){
// const selIds= this.model.infbut.selrow;
// const selDst= "dspstm";
// let params = {selIds,selDst};
// this.model.infbut.selrow = idx+2 ;
// let rtnmsg = await this.executeRule("infbut.dsp", params)
// //TODO 处理数据逻辑
// //console.log(selrow)
// this.updateModel(rtnmsg.data);
// },
} }
\ No newline at end of file
...@@ -46,20 +46,20 @@ ...@@ -46,20 +46,20 @@
</c-col> </c-col>
<!-- 表格 --> <!-- 表格 -->
<c-col :span="24"> <!-- <c-col :span="24">
<c-docpre :model="model" :argadr="{ <c-docpre :model="model" :argadr="{
path: 'brdgrp.blk.prsdoc', path: 'brdgrp.blk.prsdoc',
grp: 'brtp', grp: 'brtp',
code: 'docpre', code: 'docpre',
}"></c-docpre> }"></c-docpre>
</c-col> </c-col> -->
</c-col> </c-col>
<!--=== ========================================右边======================================== --> <!--=== ========================================右边======================================== -->
<c-col :span="12" style="padding-left: 20px;"> <c-col :span="12" style="padding-left: 20px;">
<c-col :span="24"> <!-- <c-col :span="24">
<c-checkbox v-model="model.brdgrp.rec.igndisflg">忽略不符点</c-checkbox> <c-checkbox v-model="model.brdgrp.rec.igndisflg">忽略不符点</c-checkbox>
</c-col> </c-col>
...@@ -67,7 +67,32 @@ ...@@ -67,7 +67,32 @@
<c-checkbox v-model="docdisflg" <c-checkbox v-model="docdisflg"
@change="docdisDefault" @change="docdisDefault"
>录入不符点</c-checkbox> >录入不符点</c-checkbox>
<!-- <c-checkbox v-model="model.brdgrp.blk.docdisflg">不符点修改</c-checkbox> --> </c-col> -->
<c-col :span="12">
<el-form-item
label=""
prop="brdgrp.rec.igndisflg"
label-width="0px"
>
<c-checkbox
style="margin: 0px 0 10px 120px;float: left;"
v-model="model.brdgrp.rec.igndisflg"
>忽略不符点</c-checkbox
>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item
label=""
prop="brdgrp.blk.docdis"
>
<c-checkbox
style="margin: 0px 0 10px 150px;"
v-model="docdisflg"
@change="docdisDefault"
>录入不符点</c-checkbox
>
</el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
...@@ -87,7 +112,7 @@ ...@@ -87,7 +112,7 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="不符点通知日期" prop="brdgrp.rec.disdat" label-width="155px"> <el-form-item label="不符点通知日期" prop="brdgrp.rec.disdat">
<c-date-picker type="date" v-model="model.brdgrp.rec.disdat" style="width: 100%" <c-date-picker type="date" v-model="model.brdgrp.rec.disdat" style="width: 100%"
placeholder="请选择日期" disabled></c-date-picker> placeholder="请选择日期" disabled></c-date-picker>
</el-form-item> </el-form-item>
...@@ -96,6 +121,17 @@ ...@@ -96,6 +121,17 @@
</c-col> </c-col>
<!-- 底部表格 -->
<c-col :span="24" label-width="0px">
<c-docpre
:model="model"
:argadr="{
path: 'brdgrp.blk.prsdoc',
grp: 'brtp',
code: 'docpre',
}"
></c-docpre>
</c-col>
</div> </div>
......
...@@ -132,41 +132,41 @@ ...@@ -132,41 +132,41 @@
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="18" :offset="6"> <c-col :span="24">
<el-form-item label="" prop="" class="checkbox-left">
<c-checkbox v-model="model.brdgrp.blk.docdisflg" disabled <c-checkbox v-model="model.brdgrp.blk.docdisflg" disabled
>不符点修改</c-checkbox >不符点修改</c-checkbox
> >
</el-form-item>
<!-- <c-checkbox v-model="model.brdgrp.blk.docdisflg">不符点修改</c-checkbox> --> <!-- <c-checkbox v-model="model.brdgrp.blk.docdisflg">不符点修改</c-checkbox> -->
</c-col> </c-col>
</c-col> </c-col>
</div> </div>
</template> </template>
<script> <script>
import Api from '~/service/Api' import Api from "~/service/Api";
import commonProcess from '~/mixin/commonProcess' import commonProcess from "~/mixin/commonProcess";
import CodeTable from '~/config/CodeTable' import CodeTable from "~/config/CodeTable";
import Event from '~/model/Brtudp/Event' import Event from "~/model/Brtudp/Event";
import Ptap1 from '~/views/Public/Ptap1' import Ptap1 from "~/views/Public/Ptap1";
export default { export default {
components: { components: {
'c-ptap1': Ptap1, "c-ptap1": Ptap1,
// "c-ptap": Ptap, // "c-ptap": Ptap,
// "c-ptsmsg": Ptsmsg, // "c-ptsmsg": Ptsmsg,
}, },
inject: ['root'], inject: ["root"],
props: ['model', 'codes'], props: ["model", "codes"],
mixins: [commonProcess], mixins: [commonProcess],
data() { data() {
return {} return {};
}, },
methods: { methods: {
...Event, ...Event,
onSeainf(){}, onSeainf() {},
}, },
created: function () {}, created: function () {},
} };
</script> </script>
<style></style> <style></style>
...@@ -10,12 +10,12 @@ ...@@ -10,12 +10,12 @@
<el-collapse-item title="不符点通知" name="mt750p" v-if="model.brdgrp.rec.advtyp == '750'"> <el-collapse-item title="不符点通知" name="mt750p" v-if="model.brdgrp.rec.advtyp == '750'">
<m-mt750p :model="model" :codes="codes" /> <m-mt750p :model="model" :codes="codes" />
</el-collapse-item> </el-collapse-item>
<el-collapse-item title="装运详情" name="shpdet" v-if="model.brdgrp.rec.dscinsflg">
<m-shpdet :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="付款通知" name="mt754p" v-if="model.brdgrp.rec.advtyp == '754'"> <el-collapse-item title="付款通知" name="mt754p" v-if="model.brdgrp.rec.advtyp == '754'">
<m-mt754p :model="model" :codes="codes" /> <m-mt754p :model="model" :codes="codes" />
</el-collapse-item> </el-collapse-item>
<el-collapse-item title="装运详情" name="shpdet" v-if="model.brdgrp.rec.dscinsflg">
<m-shpdet :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="通知详情" name="othadvtypp" v-if="model.brdgrp.rec.advtyp == 'oth'"> <el-collapse-item title="通知详情" name="othadvtypp" v-if="model.brdgrp.rec.advtyp == 'oth'">
<m-othadvtypp :model="model" :codes="codes" /> <m-othadvtypp :model="model" :codes="codes" />
</el-collapse-item> </el-collapse-item>
...@@ -46,6 +46,8 @@ import Othadvtypp from "./Othadvtypp"; ...@@ -46,6 +46,8 @@ import Othadvtypp from "./Othadvtypp";
import Cfap from "./Cfap"; import Cfap from "./Cfap";
import Conp from "./Conp"; import Conp from "./Conp";
import Dclpp from "./Dclpp"; import Dclpp from "./Dclpp";
// import Shisuan from "./Shisuan";
export default { export default {
components: { components: {
......
...@@ -418,7 +418,7 @@ ...@@ -418,7 +418,7 @@
<!-- ====================================右边 ======================================--> <!-- ====================================右边 ======================================-->
<c-col :span="12" style="padding-left: 20px"> <c-col :span="12" style="padding-left: 20px">
<!-- 信用证余额 --> <!-- 信用证余额 -->
<c-col :span="12"> <c-col :span="13">
<c-form-item label="信用证余额" prop="lidgrp.cbs.opn1.cur"> <c-form-item label="信用证余额" prop="lidgrp.cbs.opn1.cur">
<c-input <c-input
v-model="model.lidgrp.cbs.opn1.cur" v-model="model.lidgrp.cbs.opn1.cur"
...@@ -428,8 +428,8 @@ ...@@ -428,8 +428,8 @@
></c-input> ></c-input>
</c-form-item> </c-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="11">
<c-form-item label="" label-width="10px" prop="lidgrp.cbs.opn1.amt"> <c-form-item label="" label-width="5px" prop="lidgrp.cbs.opn1.amt">
<c-input <c-input
v-model="model.lidgrp.cbs.opn1.amt" v-model="model.lidgrp.cbs.opn1.amt"
placeholder="" placeholder=""
......
<template> <template>
<div class="eibs-tab"> <div class="eibs">
<c-col :span="24"> <c-col :span="24">
<div class="e-table-wrapper"> <div class="e-table-wrapper">
...@@ -17,13 +17,13 @@ ...@@ -17,13 +17,13 @@
prop="cur" prop="cur"
label="业务币种" label="业务币种"
sortable sortable
width="80"> width="70">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="cbeamt" prop="cbeamt"
label="业务发生额" label="业务发生额"
sortable sortable
width="90"> width="100">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="reqtyp1" prop="reqtyp1"
......
...@@ -38,9 +38,28 @@ ...@@ -38,9 +38,28 @@
</el-tab-pane> </el-tab-pane>
<!--PD000001 --> <!--PD000001 -->
<!-- <el-tab-pane label="统一授信" name="limitbody">
<c-content>
<m-limitbody :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-collapse-item title="试算" name="shisuan">
<m-shisuan :model="model" :codes="codes"/>
</el-collapse-item> -->
<el-tab-pane label="统一授信" name="limitbody"> <el-tab-pane label="统一授信" name="limitbody">
<c-content> <c-content>
<div class="eibs-tab">
<el-collapse v-model="activeNames">
<el-collapse-item title="统一授信" name="limitbody">
<!-- 统一授信 -->
<m-limitbody :model="model" :codes="codes" /> <m-limitbody :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="试算" name="shisuan">
<!-- 试算 -->
<m-shisuan :model="model" :codes="codes" />
</el-collapse-item>
</el-collapse>
</div>
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
...@@ -237,7 +256,7 @@ import Ovwp from "./Ovwp"; ...@@ -237,7 +256,7 @@ import Ovwp from "./Ovwp";
// import Docpan from "./Docpan"; // import Docpan from "./Docpan";
// import Doctre from "./Doctre"; // import Doctre from "./Doctre";
import Cfap from "./Cfap"; import Cfap from "./Cfap";
import Shisuan from "./Shisuan"; // import Shisuan from "./Shisuan";
// import Limitbody from "./Limitbody"; // import Limitbody from "./Limitbody";
import Conp from "./Conp"; import Conp from "./Conp";
import Dclpp from "./Dclpp"; import Dclpp from "./Dclpp";
...@@ -251,6 +270,7 @@ import Coninfp from "~/views/Public/Coninfp"; ...@@ -251,6 +270,7 @@ import Coninfp from "~/views/Public/Coninfp";
import Docpan from "~/views/Public/Docpan"; import Docpan from "~/views/Public/Docpan";
import Doctre from "~/views/Public/Doctre"; import Doctre from "~/views/Public/Doctre";
import Limitbody from "~/views/Public/Limitbody"; import Limitbody from "~/views/Public/Limitbody";
import Shisuan from "~/views/Public/Shisuan";
export default { export default {
name: "Brtudp", name: "Brtudp",
......
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
<!-- SF000036 : Type --> <!-- SF000036 : Type -->
<c-col :span="8"> <c-col :span="8">
<el-form-item label=" Type" prop="recgrp.typ"> <el-form-item label=" Type" prop="typ">
<c-select v-model="model.recgrp.typ" style="width:100%" :placeholder="'Type'"> <c-select v-model="model.recgrp.rec.typ" style="width:100%" :placeholder="'Type'">
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
<!-- SF000034 : Currency --> <!-- SF000034 : Currency -->
<c-col :span="12"> <c-col :span="12">
<el-form-item label="Account Currency" prop="recgrp.cur"> <el-form-item label="Currency" prop="cur">
<c-select v-model="model.recgrp.cur" style="width:100%" :placeholder="'Account Currency'"> <c-select v-model="model.recgrp.rec.cur" style="width:100%" :placeholder="'Account Currency'">
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
<template> <template>
<div class="eibs-tab"> <div class="eibs-tab">
<c-content>
<template > <c-col :span="11">
<el-form <c-col :span="24">
class="m-table-search-form" <el-form-item label="Account No." prop="extkey">
ref="paramsForm" <c-input
:inline="true" v-model="model.extkey"
label-position="left" placeholder="请输入Account No">
label-width="110px" </c-input>
size="small"> </el-form-item>
<c-col :span="12">
<c-form-item :label="'Account No.'" prop="extkey">
<c-input v-model="model.extkey" maxlength="24" :placeholder="'请输入Account No'"></c-input>
</c-form-item>
</c-col>
<!-- SF000048 : Name of Account Owner -->
<c-col :span="12">
<c-form-item :label="'Name of Act. Owner'" prop="nam">
<c-input v-model="model.nam" maxlength="100" :placeholder="'请输入Name of Act. Owner'"></c-input>
</c-form-item>
</c-col> </c-col>
<!-- SF000045 : Holding Party --> <!-- SF000045 : Holding Party -->
<c-col :span="12"> <c-col :span="24">
<c-form-item :label="'Holding Party'" prop="hdlpty.extkey"> <el-form-item label="Holding Party" prop="hdlpty.extkey">
<c-input v-model="model.hdlpty.extkey" maxlength="24" :placeholder="'请输入 Holding Party'"></c-input> <c-input
</c-form-item> v-model="model.hdlpty.extkey"
</c-col> placeholder="请输入 Holding Party">
</c-input>
<!-- SF000050 : IBAN --> </el-form-item>
<c-col :span="12">
<c-form-item :label="'IBAN'" prop="iban">
<c-input v-model="model.iban" maxlength="40" :placeholder="'请输入IBAN'"></c-input>
</c-form-item>
</c-col> </c-col>
<!-- SF000042 : Type --> <!-- SF000042 : Type -->
<c-col :span="12"> <c-col :span="24">
<el-form-item :label="'type'" prop="typ"> <el-form-item label="Type" prop="typ">
<c-select v-model="model.typ" style="width:100%" :placeholder="'请输入type'"> <c-select
<el-option v-for="item in codes.typ" :key="item.value" :label="item.label" v-model="model.typ"
style="width:100%"
placeholder="请输入type">
<el-option
v-for="item in codes.recgrptyp"
:key="item.value"
:label="item.label"
:value="item.value"> :value="item.value">
</el-option> </el-option>
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col>
<c-col :span="12" :offset="1">
<!-- SF000048 : Name of Account Owner -->
<c-col :span="24">
<el-form-item
label="Name of Act. Owner"
prop="nam">
<c-input
v-model="model.nam"
placeholder="请输入Name of Act. Owner">
</c-input>
</el-form-item>
</c-col>
<!-- SF000050 : IBAN -->
<c-col :span="24">
<c-form-item label="IBAN" prop="iban">
<c-input
v-model="model.iban"
placeholder="请输入IBAN"></c-input>
</c-form-item>
</c-col>
<!-- SF000043 : Currency --> <!-- SF000043 : Currency -->
<c-col :span="12"> <c-col :span="24">
<el-form-item :label="'Currency'" prop="cur"> <el-form-item :label="'Currency'" prop="cur">
<c-select v-model="model.cur" style="width:100%" :placeholder="'请输入Currency'"> <c-select
<el-option v-for="item in codes.cur" :key="item.value" :label="item.label" v-model="model.cur"
style="width:100%"
:placeholder="'请输入Currency'">
<el-option
v-for="item in codes.curtxt1"
:key="item.value"
:label="item.label"
:value="item.value"> :value="item.value">
</el-option> </el-option>
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col>
<!--
<c-col :span="12">
<c-form-item label="display stream" prop="infbut.dspstm">
<c-input v-model="model.infbut.dspstm" :placeholder="$t('other.please_enter')+'display stream'"></c-input>
</c-form-item>
</c-col> -->
<c-col :span="24" style="text-align: right; height: 36.8px"> <c-col :span="24" style="text-align: right; height: 36.8px">
<el-button size="small" @click="handleReset">重置</el-button> <el-button size="small" @click="handleReset">重置</el-button>
...@@ -72,7 +88,7 @@ ...@@ -72,7 +88,7 @@
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
size="small" size="small"
@click="onInfbutSearow" @click="onInfbutSearow()"
>查询 >查询
</el-button> </el-button>
</c-col> </c-col>
...@@ -92,27 +108,22 @@ ...@@ -92,27 +108,22 @@
</c-button> </c-button>
</c-col> </c-col>
</el-form>
</template>
<c-col :span="24" > <c-col :span="24" >
<c-istream-table <c-istream-table
:list="stmData.data" :list="stmData.data"
:columns="stmData.columns" :columns="stmData.columns"
:showButtonFlg="true"> :showButtonFlg="false">
<c-table-column fixed="right" prop="op" label="详情" width="165px"> <c-table-column fixed="right" prop="op" label="操作" width="160px">
<template slot-scope="{ scope }"> <template slot-scope="{ scope }">
<c-button style="margin-left: 0" size="small" @click="onInfbutDsp(scope.$index, scope.row)">详情 </c-button> <c-button style="margin-left: 0" size="small" @click="onInfbutDsp(scope.$index, scope.row)">详情 </c-button>
</template> </template>
</c-table-column> </c-table-column>
</c-istream-table> </c-istream-table>
</c-col> </c-col>
</c-content>
</div> </div>
</template> </template>
...@@ -132,14 +143,14 @@ export default { ...@@ -132,14 +143,14 @@ export default {
stmData: { stmData: {
columns: [ columns: [
"1 1 \"Account Owner\" 180 ", "8 1 \"Account Owner\" 180 ",
"1 2\"Typ\" 150", "3 2\"Typ\" 160",
"2 3 \"Cur\" 150", "4 3 \"Cur\" 160",
"3 4 \"Account No.\" 180", "5 4 \"Account No.\" 180",
"4 5 \" Owner Number\" 150 ", "6 5 \" Owner Number\" 180 ",
"5 6 \"Servicing Party \" 150",
"6 7 \"Servicing Number\" 150",
"9 6 \"Servicing Party \" 160",
"10 7 \"Servicing Number\" 160",
], ],
data: [ ] data: [ ]
...@@ -160,7 +171,12 @@ return this.model.infbut.dspstm.rows; ...@@ -160,7 +171,12 @@ return this.model.infbut.dspstm.rows;
} */ } */
}, },
methods:{...Event}, methods:{
chooseRowEvent(row) {
this.model.infbut.selrow = row.IDX + 1;
},
...Event},
created:function(){ created:function(){
} }
......
...@@ -4,15 +4,15 @@ ...@@ -4,15 +4,15 @@
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick"> <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<!--infact PD000041 Search Panel --> <!--infact PD000041 Search Panel -->
<el-tab-pane :label="'查询页面'" name="infsea"> <el-tab-pane :label="'查询页面'" name="infsea">
<m-infsea :model="model" :codes="codes"/> <m-infsea :model="model" :codes="codes" ref="infsea"/>
</el-tab-pane> </el-tab-pane>
<!--actp PD000000 Accounts --> <!--actp PD000000 Accounts -->
<el-tab-pane :label="'详情'" name="actp0"> <el-tab-pane :label="'详情'" name="actp0">
<m-actp0 :model="model" :codes="codes"/> <m-actp0 :model="model" :codes="codes" ref="actp0"/>
</el-tab-pane> </el-tab-pane>
<!--actp PD000700 Info and Stoptext --> <!--actp PD000700 Info and Stoptext -->
<el-tab-pane :label="'Info and Stoptext'" name="oitpan"> <el-tab-pane :label="'Info and Stoptext'" name="oitpan">
<m-oitpan :model="model" :codes="codes"/> <m-oitpan :model="model" :codes="codes" ref="oitpan"/>
</el-tab-pane> </el-tab-pane>
......
<template> <template>
<div class="eibs-tab"> <div class="eibs-tab">
<c-col :span="24" style="text-align:right; height:36.8px"> <!-- <c-col :span="24" style="text-align:right; height:36.8px">
<el-button-group> <el-button-group>
<el-button type="primary" icon="el-icon-arrow-left">上一页</el-button> <el-button type="primary" icon="el-icon-arrow-left" @click="pre(idx)">上一页</el-button>
<el-button type="primary">下一页<i class="el-icon-arrow-right el-icon--right"></i></el-button> <el-button type="primary" @click="next(idx)">下一页<i class="el-icon-arrow-right el-icon--right"></i></el-button>
</el-button-group> </el-button-group>
</c-col> </c-col> -->
<!-- <c-col :span="12"> <!-- <c-col :span="12">
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
<c-col :span="12"> <c-col :span="12">
<el-form-item label="Fee Code" prop="rec.cod"> <el-form-item label="Fee Code" prop="rec.cod">
<c-input v-model="model.cod" maxlength="6" placeholder="请输入Fee Code"></c-input> <c-input v-model="model.rec.cod" maxlength="6" placeholder="请输入Fee Code"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12" > <c-col :span="12" >
<el-form-item label="Description" prop="rec.nam"> <el-form-item label="Description" prop="nam">
<c-input v-model="model.nam" maxlength="32" placeholder="请输入Description"></c-input> <c-input v-model="model.nam" maxlength="32" placeholder="请输入Description"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
<template> <template>
<div class="eibs-tab" > <div class="eibs-tab" >
<c-content> <c-content>
<el-row > <c-col :span="11">
<c-col :span="12" > <c-col :span="24" >
<el-form-item label="FeeCode" prop="rec.cod"> <el-form-item label="FeeCode" prop="rec.cod">
<c-input v-model="model.cod" maxlength="20" placeholder="请输入FeeCode"></c-input> <c-input
v-model="model.cod"
placeholder="请输入FeeCode"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col>
<c-col :span="12" > <c-col :span="12" :offset="1">
<c-col :span="24" >
<el-form-item label="Description" prop="rec.nam"> <el-form-item label="Description" prop="rec.nam">
<c-input v-model="model.nam" maxlength="20" placeholder="请输入Description"></c-input> <c-input v-model="model.nam" placeholder="请输入Description"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col>
<!--重置--> <!--重置-->
<c-col :span="24" style="text-align: right; height: 36.8px" > <c-col :span="24" style="text-align: right; height: 36.8px" >
<el-button size="small" @click="onInfbutClr">重置</el-button> <el-button size="small" @click="onInfbutClr">重置</el-button>
<el-button type="primary" icon="el-icon-search" size="small" @click="onInfbutSearow()" >查询</el-button > <el-button type="primary" icon="el-icon-search" size="small" @click="onInfbutSearow()">查询</el-button >
</c-col> </c-col>
</el-row>
<div style="margin-top:20px;"> <div style="margin-top:20px;">
<!-- EXCEL导出 <!-- EXCEL导出
...@@ -41,12 +46,13 @@ ...@@ -41,12 +46,13 @@
</div> </div>
<el-row> <c-col :span="24" >
<c-istream-table <c-istream-table
:list="stmData.data" :list="stmData.data"
:columns="stmData.columns" :columns="stmData.columns"
:showButtonFlg="true"> v-on:chooseRowEvent="chooseRowEvent"
<c-table-column fixed="right" prop="op" label="操作" width="150px"> :showButtonFlg="false">
<c-table-column fixed="right" prop="op" label="操作" width="160px">
<template slot-scope="{ scope }"> <template slot-scope="{ scope }">
<c-button size="small" type="primary" @click="onInfbutDsp(scope.$index, scope.row)">详情 </c-button> <c-button size="small" type="primary" @click="onInfbutDsp(scope.$index, scope.row)">详情 </c-button>
...@@ -70,20 +76,15 @@ ...@@ -70,20 +76,15 @@
</template> </template>
</c-table-column> </c-table-column>
</c-istream-table> </c-istream-table>
</el-row> </c-col>
<!-- <c-col :span="12">
<el-form-item label="display stream" prop="infbut.dspstm">
<c-input v-model="model.infbut.dspstm" placeholder="请输入display stream"></c-input>
</el-form-item>
</c-col> -->
<c-function-btn <!-- <c-function-btn
:handleSubmit="handleSubmit" :handleSubmit="handleSubmit"
:handleCheck="handleCheck" :handleCheck="handleCheck"
:handleStash="handleStash" :handleStash="handleStash"
> >
</c-function-btn> </c-function-btn> -->
</c-content> </c-content>
</div> </div>
...@@ -110,9 +111,9 @@ export default { ...@@ -110,9 +111,9 @@ export default {
stmData: { stmData: {
columns: [ columns: [
"1 1 \"Fee Cod\" 160 ", "1 1 \"Fee Cod\" 160 ",
{ index: 1, position: 2, width: 190, pattern: 'code', label: 'description',"code":"fepfeecod"}, { index: 1, position: 2, width: 200, pattern: 'code', label: 'description',"code":"fepfeecod"},
// "1 2\"Description\" 160 ", // "1 2\"Description\" 160 ",
"2 3 \"Relevant Amount\" 160", "2 3 \"Relevant Amount\" 180",
"3 4 \"SWIFT / DTA Code\" 180", "3 4 \"SWIFT / DTA Code\" 180",
"4 5 \" Booking Type\" 160 ", "4 5 \" Booking Type\" 160 ",
"5 6 \" Fee Payer (Default) \" 180", "5 6 \" Fee Payer (Default) \" 180",
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</el-tab-pane> </el-tab-pane>
<!--PD000119 --> <!--PD000119 -->
<el-tab-pane label="费用详情" name="feep"> <el-tab-pane label="费用详情" name="feep">
<m-feep :model="model" :codes="codes"/> <m-feep :model="model" :codes="codes" ref="feep"/>
</el-tab-pane> </el-tab-pane>
</c-tabs> </c-tabs>
</el-form> </el-form>
......
...@@ -117,10 +117,10 @@ ...@@ -117,10 +117,10 @@
<c-col :span="12"> <c-col :span="12">
<el-form-item label="" prop="trnmod.swiadd.ameamt"> <el-form-item label="" prop="trnmod.swiadd.ameamt">
<c-input <c-input-currency
v-model="model.trnmod.swiadd.ameamt" v-model="model.trnmod.swiadd.ameamt"
placeholder="请输入增减金额." placeholder="请输入增减金额."
></c-input> ></c-input-currency>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
......
...@@ -254,70 +254,26 @@ ...@@ -254,70 +254,26 @@
<c-col :span="24">
<c-col :span="23"> <el-form-item label="附加当事人" >
<div class="e-table-wrapper"> <c-edit-table :model="model" v-bind="ptsaddg">
<c-table <el-table-column label="操作" align="center">
:data="model.litp.ptsaddp.ptsaddg" <template slot-scope="scope">
style="width: 100%"
>
<c-table-column
prop="rol"
label="角色"
sortable
width="300">
</c-table-column>
<c-table-column
prop="当事人"
label="Party"
sortable
width="300">
</c-table-column>
<c-table-column
prop="nam"
label="当事人名称"
sortable
width="300">
</c-table-column>
<c-table-column
prop="ref"
label="名称地址"
sortable
width="300">
</c-table-column>
<el-table-column label="" prop="det" width="100px" fixed="right">
<template slot-scope="scope" slot="header">
<el-button
circle
style="padding:4px"
class="el-icon-plus"
size="mini"
@click="addRow(scope)"
>
</el-button>
<el-button <el-button
style="padding:4px"
circle
class="el-icon-minus"
size="mini" size="mini"
@click="removeRow(scope)" @click="handleEdit(scope.$index, scope.row)"
>
</el-button>
</template>
<template slot-scope="scoped">
<el-button
style="margin-left:0"
size="small"
type="primary" type="primary"
@click="detail1(scoped.$index, scoped.row)" icon="el-icon-info"
>详情</el-button ></el-button
> >
</template> </template>
</el-table-column> </el-table-column>
</c-table> </c-edit-table>
</el-form-item>
</div>
</c-col> </c-col>
</div> </div>
</template> </template>
<script> <script>
...@@ -332,7 +288,33 @@ export default { ...@@ -332,7 +288,33 @@ export default {
mixins: [commonProcess], mixins: [commonProcess],
data(){ data(){
return { return {
ptsaddg: {
columns: [
{
title: "角色",
width: "120px",
dataIndex: "rol",
show: "select",
},
{
title: "当事人",
width: "180px",
dataIndex: "ptyextkey",
show: "input",
},
{
title: "名称",
width: "250px",
dataIndex: "nam",
},
{
title: "参考号",
width: "250px",
dataIndex: "ref",
},
],
urls: "litp.ptsaddp.ptsaddg",
},
} }
}, },
methods:{...Event}, methods:{...Event},
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="eibs"> <div class="eibs">
<c-col :span="11"> <c-col :span="11">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Special Payment Conditions for Beneficiary" prop="lidgrp.blk.spcben"> <el-form-item label="受益人的特殊付款条款" prop="lidgrp.blk.spcben">
<c-input <c-input
:rows="12" :rows="12"
:disabled="this.flag1" :disabled="this.flag1"
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<c-col :span="11"> <c-col :span="11">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="仅适用于银行的特殊付款条" prop="lidgrp.blk.spcrcb"> <el-form-item label="仅适用于银行的特殊付款条" prop="lidgrp.blk.spcrcb">
<c-input <c-input
:rows="12" :rows="12"
:disabled="this.flag1" :disabled="this.flag1"
......
...@@ -8,6 +8,14 @@ ...@@ -8,6 +8,14 @@
<!-- 详情 --> <!-- 详情 -->
<m-detp :model="model" :codes="codes" /> <m-detp :model="model" :codes="codes" />
</el-collapse-item> </el-collapse-item>
<el-collapse-item
title="附加金额"
name="aamp"
v-if="model.litp.aamp.aammod.addamtflg"
>
<!-- 附加金额 -->
<m-aamp :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="当事人" name="ptyp"> <el-collapse-item title="当事人" name="ptyp">
<!-- 当事人 --> <!-- 当事人 -->
<m-ptyp :model="model" :codes="codes" /> <m-ptyp :model="model" :codes="codes" />
...@@ -25,14 +33,6 @@ ...@@ -25,14 +33,6 @@
<m-doxp :model="model" :codes="codes" :dtyp="'adcp'" :rec="'lid'" /> <m-doxp :model="model" :codes="codes" :dtyp="'adcp'" :rec="'lid'" />
</el-collapse-item> </el-collapse-item>
<el-collapse-item <el-collapse-item
title="附加金额"
name="aamp"
v-if="model.litp.aamp.aammod.addamtflg"
>
<!-- 附加金额 -->
<m-aamp :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item
title="仅适用于指定银行的特殊付款条款" title="仅适用于指定银行的特殊付款条款"
name="spcrcvp" name="spcrcvp"
v-if="model.lidgrp.rec.spcrcbflg" v-if="model.lidgrp.rec.spcrcbflg"
......
...@@ -448,8 +448,6 @@ ...@@ -448,8 +448,6 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="附加当事人" > <el-form-item label="附加当事人" >
</el-form-item>
</c-col>
<c-edit-table :model="model" v-bind="ptsaddg"> <c-edit-table :model="model" v-bind="ptsaddg">
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -463,6 +461,8 @@ ...@@ -463,6 +461,8 @@
</template> </template>
</el-table-column> </el-table-column>
</c-edit-table> </c-edit-table>
</el-form-item>
</c-col>
<!-- <!--
<c-col :span="12"> <c-col :span="12">
<span v-text="model.litp.avblab" data-path=".litp.avblab" > </span> <span v-text="model.litp.avblab" data-path=".litp.avblab" > </span>
......
...@@ -111,4 +111,10 @@ export default { ...@@ -111,4 +111,10 @@ export default {
display: block; display: block;
clear: both; clear: both;
} }
.eibs{
margin-top: 20px;
}
</style> </style>
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
</div> </div>
<div class="self_header_label"> <div class="self_header_label">
<h2>国际结算系统</h2> <h2>国际结算系统</h2>
<h2 style="margin-left: 15px;">International Settlement</h2> <!--h2 style="margin-left: 15px;">International Settlement</h2-->
</div> </div>
<div class="header-tool"> <div class="header-tool">
<div class="header-subInstName"> <div class="header-subInstName">
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<h2>国际结算系统</h2> <h2>国际结算系统</h2>
</div> </div>
<div id="loginForm"> <div id="loginForm">
<h2>International Settlement</h2> <!--div class="en-title">International Trade Financing</div-->
<el-form <el-form
:model="loginForm" :model="loginForm"
status-icon status-icon
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
size="small" size="small"
:hide-required-asterisk="true" :hide-required-asterisk="true"
> >
<el-form-item prop="username" label="用户名"> <el-form-item prop="username" label="用户名" style="margin-top: 50px;">
<el-input prefix-icon="el-icon-user" :placeholder="$t('login.namePlaceholder')" v-model="loginForm.username"></el-input> <el-input prefix-icon="el-icon-user" :placeholder="$t('login.namePlaceholder')" v-model="loginForm.username"></el-input>
</el-form-item> </el-form-item>
...@@ -26,15 +26,17 @@ ...@@ -26,15 +26,17 @@
</el-form-item> </el-form-item>
<el-button style="width: 100%;height: 40px; margin: 20px 0 0" type="primary" @click="submitForm('loginForm')" > <el-button style="width: 100%;height: 40px; margin: 20px 0 0" type="primary" @click="submitForm('loginForm')" >
{{ $t("login.loginBtn") }} 登陆<!--{{ $t("login.loginBtn") }}-->
</el-button> </el-button>
</el-form> </el-form>
</div> </div>
<div class="copy-right"> <div class="copy-right">
<p>新晨科技 版权所有</p> <span>
<p>COPYRIGHT BRILLIANCE</p> <span class="copyright-icon">©</span>
<p style="margin-bottom: 15%;">2022</p> 2022 新晨公司版权所有
</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -90,6 +92,16 @@ export default { ...@@ -90,6 +92,16 @@ export default {
background-image: url("../../assets/login_bg.png"); background-image: url("../../assets/login_bg.png");
background-size: cover; background-size: cover;
} }
.loginContainer .en-title {
font-weight: 600;
font-size: 0.4em;
text-align: center;
margin: 10px 0px 20px;
color: #0000005e;
}
#loginForamWrapper { #loginForamWrapper {
width: 20%; width: 20%;
margin-left: 15%; margin-left: 15%;
...@@ -139,7 +151,7 @@ export default { ...@@ -139,7 +151,7 @@ export default {
flex-direction: column; flex-direction: column;
justify-content: flex-end; justify-content: flex-end;
text-align: center; text-align: center;
font-size: 14px; font-size: 0.4em;
color: #858585; color: #858585;
} }
...@@ -147,3 +159,4 @@ export default { ...@@ -147,3 +159,4 @@ export default {
margin: 3px 0; margin: 3px 0;
} }
</style> </style>
\ No newline at end of file
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="tenpct" label="%" width="70px"> <el-table-column prop="tenpct" label="%" width="70px">
</el-table-column> </el-table-column>
<el-table-column prop="acc" label="核心账号" width="160px"> <el-table-column prop="acc" label="核心账号" width="170px">
<!-- check,需用el-form-item标签包起来 --> <!-- check,需用el-form-item标签包起来 -->
<template slot-scope="scope"> <template slot-scope="scope">
<el-form-item <el-form-item
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="valdat" label="起息日" width="auto"> <el-table-column prop="valdat" label="起息日" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ dateFormat(scope.row.valdat) }} {{ dateFormat(scope.row.valdat) }}
</template> </template>
......
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="款人" width="110px"> <el-table-column label="款人" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-form-item <el-form-item
label-width="0" label-width="0"
......
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