From dca78d5fd0c67fd841d6841ef2cd94a10669c356 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 21 二月 2024 15:40:48 +0800
Subject: [PATCH] #

---
 zy-asrs-flow/src/pages/system/role/index.jsx |   32 +++++++++++++++++---------------
 1 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/zy-asrs-flow/src/pages/system/role/index.jsx b/zy-asrs-flow/src/pages/system/role/index.jsx
index a34f947..6352839 100644
--- a/zy-asrs-flow/src/pages/system/role/index.jsx
+++ b/zy-asrs-flow/src/pages/system/role/index.jsx
@@ -1,6 +1,5 @@
 
 import React, { useState, useRef, useEffect } from 'react';
-import { useIntl, FormattedMessage } from '@umijs/max';
 import { Button, message, Modal } from 'antd';
 import {
     FooterToolbar,
@@ -17,7 +16,6 @@
     const hide = message.loading('姝ｅ湪娣诲姞');
     try {
         const resp = await Http.doPost('api/role/save', val);
-        hide();
         if (resp.code === 200) {
             message.success('娣诲姞鎴愬姛');
             return true;
@@ -26,9 +24,10 @@
             return false;
         }
     } catch (error) {
-        hide();
         message.error('娣诲姞澶辫触璇烽噸璇曪紒');
         return false;
+    } finally {
+        hide();
     }
 };
 
@@ -36,7 +35,6 @@
     const hide = message.loading('姝ｅ湪鏇存柊');
     try {
         const resp = await Http.doPost('api/role/update', val);
-        hide();
         if (resp.code === 200) {
             message.success('鏇存柊鎴愬姛');
             return true;
@@ -45,9 +43,10 @@
             return false;
         }
     } catch (error) {
-        hide();
         message.error('閰嶇疆澶辫触璇烽噸璇曪紒');
         return false;
+    } finally {
+        hide();
     }
 };
 
@@ -56,7 +55,6 @@
     const hide = message.loading('姝ｅ湪鍒犻櫎');
     try {
         const resp = await Http.doPost('api/role/remove/' + rows.map((row) => row.id).join(','));
-        hide();
         if (resp.code === 200) {
             message.success('鍒犻櫎鎴愬姛');
             return true;
@@ -65,23 +63,26 @@
             return false;
         }
     } catch (error) {
-        hide();
         message.error('鍒犻櫎澶辫触锛岃閲嶈瘯');
         return false;
+    } finally {
+        hide();
     }
 };
 
 const handleExport = async () => {
     const hide = message.loading('姝ｅ湪瀵煎嚭');
     try {
-        await Http.doPost('api/role/export');
-        hide();
+        const resp = await Http.doPostBlob('api/role/export');
+        const blob = new Blob([resp], { type: 'application/vnd.ms-excel' });
+        window.location.href = window.URL.createObjectURL(blob);
         message.success('瀵煎嚭鎴愬姛');
         return true;
     } catch (error) {
-        hide();
         message.error('瀵煎嚭澶辫触锛岃閲嶈瘯');
         return false;
+    } finally {
+        hide();
     }
 };
 
@@ -93,8 +94,6 @@
     const [modalVisible, setModalVisible] = useState(false);
     const [currentRow, setCurrentRow] = useState();
     const [searchParam, setSearchParam] = useState({});
-
-    const intl = useIntl();
 
     useEffect(() => {
 
@@ -136,6 +135,7 @@
             valueType: 'text',
             filterDropdown: (props) => <LinkFilter
                 name='hostId'
+                major='host'
                 {...props}
                 actionRef={actionRef}
                 setSearchParam={setSearchParam}
@@ -170,7 +170,7 @@
         {
             title: '鎿嶄綔',
             dataIndex: 'option',
-            width: '220px',
+            width: 140,
             valueType: 'option',
             render: (_, record) => [
                 <Button
@@ -219,8 +219,10 @@
                     columns={columns}
                     cardBordered
                     dateFormatter="string"
+                    pagination={{ pageSize: 20 }}
                     search={false}
                     toolbar={{
+                        multipleLine: true,
                         search: {
                             onSearch: (value) => {
                                 setSearchParam(prevState => ({
@@ -289,9 +291,9 @@
                 <FooterToolbar
                     extra={
                         <div>
-                            <FormattedMessage id="pages.searchTable.chosen" defaultMessage="宸查�夋嫨" />
+                            宸查�夋嫨
                             <a style={{ fontWeight: 600 }}>{selectedRows.length}</a>
-                            <FormattedMessage id="pages.searchTable.item" defaultMessage="椤�" />
+                            椤�
                         </div>
                     }
                 >

--
Gitblit v1.9.1