From 31d62d0ac0bf6fdcb200ffeaa7b4e15aaf2d4946 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 25 七月 2025 16:40:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/flowable/workflow/FlowCompleted.vue | 66 +++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 12 deletions(-)
diff --git a/src/views/flowable/workflow/FlowCompleted.vue b/src/views/flowable/workflow/FlowCompleted.vue
index d664cec..a35123e 100644
--- a/src/views/flowable/workflow/FlowCompleted.vue
+++ b/src/views/flowable/workflow/FlowCompleted.vue
@@ -76,6 +76,14 @@
<!--涓変繚鍙樻洿-->
<third-maintenance-order-change-approval-modal ref="thirdMaintenanceOrderChangeApprovalModal"
:selectShenpiData="selectedRowData"/>
+
+ <!--鐪熺┖鐑鐞嗙倝涓変繚-->
+ <third-maintenance-furnace-approval-modal ref="thirdMaintenanceFurnaceApprovalModal"
+ :selectShenpiData="selectedRowData"/>
+
+ <!--璁惧浜嬫晠鐧昏-->
+ <report-accidents-register-approval-modal ref="reportAccidentsRegisterApprovalModal"
+ :selectShenpiData="selectedRowData"/>
</a-card>
</template>
@@ -95,11 +103,15 @@
import RepairOrderApprovalModal from './repairOrder/RepairOrderApprovalModal'
import MaintenanceStandardApprovalModal from './MaintenanceStandard/MaintenanceStandardApprovalModal'
import ThirdMaintenanceOrderChangeApprovalModal from './thirdMaintenance/ThirdMaintenanceOrderChangeApprovalModal'
+ import ThirdMaintenanceFurnaceApprovalModal from './thirdMaintenance/ThirdMaintenanceFurnaceApprovalModal'
+ import ReportAccidentsRegisterApprovalModal from './repairOrder/ReportAccidentsRegisterApprovalModal'
export default {
name: 'FlowCompleted',
mixins: [JeecgListMixin],
components: {
+ ReportAccidentsRegisterApprovalModal,
+ ThirdMaintenanceFurnaceApprovalModal,
ThirdMaintenanceOrderChangeApprovalModal,
MaintenanceStandardApprovalModal,
RepairOrderApprovalModal,
@@ -211,6 +223,12 @@
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('娌℃壘鍒拌娴佺▼')
}
@@ -223,9 +241,9 @@
handleThirdMaintenance(record) {
this.selectedRowData = Object.assign({}, record)
this.$refs.thirdMaintenanceApprovalModal.visible = true
- this.$refs.thirdMaintenanceApprovalModal.title = record.name
+ this.$refs.thirdMaintenanceApprovalModal.title = record.taskName
this.$refs.thirdMaintenanceApprovalModal.disableSubmit = true
- this.$refs.thirdMaintenanceApprovalModal.handleDetail(record)
+ this.$refs.thirdMaintenanceApprovalModal.handleApprove(record)
},
/**
@@ -235,7 +253,7 @@
handleTechnicalStatusDeactivate(record) {
this.selectedRowData = Object.assign({}, record)
this.$refs.technicalStatusDeactivateApprovalModal.visible = true
- this.$refs.technicalStatusDeactivateApprovalModal.title = record.name
+ this.$refs.technicalStatusDeactivateApprovalModal.title = record.taskName
this.$refs.technicalStatusDeactivateApprovalModal.disableSubmit = true
this.$refs.technicalStatusDeactivateApprovalModal.handleApprove(record)
},
@@ -247,7 +265,7 @@
handleTechnicalStatusEvaluationApply(record) {
this.selectedRowData = Object.assign({}, record)
this.$refs.technicalStatusEvaluationApplicationApprovalModal.visible = true
- this.$refs.technicalStatusEvaluationApplicationApprovalModal.title = record.name
+ this.$refs.technicalStatusEvaluationApplicationApprovalModal.title = record.taskName
this.$refs.technicalStatusEvaluationApplicationApprovalModal.disableSubmit = true
this.$refs.technicalStatusEvaluationApplicationApprovalModal.handleApprove(record)
},
@@ -259,7 +277,7 @@
handleTechnicalStatusChange(record) {
this.selectedRowData = Object.assign({}, record)
this.$refs.technicalStatusChangeApprovalModal.visible = true
- this.$refs.technicalStatusChangeApprovalModal.title = record.name
+ this.$refs.technicalStatusChangeApprovalModal.title = record.taskName
this.$refs.technicalStatusChangeApprovalModal.disableSubmit = true
this.$refs.technicalStatusChangeApprovalModal.handleApprove(record)
},
@@ -271,7 +289,7 @@
handleEvaluationOrderChange(record) {
this.selectedRowData = Object.assign({}, record)
this.$refs.evaluationOrderChangeApprovalModal.visible = true
- this.$refs.evaluationOrderChangeApprovalModal.title = record.name
+ this.$refs.evaluationOrderChangeApprovalModal.title = record.taskName
this.$refs.evaluationOrderChangeApprovalModal.disableSubmit = true
this.$refs.evaluationOrderChangeApprovalModal.handleApprove(record)
},
@@ -283,7 +301,7 @@
handleTechnicalStatusEvaluation(record) {
this.selectedRowData = Object.assign({}, record)
this.$refs.technicalStatusApprovalModal.visible = true
- this.$refs.technicalStatusApprovalModal.title = record.name
+ this.$refs.technicalStatusApprovalModal.title = record.taskName
this.$refs.technicalStatusApprovalModal.disableSubmit = true
this.$refs.technicalStatusApprovalModal.handleApprove(record)
},
@@ -295,7 +313,7 @@
handleSecondMaintenance(record) {
this.selectedRowData = Object.assign({}, record)
this.$refs.secondMaintenanceApprovalModal.visible = true
- this.$refs.secondMaintenanceApprovalModal.title = record.name
+ this.$refs.secondMaintenanceApprovalModal.title = record.taskName
this.$refs.secondMaintenanceApprovalModal.disableSubmit = true
this.$refs.secondMaintenanceApprovalModal.handleApprove(record)
},
@@ -307,7 +325,7 @@
handInspectionOrder(record) {
this.selectedRowData = Object.assign({}, record)
this.$refs.inspectionOrderHandle.visible = true
- this.$refs.inspectionOrderHandle.title = record.name
+ this.$refs.inspectionOrderHandle.title = record.taskName
this.$refs.inspectionOrderHandle.disableSubmit = true
this.$refs.inspectionOrderHandle.handleApprove(record)
},
@@ -319,7 +337,7 @@
handleRepairOrder(record) {
this.selectedRowData = Object.assign({}, record)
this.$refs.repairOrderApprovalModal.visible = true
- this.$refs.repairOrderApprovalModal.title = record.name
+ this.$refs.repairOrderApprovalModal.title = record.taskName
this.$refs.repairOrderApprovalModal.disableSubmit = true
this.$refs.repairOrderApprovalModal.handleApprove(record)
},
@@ -331,7 +349,7 @@
handleMaintenanceStandard(record) {
this.selectedRowData = Object.assign({}, record)
this.$refs.maintenanceStandardApprovalModal.visible = true
- this.$refs.maintenanceStandardApprovalModal.title = record.name
+ this.$refs.maintenanceStandardApprovalModal.title = record.taskName
this.$refs.maintenanceStandardApprovalModal.disableSubmit = true
this.$refs.maintenanceStandardApprovalModal.handleApprove(record)
},
@@ -343,11 +361,35 @@
handleThirdMaintenanceOrderChange(record) {
this.selectedRowData = Object.assign({}, record)
this.$refs.thirdMaintenanceOrderChangeApprovalModal.visible = true
- this.$refs.thirdMaintenanceOrderChangeApprovalModal.title = record.name
+ this.$refs.thirdMaintenanceOrderChangeApprovalModal.title = record.taskName
this.$refs.thirdMaintenanceOrderChangeApprovalModal.disableSubmit = true
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.disableSubmit = true
+ 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.disableSubmit = true
+ this.$refs.reportAccidentsRegisterApprovalModal.handleApprove(record)
+ },
+
splitProcessType(title) {
let parts = title.split('锛�') // 娉ㄦ剰鍐掑彿鏄叏瑙掑瓧绗︼紝浣跨敤瀵瑰簲鐨勫瓧杩涜鍒嗗壊
let result = parts[0]
--
Gitblit v1.9.3