Skip to content

V
vue-gjjs
Commit 4a45ece3 by lianyang
Options

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 abf65ce4 aede9ac5
Showing with 193 additions and 154 deletions
src/components/FunctionBtn.vue
......@@ -127,10 +127,11 @@ export default {
display: flex; /*flex布局*/
flex-direction: row;
flex-wrap: nowrap;
justify-content: space-between;
justify-content: center;
align-items: flex-start;
height: 24px;
margin-bottom: 5px;
text-align: center;
margin-right:10px;
}
.m-funcBtn-eContainer {
order: 1;
......@@ -144,7 +145,7 @@ export default {
.m-funcBtn-eContainer button,
.m-funcBtn-eContainer .el-button + .el-button {
margin: 0px 0px 0px 0px;
margin: 0px 10px 0px 0px;
}
.m-funcBtn-eContainer .el-button--default {
background-image: linear-gradient(#fff,#dedede);
......@@ -186,4 +187,12 @@ export default {
background-color: #b3d8ff;
color: #606266;
}
/* ui美化 */
.m-Btn-eContainer .el-button--small,.m-Btn-eContainer .el-button--small.is-round {
padding: 10px 30px;
font-size: 16px;
height: 40px;
font-weight:bold;
}
</style>
src/components/SearchInput.vue
......@@ -5,7 +5,7 @@
placeholder="全局搜索"
v-model="searchContent"
:clearable="true"
@keyup.enter.native="searchEvent"
@keydown.up.native="preDownEvent"
@keyup.up.native="preUpEvent"
......@@ -259,9 +259,17 @@ export default {
}
.search-wrapper >>> .el-input {
z-index: 101;
/* position:absolute; */
}
.search-wrapper >>> .el-input input::-ms-input-placeholder{text-align: center;}
.search-wrapper >>> .el-input input::-webkit-input-placeholder{text-align: center;}
.search-wrapper >>> .el-input .el-input__inner {
height: 30px;
/* height: 30px; */
padding: 10px 20px;
/* position:relative;
top:-3px; */
}
.search-sug {
position: absolute;
......
src/components/c-page.vue
......@@ -4,7 +4,7 @@
<i class="el-icon-location" style="color: #409eff;"></i>
<span>{{ title }}</span>
</div> -->
<div style="flex: 1; padding: 5px 15px; position: relative">
<div style="flex: 1; padding: 0px 15px 5px; position: relative">
<slot></slot>
</div>
</div>
......
src/views/Business/Infbed/index.vue
......@@ -201,6 +201,6 @@ export default {
background-color: #f7faff;
}
.eContainer {
padding: 3px 15px;
padding: 0px 15px 3px;
}
</style>
src/views/Business/Infbrd/Infsea.vue
......@@ -452,9 +452,6 @@ export default {
.m-table-search {
padding: 20px 0px 10px 0px;
}
.el-form-item__label{
text-align: left!important;
}
.el-row > .el-col {
padding-right: 10px!important;
}
......
src/views/Business/Inflid/Infsea.vue
......@@ -735,9 +735,6 @@ export default {
.m-table-search {
padding: 20px 0px 10px 0px;
}
.el-form-item__label{
text-align: left!important;
}
.el-row > .el-col {
padding-right: 10px!important;
}
......
src/views/Business/Litacp/Detp.vue
......@@ -136,13 +136,13 @@
<c-col :span="12">
<el-form-item label="始发（航空）站"" prop="lidgrp.rec.porloa">
<el-form-item label="始发（航空）站" prop="lidgrp.rec.porloa">
<c-input disabled v-model="model.lidgrp.rec.porloa" maxlength="65" placeholder="请输入Air-/Port of Departure"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="终点（航空）站"" prop="lidgrp.rec.pordis">
<el-form-item label="终点（航空）站" prop="lidgrp.rec.pordis">
<c-input disabled v-model="model.lidgrp.rec.pordis" maxlength="65" placeholder="请输入Air-/Port of Destination"></c-input>
</el-form-item>
</c-col>
......
src/views/Business/Litame/Detp.vue
......@@ -153,13 +153,13 @@
<c-col :span="24">
<el-form-item label="始发（航空）站"" prop="lidgrp.rec.porloa">
<el-form-item label="始发（航空）站" prop="lidgrp.rec.porloa">
<c-input v-model="model.lidgrp.rec.porloa" maxlength="65" placeholder="请输入Air-/Port of Departure"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="终点（航空）站"" prop="lidgrp.rec.pordis">
<el-form-item label="终点（航空）站" prop="lidgrp.rec.pordis">
<c-input v-model="model.lidgrp.rec.pordis" maxlength="65" placeholder="请输入Air-/Port of Destination"></c-input>
</el-form-item>
</c-col>
......
src/views/Business/Litdla/Detp.vue
......@@ -111,13 +111,13 @@
<c-col :span="12">
<el-form-item label="始发（航空）站"" prop="lidgrp.rec.porloa">
<el-form-item label="始发（航空）站" prop="lidgrp.rec.porloa">
<c-input disabled v-model="model.lidgrp.rec.porloa" maxlength="65" placeholder="请输入Air-/Port of Departure"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="终点（航空）站"" prop="lidgrp.rec.pordis">
<el-form-item label="终点（航空）站" prop="lidgrp.rec.pordis">
<c-input disabled v-model="model.lidgrp.rec.pordis" maxlength="65" placeholder="请输入Air-/Port of Destination"></c-input>
</el-form-item>
</c-col>
......
src/views/Business/Litopn/Addbcb.vue
<template>
<div class="eibs-tab">
<c-col :span="24">
<el-col :span="12">
<el-form-item label="货物简称" prop="godnam">
<c-input
v-model="model.godnam"
maxlength="40"
style="width: 50%"
placeholder="请输入货物简称"
></c-input>
</el-form-item>
</el-col>
</c-col>
<el-collapse v-model="activeNames" @change="handleChange">
<el-collapse-item title="备查表" name="1">
<c-col :span="24">
<el-col :span="12">
<el-form-item label="货物简称" prop="godnam">
<c-input
v-model="model.godnam"
maxlength="40"
style="width: 50%"
placeholder="请输入货物简称"
></c-input>
</el-form-item>
</el-col>
</c-col>
<c-col :span="24">
<el-form-item label="备案表类型">
<c-checkbox v-model="model.bcbtyp1">不在名录</c-checkbox>
<c-checkbox v-model="model.bcbtyp2">异地付汇</c-checkbox>
<c-checkbox v-model="model.bcbtyp3">转口贸易</c-checkbox>
<c-checkbox v-model="model.bcbtyp4">90天以上信用证</c-checkbox>
<c-checkbox v-model="model.bcbtyp5">不需要</c-checkbox>
<c-checkbox v-model="model.bcbtyp6">其它</c-checkbox>
</el-form-item>
<el-form-item label="" prop="bcbtyp7" v-if="model.bcbtyp6">
<c-input
v-model="model.bcbtyp7"
maxlength="30"
style="width: 21.8%"
placeholder="请输入备查表类型填写文本框"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="备案表类型">
<c-checkbox v-model="model.bcbtyp1">不在名录</c-checkbox>
<c-checkbox v-model="model.bcbtyp2">异地付汇</c-checkbox>
<c-checkbox v-model="model.bcbtyp3">转口贸易</c-checkbox>
<c-checkbox v-model="model.bcbtyp4">90天以上信用证</c-checkbox>
<c-checkbox v-model="model.bcbtyp5">不需要</c-checkbox>
<c-checkbox v-model="model.bcbtyp6">其它</c-checkbox>
</el-form-item>
<el-form-item label="" prop="bcbtyp7" v-if="model.bcbtyp6">
<c-input
v-model="model.bcbtyp7"
maxlength="30"
style="width: 21.8%"
placeholder="请输入备查表类型填写文本框"
></c-input>
</el-form-item>
</c-col>
<!-- <c-col :span="4" class=".centerLable">
<!-- <c-col :span="4" class=".centerLable">
<c-checkbox v-model="model.bcbtyp1">不在名录</c-checkbox>
</c-col>
......@@ -57,23 +58,20 @@
<c-checkbox v-model="model.bcbtyp6">其它</c-checkbox>
</c-col> -->
<c-col :span="10" :pull=5>
</c-col>
<c-col :span="10" :pull="5"> </c-col>
<c-col :span="18">
<el-form-item label="备案表效期" prop="bcbdat">
<c-date-picker
type="date"
v-model="model.bcbdat"
style="width: 30.75%"
placeholder="请选择备案表效期"
></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="18">
<el-form-item label="备案表效期" prop="bcbdat">
<c-date-picker
type="date"
v-model="model.bcbdat"
style="width: 30.75%"
placeholder="请选择备案表效期"
></c-date-picker>
</el-form-item>
</c-col>
<!--
<!--
<c-col :span="15" :push="1">
<el-form-item label="1、申请人与我行已签署贸易融资协议（如需）;" label-width="360px"></el-form-item>
</c-col>
......@@ -90,25 +88,34 @@
<el-form-item label="4、占用授信额度的开证业务;" label-width="360px"></el-form-item>
</c-col>
-->
<el-col :span="24">
<el-form-item label="交易银行部意见">
<div
v-text="model.label1"
data-path=".label1"
class="lableSize"
></div>
<div v-text="model.label2" data-path=".label2" class="lableSize">
</div>
<el-col :span="24">
<el-form-item label="交易银行部意见">
<div
v-text="model.label1"
data-path=".label1"
class="lableSize"
></div>
<div v-text="model.label3" data-path=".label3" class="lableSize">
</div>
<div v-text="model.label4" data-path=".label4" class="lableSize">
</div>
</el-form-item>
</el-col>
<div
v-text="model.label2"
data-path=".label2"
class="lableSize"
></div>
<!-- <c-col :span="15" :push="1">
<div
v-text="model.label3"
data-path=".label3"
class="lableSize"
></div>
<div
v-text="model.label4"
data-path=".label4"
class="lableSize"
></div>
</el-form-item>
</el-col>
<!-- <c-col :span="15" :push="1">
<span v-text="model.label2" data-path=".label2" class="lableSize"> </span>
</c-col>
......@@ -121,24 +128,24 @@
</c-col>
-->
<c-col :span="24">
<el-form-item label="" prop="label5">
<c-select
v-model="model.label5"
style="width: 33%"
placeholder="请选择国际部意见"
:code="codes.label5"
>
</c-select>
</el-form-item>
</c-col>
<!--
<c-col :span="24">
<el-form-item label="" prop="label5">
<c-select
v-model="model.label5"
style="width: 33%"
placeholder="请选择国际部意见"
:code="codes.label5"
>
</c-select>
</el-form-item>
</c-col>
<!--
<c-col :span="12">
<span v-text="model.label6" data-path=".label6" > </span>
</c-col>
-->
<!-- <c-col :span="24">
<!-- <c-col :span="24">
<el-form-item label="异地通知" prop="bccls1" label-width="270px">
<c-select v-model="model.bccls1" style="width:30%" placeholder="请选择异地通知" :code="codes.bccls1">
</c-select>
......@@ -186,6 +193,12 @@
</c-select>
</el-form-item>
</c-col> -->
</el-collapse-item>
<el-collapse-item title="附言" name="2">
<!-- 附言 -->
<m-coninfp :model="model" :codes="codes" />
</el-collapse-item>
</el-collapse>
</div>
</template>
<script>
......@@ -193,15 +206,26 @@ import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable";
import Event from "~/model/Litopn/Event";
import Coninfp from "~/views/Public/Coninfp";
export default {
components: {
"m-coninfp": Coninfp,
},
inject: ["root"],
props: ["model", "codes"],
mixins: [commonProcess],
data() {
return {};
return {
activeNames: ["1"],
};
},
methods: {
...Event,
handleChange(val) {
console.log(val);
},
},
methods: { ...Event },
created: function () {},
};
</script>
......
src/views/Business/Litopn/Detp.vue
......@@ -217,13 +217,13 @@
<c-col :span="24">
<el-form-item label="始发（航空）站"" prop="lidgrp.rec.porloa">
<el-form-item label="始发（航空）站" prop="lidgrp.rec.porloa">
<c-input v-model="model.lidgrp.rec.porloa" maxlength="65" placeholder="请输入地址"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="终点（航空）站"" prop="lidgrp.rec.pordis">
<el-form-item label="终点（航空）站" prop="lidgrp.rec.pordis">
<c-input v-model="model.lidgrp.rec.pordis" maxlength="65" placeholder="请输入地址"></c-input>
</el-form-item>
</c-col>
......
src/views/Business/Litopn/index.vue
<template>
<c-page title="进口信用证开立">
<div class="eContainer">
<c-function-btn
:handleSubmit="handleSubmit"
:handleCheck="handleCheck"
:handleStash="handleStash"
>
</c-function-btn>
<el-form
:model="model"
:rules="rules"
ref="modelForm"
label-width="160px"
size="small"
label-position="left"
label-position="right"
:validate-on-rule-change="false"
>
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
<!--PD000001 -->
<el-tab-pane :label="$t('litp.PD000001')" name="ovwp">
<el-tab-pane label="业务信息" name="ovwp">
<c-content>
<m-ovwp :model="model" :codes="codes" />
</c-content>
......@@ -27,102 +21,107 @@
<!--PD000001 -->
<el-tab-pane
v-if="model.litp.aamp.aammod.addamtflg"
:label="$t('aamp.PD000001')"
label="附加金额"
name="aamp"
>
<m-aamp :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000077 -->
<el-tab-pane :label="$t('litp.PD000077')" name="detp">
<!-- <el-tab-pane label="详情" name="detp">
<c-content>
<m-detp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
</el-tab-pane> -->
<!--PD000042 -->
<el-tab-pane :label="$t('litp.PD000042')" name="ptyp">
<!-- <el-tab-pane label="当事人" name="ptyp">
<c-content>
<m-ptyp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
</el-tab-pane> -->
<!--PD000057 -->
<el-tab-pane :label="$t('litp.PD000057')" name="dogp">
<!-- <el-tab-pane label="货物" name="dogp">
<c-content>
<m-doxp :model="model" :codes="codes" :dtyp="'dogp'" :rec="'lid'"
/>
</c-content>
</el-tab-pane>
</el-tab-pane> -->
<!--PD000060 -->
<el-tab-pane :label="$t('litp.PD000060')" name="dorp">
<!-- <el-tab-pane label="单据" name="dorp">
<c-content>
<m-doxp :model="model" :codes="codes" :dtyp="'dorp'" :rec="'lid'"
/>
</c-content>
</el-tab-pane>
</el-tab-pane> -->
<!--PD000073 -->
<el-tab-pane :label="$t('litp.PD000074')" name="adcp">
<!-- <el-tab-pane label="附加条款" name="adcp">
<c-content>
<m-doxp :model="model" :codes="codes" :dtyp="'adcp'" :rec="'lid'"
/>
</c-content>
</el-tab-pane> -->
<!--PD000001 -->
<el-tab-pane label="保证金" name="ccvpan">
<m-ccvpan :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000001 -->
<el-tab-pane label="统一授信" name="limitbody">
<m-limitbody :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000027 -->
<el-tab-pane :label="$t('liaall.PD000027')" name="engp">
<el-tab-pane label="费用/账务" name="engp">
<c-content>
<m-engp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000001 -->
<el-tab-pane :label="$t('liaccv.PD000001')" name="ccvpan">
<m-ccvpan :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000000 -->
<el-tab-pane :label="$t('setmod.PD000000')" name="setpan">
<!-- <el-tab-pane label="结算" name="setpan">
<c-content>
<m-setpan :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
</el-tab-pane> -->
<!--PD000001 -->
<el-tab-pane :label="$t('glemod.PD000001')" name="glepan">
<!-- <el-tab-pane label="会计分录" name="glepan">
<m-glepan :model="model" :codes="codes" />
</el-tab-pane>
</el-tab-pane> -->
<!--PD000510 -->
<el-tab-pane :label="$t('litopn.PD000510')" name="addbcb">
<el-tab-pane label="备查/附言" name="addbcb">
<m-addbcb :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000000 -->
<el-tab-pane :label="$t('coninf.PD000000')" name="coninfp">
<!-- <el-tab-pane label="附言" name="coninfp">
<m-coninfp :model="model" :codes="codes" />
</el-tab-pane>
</el-tab-pane> -->
<!--PD000529 -->
<el-tab-pane :label="$t('trndoc.PD000529')" name="docpan">
<el-tab-pane label="报文/面函" name="docpan">
<m-docpan :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000546 -->
<el-tab-pane :label="$t('trndoc.PD000546')" name="doctre">
<el-tab-pane label="附件信息" name="doctre">
<m-doctre :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000002 -->
<el-tab-pane :label="$t('cnybop.PD000002')" name="cnyp">
<el-tab-pane label="申报信息" name="cnyp">
<m-cnyp :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000110 -->
<el-tab-pane
:label="$t('cnybop.PD000110')"
label="2106银行跟单结算及表外融资"
name="libp"
v-if="this.model.cnybop.libflg == '1'"
>
......@@ -132,7 +131,7 @@
<!--PD000346 -->
<el-tab-pane
v-if="model.lidgrp.rec.spcrcbflg"
:label="$t('litp.PD000422')"
label="仅适用于指定银行的特殊付款条件"
name="spcrcvp"
>
<m-spcrcvp :model="model" :codes="codes" />
......@@ -152,10 +151,7 @@
<m-namp :model="model" :codes="codes"/>
</el-tab-pane> -->
<!--PD000001 -->
<el-tab-pane :label="$t('limmod.PD000001')" name="limitbody">
<m-limitbody :model="model" :codes="codes" />
</el-tab-pane>
<!--PD001033 -->
<!--
......@@ -191,6 +187,13 @@
@select-ety="selectMsg"
>
</c-grid-ety-prompt-dialog>
<c-function-btn
:handleSubmit="handleSubmit"
:handleCheck="handleCheck"
:handleStash="handleStash"
>
</c-function-btn>
</div>
</c-page>
</template>
......
src/views/Business/Ordrel/Menu.vue
......@@ -478,9 +478,6 @@ export default {
.m-table-search {
padding: 20px 0px 10px 0px;
}
.el-form-item__label{
text-align: left!important;
}
.el-row > .el-col {
padding-right: 10px!important;
}
......
src/views/Business/index.vue
......@@ -36,10 +36,9 @@ export default {
<style>
#business_container {
/* height: 100%; */
padding: 5px 15px;
/* width: 100%; */
flex: 1;
width: 85%;
margin: 40px auto 0;
}
#business_container .eibs-tab {
padding: 0 15px;
......
src/views/Layout/Header.vue
......@@ -4,10 +4,10 @@
<img src="../../assets/logo.png" alt="" style="height: 100%" />
</div>
<div class="self_header_label">
<h2>国际结算系统</h2>
<h2 style="font-size: 30px">国际结算系统</h2>
</div>
<div class="header-tool">
<div class="header-subInstName">
<div class="header-subInstName">
<!-- <marquee
v-if="subInstName.length > 12"
behavior="scroll"
......@@ -431,7 +431,7 @@ export default {
color: #fff;
/* margin-top: 10px !important; */
position: relative;
top: 22px;
top: 12.778px;
/* left: 10px; */
padding: 0px 15px;
display: inline-table;
......@@ -439,6 +439,8 @@ export default {
font-family: "黑体";
/* border-left: 1px solid antiquewhite; */
border-left: 1px solid #fff;
/* ui美化 */
font-size: 30px;
}
.self_header_label p {
font-family: "Times New Roman", Times, serif;
......
src/views/Layout/SideMenu.vue
......@@ -326,7 +326,7 @@ export default {
.eContainer-menu-search .el-button {
border: none;
font-size: 20px;
padding: 12px 20px;
padding: 9.01px 20px;
}
.eContainer-menu-search .el-input {
......@@ -406,9 +406,12 @@ export default {
.el-submenu__title,
.el-menu-item,
.el-submenu .el-menu-item {
font-size: 12px;
height: 35px;
line-height: 35px;
font-size: 14px;
height: 40px;
line-height: 40px;
}
.el-submenu__title.active{
font-weight: bold;
}
.el-menu-vertical-demo [class^="el-icon-caret-"] {
color: #606266;
......
src/views/Layout/components/TagsView/index.vue
......@@ -237,7 +237,7 @@ export default {
<style scoped>
.tags-view-container {
height: 28px;
height: 29.002px;
width: 100%;
background: #f5f4f9;
border-bottom: 1px solid #d8dce5;
......
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