dev_ssz分支，账号模块v2.0

config/config.ts

@@ -254,13 +254,13 @@ export default defineConfig({
                     {path: './AccountManagementEdit',component:'./AccountManagement/AccountManagement/AccountManagement'},
                   ]
                 },*/
-
                 {
-                  path: './AccountManagement',
+                  path: './account',
                   name: 'accountmanagement1',
                   routes: [
                     {path:'./',component: './AccountManagement/account/Account'},
-                    {path: './AccountManagementEdit',component:'./AccountManagement/AccountManagement/AccountManagement'},
+                    {path: './edit',component:'./AccountManagement/account/AccountEdit'},
+                    {path: './reset',component:'./AccountManagement/account/AccountReset'},
                   ]
                 },
 

src/components/TableShow/TableShow.tsx

@@ -12,13 +12,13 @@ const TableShow = (props:any) => {
   const key = [
     ["Service Community", "communityName"],
     ["User Name", "accountName"],
-    ["Facility Bookings", "facilityTitle"],      
+    ["Facility Bookings", "facilityTitle"],
     ["Actions",null, (text: any, record: any) => (<Space size="middle"> <a onClick={goTo.bind(this,record)}>Detail</a></Space>)],
   ]
 
   return (
     <>
-      <Table dataSource={Data2.data} columns={columns2}></Table>
+      {/*<Table dataSource={Data2.data} columns={columns2}></Table>*/}
     </>
   );
 };

src/models/permission.ts

+import { getPermission,savePermission,checkPermission } from '@/services/permission';
+
+export default{
+  namespace: 'permissionModel',
+  state: {
+    data: [],
+  },
+  effects: {
+    *getAccountPermission({callback,payload},{ call, put }) {
+      const response = yield call(getPermission,payload);
+      yield put({
+        type: "get",
+      });
+      if(callback) callback(response);
+    },
+    *saveAccountPermission({callback,payload},{ call, put }) {
+      const response = yield call(savePermission,payload);
+      yield put({
+        type: "save",
+      });
+      if(callback) callback(response);
+    },
+    *checkAccountPermission({callback,payload},{ call, put }) {
+      const response = yield call(checkPermission,payload);
+      yield put({
+        type: "check",
+      });
+      if(callback) callback(response);
+    },
+  },
+  reducers: {
+    get(state, action) {
+      return {
+        ...state,
+        data:action.payload || {},
+      };
+    },
+    save(state, action) {
+      return {
+        ...state,
+        data:action.payload || {},
+      };
+    },
+    check(state, action) {
+      return {
+        ...state,
+        data:action.payload || {},
+      };
+    },
+  },
+};

src/pages/AccountManagement/account/Account.tsx

@@ -114,7 +114,8 @@ class Account extends React.Component {
       status: this.state.status,
       moment: this.state.moment,
       name: this.state.name,
-      leaderID: this.props.currentUser.userid,
+      // leaderID: this.props.currentUser.userid,
+      leaderID:"21232f297a57a5a743894a0e4a801fc3",
       userPhone:"18813787835"
     };
     console.log(params);
@@ -188,7 +189,7 @@ class Account extends React.Component {
       }
     }
     this.props.dispatch(routerRedux.push({
-      pathname: '/account/edit',
+      pathname: '/AccountManagement/account/edit',
       query: params,
     }))
   };
@@ -292,10 +293,12 @@ class Account extends React.Component {
         <span>
           <Button style={{background: 'transparent', border: 0, color: '#1890FF'}}
                   onClick={() => this.edit(record)}>Edit</Button>
-          {record.userID == 1||record.userID == this.props.currentUser.userid?'':
+           <Button style={{background: 'transparent', border: 0, color: '#1890FF'}}
+                   onClick={() => this.changeStatus(record)}> {record.userStatus == 1 ? "lock" : "unlock"}</Button>
+          {/*{record.userID == 1||record.userID == this.props.currentUser.userid?'':
           <Button style={{background: 'transparent', border: 0, color: '#1890FF'}}
                   onClick={() => this.changeStatus(record)}>
-            {record.userStatus == 1 ? "lock" : "unlock"}</Button>}
+            {record.userStatus == 1 ? "lock" : "unlock"}</Button>}*/}
         </span>
       ),
     },

src/pages/AccountManagement/account/AccountEdit.tsx

@@ -111,7 +111,7 @@ class AccountEdit extends React.Component {
   //跳转到账户页面
   back = () => {
     this.props.dispatch(routerRedux.push({
-      pathname: '/account',
+      pathname: '/AccountManagement/account',
     }))
   };
   //获取所有上级
@@ -491,6 +491,9 @@ class AccountEdit extends React.Component {
             flag: 0,
           })
         }
+        this.setState({
+          flag: 1,
+        })
       });
       if (params.id != '' && params.id != null) {
         this.getPermission(params.account);

src/services/account.tsx

 import request from '@/utils/request';
 
 export async function getAccount(params) {
-  return request('/api/tos/user/getAllInfrom', {
+  return request('/tos/user/getAllInfrom', {
     method: 'POST',
     data: params,
   });
 }
 
 export async function delAccount(params) {
-  return request('/api/tos/users/del', {
+  return request('/tos/users/del', {
     method: 'POST',
     data: params,
   });
 }
 
 export async function saveAccount(params) {
-  return request('/api/tos/users/save', {
+  return request('/tos/users/save', {
     method: 'POST',
     data: params,
   });
 }
 
 export async function getAllLeader(params) {
-  return request('/api/users/getAllLeader', {
+  return request('/users/getAllLeader', {
     method: 'POST',
     data: params,
   });
 }
 
 export async function checkAccountByName(params) {
-  return request('/api/tos/checkAccount/username', {
+  return request('/tos/checkAccount/username', {
     method: 'POST',
     data: params,
   });
 }
 
 export async function quitAndUser(params) {
-  return request('/api/tos/users/quitAndUser', {
+  return request('/tos/users/quitAndUser', {
     method: 'POST',
     data: params,
   });

src/services/permission.ts

+import request from '@/utils/request';
+
+export async function getPermission(params) {
+  return request('/tos/account/permission/getPermission', {
+    method: 'POST',
+    data: params,
+  });
+}
+
+export async function savePermission(params) {
+  return request('/tos/account/permission/savePermission', {
+    method: 'POST',
+    data: params,
+  });
+}
+
+export async function checkPermission(params) {
+  return request('/tos/permission/checkPermission', {
+    method: 'POST',
+    data: params,
+  });
+}