合并

src/pages/UserManage/Editor/User.jsx

@@ -112,9 +112,8 @@ export default props => {
       label: '维护城市',
       name: 'cityId',
       rules: [
-        { required: true, message: '维护城市' },
+        { required: false, message: '维护城市' },
       ],
-      value: user.orgNum,
       render: row=> <Tree
         checkable
         // 展开指定节点
@@ -130,7 +129,7 @@ export default props => {
         <TreeNode title={item.name} key={item.id}>
            {item.children.map(itemCity => (
             <TreeNode
-                title={<span style={{ color: '#1890ff' }}>{itemCity.shortname}</span>}
+                title={<span style={{ color: '#1890ff' }}>{itemCity.name}</span>}
                 key={itemCity.id}
               />
           ))}

src/pages/UserManage/index.jsx

@@ -96,11 +96,17 @@ export default (props) => {
   }
 
   const handleSizeChange = e => {
-
   }
 
   const handlePageChange = e => {
-
+    getMembers({ params: { pageNum: e, pageSize: pageNavi.pageSize } }).then((dt) => {
+      const { records, ...pagenavi } = dt || {};
+      setMembers(records);
+      setPageNavi({
+        ...pageNavi,
+        ...pagenavi
+      })
+    }).catch()
   }
 
   const gotoDetail = (member, tab) => () => {