Merge remote-tracking branch 'origin/master'

zhaowei

3 天以前 31d62d0ac0bf6fdcb200ffeaa7b4e15aaf2d4946

 src/views/flowable/workflow/FlowTodo.vue

@@ -120,6 +120,21 @@
    <technical-status-deactivate-approval-modal ref="technicalStatusDeactivateApprovalModal"
                                                :selectShenpiData="selectedRowData"
                                                @modalFormOk="modalFormOk"/>

    <!--三保变更-->
    <third-maintenance-order-change-approval-modal ref="thirdMaintenanceOrderChangeApprovalModal"
                                                   :selectShenpiData="selectedRowData"
                                                   @modalFormOk="modalFormOk"/>

    <!--真空热处理炉三保-->
    <third-maintenance-furnace-approval-modal ref="thirdMaintenanceFurnaceApprovalModal"
                                              :selectShenpiData="selectedRowData"
                                              @modalFormOk="modalFormOk"/>

    <!--设备事故登记-->
    <report-accidents-register-approval-modal ref="reportAccidentsRegisterApprovalModal"
                                              :selectShenpiData="selectedRowData"
                                              @modalFormOk="modalFormOk"/>
  </a-card>
</template>

@@ -139,11 +154,17 @@
  import TechnicalStatusEvaluationApplicationApprovalModal
    from './TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal'
  import TechnicalStatusDeactivateApprovalModal from './TechnicalStatus/TechnicalStatusDeactivateApprovalModal'
  import ThirdMaintenanceOrderChangeApprovalModal from './thirdMaintenance/ThirdMaintenanceOrderChangeApprovalModal'
  import ThirdMaintenanceFurnaceApprovalModal from './thirdMaintenance/ThirdMaintenanceFurnaceApprovalModal'
  import ReportAccidentsRegisterApprovalModal from './repairOrder/ReportAccidentsRegisterApprovalModal'

  export default {
    name: 'FlowTodo',
    mixins: [JeecgListMixin],
    components: {
      ReportAccidentsRegisterApprovalModal,
      ThirdMaintenanceFurnaceApprovalModal,
      ThirdMaintenanceOrderChangeApprovalModal,
      TechnicalStatusDeactivateApprovalModal,
      TechnicalStatusEvaluationApplicationApprovalModal,
      TechnicalStatusChangeApprovalModal,
@@ -266,6 +287,15 @@
          case 'TECHNICAL_STATUS_DEACTIVATE_PROCESS':
            this.handleTechnicalStatusDeactivate(record)
            break
          case 'third_maintenance_change':
            this.handleThirdMaintenanceOrderChange(record)
            break
          case 'third_maintenance_furnace_process':
            this.handleThirdMaintenanceFurnace(record)
            break
          case 'eam_report_accidents_register':
            this.handleAccidentsRegister(record)
            break
          default:
            alert('没找到该流程')
        }
@@ -290,9 +320,13 @@
        this.selectedRowData = Object.assign({}, record)
        this.$refs.technicalStatusApprovalModal.visible = true
        this.$refs.technicalStatusApprovalModal.title = record.name
        this.$refs.technicalStatusApprovalModal.handleDetail(record)
        this.$refs.technicalStatusApprovalModal.handleApprove(record)
      },

      /**
       * 点击技术鉴定工单变更流程执行审批时触发
       * @param record
       */
      handleEvaluationOrderChange(record) {
        this.selectedRowData = Object.assign({}, record)
        this.$refs.evaluationOrderChangeApprovalModal.visible = true
@@ -308,7 +342,7 @@
        this.selectedRowData = Object.assign({}, record)
        this.$refs.secondMaintenanceApprovalModal.visible = true
        this.$refs.secondMaintenanceApprovalModal.title = record.name
        this.$refs.secondMaintenanceApprovalModal.handleDetail(record)
        this.$refs.secondMaintenanceApprovalModal.handleApprove(record)
      },

      /**
@@ -330,7 +364,7 @@
        this.selectedRowData = Object.assign({}, record)
        this.$refs.thirdMaintenanceApprovalModal.visible = true
        this.$refs.thirdMaintenanceApprovalModal.title = record.name
        this.$refs.thirdMaintenanceApprovalModal.handleDetail(record)
        this.$refs.thirdMaintenanceApprovalModal.handleApprove(record)
      },

      /**
@@ -341,7 +375,7 @@
        this.selectedRowData = Object.assign({}, record)
        this.$refs.repairOrderApprovalModal.visible = true
        this.$refs.repairOrderApprovalModal.title = record.name
        this.$refs.repairOrderApprovalModal.handleDetail(record)
        this.$refs.repairOrderApprovalModal.handleApprove(record)
      },

      /**
@@ -377,6 +411,39 @@
        this.$refs.technicalStatusDeactivateApprovalModal.handleApprove(record)
      },

      /**
       * 点击三保变更分类流程审批时触发
       * @param record
       */
      handleThirdMaintenanceOrderChange(record) {
        this.selectedRowData = Object.assign({}, record)
        this.$refs.thirdMaintenanceOrderChangeApprovalModal.visible = true
        this.$refs.thirdMaintenanceOrderChangeApprovalModal.title = record.name
        this.$refs.thirdMaintenanceOrderChangeApprovalModal.handleApprove(record)
      },

      /**
       * 点击真空热处理炉三保工单流程执行审批时触发
       * @param record
       */
      handleThirdMaintenanceFurnace(record) {
        this.selectedRowData = Object.assign({}, record)
        this.$refs.thirdMaintenanceFurnaceApprovalModal.visible = true
        this.$refs.thirdMaintenanceFurnaceApprovalModal.title = record.name
        this.$refs.thirdMaintenanceFurnaceApprovalModal.handleApprove(record)
      },

      /**
       * 点击设备事故登记流程执行审批时触发
       * @param record
       */
      handleAccidentsRegister(record) {
        this.selectedRowData = Object.assign({}, record)
        this.$refs.reportAccidentsRegisterApprovalModal.visible = true
        this.$refs.reportAccidentsRegisterApprovalModal.title = record.name
        this.$refs.reportAccidentsRegisterApprovalModal.handleApprove(record)
      },

      batchHandle() {
        const categorySet = new Set(this.selectionRows.map(item => item.category))
        const nameSet = new Set(this.selectionRows.map(item => item.name))