From d9232c930a2c71bc762b8f6a1481a5f5b7684d5d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 22 二月 2024 15:17:34 +0800
Subject: [PATCH] #

---
 zy-asrs-flow/src/pages/system/role/components/scope.jsx |    2 +-
 zy-asrs-flow/src/pages/system/role/index.jsx            |   30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/zy-asrs-flow/src/pages/system/role/components/scope.jsx b/zy-asrs-flow/src/pages/system/role/components/scope.jsx
index e260ac9..bd22a15 100644
--- a/zy-asrs-flow/src/pages/system/role/components/scope.jsx
+++ b/zy-asrs-flow/src/pages/system/role/components/scope.jsx
@@ -58,7 +58,7 @@
     return (
         <>
             <Drawer
-                title={`${name}`}
+                title={name?name:'-'}
                 width={640}
                 forceRender
                 destroyOnClose
diff --git a/zy-asrs-flow/src/pages/system/role/index.jsx b/zy-asrs-flow/src/pages/system/role/index.jsx
index c1677a9..ebdf0f4 100644
--- a/zy-asrs-flow/src/pages/system/role/index.jsx
+++ b/zy-asrs-flow/src/pages/system/role/index.jsx
@@ -204,21 +204,6 @@
             render: (_, record) => [
                 <Button
                     type="link"
-                    key="scope"
-                    onClick={() => {
-                        Http.doGetPromise('/api/role/scope/list', { roleId: record.id }, (res) => {
-                            if (res.data) {
-                                setMenuIds(res.data);
-                            }
-                            setScopeModalVisible(true);
-                            setCurrentRow(record);
-                        });
-                    }}
-                >
-                    鍒嗛厤鏉冮檺
-                </Button>,
-                <Button
-                    type="link"
                     key="edit"
                     onClick={() => {
                         setModalVisible(true);
@@ -227,6 +212,21 @@
                 >
                     缂栬緫
                 </Button>,
+                 <Button
+                 type="link"
+                 key="scope"
+                 onClick={() => {
+                     Http.doGetPromise('/api/role/scope/list', { roleId: record.id }, (res) => {
+                         if (res.data) {
+                             setMenuIds(res.data);
+                         }
+                         setScopeModalVisible(true);
+                         setCurrentRow(record);
+                     });
+                 }}
+             >
+                 鍒嗛厤鏉冮檺
+             </Button>,
                 <Button
                     type="link"
                     danger

--
Gitblit v1.9.1