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/modules/equipmentCategory/EquipmentCategory2List.vue | 126 +++++++++++++++++++++++++++++-------------
1 files changed, 87 insertions(+), 39 deletions(-)
diff --git a/src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue b/src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue
index 370a5a9..f485f6d 100644
--- a/src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue
+++ b/src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue
@@ -58,17 +58,21 @@
@click="searchReset"
icon="reload"
>閲嶇疆</a-button>
- <a-button
+ <!-- <a-button
@click="handleAdd"
type="primary"
icon="plus"
- >鏂板</a-button>
+ >鏂板</a-button> -->
<a-button
+ v-has="'equipmentCategory:import&outport'"
type="primary"
icon="download"
- @click="handleExportXls('宸ュ巶')"
+ @click="handleExportXls('璁惧鍒嗙被鎶ヨ〃')"
>瀵煎嚭</a-button>
- <a-dropdown v-if="selectedRowKeys.length > 0">
+ <a-dropdown
+ v-if="selectedRowKeys.length > 0"
+ v-has="'equipmentCategory:add&Edit&delete'"
+ >
<a-button style="margin-left: 8px">
鎵归噺鎿嶄綔
<a-icon type="down" />
@@ -92,9 +96,23 @@
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, getCheckboxProps:getCheckboxProps}"
@change="handleTableChange"
- :scroll="{ x: 'calc(1200px + 50%)', y: 900 }"
+ :scroll="{ x: true}"
>
-
+ <template
+ slot="num"
+ slot-scope="text"
+ >
+ <a-tooltip
+ placement="top"
+ :title="text"
+ trigger="hover"
+ >
+ <div>
+ <template slot="title"> </template>
+ <p style="cusor:pointer; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; width: 130px;">{{ text }}</p>
+ </div>
+ </a-tooltip>
+ </template>
<!--鐘舵�佹爮涓�у睍绀�-->
<!-- <span
slot="status"
@@ -134,9 +152,9 @@
<a-icon type="down" />
</a>
<a-menu slot="overlay">
- <a-menu-item>
+ <!-- <a-menu-item>
<a @click="handleEdit(record)">缂栬緫</a>
- </a-menu-item>
+ </a-menu-item> -->
<a-menu-item v-if="record.equipmentCategoryDtlList.length==0">
<a-popconfirm
@@ -173,10 +191,10 @@
</span>
</a-table>
- <equipment-category-model
+ <!-- <equipment-category-model
ref="modalForm"
@ok="modalFormOk"
- ></equipment-category-model>
+ ></equipment-category-model> -->
</a-card>
</template>
@@ -191,7 +209,7 @@
name: 'EquipmentCategory2List.',
mixins: [JeecgListMixin],
components: {
- EquipmentCategoryModel,
+ // EquipmentCategoryModel,
JInput,
JEllipsis,
},
@@ -221,43 +239,70 @@
},
width: 50,
},
- /* {
- title: '涓婄骇璁惧鍒嗙被缂栫爜',
- align: "center",
- dataIndex: 'parentNum',
- customRender:function(text, record){
- return record.parentName+text;
- }
- },
-
+ /* {
+ title: '涓婄骇璁惧鍒嗙被缂栫爜',
+ align: "center",
+ dataIndex: 'parentNum',
+ customRender:function(text, record){
+ return record.parentName+text;
+ }
+ },
+
+ {
+ title: '涓婄骇璁惧鍒嗙被鍚嶇О',
+ align: "center",
+ dataIndex: 'parentName',
+ }, */
{
- title: '涓婄骇璁惧鍒嗙被鍚嶇О',
- align: "center",
- dataIndex: 'parentName',
- }, */
- {
- title: '璁惧鍒嗙被缂栫爜',
+ title: '鍒嗙被缂栫爜',
align: "center",
dataIndex: 'num',
+ // scopedSlots: { customRender: 'num' },
+ // width: 100,
+ // ellipsis: true,
// scopedSlots: {
// customRender: 'num',
// },
// sorter: true,
},
{
- title: '璁惧鍒嗙被鍚嶇О',
+ title: '鍒嗙被鍚嶇О',
align: "center",
dataIndex: 'name',
+
// scopedSlots: {
// customRender: 'name',
// },
// sorter: true,
},
+ // {
+ // title: '鍒嗙被鏍囪瘑',
+
+ // align: "center",
+ // dataIndex: 'equipmentCategoryUda1_dictText',
+ // // scopedSlots: {
+ // // customRender: 'name',
+ // // },
+ // // sorter: true,
+
+ // },
+ // {
+ // title: '鎶�鏈姸鎬侀壌瀹氬懆鏈�',
+
+ // align: "center",
+ // dataIndex: 'equipmentCategoryUda2_dictText',
+ // // scopedSlots: {
+ // // customRender: 'name',
+ // // },
+ // // sorter: true,
+
+ // },
{
title: '鍒涘缓浜�',
align: "center",
dataIndex: 'createBy',
+
},
{
title: '鍒涘缓鏃堕棿',
@@ -268,6 +313,7 @@
title: '淇敼浜�',
align: "center",
dataIndex: 'updateBy',
+
},
{
title: '淇敼鏃堕棿',
@@ -285,16 +331,14 @@
// sorter: true,
// width: 100,
// },
- {
- title: '鎿嶄綔',
- align: "center",
- dataIndex: 'action',
- scopedSlots: {
- customRender: 'action',
- },
- width: 150,
- fixed: 'right',
- },
+ // {
+ // title: '鎿嶄綔',
+ // align: "center",
+ // dataIndex: 'action',
+ // scopedSlots: {
+ // customRender: 'action',
+ // },
+ // },
],
url: {
list: "/eam/equipmentCategory/list",
@@ -424,8 +468,12 @@
this.queryParam = {};
this.queryParam.id = this.nodeSelected.key;
this.loadData(1);
- }
-
+ },
+ mounted() {
+ this.$bus.$on('loadData', (data) => {
+ this.loadData();
+ })
+ },
}
</script>
--
Gitblit v1.9.3