From e14ed882d12df3b48e59390eba364442cdff70bd Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 28 五月 2025 15:46:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue b/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue
index 294a261..84f1970 100644
--- a/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue
+++ b/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue
@@ -120,6 +120,8 @@
<!-- 琛ㄥ崟鍖哄煙 -->
<eamSecondMaintenanceOrder-modal ref="modalForm" @ok="modalFormOk"></eamSecondMaintenanceOrder-modal>
+
+ <second-maintenance-approval-modal ref="secondMaintenanceApprovalModal" :selectShenpiData="selectSecondMaintenanceData" />
</a-card>
</template>
@@ -129,13 +131,15 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'
import { deleteAction, getAction } from '@api/manage'
+import SecondMaintenanceApprovalModal from '@views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue'
export default {
name: 'EamSecondMaintenanceOrderList',
mixins: [JeecgListMixin],
components: {
LxSearchEquipmentSelect,
- EamSecondMaintenanceOrderModal
+ EamSecondMaintenanceOrderModal,
+ SecondMaintenanceApprovalModal
},
props: {
isDisplayOperation: {
@@ -146,6 +150,8 @@
data() {
return {
description: '璁惧浜岀骇淇濆吇绠＄悊椤甸潰',
+ disableMixinCreated: true,
+ selectSecondMaintenanceData: {},
// 琛ㄥご
columns: [
{
@@ -439,6 +445,12 @@
}
})
}
+ },
+ handleDetail(record) {
+ this.selectSecondMaintenanceData = Object.assign({}, record)
+ this.$refs.secondMaintenanceApprovalModal.recordDetail(record)
+ this.$refs.secondMaintenanceApprovalModal.title = '璇︽儏'
+ this.$refs.secondMaintenanceApprovalModal.disableSubmit = true
}
}
}
--
Gitblit v1.9.3