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

zhaowei

19 小时以前 8905bdd0a74c4bd6cabc206c36a299341488041e

 src/views/flowable/workflow/FlowCompleted.vue

@@ -144,11 +144,6 @@
      :selectShenpiData="selectLossBoundOrderData"
      @searchReset="searchReset"
    ></loss-bound-handle>

    <equipment-lean-out-approval-modal
      ref='equipmentLeanOutApprovalModelRef'
      @searchReset='searchReset'
    />
    <equipment-seal-up-approval-modal
      ref='equipmentSealUpApprovalModelRef'
      @searchReset='searchReset'
@@ -166,6 +161,30 @@
      @searchReset='searchReset'
      :selectSparePartApplyData='selectSparePartApplyData'
    ></spare-part-apply-handle>
    <equipment-lean-out-and-return-approval-modal
      ref='EquipmentLeanOutAndReturnApprovalModalRef'
      @searchReset='searchReset'
    />
    <inbound-order-handle-xq
      ref='inboundOrderApprovalModal'
      :selectInboundOrderData='selectInboundOrderData'
      @searchReset='searchReset'
    ></inbound-order-handle-xq>
    <second-maintenance-approval-modal
      ref='secondMaintenanceApprovalModal'
      :selectShenpiData='selectSecondMaintenanceData'
      @searchReset='searchReset'
    ></second-maintenance-approval-modal>
    <third-maintenance-approval-modal
      ref='thirdMaintenanceApprovalModal'
      :selectShenpiData='selectThirdMaintenanceData'
      @searchReset='searchReset'
    ></third-maintenance-approval-modal>
    <guide-card-batch-xq
      ref='GuideCardBatchXq'
      :selectShenpiData='selectGuideCardData'
      @searchReset='searchReset'
    ></guide-card-batch-xq>
  </a-card>
</template>

@@ -183,11 +202,15 @@
import OutBoundOrderHandle from '@views/flowable/workflow/outBoundOrder/OutBoundOrderHandle.vue'
import lossBoundHandle from '@views/flowable/workflow/lossBound/lossBoundHandle.vue'
import stocktakingBoundHandle from '@views/flowable/workflow/stocktakingBound/stocktakingBoundHandle.vue'
import EquipmentLeanOutApprovalModal from '@views/flowable/workflow/leanOut/EquipmentLeanOutApprovalModal.vue'
import EquipmentSealUpApprovalModal from '@views/flowable/workflow/sealUp/EquipmentSealUpApprovalModal.vue'
import EquipmentTransferApprovalModal from '@views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue'
import EquipmentScrapApprovalModal from '@views/flowable/workflow/scrap/EquipmentScrapApprovalModal.vue'
import SparePartApplyHandle from '@views/flowable/workflow/sparePartApply/SparePartApplyHandle.vue'
import EquipmentLeanOutAndReturnApprovalModal from '@views/flowable/workflow/leanOut/EquipmentLeanOutAndReturnApprovalModal.vue'
import GuideCardBatchXq from '@views/flowable/workflow/guideCardBatch/GuideCardBatchXq.vue'
import SecondMaintenanceApprovalModal from '@views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue'
import ThirdMaintenanceApprovalModal from '@views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue'
import InboundOrderHandleXq from '@views/flowable/workflow/inboundOrder/InboundOrderHandleXq.vue'

export default {
  name: 'NcDeviceCharactersList',
@@ -202,11 +225,16 @@
    InspectionOrderHandle,
    JDictSelectTag,
    OutBoundOrderHandle,
    EquipmentLeanOutApprovalModal,
    EquipmentSealUpApprovalModal,
    EquipmentTransferApprovalModal,
    EquipmentScrapApprovalModal,
    SparePartApplyHandle
    SparePartApplyHandle,
    EquipmentLeanOutAndReturnApprovalModal,
    SecondMaintenanceApprovalModal,
    ThirdMaintenanceApprovalModal,
    InboundOrderHandleXq,
    GuideCardBatchXq

  },
  data() {
    return {
@@ -244,7 +272,7 @@
        {
          title: '流程发起人名称',
          align: 'center',
          dataIndex: 'startUserName',
          dataIndex: 'proposer_dictText',
          width: 250
        },
        {
@@ -285,6 +313,11 @@
      // selectEquipmentSealUpData: {},
      // selectEquipmentTransferData: {},
      // selectEquipmentScrapData: {},
      selectSecondMaintenanceData: {},
      selectThirdMaintenanceData: {},
      selectInboundOrderData: {},
      selectGuideCardData: {},


    }
  },
@@ -321,7 +354,7 @@
        case 'toolOutStorageApproval':
          this.handleToolOutStorageApproval(item)
          break
        case 'toolsStocktakingBound':
        case 'toolsStocktakingBoundApproval':
          this.handleToolStocktakingApproval(item)
          break
        case 'toolsLossApproval':
@@ -333,9 +366,6 @@
        case 'equipment_unseal':
          this.handleEquipmentUnSeal(item)
          break
        case 'equipment_lean_out':
          this.handleEquipmentLeanOut(item)
          break
        case 'equipment_transfer':
          this.handleEquipmentTransfer(item)
          break
@@ -344,6 +374,22 @@
          break
        case 'spare_part_apply':
          this.handleSparePartApplyApproval(item)
          break
        case 'equipment_lean_out':
        case 'equipment_return':
          this.handleEquipmentLeanOutAndReturn(item)
          break
        case 'toolInStorageApproval':
          this.handleToolInStorage(item)
          break
        case 'second_maintenance':
          this.handleSecondMaintenance(item)
          break
        case 'third_maintenance':
          this.handleThirdMaintenance(item)
          break
        case 'programConfirmApproval':
          this.handleGuideCardApproval(item)
          break
        default:
          alert('没找到该流程')
@@ -354,6 +400,47 @@
      let parts = title.split('：') // 注意冒号是全角字符，使用对应的字进行分割
      let result = parts[0]
      return result
    },

    handleEquipmentLeanOutAndReturn(item) {
      this.$refs.EquipmentLeanOutAndReturnApprovalModalRef.visible = true
      this.$refs.EquipmentLeanOutAndReturnApprovalModalRef.title = item.name
      this.$refs.EquipmentLeanOutAndReturnApprovalModalRef.handleDetail(item)
      this.$refs.EquipmentLeanOutAndReturnApprovalModalRef.disableSubmit = true
    },
    handleToolInStorage(item) {
      console.log('item----->', item)
      this.selectInboundOrderData = item
      this.selectGuideCardData.title = item.description
      this.$refs.inboundOrderApprovalModal.clearTableSource()
      this.$refs.inboundOrderApprovalModal.getAllApproveData(item)
    },
    handleSecondMaintenance(item) {
      if (item && item.dataId) {
        this.selectSecondMaintenanceData = Object.assign({}, item)
        this.$refs.secondMaintenanceApprovalModal.handleDetail(item)
        this.$refs.secondMaintenanceApprovalModal.title = item.name
        this.$refs.secondMaintenanceApprovalModal.disableSubmit = true
      }
    },
    handleThirdMaintenance(item) {
      if (item && item.dataId) {
        this.selectThirdMaintenanceData = Object.assign({}, item)
        this.$refs.thirdMaintenanceApprovalModal.handleDetail(item)
        this.$refs.thirdMaintenanceApprovalModal.title = item.name
        this.$refs.thirdMaintenanceApprovalModal.disableSubmit = true
      }
    },
    //DNC-程序确认表流程
    handleGuideCardApproval(item) {
      console.log('item----->', item)
      this.selectGuideCardData = item
      this.selectGuideCardData.assignee_dictText = item.todoUsers_dictText
      this.selectGuideCardData.procInstId = item.procInsId
      this.selectGuideCardData.processInstanceId = item.procInsId
      this.selectGuideCardData.title = item.description
      this.$refs.GuideCardBatchXq.clearTableSource()
      this.$refs.GuideCardBatchXq.getAllApproveData(item)
    },
    handDrDetial(item) {
      this.selectShenpiData = item
@@ -449,12 +536,6 @@
      this.$refs.lossBoundHandle.clearTableSource()
      this.$refs.lossBoundHandle.getAllApproveData(item)

    },
    handleEquipmentLeanOut(item) {
      this.$refs.equipmentLeanOutApprovalModelRef.visible = false
      this.$refs.equipmentLeanOutApprovalModelRef.disableSubmit = true
      this.$refs.equipmentLeanOutApprovalModelRef.handleDetail(item)
      this.$refs.equipmentLeanOutApprovalModelRef.title = item.name
    },
    handleEquipmentSealUp(item) {
      this.$refs.equipmentSealUpApprovalModelRef.visible = true