Merge remote-tracking branch 'origin/master'

cuikaidong

2 天以前 1c1000a93a88b5af5eabbf410aa264b0911dbee4

 src/views/flowable/workflow/FlowTodo.vue

@@ -242,6 +242,10 @@
      ref='equipmentLeanOutApprovalModelRef'
      @searchReset='searchReset'
    />
    <equipment-return-approval-modal
      ref='equipmentReturnApprovalModelRef'
      @searchReset='searchReset'
    />

    <second-maintenance-approval-modal
      ref='secondMaintenanceApprovalModal'
@@ -280,6 +284,11 @@
      :selectShenpiData='selectGuideCardData'
      @searchReset='searchReset'
    ></guide-card-batch-handle>
    <AssignEquipmentFileStreamHandle
      ref='assignEquipmentFileStreamHandle'
      :selectShenpiData='selectEquipmentSealUpData'
      @searchReset='searchReset'
    ></AssignEquipmentFileStreamHandle>
  </a-card>
</template>

@@ -292,7 +301,6 @@
import WeekMaintenanceApprovalModal from '@views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal'
import RepairOrderApprovalModal from '@views/flowable/workflow/repairOrder/RepairOrderApprovalModal'
import InspectionOrderHandle from '@views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue'

import { getAction } from '@api/manage'
import InspectionOrderBatchHandle from './InspectionOrder/InspectionOrderBatchHandle'
import WeekMaintenanceBatchApprovalModal from './weekMaintenance/WeekMaintenanceBatchApprovalModal'
@@ -300,10 +308,11 @@
import DispatchFileHandle from '@views/flowable/workflow/dispatchFile/DispatchFileHandle.vue'
import DispatchFileBachHandleStyle from '@views/flowable/workflow/dispatchFile/DispatchFileBachHandleStyle#Drawer.vue'
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 SecondMaintenanceApprovalModal
  from '@views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue'
import EquipmentReturnApprovalModal from '@views/flowable/workflow/leanOut/EquipmentReturnApprovalModal.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'
import EquipmentTransferApprovalModal from '@views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue'
@@ -330,6 +339,7 @@
    RepairOrderApprovalModal,
    InspectionOrderHandle,
    EquipmentLeanOutApprovalModal,
    EquipmentReturnApprovalModal,
    SecondMaintenanceApprovalModal,
    ThirdMaintenanceApprovalModal,
    OutBoundOrderHandle,
@@ -339,7 +349,8 @@
    EquipmentScrapApprovalModal,
    SparePartApplyHandle,
    StandardizedProcessHandle,
    GuideCardBatchHandle
    GuideCardBatchHandle,
    AssignEquipmentFileStreamHandle
  },
  data() {
    return {
@@ -427,7 +438,9 @@
      selectStocktakingBoundOrderData: {},
      selectInboundOrderData: {},
      selectSparePartApplyData: {},
      selectGuideCardData:{},
      selectGuideCardData: {},
      selectEquipmentAssignProductData: {},
      selectEquipmentSealUpData: {},
      //业务信息ID
      dataId: undefined
    }
@@ -490,7 +503,7 @@
        case 'ggApproval':
          this.handDispatchFileDetial(item)
          break
        case 'standardized_approval':
        case 'ncFileSettingProcessApproval':
          this.handStandardizedDetial(item)
          break
        case 'sbdjApproval':
@@ -504,6 +517,9 @@
          break
        case 'equipment_lean_out':
          this.handleEquipmentLeanOut(item)
          break
        case 'equipment_return':
          this.handleEquipmentReturn(item)
          break
        case 'second_maintenance':
          this.handleSecondMaintenance(item)
@@ -523,6 +539,9 @@
        case 'equipment_seal_up':
          this.handleEquipmentSealUp(item)
          break
        case 'equipment_unseal':
          this.handleEquipmentUnSeal(item)
          break
        case 'toolInStorageApproval':
          this.handleToolInStorage(item)
          break
@@ -537,6 +556,9 @@
          break
        case 'programConfirmApproval':
          this.handleGuideCardApproval(item)
          break
        case 'equipmentAssignProductApproval':
          this.handleEquipmentAssignProductApproval(item)
          break
        default:
          alert('没找到该流程')
@@ -570,6 +592,26 @@
      } else if (categorySet.has('WEEK_MAINTENANCE')) {
        this.$refs.weenMaintenanceBatchApprovalModalRef.handleDetail(this.selectionRows[0])
        this.$refs.weenMaintenanceBatchApprovalModalRef.title = this.selectionRows[0].name
      } else if (categorySet.has('ggApproval')) {
        let ids = ''
        for (let a = 0; a < this.selectedRowKeys.length; a++) {
          ids += this.selectedRowKeys[a] + ','
        }
        getAction(this.url.isSameNode + '?taskIds=' + ids).then((res) => {
          if (res.success) {
            let taskDefKey = res.result
            this.selectBachData.taskIds = ids
            this.selectBachData.taskDefKey = taskDefKey
            this.$refs.modalFormDispatchFileBatch.title = '批量处理'
            this.$refs.modalFormDispatchFileBatch.edit(this.selectBachData)
            this.$refs.modalFormDispatchFileBatch.disableSubmit = false
          } else {
            this.$notification.warning({
              message: '消息',
              description: res.message
            })
          }
        })
      }
    },

@@ -578,21 +620,21 @@
      let result = parts[0]
      return result
    },

    //DNC-指派NC程序至设备
    handDrDetial(item) {
      this.selectShenpiData = item
      this.$refs.modalFormApproval.clearTableSource()
      this.$refs.modalFormApproval.getAllApproveData(item)
    },

    //DNC-NC程序签派
    handDispatchFileDetial(item) {
      console.log('item----->', item)
      this.selectDispatchFileXqData = item
      this.$refs.modalFormDispatchFileXq.clearTableSource()
      this.$refs.modalFormDispatchFileXq.getAllApproveData(item)
    },
    //定型审批页面
    handStandardizedDetial(item){
    //DNC-定型审批页面
    handStandardizedDetial(item) {
      this.selectDispatchFileXqData = item
      this.$refs.StandardizedProcessHandle.clearTableSource()
      this.$refs.StandardizedProcessHandle.getAllApproveData(item)
@@ -632,6 +674,12 @@
      this.$refs.equipmentLeanOutApprovalModelRef.title = item.name
      this.$refs.equipmentLeanOutApprovalModelRef.handleDetail(item)
      this.$refs.equipmentLeanOutApprovalModelRef.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) {
@@ -680,6 +728,13 @@
      this.$refs.equipmentSealUpApprovalModelRef.handleDetail(item)
      this.$refs.equipmentSealUpApprovalModelRef.disableSubmit = false
    },

    handleEquipmentUnSeal(item) {
      this.$refs.equipmentSealUpApprovalModelRef.visible = true
      this.$refs.equipmentSealUpApprovalModelRef.title = item.name
      this.$refs.equipmentSealUpApprovalModelRef.handleDetail(item)
      this.$refs.equipmentSealUpApprovalModelRef.disableSubmit = false
    },
    handleToolInStorage(item) {
      if (item && item.dataId) {
        this.selectInboundOrderData = Object.assign({}, item)
@@ -702,18 +757,27 @@
    },
    handleSparePartApplyApproval(item) {
      if (item && item.dataId) {
        debugger
        this.selectSparePartApplyData = Object.assign({}, item)
        this.$refs.sparePartApplyModal.auditVisible = true
        this.$refs.sparePartApplyModal.clearTableSource()
        this.$refs.sparePartApplyModal.getAllApproveData(item)
      }
    },
    //DNC-程序确认表流程
    handleGuideCardApproval(item) {
      console.log('item----->', item)
      this.selectGuideCardData = item
      this.$refs.guideCardBatchHandle.clearTableSource()
      this.$refs.guideCardBatchHandle.getAllApproveData(item)
    },
    //DNC-设备结构树指派产品结构树
    handleEquipmentAssignProductApproval(item) {
      console.log('item----->', item)
      this.selectEquipmentSealUpData = item
      this.$refs.assignEquipmentFileStreamHandle.clearTableSource()
      this.$refs.assignEquipmentFileStreamHandle.getAllApproveData(item)
    }
  }
}
</script>