调整页面布局（初稿）

jshERP-web/public/static/color.less

@@ -5626,7 +5626,7 @@ form .ant-upload {
   border-radius: 0 0 4px 4px;
 }
 .ant-modal-mask {
-  background-color: rgba(0, 0, 0, 0.65);
+  background-color: rgba(0, 0, 0, 0.1) !important;
 }
 .ant-confirm-body .ant-confirm-title {
   color: rgba(0, 0, 0, 0.85);

jshERP-web/src/assets/less/common.less

@@ -19,6 +19,8 @@
 }
 /*列表页面弹出modal*/
 .ant-modal-cust-warp {
+  margin-top: 101px;
+  margin-left: 151px;
   height: 100%
 }
 /*弹出modal Y轴滚动条*/
@@ -38,6 +40,8 @@
 }
 /*商品-列表页面弹出modal*/
 .ant-modal-material-warp {
+  margin-top: 101px;
+  margin-left: 151px;
   height: 100%
 }
 /*商品-弹出modal Y轴滚动条*/
@@ -72,3 +76,7 @@
 .j-inner-table-wrapper /deep/ .ant-table-expanded-row .ant-table-wrapper .ant-table-tbody .ant-table-row {
   background-color: #FFFFFF;
 }
+
+.ant-modal-mask {
+  background-color: rgba(0, 0, 0, 0.1) !important;
+}
\ No newline at end of file

jshERP-web/src/components/jeecg/JModal/index.vue

 <template>
+  <div ref="container">
     <a-modal
       ref="modal"
       :class="getClass(modalClass)"
       :style="getStyle(modalStyle)"
       :visible="visible"
+      :maskStyle="{'top':'101px','left':'151px'}"
+      :getContainer="() => $refs.container"
       v-bind="_attrs"
       v-on="$listeners"
       @ok="handleOk"
@@ -39,6 +42,7 @@
       </template>
 
     </a-modal>
+  </div>
 </template>
 
 <script>

jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue

@@ -6,7 +6,7 @@
     @ok="handleSubmit"
     @cancel="close"
     cancelText="关闭"
-    style="top:5%;height: 100%;overflow-y: hidden"
+    style="top:5%;height: 90%;overflow-y: hidden"
     wrapClassName="ant-modal-cust-warp"
   >
     <a-row :gutter="10" style="padding: 10px; margin: -10px">

jshERP-web/src/components/menu/SideMenu.vue

 <template>
   <a-layout-sider
     :class="['sider', isDesktop() ? null : 'shadow', theme, fixSiderbar ? 'ant-fixed-sidemenu' : null ]"
-    width="200px"
+    width="150px"
     :collapsible="collapsible"
     v-model="collapsed"
     :trigger="null">

jshERP-web/src/components/menu/index.js

@@ -172,7 +172,8 @@ export default {
     const props = {
       mode: mode,
       theme: theme,
-      openKeys: this.openKeys
+      openKeys: this.openKeys,
+      inlineIndent: 12,
     }
     const on = {
       select: obj => {

jshERP-web/src/components/page/GlobalHeader.vue

@@ -168,7 +168,7 @@
 <style lang="less" scoped>
   /* update_begin author:scott date:20190220 for: 缩小首页布局顶部的高度*/
 
-  @height: 59px;
+  @height: 49px;
 
   .layout {
 

jshERP-web/src/components/page/GlobalLayout.vue

@@ -9,7 +9,7 @@
         @close="() => this.collapsed = false"
         :closable="false"
         :visible="collapsed"
-        width="200px"
+        width="150px"
       >
         <side-menu
           mode="inline"
@@ -38,7 +38,7 @@
         @close="() => this.collapsed = false"
         :closable="false"
         :visible="collapsed"
-        width="200px"
+        width="150px"
       >
         <side-menu
           mode="inline"
@@ -52,7 +52,7 @@
 
     <a-layout
       :class="[layoutMode, `content-width-${contentWidth}`]"
-      :style="{ paddingLeft: fixSiderbar && isDesktop() ? `${sidebarOpened ? 200 : 80}px` : '0' }">
+      :style="{ paddingLeft: fixSiderbar && isDesktop() ? `${sidebarOpened ? 150 : 80}px` : '0' }">
       <!-- layout header -->
       <global-header
         :mode="layoutMode"
@@ -65,7 +65,7 @@
       />
 
       <!-- layout content -->
-      <a-layout-content :style="{ height: '100%', paddingTop: fixedHeader ? '59px' : '0' }">
+      <a-layout-content :style="{ height: '100%', paddingTop: fixedHeader ? '49px' : '0' }">
         <slot></slot>
       </a-layout-content>
 
@@ -292,7 +292,7 @@
         transition: width .2s;
 
         &.ant-header-side-opened {
-          width: calc(100% - 200px)
+          width: calc(100% - 150px)
         }
 
         &.ant-header-side-closed {
@@ -322,7 +322,7 @@
           transition: all .3s;
 
           height: 70%;
-          line-height: 46px;
+          line-height: 36px;
 
           &.action-full {
             height: 100%;
@@ -435,7 +435,7 @@
         margin: auto;
         padding: 0 20px 0 0;
         display: flex;
-        height: 59px;
+        height: 49px;
 
         .ant-menu.ant-menu-horizontal {
           border: none;
@@ -474,7 +474,7 @@
 
         .header-index-right {
           float: right;
-          height: 59px;
+          height: 49px;
           overflow: hidden;
           .action:hover {
             background-color: rgba(0, 0, 0, 0.05);

jshERP-web/src/components/tools/ImportFileModal.vue

 <template>
+  <div ref="container">
     <a-modal
       :title="title"
       :width="500"
       :visible="visible"
       :confirm-loading="confirmLoading"
+      :getContainer="() => $refs.container"
+      :maskStyle="{'top':'101px','left':'151px'}"
       :maskClosable="false"
       @cancel="handleCancel"
       wrapClassName="ant-modal-cust-warp"
@@ -31,6 +34,7 @@
         </a-row>
       </a-spin>
     </a-modal>
+  </div>
 </template>
 
 <script>

jshERP-web/src/components/tools/Logo.vue

@@ -26,7 +26,7 @@
 </script>
 <style lang="less" scoped>
   /*缩小首页布 局顶部的高度*/
-  @height: 59px;
+  @height: 49px;
 
   .sider {
     box-shadow: none !important;

jshERP-web/src/components/tools/UserPassword.vue

 <template>
+  <div ref="container">
     <a-modal
       :title="title"
       :width="modalWidth"
       :visible="visible"
       :confirmLoading="confirmLoading"
+      :getContainer="() => $refs.container"
+      :maskStyle="{'top':'101px','left':'151px'}"
+      :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
       wrapClassName="ant-modal-cust-warp"
-    style="top:25%;height: 50%;overflow-y: hidden">
+      style="top:20%;height: 50%;overflow-y: hidden">
       <a-spin :spinning="confirmLoading">
         <a-form :form="form">
           <a-form-item label="旧密码" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -23,6 +27,7 @@
         </a-form>
       </a-spin>
     </a-modal>
+  </div>
 </template>
 
 <script>

jshERP-web/src/views/bill/dialog/BatchSetDepot.vue

 <template>
+  <div ref="container">
     <a-modal
       :title="title"
       :width="500"
       :visible="visible"
       :confirmLoading="confirmLoading"
+      :getContainer="() => $refs.container"
+      :maskStyle="{'top':'101px','left':'151px'}"
+      :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
@@ -26,6 +30,7 @@
         </a-form>
       </a-spin>
     </a-modal>
+  </div>
 </template>
 <script>
   import pick from 'lodash.pick'

jshERP-web/src/views/bill/dialog/BillDetail.vue

@@ -8,7 +8,7 @@
     :forceRender="true"
     @cancel="handleCancel"
     wrapClassName="ant-modal-cust-warp"
-    style="top:5%;height: 100%;overflow-y: hidden">
+    style="top:20px;height: 95%;overflow-y: hidden">
     <template slot="footer">
       <a-button v-if="billPrintFlag" @click="handlePrint">三联打印预览</a-button>
       <!--此处为解决缓存问题-->

jshERP-web/src/views/bill/dialog/BillPrintIframe.vue

 <template>
+  <div ref="container">
     <a-modal
       :title="title"
       :width="width"
       :visible="visible"
+      :getContainer="() => $refs.container"
+      :maskStyle="{'top':'101px','left':'151px'}"
+      :maskClosable="false"
       @cancel="handleCancel"
       cancelText="关闭"
       wrapClassName="ant-modal-cust-warp"
-    style="top:5%;height: 100%;overflow-y: hidden">
+      style="top:20px;height: 95%;overflow-y: hidden">
       <template slot="footer">
         <a-button key="back" @click="handleCancel">取消</a-button>
       </template>
@@ -25,6 +29,7 @@
         </template>
       </a-form>
     </a-modal>
+  </div>
 </template>
 
 <script>

jshERP-web/src/views/bill/dialog/HistoryBillList.vue

 <template>
+  <div ref="container">
     <a-modal
       :title="title"
       :width="1250"
       :visible="visible"
+      :getContainer="() => $refs.container"
+      :maskStyle="{'top':'101px','left':'151px'}"
+      :maskClosable="false"
       @cancel="handleCancel"
       cancelText="关闭"
       wrapClassName="ant-modal-cust-warp"
-    style="top:5%;height: 100%;overflow-y: hidden">
+      style="top:50px;height: 90%;overflow-y: hidden">
       <template slot="footer">
         <a-button @click="handleCancel">关闭</a-button>
       </template>
@@ -82,6 +86,7 @@
       <!-- 表单区域 -->
       <bill-detail ref="billDetail"></bill-detail>
     </a-modal>
+  </div>
 </template>
 
 <script>

jshERP-web/src/views/bill/dialog/LinkBillList.vue

 <template>
+  <div ref="container">
     <a-modal
       :title="title"
       :width="1250"
       :visible="visible"
+      :getContainer="() => $refs.container"
+      :maskStyle="{'top':'101px','left':'151px'}"
+      :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
       wrapClassName="ant-modal-cust-warp"
-    style="top:5%;height: 100%;overflow-y: hidden">
+      style="top:20px;height: 95%;overflow-y: hidden">
       <!-- 查询区域 -->
       <div class="table-page-search-wrapper" v-if="selectType === 'list'">
         <!-- 搜索区域 -->
@@ -93,6 +97,7 @@
       <!-- 表单区域 -->
       <bill-detail ref="billDetail"></bill-detail>
     </a-modal>
+  </div>
 </template>
 
 <script>

jshERP-web/src/views/bill/dialog/ManyAccountModal.vue

 <template>
+  <div ref="container">
     <a-modal
       :title="title"
       :width="650"
       :visible="visible"
       :confirmLoading="confirmLoading"
+      :getContainer="() => $refs.container"
+      :maskStyle="{'top':'101px','left':'151px'}"
+      :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
@@ -62,6 +66,7 @@
         </a-form>
       </a-spin>
     </a-modal>
+  </div>
 </template>
 <script>
   import pick from 'lodash.pick'

jshERP-web/src/views/bill/modules/AllocationOutModal.vue

@@ -10,7 +10,7 @@
     switchFullscreen
     @cancel="handleCancel"
     wrapClassName="ant-modal-cust-warp"
-    style="top:5%;height: 100%;overflow-y: hidden">
+    style="top:20px;height: 95%;overflow-y: hidden">
     <template slot="footer">
       <a-button @click="handleCancel">取消</a-button>
       <a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>

jshERP-web/src/views/bill/modules/AssembleModal.vue

@@ -10,7 +10,7 @@
     switchFullscreen
     @cancel="handleCancel"
     wrapClassName="ant-modal-cust-warp"
-    style="top:5%;height: 100%;overflow-y: hidden">
+    style="top:20px;height: 95%;overflow-y: hidden">
     <template slot="footer">
       <a-button @click="handleCancel">取消</a-button>
       <a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>

jshERP-web/src/views/bill/modules/DisassembleModal.vue

@@ -10,7 +10,7 @@
     switchFullscreen
     @cancel="handleCancel"
     wrapClassName="ant-modal-cust-warp"
-    style="top:5%;height: 100%;overflow-y: hidden">
+    style="top:20px;height: 95%;overflow-y: hidden">
     <template slot="footer">
       <a-button @click="handleCancel">取消</a-button>
       <a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>