From 9be2e2f91332ed341406acf9739d8912dddbf6fe Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 22 七月 2025 20:43:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/flowable/workflow/FlowTodo.vue | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 67c1d04..9215f12 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -106,6 +106,15 @@
<!--缁翠慨宸ュ崟-->
<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>
@@ -121,11 +130,16 @@
import TechnicalStatusEvaluationOrderChangeApprovalModal
from './TechnicalStatusEvaluation/TechnicalStatusEvaluationOrderChangeApprovalModal'
import RepairOrderApprovalModal from './repairOrder/RepairOrderApprovalModal'
+ import TechnicalStatusChangeApprovalModal from './TechnicalStatus/TechnicalStatusChangeApprovalModal'
+ import TechnicalStatusEvaluationApplicationApprovalModal
+ from './TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal'
export default {
name: 'FlowTodo',
mixins: [JeecgListMixin],
components: {
+ TechnicalStatusEvaluationApplicationApprovalModal,
+ TechnicalStatusChangeApprovalModal,
RepairOrderApprovalModal,
TechnicalStatusEvaluationOrderChangeApprovalModal,
ThirdMaintenanceApprovalModal,
@@ -236,6 +250,12 @@
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('娌℃壘鍒拌娴佺▼')
}
@@ -315,6 +335,28 @@
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() {
const categorySet = new Set(this.selectionRows.map(item => item.category))
const nameSet = new Set(this.selectionRows.map(item => item.name))
--
Gitblit v1.9.3