From f80451e4762f87c319de61af8b284810f2a072da Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 03 六月 2025 17:12:47 +0800
Subject: [PATCH] 1、设备TEEP页面大数据导出按钮新增loading提示 2、更新打包IP地址文件
---
src/views/eam/EquipmentListOfAll.vue | 79 +++++++++++++++++++++++++++++++++------
1 files changed, 67 insertions(+), 12 deletions(-)
diff --git a/src/views/eam/EquipmentListOfAll.vue b/src/views/eam/EquipmentListOfAll.vue
index 9da36c7..de4d6d5 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"
>
@@ -39,7 +39,7 @@
:wrapperCol="wrapperCol"
>
<j-dict-select-tag
- dictCode="mom_eam_equipment_category,name,id,del_flag!='1'"
+ :dictCode="caytegoryParam==='all'?'mom_eam_equipment_category,name,id,del_flag!=\'1\'':'mom_eam_equipment_category,name,id,equipment_category_uda1 = '+'\''+caytegoryParam+'\''"
placeholder="璇疯緭鍏ユ悳绱㈡潯浠跺苟閫夋嫨"
v-model="queryParam.equipmentCategoryId"
/>
@@ -372,6 +372,13 @@
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"
icon="calendar"
@@ -679,7 +686,6 @@
<a-tab-pane
tab="璁惧鏂囨。"
key="1"
- forceRender
>
<EquipmentDocumentList :mainId="selectedMainId" />
</a-tab-pane>
@@ -706,44 +712,69 @@
<a-tab-pane
tab="澶囦欢"
key="4"
- forceRender
>
<EquipmentSpareParts :mainId="selectedMainId" />
</a-tab-pane>
<a-tab-pane
tab="ABC鏍囪瘑鍙樻洿璁板綍"
key="5"
- forceRender
>
<equipment-update-ABC-list :mainId="selectedMainId" />
</a-tab-pane>
<a-tab-pane
tab="璐ㄤ繚鏈熷彉鏇�"
key="6"
- forceRender
>
<equipment-update-warranty-list :mainId="selectedMainId" />
</a-tab-pane>
<a-tab-pane
tab="鐐规鏍囧噯"
key="7"
- forceRender
>
<daily-maintenance-list :mainId="selectedMainId"></daily-maintenance-list>
</a-tab-pane>
+
<a-tab-pane
tab="浜屼繚鏍囧噯"
key="8"
- forceRender
>
<second-maintenance-list :mainId="selectedMainId"></second-maintenance-list>
</a-tab-pane>
<a-tab-pane
tab="涓変繚鏍囧噯"
key="9"
- forceRender
>
<third-maintenance-list :mainId="selectedMainId"></third-maintenance-list>
+ </a-tab-pane>
+ <a-tab-pane
+ tab="鐐规宸ュ崟"
+ key="10"
+ >
+ <daily-inspection-order-list-component :mainId="selectedMainId"></daily-inspection-order-list-component>
+ </a-tab-pane>
+ <a-tab-pane
+ tab="浜屼繚宸ュ崟"
+ key="11"
+ >
+ <daily-maintenance-order-list-component :mainId="selectedMainId"></daily-maintenance-order-list-component>
+ </a-tab-pane>
+ <a-tab-pane
+ tab="涓変繚宸ュ崟"
+ key="12"
+ >
+ <daily3-maintenance-order-list-component :mainId="selectedMainId"></daily3-maintenance-order-list-component>
+ </a-tab-pane>
+ <a-tab-pane
+ tab="缁翠慨宸ュ崟"
+ key="13"
+ >
+ <repair-order-list-component :mainId="selectedMainId"></repair-order-list-component>
+ </a-tab-pane>
+ <a-tab-pane
+ tab="鎶�鏈姸鎬侀壌瀹�"
+ key="14"
+ >
+ <equipment-calibration-order-component :mainId="selectedMainId"></equipment-calibration-order-component>
</a-tab-pane>
</a-tabs>
<equipment-modal
@@ -780,7 +811,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 +832,11 @@
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'
+import Daily3MaintenanceOrderListComponent from './modules/equipmentNew/Daily3MaintenanceOrderListComponent.vue'
+import RepairOrderListComponent from './modules/equipmentNew/RepairOrderListComponent.vue'
+import EquipmentCalibrationOrderComponent from './modules/equipmentNew/EquipmentCalibrationOrderComponent.vue'
export default {
name: "EquipmentList",
@@ -827,11 +863,22 @@
ThirdMaintenanceList,
KeyEquipmentUpdateModel,
JEllipsis,
+ DailyInspectionOrderListComponent,
+ DailyMaintenanceOrderListComponent,
+ Daily3MaintenanceOrderListComponent,
+ RepairOrderListComponent,
+ EquipmentCalibrationOrderComponent,
+ },
+ props: {
+ caytegoryParam: {
+ type: String,
+ default: 'all',
+ required: true,
+ },
},
data() {
return {
description: '璁惧鍙拌处绠＄悊椤甸潰',
- caytegoryParam: 'all',
// 琛ㄥご
columns: [
{
@@ -1250,7 +1297,10 @@
this.ipagination.current = 1;
}
this.onClearSelected()
- var params = this.getQueryParams();//鏌ヨ鏉′欢
+ if(this.caytegoryParam !== 'all') {
+ this.queryParam.equipmentCategoryUda1 = this.caytegoryParam;
+ }
+ let params = this.getQueryParams();//鏌ヨ鏉′欢
this.loading = true;
getAction(this.url.list, params).then((res) => {
if (res.success) {
@@ -1393,6 +1443,11 @@
}
})
}
+ else {
+ this.$message.warning('鏈煡璇㈠埌鏈夋晥妯℃澘')
+ }
+ } else {
+ this.$message.warning('鏈煡璇㈠埌鏈夋晥妯℃澘')
}
})
},
--
Gitblit v1.9.3