From a80a022b6f385cd4793f9143a9a1abe091ae84ad Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 11 六月 2025 09:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue | 109 +++++++++++++++++++++++++++++-------------------------
1 files changed, 58 insertions(+), 51 deletions(-)
diff --git a/src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue b/src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue
index c0d27dc..ef6c8bc 100644
--- a/src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue
+++ b/src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue
@@ -63,13 +63,16 @@
type="primary"
icon="plus"
>鏂板</a-button> -->
- <a-button
- v-has="'equipmentCategory:import&outport'"
- type="primary"
- icon="download"
- @click="handleExportXls('璁惧鍒嗙被鎶ヨ〃')"
- >瀵煎嚭</a-button>
- <a-dropdown v-if="selectedRowKeys.length > 0" v-has="'equipmentCategory:add&Edit&delete'">
+<!-- <a-button-->
+<!-- v-has="'equipmentCategory:import&outport'"-->
+<!-- type="primary"-->
+<!-- icon="download"-->
+<!-- @click="handleExportXls('璁惧鍒嗙被鎶ヨ〃')"-->
+<!-- >瀵煎嚭</a-button>-->
+ <a-dropdown
+ v-if="selectedRowKeys.length > 0"
+ v-has="'equipmentCategory:add&Edit&delete'"
+ >
<a-button style="margin-left: 8px">
鎵归噺鎿嶄綔
<a-icon type="down" />
@@ -95,8 +98,15 @@
@change="handleTableChange"
:scroll="{ x: true}"
>
- <template slot="num" slot-scope="text" >
- <a-tooltip placement="top" :title="text" trigger="hover">
+ <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>
@@ -229,27 +239,27 @@
},
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: '鍒嗙被缂栫爜',
align: "center",
dataIndex: 'num',
- scopedSlots: { customRender: 'num' },
- width: 100,
- ellipsis: true,
+ // scopedSlots: { customRender: 'num' },
+ // width: 100,
+ // ellipsis: true,
// scopedSlots: {
// customRender: 'num',
// },
@@ -266,33 +276,38 @@
// },
// sorter: true,
},
- {
- title: '鍒嗙被鏍囪瘑',
+ // {
+ // title: '鍒嗙被鏍囪瘑',
- align: "center",
- dataIndex: 'equipmentCategoryUda1_dictText',
- // scopedSlots: {
- // customRender: 'name',
- // },
- // sorter: true,
+ // align: "center",
+ // dataIndex: 'equipmentCategoryUda1_dictText',
+ // // scopedSlots: {
+ // // customRender: 'name',
+ // // },
+ // // sorter: true,
- },
- {
- title: '鎶�鏈姸鎬侀壌瀹氬懆鏈�',
+ // },
+ // {
+ // title: '鎶�鏈姸鎬侀壌瀹氬懆鏈�',
- align: "center",
- dataIndex: 'equipmentCategoryUda2_dictText',
- // scopedSlots: {
- // customRender: 'name',
- // },
- // sorter: true,
+ // align: "center",
+ // dataIndex: 'equipmentCategoryUda2_dictText',
+ // // scopedSlots: {
+ // // customRender: 'name',
+ // // },
+ // // sorter: true,
- },
+ // },
{
title: '鍒涘缓浜�',
align: "center",
dataIndex: 'createBy',
+ },
+ {
+ title: '鍒涘缓鏃堕棿',
+ align: "center",
+ dataIndex: 'createTime',
},
{
title: '淇敼浜�',
@@ -301,17 +316,9 @@
},
{
- title: '鍒涘缓鏃堕棿',
- align: "center",
- dataIndex: 'createTime',
-
- },
-
- {
title: '淇敼鏃堕棿',
align: "center",
dataIndex: 'updateTime',
-
},
// {
--
Gitblit v1.9.3