From ec68cffd70d2a2788f7c74af55a11563aaf611d1 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 06 十二月 2023 15:47:38 +0800
Subject: [PATCH] 1、登录页面优化首次登录会出现404字样，需要明确用户登录后显示页面是否为首页/消息页或者角色中可设置 2、驱动参数管理页面新增或修改控制系统中英文名称规则限制字符数最少6位调整为2位 3、效率段管理页面效率段颜色可自定义 4、设备利用率、设备开动率、班次利用率页面增加可按照设备类型筛选查询 5、对比分析页面增加通过选择设备来对比 6、设备日利用率和设备日利用率对比页面优化选择树节点后查询区域的设备名称字段不会更新问题
---
src/views/eam/EquipmentTransferInList.vue | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/views/eam/EquipmentTransferInList.vue b/src/views/eam/EquipmentTransferInList.vue
index 5fb81e4..0fe667c 100644
--- a/src/views/eam/EquipmentTransferInList.vue
+++ b/src/views/eam/EquipmentTransferInList.vue
@@ -60,12 +60,13 @@
style='margin-top: 15px'
@click='handleAdd'
type='primary'
+ v-has="'equipmentTransferIn:add'"
icon='plus'
>鏂板
</a-button>
<a-button
v-if="selectedRowKeys.length > 0 && (selectionRows[0].auditStatus==='notSubmitted' || selectionRows[0].auditStatus==='Rejected')"
- @click='handleSubmit' type='primary' icon='check'>鎻愪氦
+ @click='handleSubmit' type='primary' icon='check' v-has="'equipmentTransferIn:submitAndCancel'">鎻愪氦
</a-button>
<a-button v-if="selectedRowKeys.length > 0 && selectionRows[0].auditStatus === 'pendingApproval'"
@click='handleRevocation' type='primary' icon='rollback'>鎾ゅ洖
@@ -85,13 +86,13 @@
@click='onClearSelected'
>娓呯┖</a>
</div>
-
+<!-- X杞存粦鍔� :scroll="{ x: 'calc(1400px + 50%)', y: 900 }"-->
<a-table
ref='table'
size='middle'
bordered
rowKey='id'
- :scroll="{ x: 'calc(1400px + 50%)', y: 900 }"
+ :scroll="{ x: true}"
:columns='columns'
:dataSource='dataSource'
:pagination='ipagination'
@@ -100,12 +101,19 @@
:customRow='clickThenSelect'
@change='handleTableChange'
>
-
+ <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>
+ </div>
+ </a-tooltip>
+ </template>
<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 === 'notSubmitted' || record.auditStatus === 'Rejected'" @click='handleEdit(record)' v-has="'equipmentTransferIn:edit'">缂栬緫</a>
<a v-if="record.auditStatus === 'pendingApproval'" @click='handleApprove(record)'>瀹℃壒</a>
<a-divider
@@ -118,7 +126,7 @@
<a-menu-item>
<a @click='handleDetail(record)'>璇︽儏</a>
</a-menu-item>
- <a-menu-item v-if="record.auditStatus === 'notSubmitted'||record.auditStatus === 'Rejected'">
+ <a-menu-item v-if="record.auditStatus === 'notSubmitted'||record.auditStatus === 'Rejected'" v-has="'equipmentTransferIn:delete'">
<a-popconfirm title='纭畾鍒犻櫎鍚�?'
@confirm='() => handleDelete(record.id)'>
<a>鍒犻櫎</a>
@@ -194,7 +202,10 @@
{
title: '鍗曟嵁鍙�',
align: 'center',
- dataIndex: 'num'
+ dataIndex: 'num',
+ scopedSlots: { customRender: 'num' },
+ width: 100,
+ ellipsis: true,
},
{
title: '璋冨嚭鍏徃',
--
Gitblit v1.9.3