diff --git a/jshERP-web/src/assets/less/common.less b/jshERP-web/src/assets/less/common.less
index d93afda6..0bfc29ef 100644
--- a/jshERP-web/src/assets/less/common.less
+++ b/jshERP-web/src/assets/less/common.less
@@ -1,58 +1,58 @@
-
-/*列表上方操作按钮区域*/
-.ant-card-body .table-operator {
-  margin-bottom: 0px;
-}
-/** Button按钮间距 */
-.table-operator .ant-btn {
-  margin: 0 8px 8px 0;
-}
-.table-operator .ant-btn-group .ant-btn {
-  margin: 0;
-}
-
-.table-operator .ant-btn-group .ant-btn:last-child {
-  margin: 0 8px 8px 0;
-}
-/*列表td的padding设置 可以控制列表大小*/
-.ant-table-tbody .ant-table-row td {
-  padding-top: 15px;
-  padding-bottom: 15px;
-}
-
-/*列表页面弹出modal*/
-.ant-modal-cust-warp {
-  height: 100%
-}
-
-/*弹出modal Y轴滚动条*/
-.ant-modal-cust-warp .ant-modal-body {
-  height: calc(100% - 110px) !important;
-  overflow-y: auto
-}
-
-/*弹出modal 先有content后有body 故滚动条控制在body上*/
-.ant-modal-cust-warp .ant-modal-content {
-  height: 90% !important;
-  overflow-y: hidden
-}
-/*列表中有图片的加这个样式 参考用户管理*/
-.anty-img-wrap {
-  height: 25px;
-  position: relative;
-}
-.anty-img-wrap > img {
-  max-height: 100%;
-}
-/*列表中范围查询样式*/
-.query-group-cust{width: calc(50% - 10px)}
-.query-group-split-cust:before{content:"~";width: 20px;display: inline-block;text-align: center}
-
-
-/*erp风格子表外框padding设置*/
-.ant-card-wider-padding.cust-erp-sub-tab>.ant-card-body{padding:5px 12px}
-
-/* 内嵌子表背景颜色 */
-.j-inner-table-wrapper /deep/ .ant-table-expanded-row .ant-table-wrapper .ant-table-tbody .ant-table-row {
-  background-color: #FFFFFF;
+
+/*列表上方操作按钮区域*/
+.ant-card-body .table-operator {
+  margin-bottom: 0px;
+}
+/** Button按钮间距 */
+.table-operator .ant-btn {
+  margin: 0 8px 8px 0;
+}
+.table-operator .ant-btn-group .ant-btn {
+  margin: 0;
+}
+
+.table-operator .ant-btn-group .ant-btn:last-child {
+  margin: 0 8px 8px 0;
+}
+/*列表td的padding设置 可以控制列表大小*/
+.ant-table-tbody .ant-table-row td {
+  padding-top: 15px;
+  padding-bottom: 15px;
+}
+
+/*列表页面弹出modal*/
+.ant-modal-cust-warp {
+  height: 100%
+}
+
+/*弹出modal Y轴滚动条*/
+.ant-modal-cust-warp .ant-modal-body {
+  height: calc(100% - 110px) !important;
+  overflow-y: auto
+}
+
+/*弹出modal 先有content后有body 故滚动条控制在body上*/
+.ant-modal-cust-warp .ant-modal-content {
+  height: 90%;
+  overflow-y: hidden
+}
+/*列表中有图片的加这个样式 参考用户管理*/
+.anty-img-wrap {
+  height: 25px;
+  position: relative;
+}
+.anty-img-wrap > img {
+  max-height: 100%;
+}
+/*列表中范围查询样式*/
+.query-group-cust{width: calc(50% - 10px)}
+.query-group-split-cust:before{content:"~";width: 20px;display: inline-block;text-align: center}
+
+
+/*erp风格子表外框padding设置*/
+.ant-card-wider-padding.cust-erp-sub-tab>.ant-card-body{padding:5px 12px}
+
+/* 内嵌子表背景颜色 */
+.j-inner-table-wrapper /deep/ .ant-table-expanded-row .ant-table-wrapper .ant-table-tbody .ant-table-row {
+  background-color: #FFFFFF;
 }
\ No newline at end of file
diff --git a/jshERP-web/src/components/jeecg/JModal/index.vue b/jshERP-web/src/components/jeecg/JModal/index.vue
index 90f0b20c..93a1677e 100644
--- a/jshERP-web/src/components/jeecg/JModal/index.vue
+++ b/jshERP-web/src/components/jeecg/JModal/index.vue
@@ -44,7 +44,7 @@
 <script>
 
   import { getClass, getStyle } from '@/utils/props-util'
-  import { handleIntroJs } from "@/utils/util"
+  import { triggerWindowResizeEvent, handleIntroJs } from "@/utils/util"
   import Vue from 'vue'
 
   export default {
@@ -172,6 +172,7 @@
       /** 切换全屏 */
       toggleFullscreen() {
         this.innerFullscreen = !this.innerFullscreen
+        triggerWindowResizeEvent()
       },
 
     }