From 3a8181119526dd55814fc69ac0566f93009fa71f Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 23 七月 2025 17:31:07 +0800
Subject: [PATCH] 1、各类审批状态提至列表靠前位置 2、新增二保、技术鉴定状态申请以及技术鉴定工单变更流程驳回时的审批节点展示条件
---
src/views/flowable/workflow/FlowTodo.vue | 87 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 77 insertions(+), 10 deletions(-)
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 78481be..64c32b7 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -102,6 +102,24 @@
<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"/>
+
+ <!--璁惧鍋滅敤鐢宠-->
+ <technical-status-deactivate-approval-modal ref="technicalStatusDeactivateApprovalModal"
+ :selectShenpiData="selectedRowData"
+ @modalFormOk="modalFormOk"/>
</a-card>
</template>
@@ -116,11 +134,20 @@
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'
+ import TechnicalStatusDeactivateApprovalModal from './TechnicalStatus/TechnicalStatusDeactivateApprovalModal'
export default {
name: 'FlowTodo',
mixins: [JeecgListMixin],
components: {
+ TechnicalStatusDeactivateApprovalModal,
+ TechnicalStatusEvaluationApplicationApprovalModal,
+ TechnicalStatusChangeApprovalModal,
+ RepairOrderApprovalModal,
TechnicalStatusEvaluationOrderChangeApprovalModal,
ThirdMaintenanceApprovalModal,
SecondMaintenanceApprovalModal,
@@ -215,9 +242,6 @@
case 'sbdjApproval':
this.handInspectionOrder(record)
break
- case 'eam_repair':
- this.handleRepairOrder(record)
- break
case 'second_maintenance':
this.handleSecondMaintenance(record)
break
@@ -229,6 +253,18 @@
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
+ case 'TECHNICAL_STATUS_DEACTIVATE_PROCESS':
+ this.handleTechnicalStatusDeactivate(record)
break
default:
alert('娌℃壘鍒拌娴佺▼')
@@ -242,9 +278,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)
},
/**
@@ -273,7 +308,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)
},
/**
@@ -303,11 +338,43 @@
* @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)
+ },
+
+ /**
+ * 鐐瑰嚮鍋滅敤鍔犲伐璁惧鐢宠鍒嗙被娴佺▼瀹℃壒鏃惰Е鍙�
+ * @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)
},
batchHandle() {
--
Gitblit v1.9.3