周兴 3 лет назад
Родитель
Сommit
ef95026bf9
91 измененных файлов с 188 добавлено и 18 удалено
  1. 3 1
      src/components/base/dk-modal/dk-modal.vue
  2. 1 2
      src/components/base/edit-tree-table/edit-tree-table.vue
  3. 7 1
      src/components/business/process/node-modal/node-modal.vue
  4. 5 0
      src/components/business/select-magnifier/select-magnifier.vue
  5. 3 2
      src/components/business/table-select/table-select.vue
  6. 4 11
      src/components/loading/loading.vue
  7. 1 0
      src/view/core/factory/index.vue
  8. 1 0
      src/view/core/job/index.vue
  9. 1 0
      src/view/core/organization/index.vue
  10. 2 0
      src/view/core/post/index.vue
  11. 2 0
      src/view/core/role/index.vue
  12. 2 0
      src/view/core/staff/index.vue
  13. 2 0
      src/view/core/system-setting/index.vue
  14. 2 0
      src/view/core/unique-base/index.vue
  15. 2 0
      src/view/core/user/form.vue
  16. 2 0
      src/view/core/user/index.vue
  17. 2 0
      src/view/core/work-team/index.vue
  18. 2 0
      src/view/mst/busobj-category/index.vue
  19. 2 0
      src/view/mst/busobj/index.vue
  20. 2 0
      src/view/mst/carr-kiln-car/index.vue
  21. 2 0
      src/view/mst/carrier/index.vue
  22. 1 0
      src/view/mst/custom-report/form.vue
  23. 1 0
      src/view/mst/custom-report/index.vue
  24. 2 0
      src/view/mst/custom-report/report.vue
  25. 2 0
      src/view/mst/dictionary/index.vue
  26. 2 0
      src/view/mst/equip-kiln/index.vue
  27. 2 0
      src/view/mst/equip-thmeter/index.vue
  28. 2 0
      src/view/mst/factory-space/index.vue
  29. 2 0
      src/view/mst/kiln-car-place/index.vue
  30. 2 0
      src/view/mst/label-print-layout/index.vue
  31. 2 0
      src/view/mst/label-print-type/index.vue
  32. 2 0
      src/view/mst/model-category/index.vue
  33. 2 0
      src/view/mst/model-mould-change/index.vue
  34. 2 0
      src/view/mst/model-pdt-label/index.vue
  35. 2 0
      src/view/mst/model/index.vue
  36. 1 0
      src/view/mst/molding/index.vue
  37. 2 0
      src/view/mst/mould-check/form.vue
  38. 2 0
      src/view/mst/mould/form.vue
  39. 2 0
      src/view/mst/mould/index.vue
  40. 2 0
      src/view/mst/product-colour/index.vue
  41. 2 0
      src/view/mst/product-defect-fine/index.vue
  42. 2 0
      src/view/mst/product-defect-type/index.vue
  43. 2 0
      src/view/mst/product-defect/index.vue
  44. 2 0
      src/view/mst/product-grade/index.vue
  45. 2 0
      src/view/mst/product-logo/index.vue
  46. 2 0
      src/view/mst/product-place/index.vue
  47. 3 1
      src/view/mst/product-view/form.vue
  48. 2 0
      src/view/mst/product-view/index.vue
  49. 2 0
      src/view/pdm/carrier-flow-pdt/index.vue
  50. 2 0
      src/view/pdm/data-collection/climbKiln.vue
  51. 2 0
      src/view/pdm/data-collection/finishCheck-add.vue
  52. 2 0
      src/view/pdm/data-collection/finishCheck.vue
  53. 2 0
      src/view/pdm/data-collection/halfCheck-add.vue
  54. 2 0
      src/view/pdm/data-collection/halfCheck-touch-add.vue
  55. 2 0
      src/view/pdm/data-collection/inKiln.vue
  56. 2 0
      src/view/pdm/data-collection/outKiln-add.vue
  57. 2 0
      src/view/pdm/data-collection/outKiln.vue
  58. 2 0
      src/view/pdm/data-collection/recover-add.vue
  59. 2 0
      src/view/pdm/data-collection/register-add.vue
  60. 2 0
      src/view/pdm/data-collection/register.vue
  61. 2 0
      src/view/pdm/molding-record/bind-barcode-group.vue
  62. 2 0
      src/view/pdm/molding-record/bind-barcode-grouping.vue
  63. 2 0
      src/view/pdm/molding-record/index.vue
  64. 2 0
      src/view/pdm/molding-user-change/index.vue
  65. 2 0
      src/view/pdm/process-node-reverse/add.vue
  66. 2 0
      src/view/pdm/process-node-reverse/index.vue
  67. 2 0
      src/view/pdm/prod-carryover/index.vue
  68. 2 0
      src/view/pdm/prod-check/form.vue
  69. 2 0
      src/view/pdm/prod-check/index.vue
  70. 2 0
      src/view/pdm/prod-code-change/index.vue
  71. 2 0
      src/view/pdm/prod-defect/add.vue
  72. 2 0
      src/view/pdm/prod-defect/index.vue
  73. 2 0
      src/view/pdm/prod-defect/reverse.vue
  74. 2 0
      src/view/pdm/prod-logo-colour/index.vue
  75. 2 0
      src/view/pdm/prod-suspend/form.vue
  76. 2 0
      src/view/pdm/prod-suspend/index.vue
  77. 2 0
      src/view/pdm/product-code-change/index.vue
  78. 2 0
      src/view/pdm/thmeter-record/index.vue
  79. 2 0
      src/view/pdm/work-record/index.vue
  80. 2 0
      src/view/pdm/work-station/index.vue
  81. 2 0
      src/view/pdm/ws-clock/clock-user.vue
  82. 2 0
      src/view/pdm/ws-clock/form.vue
  83. 2 0
      src/view/pdm/ws-clock/index.vue
  84. 2 0
      src/view/process/process-flow/index.vue
  85. 2 0
      src/view/report/code-change-report/index.vue
  86. 2 0
      src/view/report/delivery-blank/index.vue
  87. 2 0
      src/view/report/molding-record-report/index.vue
  88. 2 0
      src/view/report/mould-follow-report/index.vue
  89. 2 0
      src/view/report/process-output/index.vue
  90. 2 0
      src/view/report/product-follow-report/index.vue
  91. 2 0
      src/view/report/product-report/index.vue

+ 3 - 1
src/components/base/dk-modal/dk-modal.vue

@@ -1,6 +1,6 @@
 <!-- @desc:modal弹窗  @auth:周兴  @time:2022/7/23 15:40 -->
 <template>
-  <div ref="modal_div" v-if="showModal">
+  <div ref="modal_div" v-if="showModal" >
     <Modal
       ref="modal"
       :width="width"
@@ -36,6 +36,8 @@
         </Poptip>
       </div>
       <slot></slot>
+      <!--加载中-->
+      <loading :loading="loading"></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>-->

+ 1 - 2
src/components/base/edit-tree-table/edit-tree-table.vue

@@ -3574,7 +3574,6 @@
        * @date   : 2022/5/27 16:04
        */
       getDataTable(row) {
-        console.log(row)
         let param = {}
         param.ftyId = this.$store.state.user.ftyId
         // 根据传入的数据进行检索
@@ -3598,7 +3597,7 @@
        * @date   : 2022/5/28 7:54
        */
       checkExchangeIconVisible(row) {
-        console.log('ff',!this.readonly,row,row[this.exchangeField],this.exchangeField)
+        // console.log('ff',!this.readonly,row,row[this.exchangeField],this.exchangeField)
         if (!this.readonly && row && row[this.exchangeField]) {
           return true
         }

+ 7 - 1
src/components/business/process/node-modal/node-modal.vue

@@ -6,6 +6,7 @@
       v-model="modalDisplay"
       :mask-closable="false"
       :mask="false"
+      :loading="loading"
       draggable
       sticky
       fullscreen
@@ -281,6 +282,7 @@ export default {
   data() {
     let self = this
     return {
+      loading:false,
       existsFlag:true,
       routerTableFlag: true,
       modalDisplay: false,//如不定义此变量,则进入modal无动画
@@ -943,6 +945,7 @@ export default {
     }
   },
   created() {
+    this.loading = true;
     //获取图形对象
     if (this.graph == null) this.graph = Process.graph
     //获取业务数据
@@ -958,7 +961,10 @@ export default {
       return { id: it.id, name: it.data.nodeName, flowKind:it.data.flowKind, nodeKind:it.data.nodeKind, flgAloneJudge: it.data.flgAloneJudge}
     })
     //设置初始值
-    this.handleDataKindList()
+    this.handleDataKindList();
+    setTimeout(()=>{
+      this.loading = false;
+    },800)
   },
   mounted() {
     if(!this.nodeData.displayNo){

+ 5 - 0
src/components/business/select-magnifier/select-magnifier.vue

@@ -20,6 +20,7 @@
       width="1100"
       ref="modal_search"
       v-model="showModal"
+      :loading="loading"
       @modalOk="ok"
       @modalCancel="cancel"
       @on-visible-change="onVisibleChange"
@@ -205,6 +206,7 @@ export default {
     const vm = window.vm
     let self = this
     return {
+      loading:false,
       tabIndex: 0,
       tabsOptions: [
         {label: '选择列表', name: 'name1', index: 0},
@@ -715,6 +717,7 @@ export default {
       if (!this.check()) {
         return
       }
+      this.loading = true;
       let param = {...this.$refs['table-select'].pageInfo}
       param.currentPage = this.pageInfo.currentPage?this.pageInfo.currentPage:1
       param.pageSize = this.pageInfo.pageSize
@@ -764,8 +767,10 @@ export default {
           //   this.$refs['table-select'].batchRows = this.batchRowsPage
           // }
           this.$refs['table-select'].pageInfo.total = res.data.total
+          this.loading = false;
         } else {
           this.$Message.error(res.message)
+          this.loading = false;
         }
       })
     },

+ 3 - 2
src/components/business/table-select/table-select.vue

@@ -22,6 +22,7 @@
         id="search-data-class"
         class="search-data-class"
         width="1050px"
+        :loading="loading"
         v-model="showModal"
         @modalOk="modalOk"
         @on-visible-change="onVisibleChange"
@@ -40,7 +41,6 @@
         <div style="width: 100%;height: 10px"></div>
         <DkTabs ref="tabs" :options="multiple?tabsOptions:tabsOptionsOnly" @on-click="tabsClick"
                 @on-clear="clearSelected"></DkTabs>
-        <loading :loading="loading"></loading>
         <!--      商品种类列表-->
         <div :style="'height: ' + tableHeight + 'px'">
           <Split v-model="split" :min="minSplit" v-if="methodsNameLeft" v-show="tabIndex === 0">
@@ -920,11 +920,12 @@ export default {
             }
             this.$refs['table-select-only'].pageInfo.total = res.data.total
           }
+          this.loading = false;
         } else {
           this.$Message.error(res.message)
+          this.loading = false;
         }
       })
-      this.loading = false;
     },
     /**
      * @desc   : 查左侧数据

+ 4 - 11
src/components/loading/loading.vue

@@ -1,6 +1,7 @@
 <template>
-  <div v-if="loading" >
-    <div style="position:absolute;z-index: 9998;width: 100%;height: 100%;background: white; opacity: 0.25" @contextmenu.prevent >
+  <div v-if="loading">
+    <div style="position:absolute;z-index: 9998;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 class="container animation-6">
@@ -41,7 +42,7 @@ export default {
     height: {
       type: Number,
       default: undefined
-    }
+    },
   },
   watch: {
     loading(n, o) {
@@ -62,14 +63,6 @@ export default {
       this.styleJs.left = this.width / 2 + 'px'
       this.styleJs.top = this.height / 2 + 'px'
     }
-    this.$nextTick(()=>{
-      let mainHeight = 0;
-      let mainDiv = document.getElementsByClassName('main-div');
-      if (mainDiv && mainDiv.length > 0) {
-        mainHeight = mainDiv[0].scrollHeight
-      }
-      console.log('rrr',mainDiv,mainHeight)
-    })
   },
 }
 </script>

+ 1 - 0
src/view/core/factory/index.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="main-div">
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup ref="BaseIndexButtonGroup" id="BaseIndexButtonGroup">
       <template #left>

+ 1 - 0
src/view/core/job/index.vue

@@ -1,6 +1,7 @@
 <!-- @desc:工种管理  @auth:沈博  @time:2022年12月13日14:14:50 -->
 <template>
   <div class="main-div">
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 1 - 0
src/view/core/organization/index.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="main-div">
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/core/post/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:职务管理  @auth:沈博  @time:2022年12月13日14:14:50 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/core/role/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:角色管理  @auth:沈博  @time:2022年12月13日13:21:04 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/core/staff/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:员工管理  @auth:沈博  @time:2022年12月13日14:14:50 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <Upload v-show="false"
             :headers="{Authorization: 'Bearer ' + $store.state.user.token}"
             :action="this.$config.serviceUrl + '/mdm-server/core/staff/import'"

+ 2 - 0
src/view/core/system-setting/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:系统参数一览  @auth:沈博  @time:2022年12月14日11:01:32 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/core/unique-base/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:唯一码  @auth:洪旭东  @time:2022-12-21 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/core/user/form.vue

@@ -1,6 +1,8 @@
 <!-- @desc:用户新建/编辑  @auth:周兴  @time:2022/3/30 10:29 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <DkPageButton :total="editKeys?editKeys.length:0"
                   :current="editIndex"
                   v-if="editKeys && editKeys.length > 1"

+ 2 - 0
src/view/core/user/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:用户管理  @auth:洪旭东  @time:2022-04-25 16:28 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
         <!--    查询    -->

+ 2 - 0
src/view/core/work-team/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:职务管理  @auth:沈博  @time:2022年12月13日14:14:50 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/mst/busobj-category/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:业务对象类别管理  @auth:寇珊珊  @time:2022年12月20日13:56:49 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/mst/busobj/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:业务对象管理  @auth:寇珊珊  @time:2022年12月20日13:56:49 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/mst/carr-kiln-car/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:窑车管理  @auth:常皓宁  @time:2023年2月9日8:43:49 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/mst/carrier/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:装载工具  @auth:常皓宁  @time:2023年2月8日11:03:49 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 1 - 0
src/view/mst/custom-report/form.vue

@@ -1,6 +1,7 @@
 <!-- @desc:新建编辑自定义报表  @auth:周兴  @time:2023/3/26 15:00 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
     <loading :loading="loading"></loading>
     <div class="tab-fixed-class">
       <!--  选择tab区域  -->

+ 1 - 0
src/view/mst/custom-report/index.vue

@@ -1,6 +1,7 @@
 <!-- @desc:自定义报表  @auth:周兴  @time:2023/3/26 10:05 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
     <loading :loading="loading"></loading>
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/mst/custom-report/report.vue

@@ -1,6 +1,8 @@
 <!-- @desc:自定义报表  @auth:周兴  @time:2023/3/28 17:12 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
         <!--    查询    -->

+ 2 - 0
src/view/mst/dictionary/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:数据字典  @auth:常皓宁  @time:2023年2月7日8:56:49 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/mst/equip-kiln/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:窑炉  @auth:洪旭东  @time:2022-12-21 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/mst/equip-thmeter/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:湿温度计管理  @auth:寇珊珊  @time:2022年12月20日13:56:49 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/mst/factory-space/index.vue

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

+ 2 - 0
src/view/mst/kiln-car-place/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:窑车位置管理  @auth:寇珊珊  @time:2023年1月30日11:17:11 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/mst/label-print-layout/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:标签打印模板  @auth:常皓宁  @time:2023-2-14 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/mst/label-print-type/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:打印模板分类  @auth:常皓宁  @time:2023-2-13 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/mst/model-category/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:型号类别  @auth:常皓宁  @time:2023年2月3日13:56:49 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/mst/model-mould-change/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:模具型号变更  @auth:姜宁  @time:2023/3/29 11:08 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/mst/model-pdt-label/index.vue

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

+ 2 - 0
src/view/mst/model/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:模具、物料、载具、设备 型号  @auth:洪旭东  @time:2023-02-01 14:20 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 1 - 0
src/view/mst/molding/index.vue

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

+ 2 - 0
src/view/mst/mould-check/form.vue

@@ -1,6 +1,8 @@
 <!-- @desc:模具盘点  @auth:寇珊珊  @time:2023年3月28日10:59:41 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <DkPageButton :total="editKeys?editKeys.length:0"
                   :current="editIndex"
                   v-if="editKeys && editKeys.length > 1"

+ 2 - 0
src/view/mst/mould/form.vue

@@ -1,6 +1,8 @@
 <!-- @desc:成型模具新建/编辑  @auth:姜宁  @time:2023/2/8 13:58-->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <DkPageButton :total="editKeys?editKeys.length:0"
                   :current="editIndex"
                   v-if="editKeys && editKeys.length > 1"

+ 2 - 0
src/view/mst/mould/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:模具档案  @auth:姜宁  @time:2022-04-25 16:28 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
         <!--    查询    -->

+ 2 - 0
src/view/mst/product-colour/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:产品釉色  @auth:洪旭东  @time:2022-12-21 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/mst/product-defect-fine/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:缺陷扣罚  @auth:洪旭东  @time:2023-02-01 14:20 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/mst/product-defect-type/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:产品缺陷分类  @auth:洪旭东  @time:2022-12-21 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/mst/product-defect/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:产品缺陷  @auth:洪旭东  @time:2022-12-21 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/mst/product-grade/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:产品分级  @auth:洪旭东  @time:2022-12-21 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/mst/product-logo/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:产品商标  @auth:洪旭东  @time:2022-12-21 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/mst/product-place/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:产品位置  @auth:洪旭东  @time:2022-12-20 16:00 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 3 - 1
src/view/mst/product-view/form.vue

@@ -1,5 +1,7 @@
 <template>
-  <div class="main-div" style="width:100%;height:100%;">
+  <div class="main-div" >
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <div class="tab-fixed-class">
       <!--  选择tab区域  -->
       <DkTabs :options="tabsOptions" @on-click="changeElTabs"></DkTabs>

+ 2 - 0
src/view/mst/product-view/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:产品视图管理  @auth:寇珊珊  @time:2023年1月30日15:39:00 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/pdm/carrier-flow-pdt/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:载具产品  @auth:寇珊珊  @time:2023年3月27日09:21:46 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/pdm/data-collection/climbKiln.vue

@@ -1,6 +1,8 @@
 <!-- @desc:登窑  @auth:周兴  @time:2023/2/27 12:59 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/pdm/data-collection/finishCheck-add.vue

@@ -1,6 +1,8 @@
 <!-- @desc:半检  @auth:寇珊珊  @time:2023年3月7日09:22:05 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <DkPaxeButton :total="editKeys?editKeys.length:0"
                   :current="editIndex"
                   v-if="editKeys && editKeys.length > 1"

+ 2 - 0
src/view/pdm/data-collection/finishCheck.vue

@@ -1,6 +1,8 @@
 <!-- @desc:成检  @auth:周兴  @time:2023/2/27 12:59 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/pdm/data-collection/halfCheck-add.vue

@@ -1,6 +1,8 @@
 <!-- @desc:半检  @auth:寇珊珊  @time:2023年3月7日09:22:05 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <DkPaxeButton :total="editKeys?editKeys.length:0"
                   :current="editIndex"
                   v-if="editKeys && editKeys.length > 1"

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

@@ -1,6 +1,8 @@
 <!-- @desc:半检触屏  @auth:洪旭东  @time:2023-04-18 14:17 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <Card style="padding: 0 20px">
       <DkForm ref="formInline" v-model="formData" style="width: 100%" :label-max-words="7">
         <!--选择工位-->

+ 2 - 0
src/view/pdm/data-collection/inKiln.vue

@@ -1,6 +1,8 @@
 <!-- @desc:入窑  @auth:周兴  @time:2023/2/27 13:00 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/pdm/data-collection/outKiln-add.vue

@@ -1,6 +1,8 @@
 <!-- @desc:出窑  @auth:寇珊珊  @time:2023年3月7日09:22:05 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <DkPageButton :total="editKeys?editKeys.length:0"
                   :current="editIndex"
                   v-if="editKeys && editKeys.length > 1"

+ 2 - 0
src/view/pdm/data-collection/outKiln.vue

@@ -1,6 +1,8 @@
 <!-- @desc:出窑  @auth:周兴  @time:2023/2/27 13:00 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/pdm/data-collection/recover-add.vue

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

+ 2 - 0
src/view/pdm/data-collection/register-add.vue

@@ -1,6 +1,8 @@
 <!-- @desc:计件  @auth:寇珊珊  @time:2023年3月7日09:22:05 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <DkPageButton :total="editKeys?editKeys.length:0"
                   :current="editIndex"
                   v-if="editKeys && editKeys.length > 1"

+ 2 - 0
src/view/pdm/data-collection/register.vue

@@ -1,6 +1,8 @@
 <!-- @desc:计件  @auth:周兴  @time:2023/2/27 13:00 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

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

@@ -1,6 +1,8 @@
 <!-- @desc:组内粘贴  @auth:寇珊珊  @time:2023年4月20日16:00:36 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <DkPageButton :total="editKeys?editKeys.length:0"
                   :current="editIndex"
                   v-if="editKeys && editKeys.length > 1"

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

@@ -1,6 +1,8 @@
 <!-- @desc:分组粘贴  @auth:寇珊珊  @time:2023年4月20日16:00:36 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <DkPageButton :total="editKeys?editKeys.length:0"
                   :current="editIndex"
                   v-if="editKeys && editKeys.length > 1"

+ 2 - 0
src/view/pdm/molding-record/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:成型记录  @auth:姜宁  @time:2023/2/15 13:04 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
         <!--    查询    -->

+ 2 - 0
src/view/pdm/molding-user-change/index.vue

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

+ 2 - 0
src/view/pdm/process-node-reverse/add.vue

@@ -1,6 +1,8 @@
 <!-- @desc:工序撤销  @auth:寇珊珊  @time:2023年3月21日15:21:08 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <DkPaxeButton :total="editKeys?editKeys.length:0"
                   :current="editIndex"
                   v-if="editKeys && editKeys.length > 1"

+ 2 - 0
src/view/pdm/process-node-reverse/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:工序撤销  @auth:寇珊珊  @time:2023年3月21日10:14:37 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/pdm/prod-carryover/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:在产结转  @auth:姜宁  @time:2023/3/24 10:12 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
         <!--    查询    -->

+ 2 - 0
src/view/pdm/prod-check/form.vue

@@ -1,6 +1,8 @@
 <!-- @desc:在产盘点  @auth:寇珊珊  @time:2023年3月23日13:23:58 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <DkPageButton :total="editKeys?editKeys.length:0"
                   :current="editIndex"
                   v-if="editKeys && editKeys.length > 1"

+ 2 - 0
src/view/pdm/prod-check/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:在产盘点  @auth:寇珊珊  @time:2023年3月23日13:23:58 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/pdm/prod-code-change/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:产品型号变更  @auth:洪旭东  @time:2023-04-19 10:41 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--  操作按钮-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/pdm/prod-defect/add.vue

@@ -1,6 +1,8 @@
 <!-- @desc:产品报损  @auth:寇珊珊  @time:2023年3月21日15:21:08 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <DkPaxeButton :total="editKeys?editKeys.length:0"
                   :current="editIndex"
                   v-if="editKeys && editKeys.length > 1"

+ 2 - 0
src/view/pdm/prod-defect/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:产品报损  @auth:寇珊珊  @time:2023年3月21日10:14:37 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/pdm/prod-defect/reverse.vue

@@ -1,6 +1,8 @@
 <!-- @desc:产品报损撤销  @auth:寇珊珊  @time:2023年3月21日15:21:08 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <DkPaxeButton :total="editKeys?editKeys.length:0"
                   :current="editIndex"
                   v-if="editKeys && editKeys.length > 1"

+ 2 - 0
src/view/pdm/prod-logo-colour/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:商标釉色  @auth:周兴  @time:2023/3/4 20:06 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--  操作按钮-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/pdm/prod-suspend/form.vue

@@ -1,6 +1,8 @@
 <!-- @desc:产品挂起  @auth:常皓宁  @time:2023年2月20日16:56:49 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <DkCollapse ref="collapse" @on-change="changeCollapse">
       <DkPanel prop="prodSuspend">
         <DkForm slot="content" ref="formInline" v-model="formData" style="width: 95%">

+ 2 - 0
src/view/pdm/prod-suspend/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:产品挂起  @auth:常皓宁  @time:2023年2月20日8:56:49 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/pdm/product-code-change/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:条码变更  @auth:周兴  @time:2023/3/4 20:02 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--  操作按钮-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/pdm/thmeter-record/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:温湿度计记录  @auth:寇珊珊  @time:2023年4月3日09:52:50 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/pdm/work-record/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:报工记录  @auth:寇珊珊  @time:2023年4月10日14:33:01 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/pdm/work-station/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:工位管理  @auth:常皓宁  @time:2023年2月15日09:03:49 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--按钮区-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/pdm/ws-clock/clock-user.vue

@@ -1,6 +1,8 @@
 <!-- @desc:工位打卡  @auth:周兴  @time:2023/3/15 17:03 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <DkCollapse ref="collapse" @on-change="changeCollapse">
       <DkPanel prop="wsClockInformation">
         <!--  下拉区域  -->

+ 2 - 0
src/view/pdm/ws-clock/form.vue

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

+ 2 - 0
src/view/pdm/ws-clock/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:打卡记录  @auth:周兴  @time:2023/3/4 19:58 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--  操作按钮-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/process/process-flow/index.vue

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

+ 2 - 0
src/view/report/code-change-report/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:条码变更明细表  @auth:姜宁  @time:2023/3/10 11:34 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <!--  操作按钮-->
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>

+ 2 - 0
src/view/report/delivery-blank/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:交坯明细表  @auth:姜宁  @time:2023/4/7 11:20 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
         <!--    查询    -->

+ 2 - 0
src/view/report/molding-record-report/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:成型记录明细表  @auth:姜宁  @time:2023/2/15 13:04 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
         <!--    查询    -->

+ 2 - 0
src/view/report/mould-follow-report/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:在产品明细表  @auth:姜宁  @time:2023/3/2 17:14 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
         <!--    查询    -->

+ 2 - 0
src/view/report/process-output/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:工序产量明细表  @auth:姜宁  @time:2023/4/10 16:35 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
         <!--    查询    -->

+ 2 - 0
src/view/report/product-follow-report/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:在产品明细表  @auth:姜宁  @time:2023/3/2 17:14 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
         <!--    查询    -->

+ 2 - 0
src/view/report/product-report/index.vue

@@ -1,6 +1,8 @@
 <!-- @desc:产成品明细表  @auth:姜宁  @time:2023/3/3 13:41 -->
 <template>
   <div class="main-div">
+    <!--加载中-->
+    <loading :loading="loading"></loading>
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
       <template #left>
         <!--    查询    -->