From c983d4642b2aeeceb6442badaebd1b7bab7943eb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 15 二月 2024 16:52:14 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/Role.java | 2 +-
zy-asrs-flow/src/pages/system/role/index.jsx | 16 ++++++++++++++++
2 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-flow/src/pages/system/role/index.jsx b/zy-asrs-flow/src/pages/system/role/index.jsx
index 4efe91c..86c5aa0 100644
--- a/zy-asrs-flow/src/pages/system/role/index.jsx
+++ b/zy-asrs-flow/src/pages/system/role/index.jsx
@@ -112,6 +112,7 @@
dataIndex: 'name',
valueType: 'text',
copyable: true,
+ filterDropdown: (props) => <Filter name='name' {...props} actionRef={actionRef} setSearchParam={setSearchParam} />,
},
{
title: '鏍囪瘑',
@@ -120,6 +121,21 @@
filterDropdown: (props) => <Filter name='code' {...props} actionRef={actionRef} setSearchParam={setSearchParam} />,
},
{
+ title: '鍏徃',
+ dataIndex: 'hostId$',
+ valueType: 'text',
+ },
+ {
+ title: '鐘舵��',
+ dataIndex: 'status$',
+ valueType: 'text',
+ },
+ {
+ title: '淇敼鏃堕棿',
+ dataIndex: 'updateTime$',
+ valueType: 'text',
+ },
+ {
title: '鎿嶄綔',
dataIndex: 'option',
width: '220px',
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/Role.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/Role.java
index c80b6e3..7395569 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/Role.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/entity/Role.java
@@ -107,7 +107,7 @@
HostService service = SpringUtils.getBean(HostService.class);
Host host = service.getById(this.hostId);
if (!Cools.isEmpty(host)){
- return String.valueOf(host.getId());
+ return String.valueOf(host.getName());
}
return null;
}
--
Gitblit v1.9.1