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

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;

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

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%;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:"修改密码",

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%;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:"操作",

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: "三联打印预览",

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

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

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:"操作",

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>

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>

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>

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>

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>

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>

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>