Browse Source

用户权限设置

zhuth 6 years ago
parent
commit
f882158c7f
2 changed files with 14 additions and 13 deletions
  1. 10 5
      src/components/admin/userManagement.jsx
  2. 4 8
      src/models/user.js

+ 10 - 5
src/components/admin/userManagement.jsx

@@ -40,6 +40,7 @@ class UserManagement extends React.Component {
         const { newOne } = user;
         const { currentUser } = main;
 
+        console.log(newOne);
         const moreOperatingMenu = (
             <Menu className='operationmenu' visible={true}>
                 <Menu.Item
@@ -81,6 +82,7 @@ class UserManagement extends React.Component {
             title: '角色',
             dataIndex: 'role',
             width: 100,
+            render: text => text === 'admin' ? '管理员' : '普通用户'
         }, {
             title: '操作',
             render: (text, record, index) => (
@@ -132,11 +134,14 @@ class UserManagement extends React.Component {
                             onRow={(record) => {
                                 return {
                                     onClick: () => {
-                                        dispatch({ type: 'user/setNewModelFields', fields: [
-                                            { name: 'code', value: record.code },
-                                            { name: 'name', value: record.name },
-                                            { name: 'description', value: record.description }
-                                        ] });
+                                        let arr = [];
+                                        for(let k in record) {
+                                            let obj = {};
+                                            obj.name = k;
+                                            obj.value = record[k];
+                                            arr.push(obj);
+                                        }
+                                        dispatch({ type: 'user/setNewModelFields', fields: arr });
                                     }
                                 }
                             }}

+ 4 - 8
src/models/user.js

@@ -45,20 +45,18 @@ export default {
                 const res = yield call(service.fetch, {
                     url: URLS.USER_LIST
                 });
-                console.log('请求用户列表', res);
                 if(!res.err && res.data.code > 0) {
                     const list = res.data.data.map(d => ({
                         code: d.id+'',
                         userName: d.userName,
                         fullName: d.name,
-                        role: d.role === 'admin' ? '管理员' : '普通用户'
+                        role: d.role
                     }));
                     yield put({ type: 'list', list });
                 }else {
                     message.error('请求用户列表失败: ' + (res.err || res.data.msg));
                 }
             }catch(e) {
-                console.log(e);
                 message.error('请求用户列表失败: ' + e);
             }
         },
@@ -75,19 +73,17 @@ export default {
                 }
             }
             try {
-                const res = yield call(service.fetch({
+                const res = yield call(service.fetch, {
                     url: URLS.USER_UPDATE,
                     body
-                }));
-                console.log('修改用户信息', body, res);
+                });
                 if(!res.err && res.data.code > 0) {
                     message.success('修改成功');
+                    yield put({ type: 'fetchList', mandatory: true });
                 }else {
-                    console.log(body, (res.err || res.data.msg));
                     message.error('修改失败: ' + (res.err || res.data.msg));
                 }
             }catch(e) {
-                console.log(body, e);
                 message.error('修改失败: ' + e);
             }
         }