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/modules/dailyMaintenanceOrder/ActualWorkHoursEditTable.vue | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/views/eam/modules/dailyMaintenanceOrder/ActualWorkHoursEditTable.vue b/src/views/eam/modules/dailyMaintenanceOrder/ActualWorkHoursEditTable.vue
index e6dcf8c..c59e9c3 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/ActualWorkHoursEditTable.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/ActualWorkHoursEditTable.vue
@@ -41,7 +41,10 @@
slot='action'
slot-scope='text, record,index'
>
- <a @click="handleDeleteFake(index)">鍒犻櫎</a>
+ <a
+ v-has="'dailyMaintenanceOrder:actualWorkHoursDelete'"
+ @click="handleDeleteFake(index)"
+ >鍒犻櫎</a>
</span>
</a-table>
<a-button
@@ -65,11 +68,13 @@
type="primary"
:style="{marginRight: '8px'}"
:disabled="dailyMaintenanceOrderStatus!='4'"
+ v-has="'dailyMaintenanceOrder:actualWorkHoursTS'"
>鏆傚瓨</a-button>
<a-button
@click="handleOk(0)"
type="primary"
:disabled="dailyMaintenanceOrderStatus!='4'"
+ v-has="'dailyMaintenanceOrder:actualWorkHoursSave'"
>淇濆瓨</a-button>
</a-row>
<!-- :disabled="false" -->
@@ -170,7 +175,7 @@
dataIndex: 'username',
align: "center",
scopedSlots: { customRender: 'username' },
- className: 'red',
+ // className: 'red',
width: 250,
},
{
@@ -183,7 +188,7 @@
title: '*瀹為檯宸ユ椂',
dataIndex: 'actualWorkingHourQuota',
align: "center",
- className: 'red',
+ // className: 'red',
scopedSlots: { customRender: 'actualWorkingHourQuota' },
width: 250,
},
--
Gitblit v1.9.3