From b1c4b9509b3b84594bbc9a541f308101d3a17140 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 24 七月 2025 10:20:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/flowable/workflow/FlowTodo.vue | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 9215f12..64c32b7 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -115,6 +115,11 @@
<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>
@@ -133,11 +138,13 @@
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,
@@ -256,6 +263,9 @@
case 'TECHNICAL_STATUS_EVALUATION_APPLY_PROCESS':
this.handleTechnicalStatusEvaluationApply(record)
break
+ case 'TECHNICAL_STATUS_DEACTIVATE_PROCESS':
+ this.handleTechnicalStatusDeactivate(record)
+ break
default:
alert('娌℃壘鍒拌娴佺▼')
}
@@ -268,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)
},
/**
@@ -299,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)
},
/**
@@ -357,6 +366,17 @@
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() {
const categorySet = new Set(this.selectionRows.map(item => item.category))
const nameSet = new Set(this.selectionRows.map(item => item.name))
--
Gitblit v1.9.3