Merge remote-tracking branch 'origin/master'

cuilei

2 天以前 8b6b7aa7e4f2ae6ec14514875b559aa6890f3b1e

Merge remote-tracking branch 'origin/master'

 src/views/flowable/workflow/FlowCompleted.vue

@@ -161,6 +161,11 @@
      ref='equipmentScrapApprovalModelRef'
      @searchReset='searchReset'
    />
    <spare-part-apply-handle
      ref='sparePartApplyModal'
      @searchReset='searchReset'
      :selectSparePartApplyData='selectSparePartApplyData'
    ></spare-part-apply-handle>
  </a-card>
</template>

@@ -182,6 +187,7 @@
import EquipmentSealUpApprovalModal from '@views/flowable/workflow/sealUp/EquipmentSealUpApprovalModal.vue'
import EquipmentTransferApprovalModal from '@views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue'
import EquipmentScrapApprovalModal from '@views/flowable/workflow/scrap/EquipmentScrapApprovalModal.vue'
import SparePartApplyHandle from '@views/flowable/workflow/sparePartApply/SparePartApplyHandle.vue'

export default {
  name: 'NcDeviceCharactersList',
@@ -199,7 +205,8 @@
    EquipmentLeanOutApprovalModal,
    EquipmentSealUpApprovalModal,
    EquipmentTransferApprovalModal,
    EquipmentScrapApprovalModal
    EquipmentScrapApprovalModal,
    SparePartApplyHandle
  },
  data() {
    return {
@@ -273,6 +280,7 @@
      selectOutBoundOrderData: {},
      selectLossBoundOrderData: {},
      selectStocktakingBoundOrderData: {},
      selectSparePartApplyData: {},
      // selectEquipmentLeanOutData: {},
      // selectEquipmentSealUpData: {},
      // selectEquipmentTransferData: {},
@@ -333,6 +341,9 @@
          break
        case 'equipment_scrap':
          this.handleEquipmentScrap(item)
          break
        case 'spare_part_apply':
          this.handleSparePartApplyApproval(item)
          break
        default:
          alert('没找到该流程')
@@ -469,6 +480,15 @@
      this.$refs.equipmentScrapApprovalModelRef.handleDetail(item)
      this.$refs.equipmentScrapApprovalModelRef.disableSubmit = true
    },
    handleSparePartApplyApproval(item) {
      this.selectSparePartApplyData = Object.assign({}, item)
      item.procInstId = item.procInsId
      item.processInstanceId = item.procInsId
      this.selectSparePartApplyData.assignee_dictText = item.todoUsers_dictText
      this.$refs.sparePartApplyModal.auditVisible = false
      this.$refs.sparePartApplyModal.clearTableSource()
      this.$refs.sparePartApplyModal.getAllApproveData(item)
    },
  }
}
</script>

 src/views/flowable/workflow/FlowTodo.vue

@@ -742,6 +742,7 @@
    },
    handleSparePartApplyApproval(item) {
      if (item && item.dataId) {
        debugger
        this.selectSparePartApplyData = Object.assign({}, item)
        this.$refs.sparePartApplyModal.auditVisible = true
        this.$refs.sparePartApplyModal.clearTableSource()