From f8668b057747f2982afafcc1ce9a2842a4abd50c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 29 十一月 2023 16:36:39 +0800
Subject: [PATCH] 1、设备车间管理页面车间名称新增、修改以及批量删除成功后提示为warning图标 2、设备车间管理页面调整修改车间信息中的排序字段由departOrder为productionOrder 3、删除树节点时需判断节点下是否有子节点，若有子节点则不能删除并提示 4、大屏车间管理页面左右两侧卡片区域布局保持一致 5、设备综合效率分析页面由于ant-design-vie的table组件固定列功能导致导出报表布局混乱
---
src/views/eam/MaintenanceCycleList.vue | 60 +++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 43 insertions(+), 17 deletions(-)
diff --git a/src/views/eam/MaintenanceCycleList.vue b/src/views/eam/MaintenanceCycleList.vue
index 234af67..80c00f5 100644
--- a/src/views/eam/MaintenanceCycleList.vue
+++ b/src/views/eam/MaintenanceCycleList.vue
@@ -70,6 +70,7 @@
@click="handleAdd"
type="primary"
icon="plus"
+ v-has="'maintenanceCycle:add'"
>鏂板</a-button>
<a-button
type="primary"
@@ -110,7 +111,7 @@
<a-table
ref="table"
size="middle"
- :scroll="{ x: 'calc(1500px + 50%)', y: 900 }"
+ :scroll="{ x: 'calc(2000px + 50%)', y: 900 }"
bordered
rowKey="id"
:columns="columns"
@@ -128,22 +129,26 @@
<a
v-if="record.versionStatus == '2'"
@click="handleRevise(record)"
+ v-has="'maintenanceCycle:revise'"
>鍗囩増</a>
<a-divider type="vertical" />
<a
v-if="record.versionStatus == '1'"
@click="handleTakeEffect(record)"
+ v-has="'maintenanceCycle:takeEffect'"
>鐢熸晥</a>
<a-divider type="vertical" />
<a
v-if="record.versionStatus == '1'"
@click="handleEdit(record)"
+ v-has="'maintenanceCycle:edit'"
>缂栬緫</a>
<a-divider type="vertical" />
<a-popconfirm
v-if="record.versionStatus == '1'"
title="纭畾鍒犻櫎鍚�?"
@confirm="() => handleDelete(record.id)"
+ v-has="'maintenanceCycle:delete'"
>
<a>鍒犻櫎</a>
</a-popconfirm>
@@ -186,16 +191,7 @@
return parseInt(index) + 1
},
},
- {
- title: '鐗堟湰',
- align: 'center',
- dataIndex: 'version',
- },
- {
- title: '鐗堟湰鐘舵��',
- align: 'center',
- dataIndex: 'versionStatusName',
- },
+
{
title: '鍛ㄦ湡缂栫爜',
align: 'center',
@@ -247,20 +243,50 @@
align: 'center',
dataIndex: 'unitName',
},
+ // {
+ // title: '璋冩暣鏂瑰紡',
+ // align: 'center',
+ // dataIndex: 'arrangeWayName',
+ // },
+ // {
+ // title: '閫炬湡澶勭悊鏂瑰紡',
+ // align: 'center',
+ // dataIndex: 'overdueDisposeModeName',
+ // },
+ // {
+ // title: '渚濇嵁鏃ュ巻',
+ // align: 'center',
+ // dataIndex: 'accordingCalendarName',
+ // },
+ // {
+ // title: '鐢熸晥鏃堕棿',
+ // align: 'center',
+ // dataIndex: 'takeEffectTime',
+ // },
+ // {
+ // title: '澶辨晥鏃堕棿',
+ // align: 'center',
+ // dataIndex: 'loseEfficacyTime',
+ // },
{
- title: '璋冩暣鏂瑰紡',
+ title: '鐗堟湰',
align: 'center',
- dataIndex: 'arrangeWayName',
+ dataIndex: 'version',
},
{
- title: '閫炬湡澶勭悊鏂瑰紡',
+ title: '鐗堟湰鐘舵��',
align: 'center',
- dataIndex: 'overdueDisposeModeName',
+ dataIndex: 'versionStatusName',
},
{
- title: '渚濇嵁鏃ュ巻',
+ title: '鍒涘缓浜�',
align: 'center',
- dataIndex: 'accordingCalendarName',
+ dataIndex: 'createBy',
+ },
+ {
+ title: '鍒涘缓鏃ユ湡',
+ align: 'center',
+ dataIndex: 'createTime',
},
{
title: '鎿嶄綔',
--
Gitblit v1.9.3