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/outStorageRecallApply/index.vue

+<!--
+ * @Author: gjn
+ * @Date: 2023-08-03 16:29:39
+ * @Description:批量签审_三期出库申请
+-->
+<template>
+  <div class="outStorageRecallApply">
+    <dee-as-com
+      ref="applyTable"
+      class="list-table"
+      :basic-data=" { selectData: selectData }"
+      :lay-config="{ typeName: 'OutStorageExpire', layKey: 'batchSign_outStorageRecallApply'}"
+    />
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'OutStorageRecallApply',
+  components: {},
+  props: {
+    selectData: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  data() {
+    return {}
+  },
+  computed: {},
+  watch: {},
+  created() {},
+  mounted() {},
+  // 组件方法
+  methods: {}
+}
+</script>
+
+<style  lang='scss'>
+.outStorageRecallApply{
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
+  padding:0 4px;
+
+}
+</style>

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

@@ -9,9 +9,11 @@
 <script>
 export default {
   components: {
-    WarehouseApply: () => import('./warehouseApply'),
-    OutStorageExpireApply: () => import('./outStorageExpireApply'),
-    JobResponseInExperiment: () => import('./jobResponseInExperiment')
+    WarehouseApply: () => import('./warehouseApply'), // 验收入库申请
+    WarehouseExamine: () => import('./warehouseExamine'), // 验收入库审核
+    JobResponseInExperiment: () => import('./jobResponseInExperiment'), // 理化试验验入库响应
+    OutStorageExpireApply: () => import('./outStorageExpireApply'), // 三期出库申请
+    OutStorageRecallApply: () => import('./outStorageRecallApply') // 返厂出库申请
   },
   props: {
     selectData: {

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

+<!--
+ * @Author: gjn
+ * @Date: 2023-08-04 17:10:07
+ * @Description:批量签审_验收入库审核
+-->
+<template>
+  <div class="warehouseExamine">
+    <dee-as-com
+      ref="search"
+      :lay-config="{ typeName: 'InStorageRequestItem', layKey: 'warehouse_search'}"
+      :basic-data="defaultData"
+      @searchEvent="searchEvent"
+    />
+    <!-- tab页签 -->
+    <el-tabs v-model="active" type="border-card" class="detailTabs" @tab-click="tabClick">
+      <el-tab-pane :label="'器材验收单(' + totals.MaterialTotal + ')'" name="Material">
+        <dee-as-com
+          ref="MaterialTable"
+          class="list-table"
+          :basic-data=" basicData"
+          :lay-config="{ typeName: 'InStorageRequestItem', layKey: 'examine_material_table'}"
+          @freshData="freshData('Material')"
+          @selectionChange="selectionChange($event,'Material')"
+        />
+      </el-tab-pane>
+      <el-tab-pane :label="'机载系统设备验收单(' + totals.AirEquipmentTotal + ')'" name="AirEquipment">
+        <dee-as-com
+          ref="AirEquipmentTable"
+          class="list-table"
+          :lay-config="{ typeName: 'InStorageRequestItem', layKey: 'examine_airEquipment_table'}"
+          :basic-data=" basicData"
+          @freshData="freshData('AirEquipment')"
+          @selectionChange="selectionChange($event,'AirEquipment')"
+        />
+      </el-tab-pane>
+      <el-tab-pane :label="'外包产品验收单(' + totals.OutSourceTotal + ')'" name="OutSource">
+        <dee-as-com
+          ref="OutSourceTable"
+          class="list-table"
+          :lay-config="{ typeName: 'InStorageRequestItem', layKey: 'examine_outSource_table'}"
+          :basic-data=" basicData"
+          @freshData="freshData('OutSource')"
+          @selectionChange="selectionChange($event,'OutSource')"
+        />
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'WarehouseExamine',
+  components: {},
+  props: {
+    selectData: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  data() {
+    const _that = this
+    return {
+      active: 'Material',
+      defaultData: {},
+      totals: {
+        MaterialTotal: 0,
+        AirEquipmentTotal: 0,
+        OutSourceTotal: 0
+      },
+      billTypeList: [],
+      searchItems: [],
+      tabNames: [
+        'Material',
+        'AirEquipment',
+        'OutSource'
+      ],
+      selectionRows: {},
+      basicData: { selectData: _that.selectData, selectionRows: [] }
+    }
+  },
+  computed: {
+  },
+  watch: {
+    selectData: {
+      immediate: true,
+      deep: true,
+      handler(val) {
+        if (val && val.taskKey) {
+          this.$nextTick(() => {
+            this.getTableData()
+          })
+        }
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  // 组件方法
+  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)
+        }
+      })
+    },
+    selectionChange(val, tabName) {
+      this.$set(this.basicData, 'selectionRows', val)
+    },
+    tabClick() {
+      this.$set(this.basicData, 'selectionRows', [])
+    }
+  }
+}
+</script>
+
+<style  lang='scss'>
+.warehouseExamine{
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
+  padding:0 4px;
+  .search-form-box-com .search-box-col{
+    width: 100%!important;
+  }
+  .detailTabs {
+    height: calc(100% - 40px);
+    border: 0;
+    .dee-table-header{
+      padding: 0px 10px;
+      .dee-tools{
+       margin: 4px 0;
+     }
+    }
+  }
+  .el-tabs--border-card > .el-tabs__content {
+    padding: 0px;
+    height: calc(100% - 70px);
+    .el-tab-pane{
+      height: 100%;
+    }
+  }
+  .el-tabs--border-card > .el-tabs__header {
+    .el-tabs__nav-wrap {
+      margin: 0px;
+    }
+    .el-tabs__item.is-active {
+      color: #409eff;
+    }
+  }
+}
+</style>