Skip to content

V
vue-gjjs
Commit 2b885f12 by “yanyuxin”
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 601a7c57 743329ed
Showing with 93 additions and 36 deletions
src/assets/css/common.css
......@@ -160,7 +160,7 @@
.el-form-item__label {
padding: 0 20px 0 0;
line-height: 16px !important;
line-height: 20px !important;
}
.el-form-item--small .el-form-item__label {
......@@ -190,6 +190,10 @@
line-height: var(--lineheight);
}
/* .el-form-item__content{
margin-left: 0px !important;
} */
.el-select .el-input .el-select__caret {
font-size: var(--normalfont);
}
......@@ -325,6 +329,11 @@
margin-left: 2px;
}
/* 清除contentmargin-left值 */
/* .el-form-item .el-form-item__content{
margin-left: 0px;
} */
.el-tree-node__label {
font-size: 12px;
}
......
src/views/Business/Brtdck/index.vue
<template>
<c-page>
<div class="eContainer">
<div class="eContainer">
<c-page>
<!-- <c-bus-button :$pntvm="this"></c-bus-button> j加操作按钮-->
<el-form
:model="model"
......@@ -109,8 +109,8 @@
@select-ety="selectMsg"
>
</c-grid-ety-prompt-dialog>
</div>
</c-page>
</c-page>
</div>
</template>
<script>
import Api from '~/service/Api'
......
src/views/Business/Brtlat/index.vue
<template>
<c-page>
<div class="eContainer">
<div class="eContainer">
<c-page>
<el-form :model="model" :rules="rules" ref="modelForm" label-width="120px" label-position="right" size="small" :validate-on-rule-change="false">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
......@@ -124,8 +124,8 @@
<!-- <el-button size="small">拆分报文</el-button> -->
<!-- <el-button size="small">智能提示</el-button> -->
</c-function-btn>
</div>
</c-page>
</c-page>
</div>
</template>
<script>
import Api from "~/service/Api"
......
src/views/Business/Letopn/Adcp.vue
......@@ -111,6 +111,6 @@ export default {
</script>
<style>
.letopn_adcp_cheak {
margin: 0px 0 10px 160px;
margin: 0px 0 10px 120px;
}
</style>
src/views/Business/Litdav/index.vue
<template>
<c-page title="进口信用证通知">
<div class="eContainer">
<div class="eContainer">
<c-page title="进口信用证通知">
<el-form
:model="model"
:rules="rules"
......@@ -106,8 +106,8 @@
v-on:select-ety="selectEty"
>
</c-grid-ety-prompt-dialog>
</div>
</c-page>
</c-page>
</div>
</template>
<script>
import Api from "~/service/Api";
......
src/views/Business/Litopn/Ovwp.vue
......@@ -111,12 +111,12 @@
<c-col :span="9">
<el-form-item
style="text-align: left;margin-left:5px;"
label-width="20px"
label-width="0px"
prop="lidgrp.cbs.nom1.amt"
>
<c-input-currency
v-model="model.lidgrp.cbs.nom1.amt"
style="text-align: left; width: 100%"
style="text-align: left; width: 90%;"
placeholder="请输入金额"
></c-input-currency>
</el-form-item>
......
src/views/Home/cells/NoticeAnnouncement.vue
......@@ -6,7 +6,7 @@
</template>
<div class="notice-container">
<el-scrollbar style="height: 100%;">
<el-scrollbar style="height: 100%;padding-right: 10px;">
<div class="notice-item" v-for="(item, idx) in testData" :key="idx">
<div class="notice-title" :class="{ active: idx === 0 }">
<a :href="item.url" target="_blank" rel="noopener noreferrer">
......
src/views/Home/index.vue
<template>
<div class="eContainer-home">
<c-row
:gutter="10"
v-for="cRow in cellRows"
:key="cRow"
>
<c-col
:span="24 / cellCols"
<div class="cell-item"
:style="{'width': cellWidth + 'px'}"
v-for="cCol in cellCols"
:key="cCol"
>
......@@ -15,7 +14,7 @@
v-bind:is="getComponentName([cRow - 1], [cCol - 1])"
:cellContentHeight="cellContentHeight"
></component>
</c-col>
</div>
</c-row>
</div>
</template>
......@@ -46,6 +45,7 @@ export default {
data() {
return {
cellContentHeight: 0,
cellWidth: 0
};
},
created() {
......@@ -67,6 +67,9 @@ export default {
cellRows(newVal, oldVal) {
this.calcCellContentHeight()
},
cellCols(newVal, oldVal) {
this.calcCellContentWidth()
}
},
methods: {
loadCellData() {
......@@ -117,12 +120,16 @@ export default {
return this.cellNames[rowIdx] ? this.cellNames[rowIdx][colIdx] : null;
},
calcCellContentHeight() {
this.cellContentHeight = this.$el.clientHeight * this.getRowHeightPercent() - 52 - 10
// this.cellContentHeight = this.$el.clientHeight * this.getRowHeightPercent() - 52 - 10
this.cellContentHeight = (this.$el.clientHeight - (this.cellRows + 1) * 25 - (52 + 10) * this.cellRows) / this.cellRows
},
getRowHeightPercent() {
// 每行预留 0.4% 的间距
return 1 / this.cellRows - 0.004 * this.cellRows;
},
calcCellContentWidth() {
this.cellWidth = (this.$el.clientWidth - (this.cellCols + 1) * 25) / this.cellCols
}
},
destroyed() {
window.removeEventListener("resize", this.calcCellContentHeightBind);
......@@ -132,9 +139,21 @@ export default {
<style scoped>
.eContainer-home {
box-sizing: border-box;
height: 100%;
display: flex;
flex-direction: column;
justify-content: space-around;
padding: 25px;
}
.eContainer-home .el-row {
margin-bottom: 25px;
}
.eContainer-home .el-row:last-child {
margin-bottom: 0;
}
.eContainer-home .cell-item {
float: left;
margin-right: 25px;
}
.eContainer-home .el-row .cell-item:last-child {
margin-right: 0;
}
</style>
src/views/Public/Doxp.vue
......@@ -115,6 +115,6 @@ export default {
</script>
<style>
.letopn_adcp_cheak {
margin: 0px 0 10px 160px;
margin: 0px 0 10px 120px;
}
</style>
src/views/Public/Setpan.vue
......@@ -15,19 +15,20 @@
</c-col>
</c-col>
<c-col :span="8">
<c-col :span="12">
<el-form-item label="结算金额录入" label-width="150px">
<c-col :span="13">
<el-form-item label="结算金额录入" prop="setmod.doccur">
<c-input
v-model="model.setmod.doccur"
placeholder="CNY"
:disabled="true"
:readonly="true"
style="width: 100%"
></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="" label-width="5px">
<c-col :span="11">
<el-form-item label="" label-width="5px" prop="setmod.docamt">
<c-input-currency
v-model="model.setmod.docamt"
placeholder="0"
......@@ -37,8 +38,38 @@
</c-col>
</c-col>
<c-col :span="8">
<c-col :span="12">
<el-form-item label="类型" label-width="100px">
<c-col :span="24" style="text-align: right">
<el-form-item label="类型" prop="setmod.dspflg">
<c-fullbox>
<c-select
v-model="model.setmod.dspflg"
style="width: 100%"
placeholder="请选择额度类型"
disabled
>
<el-option
v-for="item in codes.dspflg"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</c-select>
<template slot="footer">
<c-button
style=""
size="small"
type="primary"
icon="el-icon-info"
@click="onSetmodDet"
>
</c-button>
</template>
</c-fullbox>
</el-form-item>
</c-col>
<!-- <c-col :span="18">
<el-form-item label="类型" label-width="120px">
<c-select
v-model="model.setmod.dspflg"
disabled
......@@ -55,8 +86,7 @@
</c-select>
</el-form-item>
</c-col>
<c-col :span="12" style="text-align: right; float: right">
<!-- <el-form-item label="" label-width="20px"> -->
<c-col :span="6" style="text-align: right; float: right">
<c-button
style=""
size="small"
......@@ -65,8 +95,7 @@
@click="onSetmodDet"
>
</c-button>
<!-- </el-form-item> -->
</c-col>
</c-col> -->
</c-col>
<!-- ====================顶部==================== -->
......
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