From 71968259038f60ff325a133ffea85617a7a36826 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 15 Dec 2022 00:15:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F=EF=BC=8C?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=89=8B=E6=9C=BA=E6=B5=8F=E8=A7=88=E5=99=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/assets/less/common.less        | 33 +++----------------
 .../src/components/jeecg/JModal/index.vue     |  7 +++-
 .../jeecgbiz/modal/JSelectMaterialModal.vue   |  5 +--
 .../src/components/tools/ImportFileModal.vue  |  8 +++--
 jshERP-web/src/components/tools/UserMenu.vue  |  6 ++--
 .../src/components/tools/UserPassword.vue     |  7 ++--
 jshERP-web/src/utils/mixin.js                 |  7 ++++
 .../src/views/bill/dialog/BatchSetDepot.vue   |  7 ++--
 .../src/views/bill/dialog/BillPrintIframe.vue |  7 ++--
 .../src/views/bill/dialog/HistoryBillList.vue |  8 +++--
 .../src/views/bill/dialog/LinkBillList.vue    |  8 +++--
 .../views/bill/dialog/ManyAccountModal.vue    |  7 ++--
 .../views/bill/modules/AllocationOutModal.vue |  4 +--
 .../src/views/bill/modules/AssembleModal.vue  |  4 +--
 .../views/bill/modules/DisassembleModal.vue   |  4 +--
 .../src/views/bill/modules/OtherInModal.vue   |  4 +--
 .../src/views/bill/modules/OtherOutModal.vue  |  4 +--
 .../views/bill/modules/PurchaseBackModal.vue  |  4 +--
 .../views/bill/modules/PurchaseInModal.vue    |  4 +--
 .../views/bill/modules/PurchaseOrderModal.vue |  4 +--
 .../views/bill/modules/RetailBackModal.vue    |  4 +--
 .../src/views/bill/modules/RetailOutModal.vue |  4 +--
 .../src/views/bill/modules/SaleBackModal.vue  |  4 +--
 .../src/views/bill/modules/SaleOrderModal.vue |  4 +--
 .../src/views/bill/modules/SaleOutModal.vue   |  4 +--
 .../views/financial/dialog/DebtBillList.vue   |  8 +++--
 .../financial/modules/AdvanceInModal.vue      |  4 +--
 .../src/views/financial/modules/GiroModal.vue |  4 +--
 .../views/financial/modules/ItemInModal.vue   |  4 +--
 .../views/financial/modules/ItemOutModal.vue  |  4 +--
 .../views/financial/modules/MoneyInModal.vue  |  4 +--
 .../views/financial/modules/MoneyOutModal.vue |  4 +--
 .../material/modules/BatchSetInfoModal.vue    |  7 ++--
 .../material/modules/BatchSetPriceModal.vue   |  7 ++--
 .../material/modules/BatchSetStockModal.vue   |  7 ++--
 .../modules/MaterialAttributeModal.vue        |  9 +++--
 .../modules/MaterialCategoryModal.vue         |  7 ++--
 .../views/material/modules/MaterialModal.vue  |  2 --
 .../modules/MaterialPropertyModal.vue         |  7 ++--
 .../views/report/modules/AccountInOutList.vue |  8 +++--
 .../views/report/modules/DebtAccountList.vue  |  8 +++--
 .../report/modules/MaterialInOutList.vue      |  8 +++--
 .../src/views/system/modules/AccountModal.vue |  7 ++--
 .../views/system/modules/CustomerModal.vue    |  7 ++--
 .../src/views/system/modules/DepotModal.vue   |  8 +++--
 .../views/system/modules/FunctionModal.vue    |  7 ++--
 .../system/modules/FunctionTreeModal.vue      |  7 ++--
 .../views/system/modules/InOutItemModal.vue   |  7 ++--
 .../src/views/system/modules/MemberModal.vue  |  7 ++--
 .../system/modules/OrganizationModal.vue      |  7 ++--
 .../src/views/system/modules/PersonModal.vue  |  7 ++--
 .../system/modules/PlatformConfigModal.vue    |  7 ++--
 .../views/system/modules/PluginAppModal.vue   |  7 ++--
 .../src/views/system/modules/PluginModal.vue  |  7 ++--
 .../system/modules/RoleFunctionModal.vue      |  7 ++--
 .../src/views/system/modules/RoleModal.vue    |  7 ++--
 .../views/system/modules/RolePushBtnModal.vue |  8 +++--
 .../src/views/system/modules/TenantModal.vue  |  7 ++--
 .../src/views/system/modules/UnitModal.vue    |  7 ++--
 .../system/modules/UserCustomerModal.vue      |  7 ++--
 .../views/system/modules/UserDepotModal.vue   |  7 ++--
 .../src/views/system/modules/UserModal.vue    |  7 ++--
 .../src/views/system/modules/VendorModal.vue  |  7 ++--
 63 files changed, 235 insertions(+), 178 deletions(-)

diff --git a/jshERP-web/src/assets/less/common.less b/jshERP-web/src/assets/less/common.less
index e781e273..835e2948 100644
--- a/jshERP-web/src/assets/less/common.less
+++ b/jshERP-web/src/assets/less/common.less
@@ -17,10 +17,12 @@
   padding-top: 15px;
   padding-bottom: 15px;
 }
-/*列表页面弹出modal*/
-.ant-modal-cust-warp {
+.depot-mask {
   margin-top: 93px;
   margin-left: 154px;
+}
+/*列表页面弹出modal*/
+.ant-modal-cust-warp {
   height: 100%
 }
 /*弹出modal Y轴滚动条*/
@@ -44,33 +46,6 @@
   height: calc(100% - 200px) !important;
   overflow-y: auto
 }
-/*商品-列表页面弹出modal*/
-.ant-modal-material-warp {
-  margin-top: 93px;
-  margin-left: 154px;
-  height: 100%
-}
-/*商品-弹出modal Y轴滚动条*/
-.ant-modal-material-warp .ant-modal-body {
-  padding: 12px 24px 12px 24px;
-  height: calc(100% - 110px) !important;
-  overflow-y: auto
-}
-/*商品-弹出modal 先有content后有body 故滚动条控制在body上*/
-.ant-modal-material-warp .ant-modal-content {
-  height: 90%;
-  overflow-y: hidden
-}
-/*商品-文本框样式*/
-.ant-modal-material-warp .ant-form-item {
-  margin-bottom: 12px;
-}
-/*全屏模式*/
-.ant-modal-material-warp .fullscreen .ant-modal-body {
-  padding: 24px 24px 12px 24px;
-  height: calc(100% - 200px) !important;
-  overflow-y: auto
-}
 /*列表中有图片的加这个样式 参考用户管理*/
 .anty-img-wrap {
   height: 25px;
diff --git a/jshERP-web/src/components/jeecg/JModal/index.vue b/jshERP-web/src/components/jeecg/JModal/index.vue
index 3a667ec7..255eb94e 100644
--- a/jshERP-web/src/components/jeecg/JModal/index.vue
+++ b/jshERP-web/src/components/jeecg/JModal/index.vue
@@ -5,8 +5,11 @@
       :class="getClass(modalClass)"
       :style="getStyle(modalStyle)"
       :visible="visible"
-      :maskStyle="{'top':'93px','left':'154px'}"
       :getContainer="() => $refs.container"
+      :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
+      :maskClosable="false"
       v-bind="_attrs"
       v-on="$listeners"
       @ok="handleOk"
@@ -49,10 +52,12 @@
 
   import { getClass, getStyle } from '@/utils/props-util'
   import { triggerWindowResizeEvent, handleIntroJs } from "@/utils/util"
+  import {mixinDevice} from '@/utils/mixin'
   import Vue from 'vue'
 
   export default {
     name: 'JModal',
+    mixins: [mixinDevice],
     props: {
       title: String,
       // 可使用 .sync 修饰符
diff --git a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
index 882de209..b647b5a3 100644
--- a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
+++ b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
@@ -3,11 +3,11 @@
     :width="modalWidth"
     :visible="visible"
     :title="title"
+    :wrapClassName="wrapClassNameInfo()"
     @ok="handleSubmit"
     @cancel="close"
     cancelText="关闭"
     style="top:5%;height: 90%;overflow-y: hidden"
-    wrapClassName="ant-modal-cust-warp"
   >
     <a-row :gutter="10" style="padding: 10px; margin: -10px">
       <a-col :md="24" :sm="24">
@@ -113,11 +113,12 @@
   import {filterObj, getMpListShort} from '@/utils/util'
   import {getMaterialBySelect, queryMaterialCategoryTreeList} from '@/api/api'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import {mixinDevice} from '@/utils/mixin'
   import Vue from 'vue'
 
   export default {
     name: 'JSelectMaterialModal',
-    mixins:[JeecgListMixin],
+    mixins:[JeecgListMixin, mixinDevice],
     components: {
       MaterialModal: () => import('@/views/material/modules/MaterialModal')
     },
diff --git a/jshERP-web/src/components/tools/ImportFileModal.vue b/jshERP-web/src/components/tools/ImportFileModal.vue
index 15f310f4..918f8786 100644
--- a/jshERP-web/src/components/tools/ImportFileModal.vue
+++ b/jshERP-web/src/components/tools/ImportFileModal.vue
@@ -7,10 +7,11 @@
       :confirm-loading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @cancel="handleCancel"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:20%;height: 45%;overflow-y: hidden">
+      style="top:20%;height: 45%;">
       <template slot="footer">
         <a-button key="back" @click="handleCancel">取消</a-button>
       </template>
@@ -39,9 +40,10 @@
 
 <script>
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import {mixinDevice} from '@/utils/mixin'
   export default {
     name: 'ImportFileModal',
-    mixins:[JeecgListMixin],
+    mixins:[JeecgListMixin, mixinDevice],
     data () {
       return {
         title:"",
diff --git a/jshERP-web/src/components/tools/UserMenu.vue b/jshERP-web/src/components/tools/UserMenu.vue
index c070b820..f2ab14de 100644
--- a/jshERP-web/src/components/tools/UserMenu.vue
+++ b/jshERP-web/src/components/tools/UserMenu.vue
@@ -59,7 +59,7 @@
     <span class="action">
       <a class="logout_title" href="javascript:;" @click="handleLogout">
         <a-icon type="logout"/>
-        <span v-if="isDesktop()">&nbsp;退出登录</span>
+        <span>&nbsp;退出登录</span>
       </a>
     </span>
     <user-password ref="userPassword"></user-password>
@@ -186,7 +186,9 @@
         }
       },
       filterOption(input, option) {
-        return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        if(option && option.componentOptions && option.componentOptions.children && option.componentOptions.children[0]) {
+          return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        }
       },
       // update_begin author:sunjianlei date:20191230 for: 解决外部链接打开失败的问题
       searchMethods(value) {
diff --git a/jshERP-web/src/components/tools/UserPassword.vue b/jshERP-web/src/components/tools/UserPassword.vue
index 4d75e477..1130f62b 100644
--- a/jshERP-web/src/components/tools/UserPassword.vue
+++ b/jshERP-web/src/components/tools/UserPassword.vue
@@ -7,12 +7,13 @@
       :confirmLoading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:20%;height: 50%;overflow-y: hidden">
+      style="top:20%;height: 50%;">
       <a-spin :spinning="confirmLoading">
         <a-form :form="form">
           <a-form-item label="旧密码" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -32,9 +33,11 @@
 
 <script>
   import { putAction } from '@/api/manage'
+  import {mixinDevice} from '@/utils/mixin'
   import md5 from 'md5'
   export default {
     name: "UserPassword",
+    mixins: [mixinDevice],
     data () {
       return {
         title:"修改密码",
diff --git a/jshERP-web/src/utils/mixin.js b/jshERP-web/src/utils/mixin.js
index 4845529d..1cfe66a1 100644
--- a/jshERP-web/src/utils/mixin.js
+++ b/jshERP-web/src/utils/mixin.js
@@ -33,6 +33,13 @@ const mixinDevice = {
     },
     isDesktop () {
       return this.device === 'desktop'
+    },
+    wrapClassNameInfo () {
+      if(this.device === 'desktop') {
+        return 'ant-modal-cust-warp depot-mask'
+      } else {
+        return 'ant-modal-cust-warp'
+      }
     }
   }
 }
diff --git a/jshERP-web/src/views/bill/dialog/BatchSetDepot.vue b/jshERP-web/src/views/bill/dialog/BatchSetDepot.vue
index 45248e83..39bef09b 100644
--- a/jshERP-web/src/views/bill/dialog/BatchSetDepot.vue
+++ b/jshERP-web/src/views/bill/dialog/BatchSetDepot.vue
@@ -7,12 +7,13 @@
       :confirmLoading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:30%;height: 35%;overflow-y: hidden">
+      style="top:30%;height: 35%;">
       <template slot="footer">
         <a-button key="back" v-if="isReadOnly" @click="handleCancel">
           关闭
@@ -35,8 +36,10 @@
 <script>
   import pick from 'lodash.pick'
   import { getAction } from '@/api/manage'
+  import {mixinDevice} from '@/utils/mixin'
   export default {
     name: "BatchSetDepot",
+    mixins: [mixinDevice],
     data () {
       return {
         title:"操作",
diff --git a/jshERP-web/src/views/bill/dialog/BillPrintIframe.vue b/jshERP-web/src/views/bill/dialog/BillPrintIframe.vue
index 711694ac..94773984 100644
--- a/jshERP-web/src/views/bill/dialog/BillPrintIframe.vue
+++ b/jshERP-web/src/views/bill/dialog/BillPrintIframe.vue
@@ -6,11 +6,12 @@
       :visible="visible"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       :style="modalStyle"
       @cancel="handleCancel"
-      cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp">
+      cancelText="关闭">
       <template slot="footer">
         <a-button key="back" @click="handleCancel">取消</a-button>
       </template>
@@ -34,8 +35,10 @@
 
 <script>
   import pick from 'lodash.pick'
+  import {mixinDevice} from '@/utils/mixin'
   export default {
     name: 'BillPrintIframe',
+    mixins: [mixinDevice],
     data () {
       return {
         title: "三联打印预览",
diff --git a/jshERP-web/src/views/bill/dialog/HistoryBillList.vue b/jshERP-web/src/views/bill/dialog/HistoryBillList.vue
index 890a553b..ee93109f 100644
--- a/jshERP-web/src/views/bill/dialog/HistoryBillList.vue
+++ b/jshERP-web/src/views/bill/dialog/HistoryBillList.vue
@@ -6,11 +6,12 @@
       :visible="visible"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:50px;height: 90%;overflow-y: hidden">
+      style="top:50px;height: 90%;">
       <template slot="footer">
         <a-button @click="handleCancel">关闭</a-button>
       </template>
@@ -92,11 +93,12 @@
 <script>
   import BillDetail from './BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import {mixinDevice} from '@/utils/mixin'
   import { findBySelectSup, findBySelectCus, findBillDetailByNumber} from '@/api/api'
   import Vue from 'vue'
   export default {
     name: 'HistoryBillList',
-    mixins:[JeecgListMixin],
+    mixins:[JeecgListMixin, mixinDevice],
     components: {
       BillDetail,
     },
diff --git a/jshERP-web/src/views/bill/dialog/LinkBillList.vue b/jshERP-web/src/views/bill/dialog/LinkBillList.vue
index 83473ff2..3f40f317 100644
--- a/jshERP-web/src/views/bill/dialog/LinkBillList.vue
+++ b/jshERP-web/src/views/bill/dialog/LinkBillList.vue
@@ -6,12 +6,13 @@
       :visible="visible"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:20px;height: 95%;overflow-y: hidden">
+      style="top:20px;height: 95%;">
       <!-- 查询区域 -->
       <div class="table-page-search-wrapper" v-if="selectType === 'list'">
         <!-- 搜索区域 -->
@@ -103,12 +104,13 @@
 <script>
   import BillDetail from './BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import {mixinDevice} from '@/utils/mixin'
   import { findBillDetailByNumber } from '@/api/api'
   import { getAction } from '@/api/manage'
   import Vue from 'vue'
   export default {
     name: 'LinkBillList',
-    mixins:[JeecgListMixin],
+    mixins:[JeecgListMixin, mixinDevice],
     components: {
       BillDetail
     },
diff --git a/jshERP-web/src/views/bill/dialog/ManyAccountModal.vue b/jshERP-web/src/views/bill/dialog/ManyAccountModal.vue
index fbf98739..09a8bb36 100644
--- a/jshERP-web/src/views/bill/dialog/ManyAccountModal.vue
+++ b/jshERP-web/src/views/bill/dialog/ManyAccountModal.vue
@@ -7,12 +7,13 @@
       :confirmLoading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:20%;height: 60%;overflow-y: hidden">
+      style="top:20%;height: 60%;">
       <a-spin :spinning="confirmLoading">
         <a-form :form="form">
           <a-row class="form-row" :gutter="24">
@@ -71,8 +72,10 @@
 <script>
   import pick from 'lodash.pick'
   import {getAccount} from '@/api/api'
+  import {mixinDevice} from '@/utils/mixin'
   export default {
     name: 'ManyAccountModal',
+    mixins: [mixinDevice],
     data () {
       return {
         title:"操作",
diff --git a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
index dbc6d658..406807c8 100644
--- a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
@@ -4,13 +4,11 @@
     :width="width"
     :visible="visible"
     :confirmLoading="confirmLoading"
-    :maskClosable="false"
     :keyboard="false"
     :forceRender="true"
     switchFullscreen
     @cancel="handleCancel"
-    wrapClassName="ant-modal-cust-warp"
-    style="top:20px;height: 95%;overflow-y: hidden">
+    style="top:20px;height: 95%;">
     <template slot="footer">
       <a-button @click="handleCancel">取消</a-button>
       <a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
diff --git a/jshERP-web/src/views/bill/modules/AssembleModal.vue b/jshERP-web/src/views/bill/modules/AssembleModal.vue
index 11c3dcd7..aea7052f 100644
--- a/jshERP-web/src/views/bill/modules/AssembleModal.vue
+++ b/jshERP-web/src/views/bill/modules/AssembleModal.vue
@@ -4,13 +4,11 @@
     :width="width"
     :visible="visible"
     :confirmLoading="confirmLoading"
-    :maskClosable="false"
     :keyboard="false"
     :forceRender="true"
     switchFullscreen
     @cancel="handleCancel"
-    wrapClassName="ant-modal-cust-warp"
-    style="top:20px;height: 95%;overflow-y: hidden">
+    style="top:20px;height: 95%;">
     <template slot="footer">
       <a-button @click="handleCancel">取消</a-button>
       <a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
diff --git a/jshERP-web/src/views/bill/modules/DisassembleModal.vue b/jshERP-web/src/views/bill/modules/DisassembleModal.vue
index e12fb636..e0e65d72 100644
--- a/jshERP-web/src/views/bill/modules/DisassembleModal.vue
+++ b/jshERP-web/src/views/bill/modules/DisassembleModal.vue
@@ -4,13 +4,11 @@
     :width="width"
     :visible="visible"
     :confirmLoading="confirmLoading"
-    :maskClosable="false"
     :keyboard="false"
     :forceRender="true"
     switchFullscreen
     @cancel="handleCancel"
-    wrapClassName="ant-modal-cust-warp"
-    style="top:20px;height: 95%;overflow-y: hidden">
+    style="top:20px;height: 95%;">
     <template slot="footer">
       <a-button @click="handleCancel">取消</a-button>
       <a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
diff --git a/jshERP-web/src/views/bill/modules/OtherInModal.vue b/jshERP-web/src/views/bill/modules/OtherInModal.vue
index c3dd8243..79aefc8d 100644
--- a/jshERP-web/src/views/bill/modules/OtherInModal.vue
+++ b/jshERP-web/src/views/bill/modules/OtherInModal.vue
@@ -4,13 +4,11 @@
     :width="width"
     :visible="visible"
     :confirmLoading="confirmLoading"
-    :maskClosable="false"
     :keyboard="false"
     :forceRender="true"
     switchFullscreen
     @cancel="handleCancel"
-    wrapClassName="ant-modal-cust-warp"
-    style="top:20px;height: 95%;overflow-y: hidden">
+    style="top:20px;height: 95%;">
     <template slot="footer">
       <a-button @click="handleCancel">取消</a-button>
       <a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
diff --git a/jshERP-web/src/views/bill/modules/OtherOutModal.vue b/jshERP-web/src/views/bill/modules/OtherOutModal.vue
index 2798dc3c..29b325bc 100644
--- a/jshERP-web/src/views/bill/modules/OtherOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/OtherOutModal.vue
@@ -4,13 +4,11 @@
     :width="width"
     :visible="visible"
     :confirmLoading="confirmLoading"
-    :maskClosable="false"
     :keyboard="false"
     :forceRender="true"
     switchFullscreen
     @cancel="handleCancel"
-    wrapClassName="ant-modal-cust-warp"
-    style="top:20px;height: 95%;overflow-y: hidden">
+    style="top:20px;height: 95%;">
     <template slot="footer">
       <a-button @click="handleCancel">取消</a-button>
       <a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
index 81654828..d22ff81f 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
@@ -4,13 +4,11 @@
     :width="width"
     :visible="visible"
     :confirmLoading="confirmLoading"
-    :maskClosable="false"
     :keyboard="false"
     :forceRender="true"
     switchFullscreen
     @cancel="handleCancel"
-    wrapClassName="ant-modal-cust-warp"
-    style="top:20px;height: 95%;overflow-y: hidden">
+    style="top:20px;height: 95%;">
     <template slot="footer">
       <a-button @click="handleCancel">取消</a-button>
       <a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
index 384d3716..93e52d21 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
@@ -4,16 +4,14 @@
     :width="width"
     :visible="visible"
     :confirmLoading="confirmLoading"
-    :maskClosable="false"
     :keyboard="false"
     :forceRender="true"
     v-bind:prefixNo="prefixNo"
     switchHelp
     switchFullscreen
     @cancel="handleCancel"
-    wrapClassName="ant-modal-cust-warp"
     :id="prefixNo"
-    style="top:20px;height: 95%;overflow-y: hidden">
+    style="top:20px;height: 95%;">
     <template slot="footer">
       <a-button @click="handleCancel">取消</a-button>
       <a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
index 03ae72ad..f2e564e4 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
@@ -4,16 +4,14 @@
     :width="width"
     :visible="visible"
     :confirmLoading="confirmLoading"
-    :maskClosable="false"
     :keyboard="false"
     :forceRender="true"
     v-bind:prefixNo="prefixNo"
     switchHelp
     switchFullscreen
     @cancel="handleCancel"
-    wrapClassName="ant-modal-cust-warp"
     :id="prefixNo"
-    style="top:20px;height: 95%;overflow-y: hidden">
+    style="top:20px;height: 95%;">
     <template slot="footer">
       <a-button @click="handleCancel">取消</a-button>
       <a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
index 3c3e9cb1..fba2c91f 100644
--- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
@@ -4,13 +4,11 @@
     :width="width"
     :visible="visible"
     :confirmLoading="confirmLoading"
-    :maskClosable="false"
     :keyboard="false"
     :forceRender="true"
     switchFullscreen
     @cancel="handleCancel"
-    wrapClassName="ant-modal-cust-warp"
-    style="top:20px;height: 95%;overflow-y: hidden">
+    style="top:20px;height: 95%;">
     <template slot="footer">
       <a-button @click="handleCancel">取消</a-button>
       <a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
diff --git a/jshERP-web/src/views/bill/modules/RetailOutModal.vue b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
index 9b6c414f..c2df52c2 100644
--- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
@@ -4,16 +4,14 @@
     :width="width"
     :visible="visible"
     :confirmLoading="confirmLoading"
-    :maskClosable="false"
     :keyboard="false"
     :forceRender="true"
     v-bind:prefixNo="prefixNo"
     switchHelp
     switchFullscreen
     @cancel="handleCancel"
-    wrapClassName="ant-modal-cust-warp"
     :id="prefixNo"
-    style="top:20px;height: 95%;overflow-y: hidden">
+    style="top:20px;height: 95%;">
     <template slot="footer">
       <a-button @click="handleCancel">取消</a-button>
       <a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
index 02e490b0..21d53843 100644
--- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
@@ -4,13 +4,11 @@
     :width="width"
     :visible="visible"
     :confirmLoading="confirmLoading"
-    :maskClosable="false"
     :keyboard="false"
     :forceRender="true"
     switchFullscreen
     @cancel="handleCancel"
-    wrapClassName="ant-modal-cust-warp"
-    style="top:20px;height: 95%;overflow-y: hidden">
+    style="top:20px;height: 95%;">
     <template slot="footer">
       <a-button @click="handleCancel">取消</a-button>
       <a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
index ecc33f1a..95246c3a 100644
--- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
@@ -4,16 +4,14 @@
     :width="width"
     :visible="visible"
     :confirmLoading="confirmLoading"
-    :maskClosable="false"
     :keyboard="false"
     :forceRender="true"
     v-bind:prefixNo="prefixNo"
     switchHelp
     switchFullscreen
     @cancel="handleCancel"
-    wrapClassName="ant-modal-cust-warp"
     :id="prefixNo"
-    style="top:20px;height: 95%;overflow-y: hidden">
+    style="top:20px;height: 95%;">
     <template slot="footer">
       <a-button @click="handleCancel">取消</a-button>
       <a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
index d9ee9e34..eb08745c 100644
--- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
@@ -4,16 +4,14 @@
     :width="width"
     :visible="visible"
     :confirmLoading="confirmLoading"
-    :maskClosable="false"
     :keyboard="false"
     :forceRender="true"
     v-bind:prefixNo="prefixNo"
     switchHelp
     switchFullscreen
     @cancel="handleCancel"
-    wrapClassName="ant-modal-cust-warp"
     :id="prefixNo"
-    style="top:20px;height: 95%;overflow-y: hidden">
+    style="top:20px;height: 95%;">
     <template slot="footer">
       <a-button @click="handleCancel">取消</a-button>
       <a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
diff --git a/jshERP-web/src/views/financial/dialog/DebtBillList.vue b/jshERP-web/src/views/financial/dialog/DebtBillList.vue
index cd500f50..49ee8664 100644
--- a/jshERP-web/src/views/financial/dialog/DebtBillList.vue
+++ b/jshERP-web/src/views/financial/dialog/DebtBillList.vue
@@ -6,12 +6,13 @@
       :visible="visible"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:20px;height: 95%;overflow-y: hidden">
+      style="top:20px;height: 95%;">
       <!-- 查询区域 -->
       <div class="table-page-search-wrapper">
         <!-- 搜索区域 -->
@@ -81,11 +82,12 @@
 <script>
   import BillDetail from '../../bill/dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import {mixinDevice} from '@/utils/mixin'
   import { findBillDetailByNumber } from '@/api/api'
   import Vue from 'vue'
   export default {
     name: 'DebtBillList',
-    mixins:[JeecgListMixin],
+    mixins:[JeecgListMixin, mixinDevice],
     components: {
       BillDetail
     },
diff --git a/jshERP-web/src/views/financial/modules/AdvanceInModal.vue b/jshERP-web/src/views/financial/modules/AdvanceInModal.vue
index 3ea43f1b..b05a2f1c 100644
--- a/jshERP-web/src/views/financial/modules/AdvanceInModal.vue
+++ b/jshERP-web/src/views/financial/modules/AdvanceInModal.vue
@@ -4,13 +4,11 @@
     :width="width"
     :visible="visible"
     :confirmLoading="confirmLoading"
-    :maskClosable="false"
     :keyboard="false"
     :forceRender="true"
     switchFullscreen
     @cancel="handleCancel"
-    wrapClassName="ant-modal-cust-warp"
-    style="top:20px;height: 95%;overflow-y: hidden">
+    style="top:20px;height: 95%;">
     <template slot="footer">
       <a-button @click="handleCancel">取消</a-button>
       <a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
diff --git a/jshERP-web/src/views/financial/modules/GiroModal.vue b/jshERP-web/src/views/financial/modules/GiroModal.vue
index 827b4af3..2d40386e 100644
--- a/jshERP-web/src/views/financial/modules/GiroModal.vue
+++ b/jshERP-web/src/views/financial/modules/GiroModal.vue
@@ -4,13 +4,11 @@
     :width="width"
     :visible="visible"
     :confirmLoading="confirmLoading"
-    :maskClosable="false"
     :keyboard="false"
     :forceRender="true"
     switchFullscreen
     @cancel="handleCancel"
-    wrapClassName="ant-modal-cust-warp"
-    style="top:20px;height: 95%;overflow-y: hidden">
+    style="top:20px;height: 95%;">
     <template slot="footer">
       <a-button @click="handleCancel">取消</a-button>
       <a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
diff --git a/jshERP-web/src/views/financial/modules/ItemInModal.vue b/jshERP-web/src/views/financial/modules/ItemInModal.vue
index 84750181..8845d3f7 100644
--- a/jshERP-web/src/views/financial/modules/ItemInModal.vue
+++ b/jshERP-web/src/views/financial/modules/ItemInModal.vue
@@ -4,13 +4,11 @@
     :width="width"
     :visible="visible"
     :confirmLoading="confirmLoading"
-    :maskClosable="false"
     :keyboard="false"
     :forceRender="true"
     switchFullscreen
     @cancel="handleCancel"
-    wrapClassName="ant-modal-cust-warp"
-    style="top:20px;height: 95%;overflow-y: hidden">
+    style="top:20px;height: 95%;">
     <template slot="footer">
       <a-button @click="handleCancel">取消</a-button>
       <a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
diff --git a/jshERP-web/src/views/financial/modules/ItemOutModal.vue b/jshERP-web/src/views/financial/modules/ItemOutModal.vue
index 361ebf29..f58203a1 100644
--- a/jshERP-web/src/views/financial/modules/ItemOutModal.vue
+++ b/jshERP-web/src/views/financial/modules/ItemOutModal.vue
@@ -4,13 +4,11 @@
     :width="width"
     :visible="visible"
     :confirmLoading="confirmLoading"
-    :maskClosable="false"
     :keyboard="false"
     :forceRender="true"
     switchFullscreen
     @cancel="handleCancel"
-    wrapClassName="ant-modal-cust-warp"
-    style="top:20px;height: 95%;overflow-y: hidden">
+    style="top:20px;height: 95%;">
     <template slot="footer">
       <a-button @click="handleCancel">取消</a-button>
       <a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
diff --git a/jshERP-web/src/views/financial/modules/MoneyInModal.vue b/jshERP-web/src/views/financial/modules/MoneyInModal.vue
index fdcb7633..c20c8fd7 100644
--- a/jshERP-web/src/views/financial/modules/MoneyInModal.vue
+++ b/jshERP-web/src/views/financial/modules/MoneyInModal.vue
@@ -4,13 +4,11 @@
     :width="width"
     :visible="visible"
     :confirmLoading="confirmLoading"
-    :maskClosable="false"
     :keyboard="false"
     :forceRender="true"
     switchFullscreen
     @cancel="handleCancel"
-    wrapClassName="ant-modal-cust-warp"
-    style="top:20px;height: 95%;overflow-y: hidden">
+    style="top:20px;height: 95%;">
     <template slot="footer">
       <a-button @click="handleCancel">取消</a-button>
       <a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
diff --git a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
index b13f5935..d806a164 100644
--- a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
+++ b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
@@ -4,13 +4,11 @@
     :width="width"
     :visible="visible"
     :confirmLoading="confirmLoading"
-    :maskClosable="false"
     :keyboard="false"
     :forceRender="true"
     switchFullscreen
     @cancel="handleCancel"
-    wrapClassName="ant-modal-cust-warp"
-    style="top:20px;height: 95%;overflow-y: hidden">
+    style="top:20px;height: 95%;">
     <template slot="footer">
       <a-button @click="handleCancel">取消</a-button>
       <a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
diff --git a/jshERP-web/src/views/material/modules/BatchSetInfoModal.vue b/jshERP-web/src/views/material/modules/BatchSetInfoModal.vue
index ff5bddbb..3bfce66a 100644
--- a/jshERP-web/src/views/material/modules/BatchSetInfoModal.vue
+++ b/jshERP-web/src/views/material/modules/BatchSetInfoModal.vue
@@ -7,11 +7,12 @@
       :confirm-loading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:20%;height: 45%;overflow-y: hidden">
+      style="top:20%;height: 45%;">
       <a-spin :spinning="confirmLoading">
         <a-form :form="form">
           <a-row class="form-row" :gutter="24">
@@ -67,8 +68,10 @@
 
 <script>
   import {queryMaterialCategoryTreeList, batchUpdateMaterial} from '@/api/api'
+  import {mixinDevice} from '@/utils/mixin'
   export default {
     name: 'BatchSetInfoModal',
+    mixins: [mixinDevice],
     data () {
       return {
         title:"批量编辑",
diff --git a/jshERP-web/src/views/material/modules/BatchSetPriceModal.vue b/jshERP-web/src/views/material/modules/BatchSetPriceModal.vue
index 777747cd..bda970df 100644
--- a/jshERP-web/src/views/material/modules/BatchSetPriceModal.vue
+++ b/jshERP-web/src/views/material/modules/BatchSetPriceModal.vue
@@ -7,12 +7,13 @@
       :confirm-loading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:30%;height: 30%;overflow-y: hidden">
+      style="top:30%;height: 30%;">
       <template slot="footer">
         <a-button key="back" v-if="isReadOnly" @click="handleCancel">
           关闭
@@ -30,8 +31,10 @@
 </template>
 
 <script>
+  import {mixinDevice} from '@/utils/mixin'
   export default {
     name: 'BatchSetPriceModal',
+    mixins: [mixinDevice],
     data () {
       return {
         title:"批量设置",
diff --git a/jshERP-web/src/views/material/modules/BatchSetStockModal.vue b/jshERP-web/src/views/material/modules/BatchSetStockModal.vue
index 3ed03ce7..48207c0d 100644
--- a/jshERP-web/src/views/material/modules/BatchSetStockModal.vue
+++ b/jshERP-web/src/views/material/modules/BatchSetStockModal.vue
@@ -7,12 +7,13 @@
       :confirm-loading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:30%;height: 30%;overflow-y: hidden">
+      style="top:30%;height: 30%;">
       <template slot="footer">
         <a-button key="back" v-if="isReadOnly" @click="handleCancel">
           关闭
@@ -30,8 +31,10 @@
 </template>
 
 <script>
+  import {mixinDevice} from '@/utils/mixin'
   export default {
     name: 'BatchSetStockModal',
+    mixins: [mixinDevice],
     data () {
       return {
         title:"批量设置",
diff --git a/jshERP-web/src/views/material/modules/MaterialAttributeModal.vue b/jshERP-web/src/views/material/modules/MaterialAttributeModal.vue
index d6e9b028..a53b86eb 100644
--- a/jshERP-web/src/views/material/modules/MaterialAttributeModal.vue
+++ b/jshERP-web/src/views/material/modules/MaterialAttributeModal.vue
@@ -7,12 +7,13 @@
       :confirmLoading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:100px;height: 50%;overflow-y: hidden">
+      style="top:100px;height: 50%;">
       <template slot="footer">
         <a-button key="back" v-if="isReadOnly" @click="handleCancel">
           关闭
@@ -36,8 +37,10 @@
 <script>
   import pick from 'lodash.pick'
   import {addMaterialAttribute,editMaterialAttribute,checkMaterialAttribute } from '@/api/api'
-    export default {
+  import {mixinDevice} from '@/utils/mixin'
+  export default {
     name: "MaterialAttributeModal",
+    mixins: [mixinDevice],
     data () {
       return {
         title:"操作",
diff --git a/jshERP-web/src/views/material/modules/MaterialCategoryModal.vue b/jshERP-web/src/views/material/modules/MaterialCategoryModal.vue
index 4d056c2a..e3e484ba 100644
--- a/jshERP-web/src/views/material/modules/MaterialCategoryModal.vue
+++ b/jshERP-web/src/views/material/modules/MaterialCategoryModal.vue
@@ -9,11 +9,12 @@
       :okButtonProps="{ props: {disabled: disableSubmit} }"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:100px;height: 50%;overflow-y: hidden"
+      style="top:100px;height: 50%;"
       cancelText="关闭">
       <a-spin :spinning="confirmLoading">
         <a-form :form="form">
@@ -43,11 +44,13 @@
 
 <script>
   import { httpAction } from '@/api/manage'
+  import {mixinDevice} from '@/utils/mixin'
   import { queryMaterialCategoryTreeList, checkMaterialCategory } from '@/api/api'
   import pick from 'lodash.pick'
   import ATextarea from 'ant-design-vue/es/input/TextArea'
   export default {
     name: "MaterialCategoryModal",
+    mixins: [mixinDevice],
     components: { ATextarea },
     data () {
       return {
diff --git a/jshERP-web/src/views/material/modules/MaterialModal.vue b/jshERP-web/src/views/material/modules/MaterialModal.vue
index 7cda2698..d2abdbcf 100644
--- a/jshERP-web/src/views/material/modules/MaterialModal.vue
+++ b/jshERP-web/src/views/material/modules/MaterialModal.vue
@@ -4,14 +4,12 @@
     :width="width"
     :visible="visible"
     :confirmLoading="confirmLoading"
-    :maskClosable="false"
     v-bind:prefixNo="prefixNo"
     switchHelp
     switchFullscreen
     @ok="handleOk"
     @cancel="handleCancel"
     cancelText="关闭"
-    wrapClassName="ant-modal-material-warp"
     :id="prefixNo"
     :style="modalStyle">
     <template slot="footer">
diff --git a/jshERP-web/src/views/material/modules/MaterialPropertyModal.vue b/jshERP-web/src/views/material/modules/MaterialPropertyModal.vue
index 3b9ab915..a0b34d2a 100644
--- a/jshERP-web/src/views/material/modules/MaterialPropertyModal.vue
+++ b/jshERP-web/src/views/material/modules/MaterialPropertyModal.vue
@@ -7,12 +7,13 @@
       :confirmLoading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:10%;height: 70%;overflow-y: hidden">
+      style="top:10%;height: 70%;">
       <a-spin :spinning="confirmLoading">
         <a-form :form="form">
           <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
@@ -34,9 +35,11 @@
 </template>
 <script>
   import pick from 'lodash.pick'
+  import {mixinDevice} from '@/utils/mixin'
   import {editMaterialProperty } from '@/api/api'
   export default {
     name: "MaterialPropertyModal",
+    mixins: [mixinDevice],
     data () {
       return {
         title:"操作",
diff --git a/jshERP-web/src/views/report/modules/AccountInOutList.vue b/jshERP-web/src/views/report/modules/AccountInOutList.vue
index f8a37a88..61f7ae52 100644
--- a/jshERP-web/src/views/report/modules/AccountInOutList.vue
+++ b/jshERP-web/src/views/report/modules/AccountInOutList.vue
@@ -6,11 +6,12 @@
       :visible="visible"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:20px;height: 95%;overflow-y: hidden">
+      style="top:20px;height: 95%;">
       <template slot="footer">
         <a-button key="back" @click="handleCancel">取消</a-button>
       </template>
@@ -40,11 +41,12 @@
   import BillDetail from '../../bill/dialog/BillDetail'
   import FinancialDetail from '../../financial/dialog/FinancialDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import {mixinDevice} from '@/utils/mixin'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import {findBillDetailByNumber, findFinancialDetailByNumber} from '@/api/api'
   export default {
     name: "AccountInOutList",
-    mixins:[JeecgListMixin],
+    mixins:[JeecgListMixin, mixinDevice],
     components: {
       BillDetail,
       FinancialDetail,
diff --git a/jshERP-web/src/views/report/modules/DebtAccountList.vue b/jshERP-web/src/views/report/modules/DebtAccountList.vue
index 490e2e39..c3a6e4fb 100644
--- a/jshERP-web/src/views/report/modules/DebtAccountList.vue
+++ b/jshERP-web/src/views/report/modules/DebtAccountList.vue
@@ -6,11 +6,12 @@
       :visible="visible"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:20px;height: 95%;overflow-y: hidden">
+      style="top:20px;height: 95%;">
       <template slot="footer">
         <a-button key="back" @click="handleCancel">取消</a-button>
       </template>
@@ -73,11 +74,12 @@
   import BillDetail from '../../bill/dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { openDownloadDialog, sheet2blob} from "@/utils/util"
+  import {mixinDevice} from '@/utils/mixin'
   import { findBillDetailByNumber } from '@/api/api'
   import Vue from 'vue'
   export default {
     name: 'DebtAccountList',
-    mixins:[JeecgListMixin],
+    mixins:[JeecgListMixin, mixinDevice],
     components: {
       BillDetail
     },
diff --git a/jshERP-web/src/views/report/modules/MaterialInOutList.vue b/jshERP-web/src/views/report/modules/MaterialInOutList.vue
index 0eac1a45..bf9eba76 100644
--- a/jshERP-web/src/views/report/modules/MaterialInOutList.vue
+++ b/jshERP-web/src/views/report/modules/MaterialInOutList.vue
@@ -6,11 +6,12 @@
       :visible="visible"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:20px;height: 95%;overflow-y: hidden">
+      style="top:20px;height: 95%;">
       <template slot="footer">
         <a-button key="back" @click="handleCancel">取消</a-button>
       </template>
@@ -40,9 +41,10 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import {findBillDetailByNumber, findFinancialDetailByNumber} from '@/api/api'
+  import {mixinDevice} from '@/utils/mixin'
   export default {
     name: "MaterialInOutList",
-    mixins:[JeecgListMixin],
+    mixins:[JeecgListMixin, mixinDevice],
     components: {
       BillDetail,
       JEllipsis
diff --git a/jshERP-web/src/views/system/modules/AccountModal.vue b/jshERP-web/src/views/system/modules/AccountModal.vue
index 2fca19f2..b9d79d63 100644
--- a/jshERP-web/src/views/system/modules/AccountModal.vue
+++ b/jshERP-web/src/views/system/modules/AccountModal.vue
@@ -7,12 +7,13 @@
       :confirmLoading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:15%;height: 65%;overflow-y: hidden">
+      style="top:15%;height: 65%;">
       <template slot="footer">
         <a-button key="back" v-if="isReadOnly" @click="handleCancel">
           关闭
@@ -47,8 +48,10 @@
   import pick from 'lodash.pick'
   import {addAccount,editAccount,checkAccount } from '@/api/api'
   import {autoJumpNextInput} from "@/utils/util"
+  import {mixinDevice} from '@/utils/mixin'
   export default {
     name: "AccountModal",
+    mixins: [mixinDevice],
     data () {
       return {
         title:"操作",
diff --git a/jshERP-web/src/views/system/modules/CustomerModal.vue b/jshERP-web/src/views/system/modules/CustomerModal.vue
index 60acbaad..20aa56af 100644
--- a/jshERP-web/src/views/system/modules/CustomerModal.vue
+++ b/jshERP-web/src/views/system/modules/CustomerModal.vue
@@ -7,12 +7,13 @@
       :confirmLoading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:10%;height: 80%;overflow-y: hidden">
+      style="top:10%;height: 80%;">
       <template slot="footer">
         <a-button key="back" v-if="isReadOnly" @click="handleCancel">
           关闭
@@ -108,8 +109,10 @@
   import pick from 'lodash.pick'
   import {addSupplier,editSupplier,checkSupplier } from '@/api/api'
   import {autoJumpNextInput} from "@/utils/util"
+  import {mixinDevice} from '@/utils/mixin'
   export default {
     name: "CustomerModal",
+    mixins: [mixinDevice],
     data () {
       return {
         title:"操作",
diff --git a/jshERP-web/src/views/system/modules/DepotModal.vue b/jshERP-web/src/views/system/modules/DepotModal.vue
index ecc9bd11..12f04ad3 100644
--- a/jshERP-web/src/views/system/modules/DepotModal.vue
+++ b/jshERP-web/src/views/system/modules/DepotModal.vue
@@ -7,12 +7,13 @@
       :confirmLoading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:10%;height: 70%;overflow-y: hidden">
+      style="top:10%;height: 70%;">
       <template slot="footer">
         <a-button key="back" v-if="isReadOnly" @click="handleCancel">
           关闭
@@ -54,13 +55,16 @@
   import pick from 'lodash.pick'
   import {addDepot,editDepot,checkDepot,getUserList } from '@/api/api'
   import {autoJumpNextInput} from "@/utils/util"
+  import {mixinDevice} from '@/utils/mixin'
   export default {
     name: "DepotModal",
+    mixins: [mixinDevice],
     data () {
       return {
         title:"操作",
         visible: false,
         model: {},
+        maskStyle: '',
         userList: [],
         isReadOnly: false,
         labelCol: {
diff --git a/jshERP-web/src/views/system/modules/FunctionModal.vue b/jshERP-web/src/views/system/modules/FunctionModal.vue
index 0efb630b..57abbaaf 100644
--- a/jshERP-web/src/views/system/modules/FunctionModal.vue
+++ b/jshERP-web/src/views/system/modules/FunctionModal.vue
@@ -7,12 +7,13 @@
       :confirmLoading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:5%;height: 90%;overflow-y: hidden">
+      style="top:5%;height: 90%;">
       <template slot="footer">
         <a-button key="back" v-if="isReadOnly" @click="handleCancel">
           关闭
@@ -62,9 +63,11 @@
   import FunctionTreeModal from './FunctionTreeModal'
   import {addFunction,editFunction,checkFunction, checkNumber } from '@/api/api'
   import {autoJumpNextInput} from "@/utils/util"
+  import {mixinDevice} from '@/utils/mixin'
   import JSelectMultiple from '@/components/jeecg/JSelectMultiple'
   export default {
     name: "FunctionModal",
+    mixins: [mixinDevice],
     components: {
       FunctionTreeModal,
       JSelectMultiple
diff --git a/jshERP-web/src/views/system/modules/FunctionTreeModal.vue b/jshERP-web/src/views/system/modules/FunctionTreeModal.vue
index 9d558abc..dd42cd41 100644
--- a/jshERP-web/src/views/system/modules/FunctionTreeModal.vue
+++ b/jshERP-web/src/views/system/modules/FunctionTreeModal.vue
@@ -7,11 +7,12 @@
       :confirmLoading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:5%;height: 90%;overflow-y: hidden">
+      style="top:5%;height: 90%;">
       <template slot="footer">
         <a-button key="back" @click="handleCancel">
           关闭
@@ -38,8 +39,10 @@
 <script>
   import pick from 'lodash.pick'
   import {getAction} from '../../../api/manage'
+  import {mixinDevice} from '@/utils/mixin'
   export default {
     name: "FunctionTreeModal",
+    mixins: [mixinDevice],
     data () {
       return {
         title:"操作",
diff --git a/jshERP-web/src/views/system/modules/InOutItemModal.vue b/jshERP-web/src/views/system/modules/InOutItemModal.vue
index da1c2891..368f9f40 100644
--- a/jshERP-web/src/views/system/modules/InOutItemModal.vue
+++ b/jshERP-web/src/views/system/modules/InOutItemModal.vue
@@ -7,12 +7,13 @@
       :confirmLoading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:20%;height: 50%;overflow-y: hidden">
+      style="top:20%;height: 50%;">
       <template slot="footer">
         <a-button key="back" v-if="isReadOnly" @click="handleCancel">
           关闭
@@ -44,8 +45,10 @@
   import pick from 'lodash.pick'
   import {addInOutItem,editInOutItem,checkInOutItem } from '@/api/api'
   import {autoJumpNextInput} from "@/utils/util"
+  import {mixinDevice} from '@/utils/mixin'
   export default {
     name: "InOutItemModal",
+    mixins: [mixinDevice],
     data () {
       return {
         title:"操作",
diff --git a/jshERP-web/src/views/system/modules/MemberModal.vue b/jshERP-web/src/views/system/modules/MemberModal.vue
index ea1ca1eb..06b02af5 100644
--- a/jshERP-web/src/views/system/modules/MemberModal.vue
+++ b/jshERP-web/src/views/system/modules/MemberModal.vue
@@ -7,12 +7,13 @@
       :confirmLoading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:15%;height: 60%;overflow-y: hidden">
+      style="top:15%;height: 60%;">
       <template slot="footer">
         <a-button key="back" v-if="isReadOnly" @click="handleCancel">
           关闭
@@ -68,8 +69,10 @@
   import pick from 'lodash.pick'
   import {addSupplier,editSupplier,checkSupplier } from '@/api/api'
   import {autoJumpNextInput} from "@/utils/util"
+  import {mixinDevice} from '@/utils/mixin'
   export default {
     name: "MemberModal",
+    mixins: [mixinDevice],
     data () {
       return {
         title:"操作",
diff --git a/jshERP-web/src/views/system/modules/OrganizationModal.vue b/jshERP-web/src/views/system/modules/OrganizationModal.vue
index 5580feca..64611246 100644
--- a/jshERP-web/src/views/system/modules/OrganizationModal.vue
+++ b/jshERP-web/src/views/system/modules/OrganizationModal.vue
@@ -8,13 +8,14 @@
       :confirmLoading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       :okButtonProps="{ props: {disabled: disableSubmit} }"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:50px;height: 80%;overflow-y: hidden">
+      style="top:50px;height: 80%;">
       <a-spin :spinning="confirmLoading">
         <a-form :form="form" id="organizationModal">
           <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
@@ -45,10 +46,12 @@
   import { httpAction } from '@/api/manage'
   import { queryOrganizationTreeList, checkOrganization } from '@/api/api'
   import {autoJumpNextInput} from "@/utils/util"
+  import {mixinDevice} from '@/utils/mixin'
   import pick from 'lodash.pick'
   import ATextarea from 'ant-design-vue/es/input/TextArea'
   export default {
     name: "OrganizationModal",
+    mixins: [mixinDevice],
     components: { ATextarea },
     data () {
       return {
diff --git a/jshERP-web/src/views/system/modules/PersonModal.vue b/jshERP-web/src/views/system/modules/PersonModal.vue
index 3292b8f4..a8c30d48 100644
--- a/jshERP-web/src/views/system/modules/PersonModal.vue
+++ b/jshERP-web/src/views/system/modules/PersonModal.vue
@@ -7,12 +7,13 @@
       :confirmLoading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:20%;height: 45%;overflow-y: hidden">
+      style="top:20%;height: 45%;">
       <template slot="footer">
         <a-button key="back" v-if="isReadOnly" @click="handleCancel">
           关闭
@@ -42,8 +43,10 @@
   import pick from 'lodash.pick'
   import {addPerson,editPerson,checkPerson } from '@/api/api'
   import {autoJumpNextInput} from "@/utils/util"
+  import {mixinDevice} from '@/utils/mixin'
   export default {
     name: "PersonModal",
+    mixins: [mixinDevice],
     data () {
       return {
         title:"操作",
diff --git a/jshERP-web/src/views/system/modules/PlatformConfigModal.vue b/jshERP-web/src/views/system/modules/PlatformConfigModal.vue
index 7dfb8024..295d422f 100644
--- a/jshERP-web/src/views/system/modules/PlatformConfigModal.vue
+++ b/jshERP-web/src/views/system/modules/PlatformConfigModal.vue
@@ -7,12 +7,13 @@
       :confirmLoading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:25%;height: 40%;overflow-y: hidden">
+      style="top:25%;height: 40%;">
       <a-spin :spinning="confirmLoading">
         <a-form :form="form" id="platformConfigModal">
           <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="配置名称">
@@ -30,8 +31,10 @@
   import pick from 'lodash.pick'
   import {addPlatformConfig,editPlatformConfig } from '@/api/api'
   import {autoJumpNextInput} from "@/utils/util"
+  import {mixinDevice} from '@/utils/mixin'
   export default {
     name: "PlatformConfigModal",
+    mixins: [mixinDevice],
     data () {
       return {
         title:"操作",
diff --git a/jshERP-web/src/views/system/modules/PluginAppModal.vue b/jshERP-web/src/views/system/modules/PluginAppModal.vue
index 009ed31e..d2e47e32 100644
--- a/jshERP-web/src/views/system/modules/PluginAppModal.vue
+++ b/jshERP-web/src/views/system/modules/PluginAppModal.vue
@@ -7,12 +7,13 @@
       :confirmLoading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:20%;height: 50%;overflow-y: hidden">
+      style="top:20%;height: 50%;">
       <a-spin :spinning="confirmLoading">
         <a-form :form="form">
           <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="机器码">
@@ -29,9 +30,11 @@
 <script>
   import pick from 'lodash.pick'
   import {getPlatformConfigByKey } from '@/api/api'
+  import {mixinDevice} from '@/utils/mixin'
   import { getAction, postAction } from '../../../api/manage'
   export default {
     name: "PluginAppModal",
+    mixins: [mixinDevice],
     data () {
       return {
         title:"操作",
diff --git a/jshERP-web/src/views/system/modules/PluginModal.vue b/jshERP-web/src/views/system/modules/PluginModal.vue
index 2dc3d3e6..489b0496 100644
--- a/jshERP-web/src/views/system/modules/PluginModal.vue
+++ b/jshERP-web/src/views/system/modules/PluginModal.vue
@@ -7,12 +7,13 @@
       :confirmLoading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:20%;height: 50%;overflow-y: hidden">
+      style="top:20%;height: 50%;">
       <a-spin :spinning="confirmLoading">
         <a-form :form="form">
           <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="机器码">
@@ -29,9 +30,11 @@
 <script>
   import pick from 'lodash.pick'
   import {getPlatformConfigByKey } from '@/api/api'
+  import {mixinDevice} from '@/utils/mixin'
   import { getAction, postAction } from '../../../api/manage'
   export default {
     name: "PluginModal",
+    mixins: [mixinDevice],
     data () {
       return {
         title:"操作",
diff --git a/jshERP-web/src/views/system/modules/RoleFunctionModal.vue b/jshERP-web/src/views/system/modules/RoleFunctionModal.vue
index c8d44343..f48e85a6 100644
--- a/jshERP-web/src/views/system/modules/RoleFunctionModal.vue
+++ b/jshERP-web/src/views/system/modules/RoleFunctionModal.vue
@@ -7,12 +7,13 @@
       :confirmLoading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:5%;height: 95%;overflow-y: hidden">
+      style="top:5%;height: 95%;">
       <a-spin :spinning="confirmLoading">
         <div class="drawer-bootom-button">
           <a-dropdown :trigger="['click']" placement="topCenter">
@@ -50,10 +51,12 @@
 </template>
 <script>
   import pick from 'lodash.pick'
+  import {mixinDevice} from '@/utils/mixin'
   import {addUserBusiness,editUserBusiness,checkUserBusiness} from '@/api/api'
   import {getAction} from '../../../api/manage'
   export default {
     name: "RoleFunctionModal",
+    mixins: [mixinDevice],
     data () {
       return {
         title:"操作",
diff --git a/jshERP-web/src/views/system/modules/RoleModal.vue b/jshERP-web/src/views/system/modules/RoleModal.vue
index 4006c1d1..f9854561 100644
--- a/jshERP-web/src/views/system/modules/RoleModal.vue
+++ b/jshERP-web/src/views/system/modules/RoleModal.vue
@@ -7,12 +7,13 @@
       :confirmLoading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:15%;height: 60%;overflow-y: hidden">
+      style="top:15%;height: 60%;">
       <template slot="footer">
         <a-button key="back" v-if="isReadOnly" @click="handleCancel">
           关闭
@@ -56,8 +57,10 @@
   import JSelectMultiple from '@/components/jeecg/JSelectMultiple'
   import {addRole,editRole,checkRole } from '@/api/api'
   import {autoJumpNextInput} from "@/utils/util"
+  import {mixinDevice} from '@/utils/mixin'
   export default {
     name: "RoleModal",
+    mixins: [mixinDevice],
     components: {
       JSelectMultiple
     },
diff --git a/jshERP-web/src/views/system/modules/RolePushBtnModal.vue b/jshERP-web/src/views/system/modules/RolePushBtnModal.vue
index e852f581..337e0031 100644
--- a/jshERP-web/src/views/system/modules/RolePushBtnModal.vue
+++ b/jshERP-web/src/views/system/modules/RolePushBtnModal.vue
@@ -7,12 +7,13 @@
       :confirmLoading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:5%;height: 95%;overflow-y: hidden">
+      style="top:5%;height: 95%;">
       <a-spin :spinning="confirmLoading">
         <div class="table-page-search-wrapper">
           <!-- 按钮区域 -->
@@ -69,9 +70,10 @@
   import { getAction } from '@/api/manage'
   import { updateBtnStrByRoleId } from '@/api/api'
   import { removeByVal } from "@/utils/util"
+  import {mixinDevice} from '@/utils/mixin'
   export default {
     name: "RolePushBtnModal",
-    mixins:[JeecgListMixin],
+    mixins:[JeecgListMixin, mixinDevice],
     data () {
       return {
         title:"操作",
diff --git a/jshERP-web/src/views/system/modules/TenantModal.vue b/jshERP-web/src/views/system/modules/TenantModal.vue
index c6c2cad0..f248318d 100644
--- a/jshERP-web/src/views/system/modules/TenantModal.vue
+++ b/jshERP-web/src/views/system/modules/TenantModal.vue
@@ -7,12 +7,13 @@
       :confirmLoading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:15%;height: 60%;overflow-y: hidden">
+      style="top:15%;height: 60%;">
       <a-spin :spinning="confirmLoading">
         <a-form :form="form">
           <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="登录名称">
@@ -41,11 +42,13 @@
 </template>
 <script>
   import pick from 'lodash.pick'
+  import {mixinDevice} from '@/utils/mixin'
   import {registerUser,editTenant,checkTenant } from '@/api/api'
   import JDate from '@/components/jeecg/JDate'
   import md5 from 'md5'
   export default {
     name: "TenantModal",
+    mixins: [mixinDevice],
     components: {
       JDate
     },
diff --git a/jshERP-web/src/views/system/modules/UnitModal.vue b/jshERP-web/src/views/system/modules/UnitModal.vue
index 4ce12a96..36c88da2 100644
--- a/jshERP-web/src/views/system/modules/UnitModal.vue
+++ b/jshERP-web/src/views/system/modules/UnitModal.vue
@@ -7,12 +7,13 @@
       :confirmLoading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:100px; height:50%;overflow-y: hidden">
+      style="top:100px; height:50%;">
       <template slot="footer">
         <a-button key="back" v-if="isReadOnly" @click="handleCancel">
           关闭
@@ -53,8 +54,10 @@
   import pick from 'lodash.pick'
   import {addUnit,editUnit,checkUnit } from '@/api/api'
   import {autoJumpNextInput} from "@/utils/util"
+  import {mixinDevice} from '@/utils/mixin'
   export default {
     name: "UnitModal",
+    mixins: [mixinDevice],
     data () {
       return {
         title:"操作",
diff --git a/jshERP-web/src/views/system/modules/UserCustomerModal.vue b/jshERP-web/src/views/system/modules/UserCustomerModal.vue
index e5b0ed59..f30181b0 100644
--- a/jshERP-web/src/views/system/modules/UserCustomerModal.vue
+++ b/jshERP-web/src/views/system/modules/UserCustomerModal.vue
@@ -7,12 +7,13 @@
       :confirmLoading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:5%;height: 95%;overflow-y: hidden">
+      style="top:5%;height: 95%;">
       <a-spin :spinning="confirmLoading">
         <div class="drawer-bootom-button">
           <a-dropdown :trigger="['click']" placement="topCenter">
@@ -50,10 +51,12 @@
 </template>
 <script>
   import pick from 'lodash.pick'
+  import {mixinDevice} from '@/utils/mixin'
   import {addUserBusiness,editUserBusiness,checkUserBusiness} from '@/api/api'
   import {getAction} from '../../../api/manage'
   export default {
     name: "UserCustomerModal",
+    mixins: [mixinDevice],
     data () {
       return {
         title:"操作",
diff --git a/jshERP-web/src/views/system/modules/UserDepotModal.vue b/jshERP-web/src/views/system/modules/UserDepotModal.vue
index c13848ff..1048bf98 100644
--- a/jshERP-web/src/views/system/modules/UserDepotModal.vue
+++ b/jshERP-web/src/views/system/modules/UserDepotModal.vue
@@ -7,12 +7,13 @@
       :confirmLoading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:5%;height: 95%;overflow-y: hidden">
+      style="top:5%;height: 95%;">
       <a-spin :spinning="confirmLoading">
         <div class="drawer-bootom-button">
           <a-dropdown :trigger="['click']" placement="topCenter">
@@ -50,10 +51,12 @@
 </template>
 <script>
   import pick from 'lodash.pick'
+  import {mixinDevice} from '@/utils/mixin'
   import {addUserBusiness,editUserBusiness,checkUserBusiness} from '@/api/api'
   import {getAction} from '../../../api/manage'
   export default {
     name: "UserDepotModal",
+    mixins: [mixinDevice],
     data () {
       return {
         title:"操作",
diff --git a/jshERP-web/src/views/system/modules/UserModal.vue b/jshERP-web/src/views/system/modules/UserModal.vue
index 84637ce6..b989d133 100644
--- a/jshERP-web/src/views/system/modules/UserModal.vue
+++ b/jshERP-web/src/views/system/modules/UserModal.vue
@@ -7,12 +7,13 @@
       :confirmLoading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:5%;height: 85%;overflow-y: hidden">
+      style="top:5%;height: 85%;">
       <template slot="footer">
         <a-button key="back" v-if="isReadOnly" @click="handleCancel">
           关闭
@@ -69,9 +70,11 @@
   import {addUser,editUser,queryOrganizationTreeList,roleAllList} from '@/api/api'
   import { disabledAuthFilter } from "@/utils/authFilter"
   import {autoJumpNextInput} from "@/utils/util"
+  import {mixinDevice} from '@/utils/mixin'
   import JImageUpload from '../../../components/jeecg/JImageUpload'
   export default {
     name: "UserModal",
+    mixins: [mixinDevice],
     components: {
       JImageUpload,
       JSelectPosition
diff --git a/jshERP-web/src/views/system/modules/VendorModal.vue b/jshERP-web/src/views/system/modules/VendorModal.vue
index acf4e3f8..5dddb6e8 100644
--- a/jshERP-web/src/views/system/modules/VendorModal.vue
+++ b/jshERP-web/src/views/system/modules/VendorModal.vue
@@ -7,12 +7,13 @@
       :confirmLoading="confirmLoading"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
       :maskClosable="false"
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      wrapClassName="ant-modal-cust-warp"
-      style="top:10%;height: 80%;overflow-y: hidden">
+      style="top:10%;height: 80%;">
       <template slot="footer">
         <a-button key="back" v-if="isReadOnly" @click="handleCancel">
           关闭
@@ -108,8 +109,10 @@
   import pick from 'lodash.pick'
   import {addSupplier,editSupplier,checkSupplier } from '@/api/api'
   import {autoJumpNextInput} from "@/utils/util"
+  import {mixinDevice} from '@/utils/mixin'
   export default {
     name: "VendorModal",
+    mixins: [mixinDevice],
     data () {
       return {
         title:"操作",