合并设备借出与归还流程，增加借出归还列表详情功能

zhaowei

19 小时以前 8905bdd0a74c4bd6cabc206c36a299341488041e

 src/views/flowable/workflow/FlowTodo.vue

@@ -238,12 +238,8 @@
      :taskList='selectionRows'
      @searchReset='searchReset'
    />
    <equipment-lean-out-approval-modal
      ref='equipmentLeanOutApprovalModelRef'
      @searchReset='searchReset'
    />
    <equipment-return-approval-modal
      ref='equipmentReturnApprovalModelRef'
    <equipment-lean-out-and-return-approval-modal
      ref='equipmentLeanOutAndReturnModalRef'
      @searchReset='searchReset'
    />

@@ -310,8 +306,7 @@
import GuideCardBatchHandle from '@views/flowable/workflow/guideCardBatch/GuideCardBatchHandle.vue'
import AssignEquipmentFileStreamHandle from '@views/flowable/workflow/assignEquipmentFileStream/AssignEquipmentFileStreamHandle.vue'
import OutBoundOrderHandle from '@views/flowable/workflow/outBoundOrder/OutBoundOrderHandle.vue'
import EquipmentLeanOutApprovalModal from '@views/flowable/workflow/leanOut/EquipmentLeanOutApprovalModal.vue'
import EquipmentReturnApprovalModal from '@views/flowable/workflow/leanOut/EquipmentReturnApprovalModal.vue'
import EquipmentLeanOutAndReturnApprovalModal from '@views/flowable/workflow/leanOut/EquipmentLeanOutAndReturnApprovalModal.vue'
import SecondMaintenanceApprovalModal from '@views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue'
import ThirdMaintenanceApprovalModal from '@views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue'
import EquipmentSealUpApprovalModal from '@views/flowable/workflow/sealUp/EquipmentSealUpApprovalModal.vue'
@@ -338,8 +333,7 @@
    WeekMaintenanceApprovalModal,
    RepairOrderApprovalModal,
    InspectionOrderHandle,
    EquipmentLeanOutApprovalModal,
    EquipmentReturnApprovalModal,
    EquipmentLeanOutAndReturnApprovalModal,
    SecondMaintenanceApprovalModal,
    ThirdMaintenanceApprovalModal,
    OutBoundOrderHandle,
@@ -371,7 +365,7 @@
          title: '流程分类',
          align: 'center',
          dataIndex: 'category_dictText',
          width: 100
          width: 200
        },
        {
          title: '流程名称',
@@ -397,13 +391,13 @@
          title: '前驱节点',
          align: 'center',
          dataIndex: 'preNode',
          width: 200
          width: 250
        },
        {
          title: '当前节点',
          align: 'center',
          dataIndex: 'name',
          width: 200
          width: 250
        },
        {
          title: '当前节点开始时间',
@@ -516,10 +510,8 @@
          this.handleRepairOrder(item)
          break
        case 'equipment_lean_out':
          this.handleEquipmentLeanOut(item)
          break
        case 'equipment_return':
          this.handleEquipmentReturn(item)
          this.handleEquipmentLeanOutAndReturn(item)
          break
        case 'second_maintenance':
          this.handleSecondMaintenance(item)
@@ -530,7 +522,7 @@
        case 'toolOutStorageApproval':
          this.handleToolOutStorageApproval(item)
          break
        case 'toolsStocktakingBound':
        case 'toolsStocktakingBoundApproval':
          this.handleToolStocktakingApproval(item)
          break
        case 'toolsLossApproval':
@@ -669,18 +661,18 @@
      this.$refs.repairOrderApprovalModal.getAllApproveData(record)
      this.$refs.repairOrderApprovalModal.getBasicInformation(record)
    },
    handleEquipmentLeanOut(item) {
      this.$refs.equipmentLeanOutApprovalModelRef.visible = true
      this.$refs.equipmentLeanOutApprovalModelRef.title = item.name
      this.$refs.equipmentLeanOutApprovalModelRef.handleDetail(item)
      this.$refs.equipmentLeanOutApprovalModelRef.disableSubmit = false

    /**
     * 设备借出与归还
     * @param item
     */
    handleEquipmentLeanOutAndReturn(item) {
      this.$refs.equipmentLeanOutAndReturnModalRef.visible = true
      this.$refs.equipmentLeanOutAndReturnModalRef.title = item.name
      this.$refs.equipmentLeanOutAndReturnModalRef.handleDetail(item)
      this.$refs.equipmentLeanOutAndReturnModalRef.disableSubmit = false
    },
    handleEquipmentReturn(item) {
      this.$refs.equipmentReturnApprovalModelRef.visible = true
      this.$refs.equipmentReturnApprovalModelRef.title = item.name
      this.$refs.equipmentReturnApprovalModelRef.handleDetail(item)
      this.$refs.equipmentReturnApprovalModelRef.disableSubmit = false
    },

    handleSecondMaintenance(item) {
      if (item && item.dataId) {
        this.selectSecondMaintenanceData = Object.assign({}, item)