返厂处理批量操作

applications/dee-task-center/src/views/workflow/task-center/myPlanTask/returnToFactoryBatch/components/left.vue

+<template>
+  <div class="returnToFactoryLeft" style="padding-right: 15px; height: 100%; overflow: scroll;">
+    <!-- 搜索 -->
+    <dee-as-com
+      :lay-config="{
+        typeName: 'OutStorageRecall',
+        layKey: 'returnToFactory_search'
+      }"
+      @searchEvent="searchEvent"
+    />
+    <!-- 分类展示 -->
+    <el-collapse
+      v-model="collapse.active"
+      v-loading="loading"
+      accordion
+    >
+      <el-collapse-item
+        v-for="(request, index) in requests"
+        :key="index"
+        :name="(index + 1).toString()"
+      >
+        <template slot="title">
+          <section class="collapse-title">| {{ request.name }}（{{ request.lists.length }}）</section>
+        </template>
+        <ul v-if="request.lists.length">
+          <template v-for="(item, subIndex) in request.lists">
+            <li
+              :key="item.id"
+              class="blue"
+              :class="{active: subIndex === active,'active-background':item.activeBackground}"
+              @click="currentDataClick(item,subIndex)"
+            >
+              <i class="el-icon-document" />
+              {{ item.reqNo }} ,{{ item.creator.userName || '暂无' }},
+              {{ item.createTime }}
+            </li>
+          </template>
+        </ul>
+        <span v-else class="empty">暂无数据</span>
+      </el-collapse-item>
+    </el-collapse>
+  </div>
+</template>
+<script>
+import { post } from '@/utils/http'
+export default {
+  name: 'ReturnToFactoryLeft',
+  components: {
+  },
+  props: {
+    selectData: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      // 手风琴默认高亮
+      active: 0,
+      // 手风琴组件
+      collapse: {
+        active: ['1']
+      },
+      // 申请列表
+      requests: [
+        { name: '返厂处理', lists: [] }
+      ],
+      searchItems: []
+    }
+  },
+  computed: {},
+  watch: {
+  },
+  mounted() {
+    this.init()
+    this.$bus.$on('reloadModuleList', (hasFlag) => {
+      this.$nextTick(() => {
+        this.init()
+      })
+    })
+  },
+  methods: {
+    searchEvent(data) {
+      this.searchItems = data && data.items || []
+      this.init()
+    },
+    // 加载左侧申请表
+    init() {
+      const params = {
+        'pageFrom': 1,
+        'pageSize': 9999,
+        'searchItems': {
+          'children': [],
+          'items': this.searchItems,
+          'operator': 'AND'
+        },
+        'openProps': [
+        ],
+        'sortItem': [
+          {
+            'fieldName': 'modifyTime',
+            'sortOrder': 'desc'
+          }
+        ]
+      }
+      this.loading = true
+      post(`OutStorageRequest/search/outStorageExpireApply?taskDefinitionKey=${this.selectData.taskKey}`, params).then(res => {
+        const data = res.items.content.map(item => {
+          return {
+            ...item.pbo,
+            processInstanceId: item.processTask.processInstanceId,
+            processTaskId: item.processTask.id
+          }
+        })
+        this.requests[0].lists = data
+        data && this.currentDataClick(data[0], 0)
+      }).catch(err => console.log(err)).finally(() => {
+        this.loading = false
+      })
+    },
+    currentDataClick(item, subIndex) {
+      this.active = subIndex
+      this.$emit('currentLeftData:click', item)
+    }
+  }
+}
+</script>
+  <style lang="scss" scoped>
+  ul {
+    margin: -10px 0;
+    padding: 5px 0 0 0;
+    li {
+      margin-top: 5px;
+      padding: 0 5px 0 8px;
+      height: 25px;
+      line-height: 25px;
+      list-style: none;
+      cursor: pointer;
+      font-size: 14px;
+      color: #606266;
+      opacity: .85;
+      white-space: nowrap;
+      &.black{
+         color: black;
+      }
+      &.active-background{background-color: #67C23A;}
+      &.blue { color: blue; }
+      &.red { color: red; }
+      i { font-size: 14px; }
+      &:hover, &.active {
+        opacity: 1;
+        font-weight: 500;
+        background-color: #edf0f5;
+      }
+    }
+  }
+  .empty { margin-left: 10px; color: #666; }
+  .el-date-editor { width: 100%; }
+  .collapse-title { font-size: 14px; color: #666; }
+  .is-active .collapse-title { font-size: 15px; font-weight: 600; color: #222; }
+  </style>
+

applications/dee-task-center/src/views/workflow/task-center/myPlanTask/returnToFactoryBatch/components/right.vue

+<template>
+  <div class="returnToFactoryRight">
+    <dee-as-com
+      ref="requestTable"
+      :basic-data=" { selectData,...currentLeftData,selectionRows}"
+      :lay-config="{ typeName: 'OutStorageRecall', layKey:'returnToFactory_applyList'}"
+      table-height="auto"
+      @selectionChange="selectionChange"
+    />
+    <div class="sub-title">
+      出库明细
+    </div>
+    <dee-as-com
+      ref="itemsTable"
+      :lay-config="{ typeName: 'OutStorageRecallItem', layKey: 'applyDeal_outStorageRecallDetails'}"
+      table-height="calc(100% - 150px)"
+      :basic-data=" { selectData,selectionRowsRes,...currentLeftData }"
+      @selectionChangeRes="selectionChangeRes"
+    />
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ReturnToFactoryRight',
+  components: {},
+  props: {
+    selectData: {
+      type: Object,
+      default: () => {}
+    },
+    currentLeftData: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  data() {
+    return {
+      selectionRows: [],
+      selectionRowsRes: []
+    }
+  },
+  computed: {},
+  watch: {
+    currentLeftData: {
+      immediate: true,
+      deep: true,
+      handler(val) {
+        setTimeout(() => {
+          this.init()
+        }, 300)
+      }
+    }
+  },
+  created() {},
+  mounted() {
+    this.$bus.$on('refreshUseItemConfirm', (data) => {
+      this.$refs.itemsTable && this.$refs.itemsTable.$refs.asCom.getData()
+    })
+  },
+  // 组件方法
+  methods: {
+    selectionChange(val) {
+      this.selectionRows = val
+    },
+    selectionChangeRes(val) {
+      this.selectionRowsRes = val
+    },
+    init() {
+      this.$refs.requestTable && this.$refs.requestTable.$refs.asCom && this.$refs.requestTable.$refs.asCom.getData()
+      this.$refs.itemsTable && this.$refs.itemsTable.$refs.asCom && this.$refs.itemsTable.$refs.asCom.getData()
+    }
+  }
+}
+</script>
+
+  <style  lang='scss'>
+  .returnToFactoryRight{
+    overflow: auto;
+    width: 100%;
+    height: 100%;
+    box-sizing: border-box;
+    padding-left: 8px;
+    .sub-title{
+        padding-top: 10px!important;
+    }
+    .dee-table{
+        .dee-tools {
+            margin: 2px 0!important;
+        }
+        .dee-table-config-bar{
+            margin: 2px 0!important;
+        }
+        .dee-table-pagination {
+            margin-top: 12px!important;
+        }
+     }
+
+  }
+  </style>
+

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

+<!--
+ * @Author: gjn
+ * @Date: 2023-1-8 15:07:39
+ * @Description:批量签审_返厂出库确认
+-->
+<template>
+  <div class="returnToFactoryBatch">
+    <dee-fold-pane
+      :min-percent="18"
+      :default-percent="18"
+      split="vertical"
+      class="detail-pane"
+    >
+      <template slot="paneL">
+        <Left
+          ref="left"
+          :select-data="selectData"
+          @currentLeftData:click="currentAoClick"
+        />
+      </template>
+      <template slot="paneR">
+        <Right
+          v-show="subTypeName === '1'"
+          ref="right"
+          :select-data="selectData"
+          :current-left-data="currentLeftData"
+        />
+        <!-- empty -->
+        <section v-if="!subTypeName" style="padding-left: 15px;">
+          请先选择左侧请求单
+        </section>
+      </template>
+    </dee-fold-pane>
+  </div>
+</template>
+
+<script>
+import Left from './components/left.vue'
+import Right from './components/right.vue'
+export default {
+  name: 'ReturnToFactoryBatch',
+  components: { Left, Right },
+  props: {
+    selectData: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  data() {
+    return {
+      subTypeName: '',
+      currentLeftData: null
+    }
+  },
+  computed: {},
+  watch: {},
+  created() {},
+  mounted() {},
+  // 组件方法
+  methods: {
+    currentAoClick(data) {
+      this.subTypeName = '1'
+      this.currentLeftData = data
+    }
+  }
+}
+</script>
+
+<style  lang='scss'>
+.returnToFactoryBatch{
+  width: 100%;
+  height: 103%;
+  box-sizing: border-box;
+  padding:0 4px;
+
+}
+</style>

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

@@ -22,6 +22,8 @@ export default {
     OutStorageOutExamine: () => import('./outStorageOutExamine'), // 供外出库审核
     OutStorageOutApproval: () => import('./outStorageOutApproval'), // 供外出库批准
     OutStorageOutConfirm: () => import('./outStorageOutConfirm'), // 供外出库确认
+    // OutStorageUseApply: () => import('./outStorageOutConfirm'), // 领用出库申请
+    // OutStorageUseExamine: () => import('./outStorageOutConfirm'), // 领用出库审核
     OutStorageUseConfirm: () => import('./outStorageOutConfirm'), // 领用出库确认
     InStorageMatchBackApply: () => import('./inStorageMatchBackApply'), // 配套退库申请
     InStorageMatchBackExamin: () => import('./inStorageMatchBackExamine'), // 配套退库审核
@@ -37,7 +39,8 @@ export default {
     OutStorageMatchConfirm: () => import('./outStorageMatchConfirm'), // 配套出库确认
     ProPreparateWorkerConfirm: () => import('./proPreparatWorkerConfirm'), // 生产准备工确认
     InstructionIdentificationBatch: () => import('./instructionIdentificationBatch'), // 指令标识
-    InstructionIdentificationBatchInfo: () => import('./instructionIdentificationBatch') // 指令标识不编辑
+    InstructionIdentificationBatchInfo: () => import('./instructionIdentificationBatch'), // 指令标识不编辑
+    ReturnToFactoryBatch: () => import('./returnToFactoryBatch') // 返厂处理
   },
   props: {
     selectData: {