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/EquipmentUnloadingBorrowList.vue | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/src/views/eam/EquipmentUnloadingBorrowList.vue b/src/views/eam/EquipmentUnloadingBorrowList.vue
index bb5907f..0cd00c8 100644
--- a/src/views/eam/EquipmentUnloadingBorrowList.vue
+++ b/src/views/eam/EquipmentUnloadingBorrowList.vue
@@ -99,16 +99,42 @@
:customRow='clickThenSelect'
@change='handleTableChange'
>
+<span
+ slot='action'
+ slot-scope='text, record'
+>
+ <a v-if="record.auditStatus === 'notSubmitted' || record.auditStatus === 'Rejected'" @click='handleEdit(record)'>缂栬緫</a>
+ <a v-if="record.auditStatus === 'pendingApproval'" @click='handleApprove(record)'>瀹℃壒</a>
- <span
+ <a-divider
+ v-if="record.auditStatus === 'notSubmitted' || record.auditStatus === 'Rejected' || record.auditStatus === 'pendingApproval'"
+ type='vertical'
+ />
+ <a-dropdown>
+ <a class='ant-dropdown-link'>鏇村 <a-icon type='down' /></a>
+ <a-menu slot='overlay'>
+ <a-menu-item>
+ <a @click='handleDetail(record)'>璇︽儏</a>
+ </a-menu-item>
+ <a-menu-item v-if="record.auditStatus === 'notSubmitted'||record.auditStatus === 'Rejected'">
+ <a-popconfirm title='纭畾鍒犻櫎鍚�?'
+ @confirm='() => handleDelete(record.id)'>
+ <a>鍒犻櫎</a>
+ </a-popconfirm>
+ </a-menu-item>
+
+ </a-menu>
+ </a-dropdown>
+ </span>
+<!-- <span
slot='action'
slot-scope='text, record'
>
- <a v-if="record.auditStatus === 'notSubmitted'" @click='handleEdit(record)'>缂栬緫</a>
+ <a v-if="record.auditStatus === 'notSubmitted' || record.auditStatus === 'Rejected'" @click='handleEdit(record)'>缂栬緫</a>
<a v-if="record.auditStatus === 'pendingApproval'" @click='handleApprove(record)'>瀹℃壒</a>
- <a-divider v-if="record.auditStatus === 'notSubmitted'" type='vertical' />
- <a-dropdown v-if="record.auditStatus === 'notSubmitted'">
+ <a-divider v-if="record.auditStatus === 'notSubmitted' || record.auditStatus === 'Rejected'" type='vertical' />
+ <a-dropdown v-if="record.auditStatus === 'notSubmitted' || record.auditStatus === 'Rejected'">
<a class='ant-dropdown-link'>鏇村 <a-icon type='down' /></a>
<a-menu slot='overlay'>
<a-menu-item>
@@ -120,7 +146,7 @@
</a-menu>
</a-dropdown>
- </span>
+ </span>-->
</a-table>
<a-tabs defaultActiveKey='1'>
--
Gitblit v1.9.3