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/FlowTodo.vue | 143 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 136 insertions(+), 7 deletions(-)
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 67c1d04..8b57b8f 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -106,6 +106,35 @@
<!--缁翠慨宸ュ崟-->
<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"/>
+
+ <!--璁惧鍋滅敤鐢宠-->
+ <technical-status-deactivate-approval-modal ref="technicalStatusDeactivateApprovalModal"
+ :selectShenpiData="selectedRowData"
+ @modalFormOk="modalFormOk"/>
+
+ <!--涓変繚鍙樻洿-->
+ <third-maintenance-order-change-approval-modal ref="thirdMaintenanceOrderChangeApprovalModal"
+ :selectShenpiData="selectedRowData"
+ @modalFormOk="modalFormOk"/>
+
+ <!--鐪熺┖鐑鐞嗙倝涓変繚-->
+ <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>
@@ -121,11 +150,24 @@
import TechnicalStatusEvaluationOrderChangeApprovalModal
from './TechnicalStatusEvaluation/TechnicalStatusEvaluationOrderChangeApprovalModal'
import RepairOrderApprovalModal from './repairOrder/RepairOrderApprovalModal'
+ import TechnicalStatusChangeApprovalModal from './TechnicalStatus/TechnicalStatusChangeApprovalModal'
+ import TechnicalStatusEvaluationApplicationApprovalModal
+ from './TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal'
+ 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,
+ TechnicalStatusEvaluationApplicationApprovalModal,
+ TechnicalStatusChangeApprovalModal,
RepairOrderApprovalModal,
TechnicalStatusEvaluationOrderChangeApprovalModal,
ThirdMaintenanceApprovalModal,
@@ -236,6 +278,24 @@
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
+ case 'TECHNICAL_STATUS_DEACTIVATE_PROCESS':
+ this.handleTechnicalStatusDeactivate(record)
+ break
+ 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('娌℃壘鍒拌娴佺▼')
}
@@ -248,9 +308,8 @@
handleMaintenanceStandard(record) {
this.selectedRowData = Object.assign({}, record)
this.$refs.maintenanceStandardApprovalModal.visible = true
- this.$refs.maintenanceStandardApprovalModal.title = '淇濆吇瑙勮寖'
- this.$refs.maintenanceStandardApprovalModal.getAllApproveData(record)
- this.$refs.maintenanceStandardApprovalModal.getBasicInformation(record)
+ this.$refs.maintenanceStandardApprovalModal.title = record.name
+ this.$refs.maintenanceStandardApprovalModal.handleApprove(record)
},
/**
@@ -261,9 +320,13 @@
this.selectedRowData = Object.assign({}, record)
this.$refs.technicalStatusApprovalModal.visible = true
this.$refs.technicalStatusApprovalModal.title = record.name
- this.$refs.technicalStatusApprovalModal.handleDetail(record)
+ this.$refs.technicalStatusApprovalModal.handleApprove(record)
},
+ /**
+ * 鐐瑰嚮鎶�鏈壌瀹氬伐鍗曞彉鏇存祦绋嬫墽琛屽鎵规椂瑙﹀彂
+ * @param record
+ */
handleEvaluationOrderChange(record) {
this.selectedRowData = Object.assign({}, record)
this.$refs.evaluationOrderChangeApprovalModal.visible = true
@@ -279,7 +342,7 @@
this.selectedRowData = Object.assign({}, record)
this.$refs.secondMaintenanceApprovalModal.visible = true
this.$refs.secondMaintenanceApprovalModal.title = record.name
- this.$refs.secondMaintenanceApprovalModal.handleDetail(record)
+ this.$refs.secondMaintenanceApprovalModal.handleApprove(record)
},
/**
@@ -301,7 +364,7 @@
this.selectedRowData = Object.assign({}, record)
this.$refs.thirdMaintenanceApprovalModal.visible = true
this.$refs.thirdMaintenanceApprovalModal.title = record.name
- this.$refs.thirdMaintenanceApprovalModal.handleDetail(record)
+ this.$refs.thirdMaintenanceApprovalModal.handleApprove(record)
},
/**
@@ -312,7 +375,73 @@
this.selectedRowData = Object.assign({}, record)
this.$refs.repairOrderApprovalModal.visible = true
this.$refs.repairOrderApprovalModal.title = record.name
- this.$refs.repairOrderApprovalModal.handleDetail(record)
+ this.$refs.repairOrderApprovalModal.handleApprove(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)
+ },
+
+ /**
+ * 鐐瑰嚮鍋滅敤鍔犲伐璁惧鐢宠鍒嗙被娴佺▼瀹℃壒鏃惰Е鍙�
+ * @param record
+ */
+ handleTechnicalStatusDeactivate(record) {
+ this.selectedRowData = Object.assign({}, record)
+ this.$refs.technicalStatusDeactivateApprovalModal.visible = true
+ this.$refs.technicalStatusDeactivateApprovalModal.title = record.name
+ this.$refs.technicalStatusDeactivateApprovalModal.handleApprove(record)
+ },
+
+ /**
+ * 鐐瑰嚮涓変繚鍙樻洿鍒嗙被娴佺▼瀹℃壒鏃惰Е鍙�
+ * @param record
+ */
+ handleThirdMaintenanceOrderChange(record) {
+ this.selectedRowData = Object.assign({}, record)
+ this.$refs.thirdMaintenanceOrderChangeApprovalModal.visible = true
+ this.$refs.thirdMaintenanceOrderChangeApprovalModal.title = record.name
+ 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.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() {
--
Gitblit v1.9.3