Merge remote-tracking branch 'origin/master'

zhaowei

3 天以前 9be2e2f91332ed341406acf9739d8912dddbf6fe

 src/views/flowable/workflow/FlowTodo.vue

@@ -102,6 +102,19 @@
    <technical-status-evaluation-order-change-approval-modal ref="evaluationOrderChangeApprovalModal"
                                                             :selectShenpiData="selectedRowData"
                                                             @modalFormOk="modalFormOk"/>

    <!--维修工单-->
    <repair-order-approval-modal ref="repairOrderApprovalModal" :selectShenpiData="selectedRowData"
                                 @modalFormOk="modalFormOk"/>

    <!--技术状态变更-->
    <technical-status-change-approval-modal ref="technicalStatusChangeApprovalModal" :selectShenpiData="selectedRowData"
                                            @modalFormOk="modalFormOk"/>

    <!--技术状态鉴定申请-->
    <technical-status-evaluation-application-approval-modal ref="technicalStatusEvaluationApplicationApprovalModal"
                                                            :selectShenpiData="selectedRowData"
                                                            @modalFormOk="modalFormOk"/>
  </a-card>
</template>

@@ -116,11 +129,18 @@
  import ThirdMaintenanceApprovalModal from './thirdMaintenance/ThirdMaintenanceApprovalModal'
  import TechnicalStatusEvaluationOrderChangeApprovalModal
    from './TechnicalStatusEvaluation/TechnicalStatusEvaluationOrderChangeApprovalModal'
  import RepairOrderApprovalModal from './repairOrder/RepairOrderApprovalModal'
  import TechnicalStatusChangeApprovalModal from './TechnicalStatus/TechnicalStatusChangeApprovalModal'
  import TechnicalStatusEvaluationApplicationApprovalModal
    from './TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal'

  export default {
    name: 'FlowTodo',
    mixins: [JeecgListMixin],
    components: {
      TechnicalStatusEvaluationApplicationApprovalModal,
      TechnicalStatusChangeApprovalModal,
      RepairOrderApprovalModal,
      TechnicalStatusEvaluationOrderChangeApprovalModal,
      ThirdMaintenanceApprovalModal,
      SecondMaintenanceApprovalModal,
@@ -215,9 +235,6 @@
          case 'sbdjApproval':
            this.handInspectionOrder(record)
            break
          case 'eam_repair':
            this.handleRepairOrder(record)
            break
          case 'second_maintenance':
            this.handleSecondMaintenance(record)
            break
@@ -229,6 +246,15 @@
            break
          case 'EVALUATION_ORDER_CHANGE_PROCESS':
            this.handleEvaluationOrderChange(record)
            break
          case 'eam_repair_order':
            this.handleRepairOrder(record)
            break
          case 'TECHNICAL_STATUS_CHANGE_PROCESS':
            this.handleTechnicalStatusChange(record)
            break
          case 'TECHNICAL_STATUS_EVALUATION_APPLY_PROCESS':
            this.handleTechnicalStatusEvaluationApply(record)
            break
          default:
            alert('没找到该流程')
@@ -303,11 +329,32 @@
       * @param record
       */
      handleRepairOrder(record) {
        this.selectRepairOrderData = Object.assign({}, record)
        this.selectedRowData = Object.assign({}, record)
        this.$refs.repairOrderApprovalModal.visible = true
        this.$refs.repairOrderApprovalModal.title = record.name
        this.$refs.repairOrderApprovalModal.getAllApproveData(record)
        this.$refs.repairOrderApprovalModal.getBasicInformation(record)
        this.$refs.repairOrderApprovalModal.handleDetail(record)
      },

      /**
       * 点击技术状态变更分类流程审批时触发
       * @param record
       */
      handleTechnicalStatusChange(record) {
        this.selectedRowData = Object.assign({}, record)
        this.$refs.technicalStatusChangeApprovalModal.visible = true
        this.$refs.technicalStatusChangeApprovalModal.title = record.name
        this.$refs.technicalStatusChangeApprovalModal.handleApprove(record)
      },

      /**
       * 点击技术状态鉴定申请分类流程审批时触发
       * @param record
       */
      handleTechnicalStatusEvaluationApply(record) {
        this.selectedRowData = Object.assign({}, record)
        this.$refs.technicalStatusEvaluationApplicationApprovalModal.visible = true
        this.$refs.technicalStatusEvaluationApplicationApprovalModal.title = record.name
        this.$refs.technicalStatusEvaluationApplicationApprovalModal.handleApprove(record)
      },

      batchHandle() {