Merge remote-tracking branch 'origin/master'

zhaowei

3 天以前 31d62d0ac0bf6fdcb200ffeaa7b4e15aaf2d4946

 src/views/flowable/workflow/FlowTodo.vue

@@ -130,6 +130,11 @@
    <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>

@@ -151,11 +156,13 @@
  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,
@@ -285,6 +292,9 @@
            break
          case 'third_maintenance_furnace_process':
            this.handleThirdMaintenanceFurnace(record)
            break
          case 'eam_report_accidents_register':
            this.handleAccidentsRegister(record)
            break
          default:
            alert('没找到该流程')
@@ -423,6 +433,17 @@
        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))