From 75b875f7538bf7700684c2eb2582c2d8f0aa8675 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 11 七月 2025 10:02:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/flowable/workflow/FlowTodo.vue | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index e29eaf4..cd203f2 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -90,6 +90,9 @@
<maintenance-standard-approval-modal ref="maintenanceStandardApprovalModal" @modalFormOk="modalFormOk"
:selectShenpiData="selectedRowData"/>
+
+ <inspection-order-handle ref="modalFormInspectionOrder" :selectShenpiData="selectedRowData"
+ @modalFormOk="modalFormOk"/>
</a-card>
</template>
@@ -98,11 +101,12 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getAction } from '@api/manage'
import MaintenanceStandardApprovalModal from './MaintenanceStandard/MaintenanceStandardApprovalModal'
+ import InspectionOrderHandle from './InspectionOrder/InspectionOrderHandle'
export default {
name: 'NcDeviceCharactersList',
mixins: [JeecgListMixin, mixinDevice],
- components: { MaintenanceStandardApprovalModal },
+ components: { InspectionOrderHandle, MaintenanceStandardApprovalModal },
data() {
return {
description: '宸ヤ綔娴�-鎴戠殑寰呭姙',
@@ -225,8 +229,11 @@
}
},
+ /**
+ * 鐐瑰嚮淇濆吇瑙勮寖鍒嗙被娴佺▼璇︽儏鏃惰Е鍙�
+ * @param record
+ */
handleMaintenanceStandard(record) {
- console.log('this.$refs.maintenanceStandardApprovalModal.', this.$refs.maintenanceStandardApprovalModal)
this.selectedRowData = Object.assign({}, record)
this.$refs.maintenanceStandardApprovalModal.visible = true
this.$refs.maintenanceStandardApprovalModal.title = '淇濆吇瑙勮寖'
@@ -272,7 +279,7 @@
handInspectionOrder(record) {
console.log('record----->', record)
- this.selectInspectionOrderData = Object.assign({}, record)
+ this.selectedRowData = Object.assign({}, record)
this.$refs.modalFormInspectionOrder.visible = true
this.$refs.modalFormInspectionOrder.title = record.name
this.$refs.modalFormInspectionOrder.getAllApproveData(record)
--
Gitblit v1.9.3