From a9f005e2af294c47d7cd1e4b6ed401bf65f5b080 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期二, 04 三月 2025 16:44:09 +0800 Subject: [PATCH] art: 所有设备 台账 二保工单 根据设备id查询二保工单,并过滤掉已完成和已取消的二保工单 --- src/views/eam/EquipmentListOfAll.vue | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/views/eam/EquipmentListOfAll.vue b/src/views/eam/EquipmentListOfAll.vue index 9da36c7..14f6c32 100644 --- a/src/views/eam/EquipmentListOfAll.vue +++ b/src/views/eam/EquipmentListOfAll.vue @@ -18,7 +18,7 @@ :md='8' :sm='24'> <a-form-item - label="缁熶竴缂栧彿缇�" + label="缁熶竴缂栫爜缇�" :labelCol="labelCol" :wrapperCol="wrapperCol" > @@ -371,6 +371,13 @@ icon="calendar" v-has="'equipmentAccount:add&delete&import&Edit'" >璐ㄤ繚鏈熷彉鏇�</a-button> + <a-button + :disabled="selectedRowKeys.length==0" + @click="batchDel" + type="danger" + icon="delete" + v-has="'equipmentAccount:add&delete&import&Edit'" + >鎵归噺鍒犻櫎</a-button> <a-button @click="handleUpdateKeyEquipment" type="primary" @@ -731,6 +738,7 @@ > <daily-maintenance-list :mainId="selectedMainId"></daily-maintenance-list> </a-tab-pane> + <a-tab-pane tab="浜屼繚鏍囧噯" key="8" @@ -744,6 +752,20 @@ forceRender > <third-maintenance-list :mainId="selectedMainId"></third-maintenance-list> + </a-tab-pane> + <a-tab-pane + tab="鐐规宸ュ崟" + key="10" + forceRender + > + <daily-inspection-order-list-component :mainId="selectedMainId"></daily-inspection-order-list-component> + </a-tab-pane> + <a-tab-pane + tab="浜屼繚宸ュ崟" + key="11" + forceRender + > + <daily-maintenance-order-list-component :mainId="selectedMainId"></daily-maintenance-order-list-component> </a-tab-pane> </a-tabs> <equipment-modal @@ -780,7 +802,7 @@ import { mixinDevice } from '@/utils/mixin' import JEllipsis from '@/components/jeecg/JEllipsis' import EquipmentModal from './modules/equipmentNew/EquipmentModal' -import { getAction, downFile } from '@/api/manage' +import { getAction, downFile, deleteAction } from '@/api/manage' import EquipmentProcessParametersList from './modules/equipmentNew/EquipmentProcessParametersList' import EquipmentDocumentList from './modules/equipmentNew/EquipmentDocumentList' import EquipmentPrecisionParametersList from './modules/equipmentNew/EquipmentPrecisionParametersList' @@ -801,6 +823,8 @@ import SecondMaintenanceList from './modules/equipmentNew/SecondMaintenanceList.vue' import ThirdMaintenanceList from './modules/equipmentNew/ThirdMaintenanceList.vue' import KeyEquipmentUpdateModel from './modules/equipmentNew/edit/KeyEquipmentUpdateModel.vue' +import DailyInspectionOrderListComponent from './modules/equipmentNew/DailyInspectionOrderListComponent.vue' +import DailyMaintenanceOrderListComponent from './modules/equipmentNew/DailyMaintenanceOrderListComponent.vue' export default { name: "EquipmentList", @@ -827,6 +851,8 @@ ThirdMaintenanceList, KeyEquipmentUpdateModel, JEllipsis, + DailyInspectionOrderListComponent, + DailyMaintenanceOrderListComponent, }, data() { return { -- Gitblit v1.9.3