fix

config/routes.js

@@ -73,6 +73,12 @@ export default [
                 component: './building/Developers/Edit',
                 menuCode: '/building/Developers/Edit',
               },
+              {
+                path: '/building/log',
+                name: '编辑日志',
+                component: './building/log',
+                menuCode: '/building/Developers',
+              },
             ],
           },
           {
@@ -600,6 +606,13 @@ export default [
                 component: './carouselFigure/customImg/edit',
                 menuCode: '/carouselFigure/customImg/edit',
               },
+              {
+                path: '/system/city',
+                name: '城市管理',
+                // hideInMenu: true,
+                component: './system/city',
+                menuCode: '/carouselFigure/customImg/edit',
+              },
             ],
           },
           {

src/pages/building/Edit/Apartment/Form.jsx

@@ -112,9 +112,9 @@ const AMForm = props => {
         {getFieldDecorator('apartmentName', {
           rules: [
             { required: true, message: '请填写户型名称' },
-            { max: 10, message: '户型名称不超过10个字符' },
+            { max: 20, message: '户型名称不超过20个字符' },
           ],
-        })(<Input placeholder="户型名称不超过10个字符" />)}
+        })(<Input placeholder="户型名称不超过20个字符" />)}
       </Form.Item>
       <Form.Item label="销售状态">
         {getFieldDecorator('marketStatus', {

src/pages/building/log/index.jsx

@@ -0,0 +1,55 @@
+import React, { useMemo, useRef, useCallback, useState } from 'react';
+import apis from '@/services/apis';
+import request from '@/utils/request';
+import AuthButton from '@/components/AuthButton';
+import QueryTable from '@/components/QueryTable';
+import BuildingSelect from '@/components/SelectButton/BuildSelect';
+
+import { router } from 'umi';
+
+export default props => {
+  const ref = useRef();
+
+  const searchFields = [
+    {
+      name: 'buildingId',
+      label: '项目',
+      placeholder: '请选择项目',
+      render: () => <BuildingSelect style={{ width: 160 }} />,
+    },
+  ];
+
+  const tableColumns = [
+    {
+      title: '项目',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      align: 'center',
+    },
+    {
+      title: '编辑人',
+      dataIndex: 'updateName',
+      key: 'updateName',
+      align: 'center',
+    },
+
+    {
+      title: '编辑时间',
+      dataIndex: 'updateTime',
+      key: 'updateTime',
+      align: 'center',
+    },
+  ];
+
+  return (
+    <>
+      <QueryTable
+        ref={ref}
+        rowKey="id"
+        api={apis.building.logs}
+        columns={tableColumns}
+        searchFields={searchFields}
+      />
+    </>
+  );
+};

src/pages/news/list/compents/Basic.jsx

@@ -8,10 +8,12 @@ import NewsTypeSelect from '@/components/SelectButton/NewTypeSelect';
 import XForm, { FieldTypes } from '@/components/XForm';
 import Wangedit from '@/components/Wangedit/Wangedit';
 import request from '@/utils/request';
-
+import CitySelect from '@/components/SelectButton/CitySelect2';
+import InstitutionSelect from '@/components/SelectButton/InstitutionSelect'
 const Basic = props => {
   const { newsId } = props;
-
+ 
+  const [isHaveBuilding, setIsHaveBuilding] = useState(true);
   const [dynamicData, setDynamicData] = useState({});
   const [changeBuildingId, setChangeBuildingIdData] = useState('');
   const [newsDetailType, setNewsDetailType] = useState(1);
@@ -27,8 +29,8 @@ const Basic = props => {
     request({ ...apis.news.get, urlData: { id: newsId } })
       .then(data => {
         setDynamicData(data);
-        console.log(data, 'sss');
         setNewsDetailType(Number(data.newsDetailType));
+        setIsHaveBuilding(data.buildingId)
       })
       .catch(err => {
         console.log(err);
@@ -42,13 +44,43 @@ const Basic = props => {
   };
 
   const fields = [
+    {
+      label: '是否关联项目',
+      name: 'isHaveBuilding',
+      type: FieldTypes.Switch,
+      value: isHaveBuilding,
+      hidden: () => newsId,
+      props: {
+        onChange: (e) => {
+          setIsHaveBuilding(e)
+        },
+      },
+      rules: [{ required: true, message: '是否城市活动' }],
+    },
     {
       label: '意向项目',
       name: 'buildingId',
+      hidden: () => !isHaveBuilding,
       render: <BuildSelect onChange={e => handleBuildingChange(e)} />,
       value: dynamicData.buildingId,
       rules: [{ required: true, message: '请选择所属项目' }],
     },
+    {
+      label: '城市',
+      name: 'cityId',
+      render: <CitySelect />,
+      hidden: () => isHaveBuilding,
+      value: dynamicData.cityId,
+      rules: [{ required: true, message: '请选择城市' }],
+    },
+    {
+      label: '组织机构',
+      name: 'institutionId',
+      render: <InstitutionSelect />,
+      hidden: () => isHaveBuilding,
+      value: dynamicData.institutionId,
+      rules: [{ required: true, message: '请选择组织机构' }],
+    },
     {
       label: '资讯列表图',
       name: 'newsImg',
@@ -133,7 +165,14 @@ const Basic = props => {
     router.go(-1);
   };
 
-  return <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>;
+  return (
+    <XForm
+      onSubmit={handleSubmit}
+      onCancel={cancelPage}
+      submitBtn={dynamicData.newsStatus !== 0}
+      fields={fields}
+    ></XForm>
+  );
 };
 
 export default Basic;

src/pages/system/city/index.jsx

@@ -0,0 +1,219 @@
+import React, { useState, useEffect } from 'react';
+import { Select, Card, Button, TreeSelect } from 'antd';
+import { Tree } from 'antd';
+
+const { TreeNode } = Tree;
+import request from '@/utils/request';
+const { SHOW_CHILD } = TreeSelect;
+const { Option } = Select;
+
+function parentTree(arr, id) {   //arr 所有的树数据 id 某个子节点的id 
+  console.log(arr, id,'sss')
+  let temp ;
+  let callback = function (nowArr, id) {     //先定义个函数寻找子节点位置 找到后 再找改节点父元素位置 以此类推
+    for (let i = 0; i < nowArr.length; i++) {
+      let item = nowArr[i];
+      if (item.value === id) {
+        // temp.push(item);
+        temp=item
+        // callback(arr, item.parentid);     //pid 父级ID
+        break;
+      } else {
+        if (item.children) {
+          callback(item.children, id); //menus 子节点字段名称
+        }
+      }
+    }
+  };
+  callback(arr, id);
+  return temp;  //最后返回
+}
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const CitySelect = props => {
+  const [data, setData] = useState({});
+  const [submitting, setSubmitting] = useState(false);
+  // 初始化的值
+  const [tree, setTree] = useState([]);
+  // 城市的值
+  const [selectCityTree, setSelectCityTree] = useState([]);
+
+  // {
+  //   title: 'Node1',
+  //   value: '0-0',
+  //   key: '0-0',
+  //   children: [
+  //     {
+  //       title: 'Child Node1',
+  //       value: '0-0-0',
+  //       key: '0-0-0',
+  //     },
+  //   ],
+  // },
+  // {
+  //   title: 'Node2',
+  //   value: '0-1',
+  //   key: '0-1',
+  //   children: [
+  //     {
+
+  const getTree = data => {
+    return data?.map(x => {
+      if (x?.children?.length > 0) {
+        return {
+          title: x.name,
+          value: x.id,
+          key: x.id,
+          parentid:x.parentid,
+          selectable:false,
+          disableCheckbox:true,
+          children: getTree(x?.children),
+        };
+      } else {
+        return {
+          title: x.name,
+          value: x.id,
+          key: x.id,
+          parentid:x.parentid
+        };
+      }
+    });
+  };
+  const getAllCityList = e => {
+    request({
+      url: '/api/admin/taUser/city/tree',
+      method: 'GET',
+      //   params: { leveltype: 2, pageNum: 1, pageSize: 999 },
+      // action: 'select',
+    }).then(data => {
+      // console.log(getTree(data.tdCityList), 'data.tdCityList');
+      setTree(getTree(data.tdCityList));
+    });
+    // GET /api/admin/city/list
+    // request({
+    //   url: '/api/center/tdCity',
+    //   method: 'GET',
+    // //   params: { leveltype: 2, pageNum: 1, pageSize: 999 },
+    //   action: 'select',
+    // }).then(data => {
+    // //   setData(data);
+    // });
+  };
+
+  const getCityList = e => {
+    request({
+      url: '/api/admin/tdCityList/tdCity',
+      method: 'GET',
+      params: { leveltype: 2, pageNum: 1, pageSize: 999 },
+      action: 'select',
+    }).then(data => {
+      setSelectCityTree(
+        data.map(x => x.id),
+      );
+    });
+  };
+
+  const onSelect = (selectedKeys, info) => {
+    console.log('selected', selectedKeys, info);
+  };
+  // 选择城市
+  const onCheck = (checkedKeys, info) => {
+    setSelectCityTree(checkedKeys);
+    console.log('onCheck', checkedKeys, info);
+  };
+
+  // 选择城市
+  const onChange = (checkedKeys, label, extra) => {
+    const info = parentTree(tree,extra.triggerValue)
+    if (checkedKeys?.length > selectCityTree.length) {
+
+      
+
+      // console.log(parentTree(tree,extra.triggerValue))
+      // 新增
+      request({
+        url: '/api/admin/city/add',
+        method: 'POST',
+        data: { 
+          cityId:info.value,
+          name:info.title,
+          parentid:info.parentid,
+         },
+        // action: 'select',
+      }).then(data => {
+        // console.log(getTree(data.tdCityList), 'data.tdCityList');
+        // setTree(getTree(data.tdCityList));
+      });
+    }else{
+      request({
+        url: `/api/admin/org/city/${extra.triggerValue}`,
+        method: 'DELETE',
+        
+        // action: 'select',
+      }).then(data => {
+        // console.log(getTree(data.tdCityList), 'data.tdCityList');
+        // setTree(getTree(data.tdCityList));
+      });
+    }
+    setSelectCityTree(checkedKeys)
+    console.log('onCheck', checkedKeys, label, extra);
+  };
+ 
+  const tProps = {
+    treeData: tree,
+    value: selectCityTree,
+    // onSelect:onChange,
+    onChange: onChange,
+    treeCheckable: true,
+    // multiple:true,
+    showCheckedStrategy: SHOW_CHILD,
+    searchPlaceholder: '请选择',
+    // labelInValue: true,
+    style: {
+      width: '100%',
+    },
+  };
+
+  useEffect(() => {
+    getAllCityList();
+    getCityList();
+  }, []);
+
+  return (
+    <Card>
+      <div style={{ display: 'flex' }}>
+        <TreeSelect {...tProps} />
+      </div>
+
+      {/* <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.name}</span>}
+                  key={itemCity.id}
+                />
+              ))}
+            </TreeNode>
+          ))}
+        </TreeNode>
+      </Tree> */}
+    </Card>
+  );
+};
+export default CitySelect;

src/services/apis.js

@@ -219,7 +219,13 @@ export default {
         action: 'admin.building.channel.post',
       }
 
+    },
+    logs:{
+      url: `${prefix}/building/logs`,
+        method: 'GET',
+        action: 'admin.building.logs.get',
     }
+
   },
   buildingType: {
     getList: {