diff --git a/jshERP-web/src/assets/less/common.less b/jshERP-web/src/assets/less/common.less index 089ad387..d7b276db 100644 --- a/jshERP-web/src/assets/less/common.less +++ b/jshERP-web/src/assets/less/common.less @@ -19,7 +19,7 @@ } /*列表页面弹出modal*/ .ant-modal-cust-warp { - margin-top: 101px; + margin-top: 89px; margin-left: 151px; height: 100% } @@ -40,7 +40,7 @@ } /*商品-列表页面弹出modal*/ .ant-modal-material-warp { - margin-top: 101px; + margin-top: 89px; margin-left: 151px; height: 100% } diff --git a/jshERP-web/src/components/jeecg/JModal/index.vue b/jshERP-web/src/components/jeecg/JModal/index.vue index cb8d87ea..b4cae8f7 100644 --- a/jshERP-web/src/components/jeecg/JModal/index.vue +++ b/jshERP-web/src/components/jeecg/JModal/index.vue @@ -5,7 +5,7 @@ :class="getClass(modalClass)" :style="getStyle(modalStyle)" :visible="visible" - :maskStyle="{'top':'101px','left':'151px'}" + :maskStyle="{'top':'89px','left':'151px'}" :getContainer="() => $refs.container" v-bind="_attrs" v-on="$listeners" diff --git a/jshERP-web/src/components/layouts/TabLayout.vue b/jshERP-web/src/components/layouts/TabLayout.vue index fd9f4943..5b61760c 100644 --- a/jshERP-web/src/components/layouts/TabLayout.vue +++ b/jshERP-web/src/components/layouts/TabLayout.vue @@ -6,7 +6,6 @@ v-if="multipage" :active-key="activePage" class="tab-layout-tabs" - style="height:52px" :hide-add="true" type="editable-card" @change="changePage" @@ -401,7 +400,7 @@ /*美化弹出Tab样式*/ .ant-tabs-nav-container { - margin-top: 4px; + margin-top: 0px; } /* 修改 ant-tabs 样式 */ @@ -412,7 +411,7 @@ padding: 0 20px; .ant-tabs-bar { - margin: 4px 0 0; + margin: 0px; border: none; } @@ -452,6 +451,7 @@ border-bottom: 1px solid transparent !important; } .ant-tabs-tab-active { + height: 35px !important; border-color: @primary-color!important; } } diff --git a/jshERP-web/src/components/tools/ImportFileModal.vue b/jshERP-web/src/components/tools/ImportFileModal.vue index 2e0664f9..58f007ae 100644 --- a/jshERP-web/src/components/tools/ImportFileModal.vue +++ b/jshERP-web/src/components/tools/ImportFileModal.vue @@ -6,11 +6,11 @@ :visible="visible" :confirm-loading="confirmLoading" :getContainer="() => $refs.container" - :maskStyle="{'top':'101px','left':'151px'}" + :maskStyle="{'top':'89px','left':'151px'}" :maskClosable="false" @cancel="handleCancel" wrapClassName="ant-modal-cust-warp" - style="top:25%;height: 45%;overflow-y: hidden"> + style="top:20%;height: 45%;overflow-y: hidden"> diff --git a/jshERP-web/src/components/tools/UserPassword.vue b/jshERP-web/src/components/tools/UserPassword.vue index 87b49665..dca45683 100644 --- a/jshERP-web/src/components/tools/UserPassword.vue +++ b/jshERP-web/src/components/tools/UserPassword.vue @@ -6,7 +6,7 @@ :visible="visible" :confirmLoading="confirmLoading" :getContainer="() => $refs.container" - :maskStyle="{'top':'101px','left':'151px'}" + :maskStyle="{'top':'89px','left':'151px'}" :maskClosable="false" @ok="handleOk" @cancel="handleCancel" diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js index c55121f7..c08b6bba 100644 --- a/jshERP-web/src/mixins/JeecgListMixin.js +++ b/jshERP-web/src/mixins/JeecgListMixin.js @@ -64,7 +64,7 @@ export const JeecgListMixin = { }, created() { if(this.isDesktop()) { - this.cardStyle = 'height:' + (document.documentElement.clientHeight-125) + 'px' + this.cardStyle = 'height:' + (document.documentElement.clientHeight-100) + 'px' } if(!this.disableMixinCreated){ //console.log(' -- mixin created -- ') diff --git a/jshERP-web/src/views/bill/dialog/BatchSetDepot.vue b/jshERP-web/src/views/bill/dialog/BatchSetDepot.vue index 1134d087..1eb8105f 100644 --- a/jshERP-web/src/views/bill/dialog/BatchSetDepot.vue +++ b/jshERP-web/src/views/bill/dialog/BatchSetDepot.vue @@ -6,7 +6,7 @@ :visible="visible" :confirmLoading="confirmLoading" :getContainer="() => $refs.container" - :maskStyle="{'top':'101px','left':'151px'}" + :maskStyle="{'top':'89px','left':'151px'}" :maskClosable="false" @ok="handleOk" @cancel="handleCancel" diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue index 38fe16c0..e54ca253 100644 --- a/jshERP-web/src/views/bill/dialog/BillDetail.vue +++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue @@ -6,9 +6,9 @@ :maskClosable="false" :keyboard="false" :forceRender="true" + :style="modalStyle" @cancel="handleCancel" - wrapClassName="ant-modal-cust-warp" - style="top:20px;height: 95%;overflow-y: hidden"> + wrapClassName="ant-modal-cust-warp">