合并

src/pages/UserManage/Editor/User.jsx

@@ -18,16 +18,22 @@ export default props => {
   const [data, setData] = useState({})
   const [submitting, setSubmitting] = useState(false)
   const user = props.data;
+  console.log('user: ', user)
   // 初始化的值
   const [tree, setTree] = useState([])
   // 城市的值
   const [selectCityTree, setSelectCityTree] = useState([])
+  
   // 省份的值
   // const [selectProvinceTree, setSelectProvinceTree] = useState([])
 
   useEffect(() => {
     getCity()
-  }, [])
+    if (user) {
+      setSelectCityTree([''])
+      setSelectCityTree(user.selectCityTree)
+    }
+  }, [user])
 
   const getCity = () => {
     getCityTree().then((user) => {
@@ -136,11 +142,11 @@ export default props => {
 
     {
       label: '默认城市',
-      name: 'cityId',
+      name: 'defaultCityId',
       rules: [
         { required: true, message: '默认城市' },
       ],
-      value: user.orgNum,
+      value: user.defaultCityId,
       render: (row, index) => <SelectCity />,
     },
 

src/pages/UserManage/Editor/index.jsx

@@ -65,7 +65,7 @@ export default (props) => {
         </Radio.Group>
       </div>
       <div style={{ width: '680px', margin: '0 auto' }}>
-        { tab === 1 ? <User data={user} {...props} onChange={handleChangeUser} onCancel={handleCancel(1)}/> : null}
+        { tab === 1 ? <User data={user}  {...props} onChange={handleChangeUser} onCancel={handleCancel(1)}/> : null}
         { tab === 2 ? <MiniApp data={user} tplTyps={tplTyps} {...props} onChange={handleChangeUser} onCancel={handleCancel(2)}/> : null}
         { tab === 3 ? <Menus data={user} {...props} onCancel={handleCancel(3)}/> : null}
       </div>