批量签审界面包含tab页签的界面loading处理

applications/architecture-dee/src/utils/http.js

@@ -23,6 +23,13 @@ const disShowLadingRequestUrl = [
   '/ExtProcessSkillUser/getSkillUser'
 ]
 
+const disShowLadingRequestRoute = [
+  '/dee-task-center/workflow/task-center/home/Activity_1gsdy96', // 批量_验收入库申请
+  '/dee-task-center/workflow/task-center/home/Activity_1oc19vh', // 批量_验收入库审核
+  '/dee-task-center/workflow/task-center/home/Activity_1f9m8pv', // 批量_验收入库理化
+  '/dee-task-center/workflow/task-center/home/Activity_1sj6bja', // 批量_验收入库检验
+  '/dee-task-center/workflow/task-center/home/Activity_1rlj2pq'// 批量_退库入库检验
+]
 axios.defaults.baseURL = VUE_APP_BASE_API || process.env.VUE_APP_BASE_API  // eslint-disable-line
 axios.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8'
 axios.defaults.headers.post['Cache-Control'] = 'no-cache'
@@ -37,6 +44,8 @@ axios.interceptors.request.use(
     }
     const disLoading = disShowLadingRequestUrl.find((el) => {
       return config.url.includes(el)
+    }) || disShowLadingRequestRoute.find((r) => {
+      return router.app.$route.path.includes(r) && router.app.$route.query && router.app.$route.query.DAO === '批量签审'
     })
     if (!disLoading) {
       loadingInstance = Loading.service({

applications/dee-task-center/src/views/workflow/task-center/myPlanTask/inStorageUseOutBackInTest/index.vue

@@ -16,6 +16,7 @@
       <el-tab-pane :label="'器材验收单(' + totals.MaterialTotal + ')'" name="Material">
         <dee-as-com
           ref="MaterialTable"
+          v-dee-loading="loadingMaterial"
           class="list-table"
           :basic-data=" {...basicData,tableType:'Material'}"
           :lay-config="{ typeName: 'InStorageBackItem', layKey: 'Material_batchSign_InStorageBackInTest'}"
@@ -26,6 +27,7 @@
       <el-tab-pane :label="'机载系统设备验收单(' + totals.AirEquipmentTotal + ')'" name="AirEquipment">
         <dee-as-com
           ref="AirEquipmentTable"
+          v-dee-loading="loadingAirEquipment"
           class="list-table"
           :lay-config="{ typeName: 'InStorageBackItem', layKey: 'AirEquipment_batchSign_InStorageBackItem'}"
           :basic-data=" {...basicData,tableType:'AirEquipment'}"
@@ -36,6 +38,7 @@
       <el-tab-pane :label="'外包产品验收单(' + totals.OutSourceTotal + ')'" name="OutSource">
         <dee-as-com
           ref="OutSourceTable"
+          v-dee-loading="loadingOutSource"
           class="list-table"
           :lay-config="{ typeName: 'InStorageBackItem', layKey: 'OutSource_batchSign_InStorageBackItem'}"
           :basic-data="{...basicData,tableType:'OutSource'}"
@@ -75,7 +78,10 @@ export default {
         'OutSource'
       ],
       selectionRows: {},
-      basicData: { selectData: _that.selectData, selectionRows: [] }
+      basicData: { selectData: _that.selectData, selectionRows: [] },
+      loadingMaterial: false,
+      loadingAirEquipment: false,
+      loadingOutSource: false
     }
   },
   computed: {
@@ -108,6 +114,7 @@ export default {
   // 组件方法
   methods: {
     onRequestSuccess(res, tabName) {
+      this['loading' + tabName] = false
       this.$set(this.totals, tabName + 'Total', res.items.totalElements)
     },
     searchEvent(val) {
@@ -116,6 +123,7 @@ export default {
     },
     getTableData() {
       this.tabNames.forEach(item => {
+        this['loading' + item] = true
         const el = this.$refs[item + 'Table']
         if (el && el.$refs.asCom) {
           el.$refs.asCom.getData(this.searchItems)

applications/dee-task-center/src/views/workflow/task-center/myPlanTask/jobResponseInExperiment/index.vue

@@ -16,6 +16,7 @@
       <el-tab-pane :label="'器材验收单(' + totals.MaterialTotal + ')'" name="Material">
         <dee-as-com
           ref="MaterialTable"
+          v-dee-loading="loadingMaterial"
           class="list-table"
           :basic-data=" {...basicData,tableType:'Material'}"
           :lay-config="{ typeName: 'JobResponseInStorage', layKey: 'material_batchSign_jobResponseInExperiment'}"
@@ -26,6 +27,7 @@
       <el-tab-pane :label="'机载系统设备验收单(' + totals.AirEquipmentTotal + ')'" name="AirEquipment">
         <dee-as-com
           ref="AirEquipmentTable"
+          v-dee-loading="loadingAirEquipment"
           class="list-table"
           :lay-config="{ typeName: 'JobResponseInStorage', layKey: 'airborne_batchSign_jobResponseInExperiment'}"
           :basic-data=" {...basicData,tableType:'AirEquipment'}"
@@ -36,6 +38,7 @@
       <el-tab-pane :label="'外包产品验收单(' + totals.OutSourceTotal + ')'" name="OutSource">
         <dee-as-com
           ref="OutSourceTable"
+          v-dee-loading="loadingOutSource"
           class="list-table"
           :lay-config="{ typeName: 'JobResponseInStorage', layKey: 'outsource_batchSign_jobResponseInExperiment'}"
           :basic-data="{...basicData,tableType:'OutSource'}"
@@ -75,7 +78,10 @@ export default {
         'OutSource'
       ],
       selectionRows: {},
-      basicData: { selectData: _that.selectData, selectionRows: [] }
+      basicData: { selectData: _that.selectData, selectionRows: [] },
+      loadingMaterial: false,
+      loadingAirEquipment: false,
+      loadingOutSource: false
     }
   },
   computed: {
@@ -108,6 +114,7 @@ export default {
   // 组件方法
   methods: {
     onRequestSuccess(res, tabName) {
+      this['loading' + tabName] = false
       this.$set(this.totals, tabName + 'Total', res.items.totalElements)
     },
     searchEvent(val) {
@@ -116,6 +123,7 @@ export default {
     },
     getTableData() {
       this.tabNames.forEach(item => {
+        this['loading' + item] = true
         const el = this.$refs[item + 'Table']
         if (el && el.$refs.asCom) {
           el.$refs.asCom.getData(this.searchItems)

applications/dee-task-center/src/views/workflow/task-center/myPlanTask/warehouseApply/index.vue

@@ -16,6 +16,7 @@
       <el-tab-pane :label="'器材验收单(' + totals.MaterialTotal + ')'" name="Material">
         <dee-as-com
           ref="MaterialTable"
+          v-dee-loading="loadingMaterial"
           class="list-table"
           :basic-data=" { selectData: selectData }"
           :lay-config="{ typeName: 'InStorageRequestItem', layKey: 'material_table'}"
@@ -25,6 +26,7 @@
       <el-tab-pane :label="'机载系统设备验收单(' + totals.AirEquipmentTotal + ')'" name="AirEquipment">
         <dee-as-com
           ref="AirEquipmentTable"
+          v-dee-loading="loadingAirEquipment"
           class="list-table"
           :lay-config="{ typeName: 'InStorageRequestItem', layKey: 'airEquipment_table'}"
           :basic-data=" { selectData: selectData }"
@@ -34,6 +36,7 @@
       <el-tab-pane :label="'外包产品验收单(' + totals.OutSourceTotal + ')'" name="OutSource">
         <dee-as-com
           ref="OutSourceTable"
+          v-dee-loading="loadingOutSource"
           class="list-table"
           :lay-config="{ typeName: 'InStorageRequestItem', layKey: 'outSource_table'}"
           :basic-data=" { selectData: selectData }"
@@ -69,7 +72,10 @@ export default {
         'Material',
         'AirEquipment',
         'OutSource'
-      ]
+      ],
+      loadingMaterial: false,
+      loadingAirEquipment: false,
+      loadingOutSource: false
     }
   },
   computed: {
@@ -101,6 +107,7 @@ export default {
   // 组件方法
   methods: {
     onRequestSuccess(res, tabName) {
+      this['loading' + tabName] = false
       this.$set(this.totals, tabName + 'Total', res.items.totalElements)
     },
     searchEvent(val) {
@@ -109,6 +116,7 @@ export default {
     },
     getTableData() {
       this.tabNames.forEach(item => {
+        this['loading' + item] = true
         const el = this.$refs[item + 'Table']
         if (el && el.$refs.asCom) {
           el.$refs.asCom.getData(this.searchItems)

applications/dee-task-center/src/views/workflow/task-center/myPlanTask/warehouseExamine/index.vue

@@ -16,6 +16,7 @@
       <el-tab-pane :label="'器材验收单(' + totals.MaterialTotal + ')'" name="Material">
         <dee-as-com
           ref="MaterialTable"
+          v-dee-loading="loadingMaterial"
           class="list-table"
           :basic-data=" basicData"
           :lay-config="{ typeName: 'InStorageRequestItem', layKey: 'examine_material_table'}"
@@ -26,6 +27,7 @@
       <el-tab-pane :label="'机载系统设备验收单(' + totals.AirEquipmentTotal + ')'" name="AirEquipment">
         <dee-as-com
           ref="AirEquipmentTable"
+          v-dee-loading="loadingAirEquipment"
           class="list-table"
           :lay-config="{ typeName: 'InStorageRequestItem', layKey: 'examine_airEquipment_table'}"
           :basic-data=" basicData"
@@ -36,6 +38,7 @@
       <el-tab-pane :label="'外包产品验收单(' + totals.OutSourceTotal + ')'" name="OutSource">
         <dee-as-com
           ref="OutSourceTable"
+          v-dee-loading="loadingOutSource"
           class="list-table"
           :lay-config="{ typeName: 'InStorageRequestItem', layKey: 'examine_outSource_table'}"
           :basic-data=" basicData"
@@ -75,7 +78,10 @@ export default {
         'OutSource'
       ],
       selectionRows: {},
-      basicData: { selectData: _that.selectData, selectionRows: [] }
+      basicData: { selectData: _that.selectData, selectionRows: [] },
+      loadingMaterial: false,
+      loadingAirEquipment: false,
+      loadingOutSource: false
     }
   },
   computed: {
@@ -100,6 +106,7 @@ export default {
   // 组件方法
   methods: {
     onRequestSuccess(res, tabName) {
+      this['loading' + tabName] = false
       this.$set(this.totals, tabName + 'Total', res.items.totalElements)
     },
     searchEvent(val) {
@@ -108,6 +115,7 @@ export default {
     },
     getTableData() {
       this.tabNames.forEach(item => {
+        this['loading' + item] = true
         const el = this.$refs[item + 'Table']
         if (el && el.$refs.asCom) {
           el.$refs.asCom.getData(this.searchItems)

applications/dee-task-center/src/views/workflow/task-center/myPlanTask/warehouseInTest/index.vue

@@ -16,6 +16,7 @@
       <el-tab-pane :label="'器材验收单(' + totals.MaterialTotal + ')'" name="Material">
         <dee-as-com
           ref="MaterialTable"
+          v-dee-loading="loadingMaterial"
           class="list-table"
           :basic-data=" {...basicData,tableType:'Material'}"
           :lay-config="{ typeName: 'JobResponseInStorage', layKey: 'batchSign_jobResponseInTest'}"
@@ -26,6 +27,7 @@
       <el-tab-pane :label="'机载系统设备验收单(' + totals.AirEquipmentTotal + ')'" name="AirEquipment">
         <dee-as-com
           ref="AirEquipmentTable"
+          v-dee-loading="loadingAirEquipment"
           class="list-table"
           :lay-config="{ typeName: 'JobResponseInStorage', layKey: 'airborne_batchSign_jobResponseInTest'}"
           :basic-data=" {...basicData,tableType:'AirEquipment'}"
@@ -36,6 +38,7 @@
       <el-tab-pane :label="'外包产品验收单(' + totals.OutSourceTotal + ')'" name="OutSource">
         <dee-as-com
           ref="OutSourceTable"
+          v-dee-loading="loadingOutSource"
           class="list-table"
           :lay-config="{ typeName: 'JobResponseInStorage', layKey: 'outsource_batchSign_jobResponseInTest'}"
           :basic-data="{...basicData,tableType:'OutSource'}"
@@ -75,7 +78,10 @@ export default {
         'OutSource'
       ],
       selectionRows: {},
-      basicData: { selectData: _that.selectData, selectionRows: [] }
+      basicData: { selectData: _that.selectData, selectionRows: [] },
+      loadingMaterial: false,
+      loadingAirEquipment: false,
+      loadingOutSource: false
     }
   },
   computed: {
@@ -108,6 +114,7 @@ export default {
   // 组件方法
   methods: {
     onRequestSuccess(res, tabName) {
+      this['loading' + tabName] = false
       this.$set(this.totals, tabName + 'Total', res.items.totalElements)
     },
     searchEvent(val) {
@@ -116,6 +123,7 @@ export default {
     },
     getTableData() {
       this.tabNames.forEach(item => {
+        this['loading' + item] = true
         const el = this.$refs[item + 'Table']
         if (el && el.$refs.asCom) {
           el.$refs.asCom.getData(this.searchItems)