diff --git a/jero-web/src/App.vue b/jero-web/src/App.vue index b9ecf2551..a5ed87aac 100644 --- a/jero-web/src/App.vue +++ b/jero-web/src/App.vue @@ -142,7 +142,40 @@ .itemModel-multi .ant-form-explain, .ant-form-extra { margin-top: -10px; } - .anticon-exclamation-circle{ - display: none!important; + + + .anticon-exclamation-circle { + display: none !important; + } + + .ant-select-selection--single { + height: 38px !important; + } + + .ant-select-selection--multiple { + height: 38px !important; + } + + .ant-select-selection__rendered { + line-height: 38px !important; + height: 38px !important; + } + + .ant-select-selection--multiple .ant-select-selection__rendered > ul > li { + margin-top: 6px; + } + + .ant-calendar-picker { + line-height: 38px !important; + height: 38px !important; + } + + .ant-calendar-picker-input { + height: 38px !important; + } + + .ant-input-number-input-wrap { + line-height: 38px !important; + height: 38px !important; } \ No newline at end of file diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue index 894f071fe..445772922 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue @@ -10,6 +10,8 @@ @close="onClose" width="900" > + + @@ -184,6 +184,7 @@ @@ -191,7 +192,7 @@ -
+
* {{item.db_field_txt}} @@ -200,6 +201,7 @@
- @@ -278,10 +279,9 @@ @@ -303,7 +303,7 @@ - + @@ -333,12 +333,12 @@ > - + - + @@ -1214,7 +1214,6 @@ margin-top: 2px; } - } .con-divider{ font-size: 16px; @@ -1310,8 +1309,21 @@ text-align: center; img{ } - } + .box-input { + /*min-width: 200px;*/ + display: inline-block; + height: 38px; + margin-top: 2px; + } + .button-text { + height: 38px; + width: calc(100% - 100px); + line-height: 38px; + background: #fff; + border: 1px #00B3BE solid; + color: #00B3BE; + } \ No newline at end of file diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue index 881792170..4768352b0 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue @@ -1170,17 +1170,18 @@ @import '~@assets/less/common.less'; .split-detail { - height: 100% !important; + /*height: 100% !important;*/ .split-detail-wrap { - display: flex; - justify-content: space-between; + /*display: flex;*/ + /*justify-content: space-between;*/ .split-detail-left { - height: 100%; - min-width: 300px; + /*height: 100%;*/ + width: 300px; + float: left; padding-right: 20px; - border-right: 1px solid #E6E7EC; + /*border-right: 1px solid #E6E7EC;*/ overflow-y: auto; .split-detail-left-tree { @@ -1206,7 +1207,10 @@ .split-detail-right { padding-left: 20px; - flex: 1; + width: calc(100% - 300px); + float: right; + border-left: 1px solid #E6E7EC; + /*flex: 1;*/ .split-detail-search-header { margin-bottom: 20px; @@ -1385,22 +1389,22 @@ min-width: 73px !important; } - .split-detail-wrap { - height: 481px !important; - } + /*.split-detail-wrap {*/ + /* height: 481px !important;*/ + /*}*/ - .mainItem { - height: 500px; - } + /*.mainItem {*/ + /* height: 500px;*/ + /*}*/ } @media screen and (min-width: 1600px) and (max-width: 2000px) { - .split-detail .split-detail-wrap .split-detail-left { - height: 735px !important; - } + /*.split-detail .split-detail-wrap .split-detail-left {*/ + /* height: 735px !important;*/ + /*}*/ - .mainItem { - height: 800px !important; - } + /*.mainItem {*/ + /* height: 800px !important;*/ + /*}*/ } \ No newline at end of file