合并

src/pages/UserManage/CitySelect.jsx

@@ -0,0 +1,50 @@
+import React, { useState, useEffect } from 'react';
+import { Select } from 'antd';
+
+import request from '../../utils/request'
+
+const { Option } = Select;
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const CitySelect = (props) => {
+  const [ data, setData ] = useState([])
+
+  useEffect(() => {
+    getCityList();
+  },[])
+
+  const getCityList = (e) => {
+    request({
+        url: '/api/admin/tdCity',
+        method: 'GET',
+        params: {leveltype: 2, pageNum: 1,pageSize: 999},
+        action: 'select',
+    }).then((data) => {
+        setData(data)
+    })
+  }
+
+  return (
+      <Select 
+      showSearch 
+      value={props.value} 
+      style={{ width: '180px' }}
+      placeholder="请选择城市" 
+      onChange={props.onChange} 
+      filterOption={(input, option) =>
+        option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      }
+      >
+          {data.map(city => (
+            <Option key={city.id} value={city.id}>{city.name}</Option>
+          ))}
+      </Select>
+  )
+}
+export default CitySelect
+

src/pages/UserManage/Editor/User.jsx

@@ -1,19 +1,49 @@
 import React, { useState, useEffect } from 'react';
-import { Button, notification } from 'antd';
+import { Button, notification, Tree } from 'antd';
 import md5 from 'md5';
 import moment from 'moment';
 import router from 'umi/router';
 import XForm, { FieldTypes } from '../../../components/XForm';
 import { fetch, apis } from '../../../utils/request';
+import SelectCity from '../CitySelect'
+
 
 const defaultPass = 'abc@123';
 const saveUser = fetch(apis.member.save)
 const updateUser = fetch(apis.member.update)
+const getCityTree = fetch(apis.member.getTree)
 
-export default (props) => {
+export default props => {
+  const { TreeNode } = Tree;
   const [data, setData] = useState({})
   const [submitting, setSubmitting] = useState(false)
   const user = props.data;
+  // 初始化的值
+  const [tree, setTree] = useState([])
+  // 城市的值
+  const [selectCityTree, setSelectCityTree] = useState([])
+  // 省份的值
+  // const [selectProvinceTree, setSelectProvinceTree] = useState([])
+
+  useEffect(() => {
+    getCity()
+  }, [])
+
+  const getCity = () => {
+    getCityTree().then((user) => {
+      console.log('user.tdCityLis', user.tdCityList)
+      setTree(user.tdCityList)
+      }).catch(() => setSubmitting(false))
+    }
+
+  const onSelect = (selectedKeys, info) => {
+    console.log('selected', selectedKeys, info);
+  };
+  // 选择城市
+  const onCheck = (checkedKeys, info) => {
+    setSelectCityTree(checkedKeys)
+    console.log('onCheck', checkedKeys, info);
+  };
 
   const fields = [
     {
@@ -42,8 +72,8 @@ export default (props) => {
       name: 'phone',
       type: FieldTypes.Text,
       rules: [
-        {required: true, message: '请填写手机号'},
-        {len: 11, message: '手机号格式不正确'}
+        { required: true, message: '请填写手机号' },
+        { len: 11, message: '手机号格式不正确' },
       ],
       value: user.phone,
     },
@@ -67,16 +97,59 @@ export default (props) => {
       name: 'expDate',
       type: FieldTypes.DatePicker,
       rules: [
-        {required: true, message: '请选择有效期'}
+        { required: true, message: '请选择有效期'}
       ],
       value: moment(user.expDate),
     },
+
+    {
+      label: '维护城市',
+      name: 'cityId',
+      rules: [
+        { required: true, message: '维护城市' },
+      ],
+      value: user.orgNum,
+      render: row=> <Tree
+        checkable
+        // 展开指定节点
+        // expandedKeys={selectProvinceTree}
+        // 选择节点,但同时会包含父节点
+        checkedKeys={selectCityTree}
+        //  defaultSelectedKeys={['420100']}
+        onSelect={onSelect}
+        onCheck={onCheck}
+      >
+      <TreeNode title="全部">
+      {tree.map(item => (
+        <TreeNode title={item.name} key={item.id}>
+           {item.children.map(itemCity => (
+            <TreeNode
+                title={<span style={{ color: '#1890ff' }}>{itemCity.shortname}</span>}
+                key={itemCity.id}
+              />
+          ))}
+        </TreeNode>
+       ))}
+</TreeNode>
+      </Tree>,
+    },
+
+    {
+      label: '默认城市',
+      name: 'cityId',
+      rules: [
+        { required: true, message: '默认城市' },
+      ],
+      value: user.orgNum,
+      render: (row, index) => <SelectCity />,
+    },
+
     {
-      label: '楼盘总数',
+      label: '维护项目数量',
       name: 'orgNum',
       type: FieldTypes.Text,
       rules: [
-        { required: true, message: '请输入楼盘总数' },
+        { required: true, message: '请输入维护项目数量' },
       ],
       value: user.orgNum,
     },
@@ -89,7 +162,8 @@ export default (props) => {
       loginPassword: md5(defaultPass),
     }
 
-    const data = { ...user, ...dt }
+    const data = { ...user, ...dt, selectCityTree }
+    console.log('datadatadatadata', data)
     setSubmitting(true)
     if (user && user.userId) {
       updateUser({ urlData: { id: user.userId }, data }).then((user) => {

src/services/apis.js

@@ -41,6 +41,11 @@ const apis = {
       method: 'PUT',
       action: 'center',
     },
+    getTree: {
+      url: `${prefix}/taUser/city/tree`,
+      method: 'get',
+      action: 'center',
+    },
     miniapp: {
       edit: {
         url: `${prefix}/taMiniapp`,