调整样式，兼容手机浏览器页面

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

@@ -17,10 +17,12 @@
   padding-top: 15px;
   padding-bottom: 15px;
 }
-/*列表页面弹出modal*/
+.depot-mask {
-.ant-modal-cust-warp {
   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;

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 修饰符

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')
     },

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%;">
-      style="top:20%;height: 45%;overflow-y: hidden">
       <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:"",

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) {

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%;">
-      style="top:20%;height: 50%;overflow-y: hidden">
       <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:"修改密码",

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'
+      }
     }
   }
 }

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%;">
-      style="top:30%;height: 35%;overflow-y: hidden">
       <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:"操作",

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="关闭"
+      cancelText="关闭">
-      wrapClassName="ant-modal-cust-warp">
       <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: "三联打印预览",

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%;">
-      style="top:50px;height: 90%;overflow-y: hidden">
       <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,
     },

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%;">
-      style="top:20px;height: 95%;overflow-y: hidden">
       <!-- 查询区域 -->
       <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
     },

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%;">
-      style="top:20%;height: 60%;overflow-y: hidden">
       <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:"操作",

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%;">
-    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

@@ -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%;">
-    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

@@ -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%;">
-    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/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%;">
-    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/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%;">
-    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/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%;">
-    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/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>

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>

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%;">
-    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/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>

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%;">
-    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/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>

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>

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%;">
-      style="top:20px;height: 95%;overflow-y: hidden">
       <!-- 查询区域 -->
       <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
     },

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%;">
-    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/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%;">
-    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/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%;">
-    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/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%;">
-    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/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%;">
-    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/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%;">
-    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/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%;">
-      style="top:20%;height: 45%;overflow-y: hidden">
       <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:"批量编辑",

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%;">
-      style="top:30%;height: 30%;overflow-y: hidden">
       <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:"批量设置",

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%;">
-      style="top:30%;height: 30%;overflow-y: hidden">
       <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:"批量设置",

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%;">
-      style="top:100px;height: 50%;overflow-y: hidden">
       <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:"操作",

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%;"
-      style="top:100px;height: 50%;overflow-y: hidden"
       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 {

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">

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%;">
-      style="top:10%;height: 70%;overflow-y: hidden">
       <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:"操作",

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%;">
-      style="top:20px;height: 95%;overflow-y: hidden">
       <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,

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%;">
-      style="top:20px;height: 95%;overflow-y: hidden">
       <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
     },

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%;">
-      style="top:20px;height: 95%;overflow-y: hidden">
       <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

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%;">
-      style="top:15%;height: 65%;overflow-y: hidden">
       <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:"操作",

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%;">
-      style="top:10%;height: 80%;overflow-y: hidden">
       <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:"操作",

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%;">
-      style="top:10%;height: 70%;overflow-y: hidden">
       <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: {

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%;">
-      style="top:5%;height: 90%;overflow-y: hidden">
       <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

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%;">
-      style="top:5%;height: 90%;overflow-y: hidden">
       <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:"操作",

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%;">
-      style="top:20%;height: 50%;overflow-y: hidden">
       <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:"操作",

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%;">
-      style="top:15%;height: 60%;overflow-y: hidden">
       <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:"操作",

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%;">
-      style="top:50px;height: 80%;overflow-y: hidden">
       <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 {

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%;">
-      style="top:20%;height: 45%;overflow-y: hidden">
       <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:"操作",

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%;">
-      style="top:25%;height: 40%;overflow-y: hidden">
       <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:"操作",

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%;">
-      style="top:20%;height: 50%;overflow-y: hidden">
       <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:"操作",

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%;">
-      style="top:20%;height: 50%;overflow-y: hidden">
       <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:"操作",

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%;">
-      style="top:5%;height: 95%;overflow-y: hidden">
       <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:"操作",

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%;">
-      style="top:15%;height: 60%;overflow-y: hidden">
       <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
     },

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%;">
-      style="top:5%;height: 95%;overflow-y: hidden">
       <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:"操作",

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%;">
-      style="top:15%;height: 60%;overflow-y: hidden">
       <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
     },

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%;">
-      style="top:100px; height:50%;overflow-y: hidden">
       <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:"操作",

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%;">
-      style="top:5%;height: 95%;overflow-y: hidden">
       <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:"操作",

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%;">
-      style="top:5%;height: 95%;overflow-y: hidden">
       <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:"操作",

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%;">
-      style="top:5%;height: 85%;overflow-y: hidden">
       <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

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%;">
-      style="top:10%;height: 80%;overflow-y: hidden">
       <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:"操作",