1、调整页面的loading事件

src/components/base/dk-modal/dk-modal.vue

@@ -37,7 +37,7 @@
       </div>
       <slot></slot>
       <!--加载中-->
-      <loading :loading="loading"></loading>
+      <loading :loading="loading" v-if="!modalVisible"></loading>
       <div v-if="footerFlag" slot="footer">
         <!--      <DkButton :loading="loading" v-if="okVisibleFlag" type="primary" @click="modalOk" name="confirm" :ref="saveFlag?'save':'confirm'">{{ saveFlag?$t('save') :$t('confirm') }}</DkButton>-->
         <!--      <DkButton v-if="cancelVisibleFlag" @click="modalCancel" name="close" ref="close">{{ $t('close') }}</DkButton>-->

src/components/loading/loading.vue

@@ -1,9 +1,10 @@
 <template>
   <div v-if="loading">
-    <div style="position:absolute;z-index: 9998;width: 100%;height: 100%;top:0;left:0; background: white; opacity: 0.25"
+    <!--只能999，不然菜单抽屉就会有问题-->
+    <div style="position:absolute;z-index: 999;width: 100%;height: 100%;top:0;left:0; background: white; opacity: 0.25"
          @contextmenu.prevent>
     </div>
-    <div style="position:absolute;z-index: 9999;" :style="styleJs">
+    <div style="position:absolute;z-index: 3999;" :style="styleJs">
       <div class="container animation-6">
         <div class="shape shape1"></div>
         <div class="shape shape2"></div>

src/components/main/main.vue

@@ -74,7 +74,7 @@ import Fullscreen from './components/fullscreen'
 import Language from './components/language'
 import ErrorStore from './components/error-store'
 import {mapMutations, mapActions, mapGetters} from 'vuex'
-import {getNewTagList, getNextRoute, getPreviousRoute, routeEqual} from '@/libs/base/util'
+import {getNewTagList, getNextRoute, getPreviousRoute, localSave, routeEqual} from '@/libs/base/util'
 import minLogo from '@/assets/images/logo-min.jpg'
 import maxLogo from '../../../public/logo.png'
 import logo from '@/assets/images/dklogo.png'
@@ -309,8 +309,9 @@ export default {
      * @date   : 2023/4/19 11:15
      */
     handleExitMax(e) {
+      let flag = this.checkFull();
       // 退出全屏
-      if (!this.checkFull()) {
+      if (!flag) {
         this.maxFlag = false;
       }
     },
@@ -398,10 +399,15 @@ export default {
       })
       this.setBreadCrumb(newRoute)
       this.setTagNavList(getNewTagList(this.tagNavList, newRoute))
+    },
+    maxFlag(n,o){
+      // 如果最小化时记录
+      if(!n){
+        localSave('restore','restore')
+      }
     }
   },
   beforeDestroy() {
-    console.log('rr')
     window.removeEventListener('resize', this.handleExitMax);
     window.removeEventListener('keydown', this.handleExitMax);
   },

src/mixins/form.js

@@ -22,6 +22,7 @@ export const formMixin = {
     let self = this;
     return {
       loading: false,
+      modalVisible: false, // 弹框是否显示
       typeData: '',
       currentTableIndex: null,
       initDataFlag: true,  // 初始化数据标识
@@ -338,7 +339,7 @@ export const formMixin = {
      * @author : 周兴
      * @date   : 2023/4/18 11:22
      */
-    changeCollapse(){
+    changeCollapse() {
       setTimeout(() => {
         this.resizeTable() // 重新计算表格高度
       }, 300)
@@ -399,9 +400,9 @@ export const formMixin = {
         //     editPage.disabled = false;
         //   },500)
         // }
-        setTimeout(()=>{
+        setTimeout(() => {
           this.loading = false
-        },300)
+        }, 300)
       })
     },
     /**
@@ -417,6 +418,19 @@ export const formMixin = {
       }
     },
     /**
+     * @desc   : desc
+     * @author : 周兴
+     * @date   : 2023/4/27 8:43
+     */
+    handleVisibleModal(e) {
+      if (e) {
+        this.modalVisible = true;
+      } else {
+        this.modalVisible = false;
+      }
+      console.log('fff2', this.modalVisible)
+    },
+    /**
      * @desc   : 处理编辑信息
      * @author : 周兴
      * @date   : 2023/2/10 10:24

src/mixins/index.js

@@ -1,7 +1,7 @@
 import Loading from '_c/loading'
 import {button as buttonList} from '@/locale/lang/zh-CN.js'
 import {request} from "@/api/base";
-import {localRead, localSave} from "@/libs/base/util";
+import {localRead, localRemove, localSave} from "@/libs/base/util";
 
 /**
  * @desc   : 一览界面混入
@@ -19,7 +19,8 @@ export const indexMixin = {
   },
   data() {
     return {
-      loading: false,
+      loading: false,        // 加载标识
+      modalVisible:false,    // 弹框显示
       existsFlag:true,
       searchButtonName: null, // 查询按钮的权限名称
       initSearchFlag: true, // 初始查询标识
@@ -31,6 +32,7 @@ export const indexMixin = {
         currentPage: 1
       },
       split: 0.5,// 分区的默认
+      _mainHeight:0,// 初始加载时div的大小，用户退出全屏后计算大小使用
       formDataInit: {},  // 记录页面初始化的数据
       tableData: [],
       searchInfo: [], // 记录的查询的实体
@@ -560,6 +562,18 @@ export const indexMixin = {
         })
     },
     /**
+     * @desc   : desc
+     * @author : 周兴
+     * @date   : 2023/4/27 8:43
+     */
+    handleVisibleModal(e){
+      if(e){
+        this.modalVisible = true;
+      }else{
+        this.modalVisible = false;
+      }
+    },
+    /**
      * @desc   : 监听全局键盘按钮按下的事件
      * @author : 周兴
      * @date   : 2022/3/4 16:57
@@ -645,12 +659,22 @@ export const indexMixin = {
     collapseChange() {
       setTimeout(() => {
         this.resizeTable() // 重新计算表格高度
-      }, 300)
+      }, 500)
 
       // 光标停留在第一个控件上
       this.$refs['searchCond'].focus()
     },
     /**
+     * @desc   : 重算table的高度(给resize调用）
+     * @author : 周兴
+     * @date   : 2023/4/27 11:44
+     */
+    resizeTableByResize(){
+      setTimeout(()=>{
+        this.resizeTable();
+      },800)
+    },
+    /**
      * @desc   : 重算table的高度
      * @author : 周兴
      * @date   : 2022/3/14 9:24
@@ -691,6 +715,12 @@ export const indexMixin = {
         if (mainDiv && mainDiv.length > 0) {
           mainHeight = mainDiv[0].clientHeight
         }
+        // 如果是最小化有值，说明是从还原回来
+        let restore = localRead('restore')
+        if(restore === 'restore'){
+          mainHeight = this._mainHeight;
+          localRemove('restore');
+        }
         let toolsHeight = 0;
         if (document.getElementById('BaseIndexButtonGroup') != null) {
           toolsHeight = document.getElementById('BaseIndexButtonGroup').offsetHeight
@@ -700,7 +730,6 @@ export const indexMixin = {
         if (this.allScreenFlag) {
           this.tableHeight = mainHeight - 3 - pageHeight - tableToolsHeight + 90
         } else {
-          // console.log('searchHeight',searchHeight)
           // 如果没有Switch开关，不用除以2
           if (this.tableSwitch) {
             this.tableHeight = mainHeight - searchHeight - toolsHeight - 3 - 20 - footInfoHeight - pageHeight - tableToolsHeight - tabHeight + 10
@@ -708,6 +737,7 @@ export const indexMixin = {
             // console.log('333', mainHeight, searchHeight, toolsHeight, footInfoHeight, pageHeight, tableToolsHeight, tabHeight)
             this.tableHeight = (mainHeight - searchHeight - toolsHeight - 3 - 20 - footInfoHeight - pageHeight - tableToolsHeight - tabHeight - 15) / 2
           }
+          // console.log('tableHeight',this.tableHeight,mainHeight)
         }
       })
     },
@@ -845,7 +875,6 @@ export const indexMixin = {
      */
     buttonClick(e) {
       if (this._buttonList && this._buttonList.length > 0) {
-        console.log('bb', this._buttonList, e,e.target._params)
         this._buttonList.forEach(it => {
           if (!it.button.disabledFlag) {
             it.button.disabledFlag = true;
@@ -870,7 +899,7 @@ export const indexMixin = {
       }
       setTimeout(() => {
         _this.resizeTable() // 重新计算表格高度
-      }, 600)
+      }, 800)
       // _this.columnDrop2()
       //监听form页面滚动
       _this.$nextTick(() => {
@@ -992,7 +1021,7 @@ export const indexMixin = {
     this.addKeyBoardEvent()
     setTimeout(() => {
       this.resizeTable() // 重新计算表格高度
-    }, 600)
+    }, 800)
   },
   deactivated() {
     //清空快捷键
@@ -1030,7 +1059,15 @@ export const indexMixin = {
     })
   },
   mounted() {
+    localRemove('maxFlag');
     this._mountedInit(); // 调用加载完后的方法
+    this.$nextTick(()=>{
+      // 计算main-div的高度
+      let mainDiv = document.getElementsByClassName('main-div');
+      if (mainDiv && mainDiv.length > 0) {
+        this._mainHeight = mainDiv[0].clientHeight;
+      }
+    })
   },
 }
 

src/view/core/factory/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="main-div">
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup ref="BaseIndexButtonGroup" id="BaseIndexButtonGroup">
       <template #left>
@@ -48,6 +48,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title="modalTitle"

src/view/core/job/index.vue

@@ -1,7 +1,7 @@
 <!-- @desc:工种管理  @auth:沈博  @time:2022年12月13日14:14:50 -->
 <template>
   <div class="main-div">
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -46,6 +46,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/core/organization/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="main-div">
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -47,6 +47,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title="modalTitle"

src/view/core/post/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -46,6 +46,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/core/role/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -56,6 +56,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title="modalTitle"

src/view/core/staff/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <Upload v-show="false"
             :headers="{Authorization: 'Bearer ' + $store.state.user.token}"
             :action="this.$config.serviceUrl + '/mdm-server/core/staff/import'"
@@ -61,6 +61,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/core/system-setting/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

src/view/core/unique-base/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -48,6 +48,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/core/user/form.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <DkPageButton :total="editKeys?editKeys.length:0"
                   :current="editIndex"
                   v-if="editKeys && editKeys.length > 1"

src/view/core/user/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
         <!--    查询    -->

src/view/core/work-team/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -41,6 +41,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/mst/busobj-category/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -49,6 +49,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/mst/busobj/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -47,6 +47,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/mst/carr-kiln-car/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

src/view/mst/carrier/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -45,6 +45,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/mst/custom-report/form.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <div class="tab-fixed-class">
       <!--  选择tab区域  -->
       <DkTabs :options="tabsOptions" @on-click="changeElTabs"></DkTabs>
@@ -152,6 +152,7 @@
       :loading="loading"
       v-model="sqlModal"
       ref="modal_sql"
+      @on-visible-change="handleVisibleModal"
       @modalOk="modalOk"
       :title="$t('sql')"
     >

src/view/mst/custom-report/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
         <!--    查询    -->
@@ -138,6 +138,7 @@
       :loading="loading"
       v-model="sqlModal"
       ref="modal_sql"
+      @on-visible-change="handleVisibleModal"
       :footer-flag="false"
       :title="$t('sql')"
     >
@@ -151,6 +152,7 @@
       :loading="loading"
       v-model="ftyModal"
       ref="modal_sql"
+      @on-visible-change="handleVisibleModal"
       @modalOk="publishOk"
       :title="$t('chooseFty')"
     >

src/view/mst/custom-report/report.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
         <!--    查询    -->

src/view/mst/dictionary/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -46,6 +46,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/mst/equip-kiln/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -53,6 +53,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle
@@ -92,6 +93,7 @@
       :loading="loading"
       v-model="updateUsedCycleModal"
       ref="modal_updateUsedCycle"
+      @on-visible-change="handleVisibleModal"
       @modalOk="saveUsedCycle"
       :saveFlag="true"
       :title=updateUsedCycleTitle

src/view/mst/equip-thmeter/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -46,6 +46,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/mst/factory-space/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -49,6 +49,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title="modalTitle"

src/view/mst/kiln-car-place/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -47,6 +47,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/mst/label-print-layout/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -55,6 +55,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/mst/label-print-type/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -46,6 +46,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/mst/label-printer/index.vue

@@ -45,6 +45,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/mst/model-category/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -73,6 +73,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title="modalTitle"

src/view/mst/model-mould-change/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -56,6 +56,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title="modalTitle"

src/view/mst/model-pdt-label/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -48,6 +48,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/mst/model/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -89,6 +89,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title="modalTitle"

src/view/mst/molding/index.vue

@@ -1,7 +1,7 @@
 <!-- @desc:成型线管理  @auth:洪旭东  @time:2023-02-06 08:58 -->
 <template>
   <div class="main-div">
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

src/view/mst/mould-carryover/index.vue

@@ -75,6 +75,7 @@
       :loading="loading"
       v-model="carryoverModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/mst/mould-check/form.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <DkPageButton :total="editKeys?editKeys.length:0"
                   :current="editIndex"
                   v-if="editKeys && editKeys.length > 1"

src/view/mst/mould-check/index.vue

@@ -172,6 +172,7 @@
         :loading="loading"
         v-model="editAddModal"
         ref="modal_editAdd"
+        @on-visible-change="handleVisibleModal"
         @modalOk="saveProdCheck"
         :title="modalTitle"
       >

src/view/mst/mould/form.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <DkPageButton :total="editKeys?editKeys.length:0"
                   :current="editIndex"
                   v-if="editKeys && editKeys.length > 1"

src/view/mst/mould/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
         <!--    查询    -->
@@ -94,6 +94,7 @@
       :loading="loading"
       v-model="changeStdNumModal"
       ref="modal_changeStdNum"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle
@@ -110,6 +111,7 @@
       :loading="loading"
       v-model="modelMouldChangeModal"
       ref="modal_modelMouldChange"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title="modalTitle"

src/view/mst/product-brand/index.vue

@@ -45,6 +45,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/mst/product-colour/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -46,6 +46,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/mst/product-defect-fine/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -50,6 +50,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title="modalTitle"

src/view/mst/product-defect-type/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -47,6 +47,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/mst/product-defect/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -49,6 +49,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/mst/product-grade/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -50,6 +50,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/mst/product-logo/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -53,6 +53,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/mst/product-place/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -47,6 +47,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/mst/product-view/form.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="main-div" >
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <div class="tab-fixed-class">
       <!--  选择tab区域  -->
       <DkTabs :options="tabsOptions" @on-click="changeElTabs"></DkTabs>

src/view/mst/product-view/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

src/view/pdm/carrier-flow-pdt/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -80,6 +80,7 @@
         :loading="loading"
         v-model="editAddModal"
         ref="modal_editAdd"
+        @on-visible-change="handleVisibleModal"
         @modalOk="saveClimbKiln"
         :title="modalTitle"
       >

src/view/pdm/data-collection/climbKiln.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

src/view/pdm/data-collection/finishCheck-add.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <DkPaxeButton :total="editKeys?editKeys.length:0"
                   :current="editIndex"
                   v-if="editKeys && editKeys.length > 1"
@@ -120,6 +120,7 @@
       :loading="loading"
       v-model="defectPlaceModal"
       ref="modal_defectPlace"
+      @on-visible-change="handleVisibleModal"
       @modalOk="saveDefectPlace"
       :saveFlag="true"
       :title=modalTitle
@@ -131,6 +132,7 @@
       :loading="loading"
       v-model="labelModal"
       ref="modal_label"
+      @on-visible-change="handleVisibleModal"
       @modalOk="saveLabel"
       :saveFlag="true"
       :title=modalTitle

src/view/pdm/data-collection/finishCheck.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

src/view/pdm/data-collection/halfCheck-add.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <DkPaxeButton :total="editKeys?editKeys.length:0"
                   :current="editIndex"
                   v-if="editKeys && editKeys.length > 1"
@@ -120,6 +120,7 @@
       :loading="loading"
       v-model="defectPlaceModal"
       ref="modal_defectPlace"
+      @on-visible-change="handleVisibleModal"
       @modalOk="saveDefectPlace"
       :saveFlag="true"
       :title=modalTitle
@@ -131,6 +132,7 @@
       :loading="loading"
       v-model="labelModal"
       ref="modal_label"
+      @on-visible-change="handleVisibleModal"
       @modalOk="saveLabel"
       :saveFlag="true"
       :title=modalTitle

src/view/pdm/data-collection/halfCheck-touch-add.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <Card style="padding: 0 20px">
       <DkForm ref="formInline" v-model="formData" style="width: 100%" :label-max-words="7">
         <!--选择工位-->
@@ -135,6 +135,7 @@
       :loading="loading"
       v-model="defectPlaceModal"
       ref="modal_defectPlace"
+      @on-visible-change="handleVisibleModal"
       @modalOk="saveDefectPlace"
       :saveFlag="true"
       :title=modalTitle
@@ -146,6 +147,7 @@
       :loading="loading"
       v-model="labelModal"
       ref="modal_label"
+      @on-visible-change="handleVisibleModal"
       @modalOk="saveLabel"
       :saveFlag="true"
       :title=modalTitle

src/view/pdm/data-collection/inKiln.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

src/view/pdm/data-collection/outKiln-add.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <DkPageButton :total="editKeys?editKeys.length:0"
                   :current="editIndex"
                   v-if="editKeys && editKeys.length > 1"

src/view/pdm/data-collection/outKiln.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

src/view/pdm/data-collection/recover-add.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <DkPageButton :total="editKeys?editKeys.length:0"
                   :current="editIndex"
                   v-if="editKeys && editKeys.length > 1"

src/view/pdm/data-collection/register-add.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <DkPageButton :total="editKeys?editKeys.length:0"
                   :current="editIndex"
                   v-if="editKeys && editKeys.length > 1"
@@ -100,6 +100,7 @@
       :loading="loading"
       v-model="labelModal"
       ref="modal_label"
+      @on-visible-change="handleVisibleModal"
       @modalOk="saveLabel"
       :saveFlag="true"
       :title=modalTitle

src/view/pdm/data-collection/register.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

src/view/pdm/molding-record/bind-barcode-group.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <DkPageButton :total="editKeys?editKeys.length:0"
                   :current="editIndex"
                   v-if="editKeys && editKeys.length > 1"

src/view/pdm/molding-record/bind-barcode-grouping.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <DkPageButton :total="editKeys?editKeys.length:0"
                   :current="editIndex"
                   v-if="editKeys && editKeys.length > 1"

src/view/pdm/molding-record/form.vue

@@ -1,6 +1,7 @@
 <!-- @desc:新建编辑成型记录  @auth:姜宁  @time:2023/2/15 13:52 -->
 <template>
   <div class="main-div">
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
         <!--    选择成型线    -->
@@ -52,6 +53,7 @@
       class="search-data-class"
       width="1200px"
       v-model="chooseModal"
+      @on-visible-change="handleVisibleModal"
       @modalOk="modalOk"
       @modalCancel="modalCancel"
       @on-visible-change="openMoldlineModal"
@@ -66,7 +68,6 @@
       <SearchCond id="search-cond-div" width="1100px" v-if="searchContent && searchContent.length > 0" ref="searchCond"
                   v-model="searchCond" :setFlag="false" :searchContent="searchContent" :col-count="4"></SearchCond>
       <div style="width: 100%;height: 10px"></div>
-      <loading :loading="loading"></loading>
       <DkTable
         ref="moldlineTable"
         :data="moldlineList"

src/view/pdm/molding-record/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
         <!--    查询    -->

src/view/pdm/molding-user-change/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--  操作按钮-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -70,6 +70,7 @@
       :loading="loading"
       v-model="changeModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/pdm/process-node-reverse/add.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <DkPaxeButton :total="editKeys?editKeys.length:0"
                   :current="editIndex"
                   v-if="editKeys && editKeys.length > 1"

src/view/pdm/process-node-reverse/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

src/view/pdm/prod-carryover/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
         <!--    查询    -->
@@ -82,6 +82,7 @@
       :loading="loading"
       v-model="carryoverModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/pdm/prod-check/form.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <DkPageButton :total="editKeys?editKeys.length:0"
                   :current="editIndex"
                   v-if="editKeys && editKeys.length > 1"

src/view/pdm/prod-check/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -198,6 +198,7 @@
         :loading="loading"
         v-model="editAddModal"
         ref="modal_editAdd"
+        @on-visible-change="handleVisibleModal"
         @modalOk="saveProdCheck"
         :title="modalTitle"
       >

src/view/pdm/prod-code-change/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--  操作按钮-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -47,6 +47,7 @@
       :loading="loading"
       v-model="changeModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/pdm/prod-defect/add.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <DkPaxeButton :total="editKeys?editKeys.length:0"
                   :current="editIndex"
                   v-if="editKeys && editKeys.length > 1"

src/view/pdm/prod-defect/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

src/view/pdm/prod-defect/reverse.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <DkPaxeButton :total="editKeys?editKeys.length:0"
                   :current="editIndex"
                   v-if="editKeys && editKeys.length > 1"

src/view/pdm/prod-logo-colour/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--  操作按钮-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -52,6 +52,7 @@
       :loading="loading"
       v-model="changeModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/pdm/prod-suspend/form.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <DkCollapse ref="collapse" @on-change="changeCollapse">
       <DkPanel prop="prodSuspend">
         <DkForm slot="content" ref="formInline" v-model="formData" style="width: 95%">

src/view/pdm/prod-suspend/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -30,7 +30,7 @@
     <DkSplit mode="vertical" v-model="split" :height="tableHeight">
       <!--      产品挂起总单-->
       <DkTable slot="top" :id="'table-'+$options.name" ref="table-select" :data="tableData"
-               :height="this.tableHeight * split - 45"
+               :height="this.tableHeight * split + 10"
                :page-total="pageInfo.total"
                :current-page="pageInfo.currentPage"
                :choose-flag="false"
@@ -50,7 +50,7 @@
                :page-flag="false"
                :multiple="false"
                :page-total-flag="false"
-               :height="this.tableHeight * (1-split) - 45"
+               :height="this.tableHeight * (1-split) + 10"
                :choose-flag="false"
                ref="prodSuspendItemTable-select"
                name="table">

src/view/pdm/product-code-change/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--  操作按钮-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -75,6 +75,7 @@
       :loading="loading"
       v-model="changeModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/pdm/thmeter-record/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -55,6 +55,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/pdm/work-record/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -73,6 +73,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       @on-cancel="clear"
       @modalCancel="clear"

src/view/pdm/work-station/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -95,6 +95,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title=modalTitle

src/view/pdm/ws-clock/clock-user.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <DkCollapse ref="collapse" @on-change="changeCollapse">
       <DkPanel prop="wsClockInformation">
         <!--  下拉区域  -->

src/view/pdm/ws-clock/form.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <DkCollapse ref="collapse" @on-change="changeCollapse">
       <DkPanel prop="wsClockInformation">
         <!--  下拉区域  -->

src/view/pdm/ws-clock/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--  操作按钮-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

src/view/process/process-flow/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="main-div" v-if="existsFlag">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
@@ -49,6 +49,7 @@
       :loading="loading"
       v-model="editAddModal"
       ref="modal_editAdd"
+      @on-visible-change="handleVisibleModal"
       @modalOk="save"
       :saveFlag="true"
       :title="modalTitle">

src/view/report/code-change-report/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <!--  操作按钮-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

src/view/report/delivery-blank/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
         <!--    查询    -->

src/view/report/molding-record-report/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
         <!--    查询    -->

src/view/report/mould-follow-report/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
         <!--    查询    -->

src/view/report/process-output/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
         <!--    查询    -->

src/view/report/product-follow-report/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
         <!--    查询    -->

src/view/report/product-report/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="main-div">
     <!--加载中-->
-    <loading :loading="loading"></loading>
+    <loading :loading="loading" v-if="!modalVisible"></loading>
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
         <!--    查询    -->