Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

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

 <template>
   <div class="MyPlanTaskPage">
     <div class="TaskComponentView" :class="{'height_class':heightClass}">
-      <compnent is="WarehouseApply" :select-data="selectData" :sub-type="subType" :def-state="state" />
+      <compnent :is="selectData.router" :select-data="selectData" :sub-type="subType" :def-state="state" />
     </div>
   </div>
 </template>

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

@@ -19,6 +19,7 @@
           class="list-table"
           :basic-data=" { selectData: selectData }"
           :lay-config="{ typeName: 'InStorageRequestItem', layKey: 'material_table'}"
+          @freshData="freshData('Material')"
         />
       </el-tab-pane>
       <el-tab-pane :label="'机载系统设备验收单(' + totals.AirEquipmentTotal + ')'" name="AirEquipment">
@@ -27,6 +28,7 @@
           class="list-table"
           :lay-config="{ typeName: 'InStorageRequestItem', layKey: 'airEquipment_table'}"
           :basic-data=" { selectData: selectData }"
+          @freshData="freshData('AirEquipment')"
         />
       </el-tab-pane>
       <el-tab-pane :label="'外包产品验收单(' + totals.OutSourceTotal + ')'" name="OutSource">
@@ -35,6 +37,7 @@
           class="list-table"
           :lay-config="{ typeName: 'InStorageRequestItem', layKey: 'outSource_table'}"
           :basic-data=" { selectData: selectData }"
+          @freshData="freshData('OutSource')"
         />
       </el-tab-pane>
     </el-tabs>
@@ -85,33 +88,33 @@ export default {
     }
   },
   created() {
-    // this.getDict()
   },
   mounted() {
-    // 获取total在界面渲染 临时渲染数据， 待修改
-    setTimeout(() => {
-      this.tabNames.forEach(item => {
-        const el = this.$refs[item + 'Table']
-        this.$set(this.totals, item + 'Total', el.$refs.asCom.pagination.total)
-      })
-    }, 2000)
   },
   // 组件方法
   methods: {
+    freshData(tabName) {
+      setTimeout(() => {
+        this.changeTotal(tabName)
+      }, 1000)
+    },
+    changeTotal(tabName) {
+      const el = this.$refs[tabName + 'Table']
+      if (el && el.$refs.asCom) {
+        this.$set(this.totals, tabName + 'Total', el.$refs.asCom.pagination.total)
+      }
+    },
+    searchEvent(val) {
+      this.searchItems = val.items
+      this.getTableData()
+    },
     getTableData() {
       this.tabNames.forEach(item => {
         const el = this.$refs[item + 'Table']
         if (el && el.$refs.asCom) {
           el.$refs.asCom.getData(this.searchItems)
-          setTimeout(() => {
-            this.$set(this.totals, item + 'Total', el.$refs.asCom.pagination.total)
-          }, 1000) // 临时渲染数据，  待修改
         }
       })
-    },
-    searchEvent(val) {
-      this.searchItems = val.items
-      this.getTableData()
     }
   }
 }