From 8c168889e5ef37b4d334827108615e762511c622 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期二, 26 十二月 2023 11:39:25 +0800
Subject: [PATCH] 1、根页面网站标题由统计分析调整为MDC智慧车间 2、车间看板页面优化代码，去除冗余代码，试图解决新增车间后设备无法自由拖拽问题（未在现场调试，本地调试无问题） 3、车间看板页面全屏模式进入车间后车间背景图无法正常计算高度 4、车间看板与设备监控页面设备详情弹窗调整数据过长则省略的判定条件 5、首页优化布局方式，实现响应式布局
---
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