Merge remote-tracking branch 'origin/master'

zhaowei

2 天以前 9be2e2f91332ed341406acf9739d8912dddbf6fe

 src/views/flowable/workflow/FlowTodo.vue

@@ -11,36 +11,26 @@
        <a-row :gutter='24'>
          <a-col :lg='6' :md='8' :sm='24' :xl='4'>
            <a-form-item label='流程分类'>
              <j-dict-select-tag
                v-model='queryParam.category'
                dictCode='flow_type'
                placeholder='请选择流程分类'
              ></j-dict-select-tag>
              <j-dict-select-tag v-model='queryParam.category' dictCode='flow_type' placeholder='请选择流程分类'/>
            </a-form-item>
          </a-col>
          <a-col :lg='6' :md='8' :sm='24' :xl='4'>
            <a-form-item label='当前节点'>
              <a-input
                v-model='queryParam.name'
                placeholder='请输入当前节点精确查询'
              ></a-input>
              <a-input v-model='queryParam.name' placeholder='请输入当前节点精确查询'/>
            </a-form-item>
          </a-col>
          <a-col :lg='6' :md='8' :sm='24' :xl='4'>
            <a-form-item label='简要描述'>
              <a-input
                v-model='queryParam.title'
                placeholder='请输入简要描述'
              ></a-input>
              <a-input v-model='queryParam.title' placeholder='请输入简要描述'/>
            </a-form-item>
          </a-col>
          <a-col :lg='8' :md='12' :sm='24' :xl='8'>
            <a-form-item label='任务时间范围'>
              <j-date v-model='queryParam.startTime' :show-time='false' class='query-group-cust'
                      date-format='YYYY-MM-DD HH:mm:ss' placeholder='请选择开始时间'></j-date>
                      date-format='YYYY-MM-DD HH:mm:ss' placeholder='请选择开始时间'/>
              <span class='query-group-split-cust'></span>
              <j-date v-model='queryParam.endTime' :show-time='false' class='query-group-cust'
                      date-format='YYYY-MM-DD HH:mm:ss' placeholder='请选择结束时间'></j-date>
                      date-format='YYYY-MM-DD HH:mm:ss' placeholder='请选择结束时间'/>
            </a-form-item>
          </a-col>

@@ -80,7 +70,7 @@

      <a-table ref='table' :columns='columns' :dataSource='dataSource' :loading='loading' :pagination='ipagination'
               :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
               :scroll="{x:'max-content',y:465}" bordered rowKey='id' size='middle'
               :scroll="{x:'max-content'}" bordered rowKey='id' size='middle'
               @change='handleTableChange'>
        <span slot='action' slot-scope='text, record'>
          <a @click='handelDetail(record,text)'>执行/审批</a>
@@ -88,20 +78,43 @@
      </a-table>
    </div>

    <!--保养规范-->
    <maintenance-standard-approval-modal ref="maintenanceStandardApprovalModal" @modalFormOk="modalFormOk"
                                         :selectShenpiData="selectedRowData"/>

    <!--点检-->
    <inspection-order-handle ref="inspectionOrderHandle" :selectShenpiData="selectedRowData"
                             @modalFormOk="modalFormOk"/>

    <!--技术鉴定工单-->
    <technical-status-evaluation-approval-modal ref="technicalStatusApprovalModal" :selectShenpiData="selectedRowData"
                                                @modalFormOk="modalFormOk"/>

    <!--二保工单-->
    <second-maintenance-approval-modal ref="secondMaintenanceApprovalModal" :selectShenpiData="selectedRowData"
                                       @modalFormOk="modalFormOk"/>

    <!--三保工单-->
    <third-maintenance-approval-modal ref="thirdMaintenanceApprovalModal" :selectShenpiData="selectedRowData"
                                      @modalFormOk="modalFormOk"/>

    <!--技术鉴定工单变更-->
    <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>

@@ -114,11 +127,21 @@
    from './TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal'
  import SecondMaintenanceApprovalModal from './secondMaintenance/SecondMaintenanceApprovalModal'
  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: 'NcDeviceCharactersList',
    name: 'FlowTodo',
    mixins: [JeecgListMixin],
    components: {
      TechnicalStatusEvaluationApplicationApprovalModal,
      TechnicalStatusChangeApprovalModal,
      RepairOrderApprovalModal,
      TechnicalStatusEvaluationOrderChangeApprovalModal,
      ThirdMaintenanceApprovalModal,
      SecondMaintenanceApprovalModal,
      TechnicalStatusEvaluationApprovalModal,
@@ -144,7 +167,7 @@
            title: '流程分类',
            align: 'center',
            dataIndex: 'category_dictText',
            width: 150
            width: 200
          },
          {
            title: '流程名称',
@@ -155,8 +178,7 @@
          {
            title: '流程业务简要描述',
            align: 'center',
            dataIndex: 'description',
            ellipsis: true
            dataIndex: 'description'
          },
          {
            title: '上一步处理人',
@@ -180,26 +202,21 @@
            title: '当前节点开始时间',
            align: 'center',
            dataIndex: 'createTime',
            width: 150
            width: 200
          },
          {
            title: '操作',
            dataIndex: 'action',
            fixed: 'right',
            scopedSlots: { customRender: 'action' },
            align: 'center',
            width: 150,
            fixed: 'right'
            width: 100
          }
        ],
        url: {
          list: '/assign/flow/toTaskBySelf'
        },
        selectedRowData: {},
        selectInspectionOrderData: {},
        selectWeekMaintenanceData: {},
        selectSecondMaintenanceData: {},
        selectThirdMaintenanceData: {},
        selectRepairOrderData: {}
        selectedRowData: {}
      }
    },
    computed: {
@@ -208,33 +225,36 @@
      }
    },
    methods: {
      handelDetail(item, index) {
        let processType = this.splitProcessType(item.category)
      handelDetail(record) {
        let processType = this.splitProcessType(record.category)
        console.log('processType', processType)
        switch (processType) {
          case 'maintenance_standard':
            this.handleMaintenanceStandard(item)
            this.handleMaintenanceStandard(record)
            break
          case 'sbdjApproval':
            this.handInspectionOrder(item)
            break
          case 'eam_repair':
            this.handleRepairOrder(item)
            this.handInspectionOrder(record)
            break
          case 'second_maintenance':
            this.handleSecondMaintenance(item)
            this.handleSecondMaintenance(record)
            break
          case 'third_maintenance':
            this.handleThirdMaintenance(item)
            this.handleThirdMaintenance(record)
            break
          case 'TECHNICAL_STATUS_EVALUATION':
            this.handleTechnicalStatusEvaluation(item)
            this.handleTechnicalStatusEvaluation(record)
            break
          case 'toolsStocktakingBound':
            this.handleToolStocktakingApproval(item)
          case 'EVALUATION_ORDER_CHANGE_PROCESS':
            this.handleEvaluationOrderChange(record)
            break
          case 'toolsLossApproval':
            this.handleToolLossApproval(item)
          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('没找到该流程')
@@ -259,8 +279,16 @@
       */
      handleTechnicalStatusEvaluation(record) {
        this.selectedRowData = Object.assign({}, record)
        this.$refs.technicalStatusApprovalModal.visible = true
        this.$refs.technicalStatusApprovalModal.title = record.name
        this.$refs.technicalStatusApprovalModal.handleDetail(record)
      },

      handleEvaluationOrderChange(record) {
        this.selectedRowData = Object.assign({}, record)
        this.$refs.evaluationOrderChangeApprovalModal.visible = true
        this.$refs.evaluationOrderChangeApprovalModal.title = record.name
        this.$refs.evaluationOrderChangeApprovalModal.handleApprove(record)
      },

      /**
@@ -279,12 +307,10 @@
       * @param record
       */
      handInspectionOrder(record) {
        console.log('record----->', record)
        this.selectedRowData = Object.assign({}, record)
        this.$refs.inspectionOrderHandle.visible = true
        this.$refs.inspectionOrderHandle.title = record.name
        this.$refs.inspectionOrderHandle.getAllApproveData(record)
        this.$refs.inspectionOrderHandle.getBasicInformation(record)
        this.$refs.inspectionOrderHandle.handleApprove(record)
      },

      /**
@@ -294,8 +320,8 @@
      handleThirdMaintenance(record) {
        this.selectedRowData = Object.assign({}, record)
        this.$refs.thirdMaintenanceApprovalModal.visible = true
        this.$refs.thirdMaintenanceApprovalModal.handleDetail(record)
        this.$refs.thirdMaintenanceApprovalModal.title = record.name
        this.$refs.thirdMaintenanceApprovalModal.handleDetail(record)
      },

      /**
@@ -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() {
@@ -347,4 +394,4 @@
      }
    }
  }
</script>
</script>