git push

config/routes.js

@@ -516,7 +516,7 @@ export default [
             component: '../layouts/BlankLayout',
             routes: [
               {
-                path: '/home/recommend/home',
+                path: '/home/recommend',
                 name: '找房需求',
                 component: './home/recommend/index',
               },

src/pages/building/Developers/Edit.jsx

@@ -1,12 +1,14 @@
 import React, { useState, useEffect } from 'react';
-import { Input, Button, Card, Form,  notification } from 'antd';
+import { Input, Button, Card, Form,  notification,message } from 'antd';
 import router from 'umi/router';
 // import Styles from './style.less';
 import ImageUploader from '../../../components/XForm/ImageUpload';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
+import { fetch } from '@/utils/request';
 
-const formItemLayout = {
+
+  const formItemLayout = {
     labelCol: {
       xs: { span: 24 },
       sm: { span: 8 },
@@ -31,35 +33,69 @@ const formItemLayout = {
 
 function Edit(props) {
   const { getFieldDecorator } = props.form;
+  const { form, history } = props;
+  const updateBrandData = fetch(apis.brand.alterBrand);
+  const saveBrandData=fetch(apis.brand.addBrand);
+  const goBack = () => router.goBack(-1);
+  const {validateFields}=form;
+
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   let data = {};
-  const { id } = props.location.query;
+  const { brandId } = props.location.query;
 
-  useEffect(() => {
-    if (id) {
-      getById(id);
+
+  useEffect(()=>{
+    if (brandId) {
+      getById({brandId})
     }
-  }, [id]);
+  },[brandId])
+
 
+//增+改
   function handleSubmit(e) {
     e.preventDefault();
-    props.form.validateFields((err, values) => {
-      if (!err) {
-        // 提交数据
-        submitData(values);
+    validateFields((err, values) => {
+      if (err) {
+        return;
+        //字符验证未填写---返回
+      }
+      if (brandId) {
+        updateBrandData({
+          data: {
+            ...values,
+          },
+          urlData: { id: brandId }
+        }).then(() => {
+          // setLoading(false);
+          message.success('数据更新成功');
+          goBack()
+        }).catch((err) => {
+          // setLoading(false);//loading消失
+          message.error(err.message || err);
+        })
+      } else {
+        saveBrandData({ data: values }).then(() => {
+          // setLoading(false);
+          message.success('数据保存成功');
+          goBack()
+        }).catch((err) => {
+          // setLoading(false);//loading消失
+          message.error(err.message || err);
+        })
       }
     });
-  }
 
+
+
+  }
   // 获取详情信息
-  function getById(currentId) {
-    request({ ...apis.buildingType.getById, urlData: { id: currentId } }).then(res => {
+  function getById(res) {
+    request({ ...apis.brand.getBrand, urlData: { id: res.brandId } }).then(res => {
       data = res;
       props.form.setFieldsValue(res);
     });
   }
-
   const openNotificationWithIcon = (type, message) => {
     notification[type]({
       message,
@@ -67,46 +103,41 @@ function Edit(props) {
     });
   };
 
-  function submitData(dataSources) {
-    if (id !== '') {
-      // 修改
-      updateType(dataSources);
-      return;
-    }
 
-    dataSources.status = 1;
-    dataSources.createDate = new Date();
-    request({ ...apis.buildingType.add, data: { ...dataSources } })
-      .then(() => {
-        // eslint-disable-next-line no-unused-expressions
-        openNotificationWithIcon('success', '操作成功');
-        router.go(-1);
-      })
-      .catch(err => {});
-  }
+//修改
+  // function submitData(dataSources) {
+  //   if (id !== '') {
+  //     // 修改
+  //     updateType(dataSources);
+  //     return;
+  //   }
+  //   dataSources.status = 1;
+  //   dataSources.createDate = new Date();
+  //   request({ ...apis.brand.alterBrand, data: { ...dataSources } })
+  //     .then(() => {
+  //       // eslint-disable-next-line no-unused-expressions
+  //       openNotificationWithIcon('success', '操作成功');
+  //       router.go(-1);
+  //     })
+  //     .catch(err => {});
+  // }
 
-  // 修改
-  function updateType(row) {
-    // const { url, method } = apis.buildingType.update
-    // const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(row.buildingTypeId)
-
-    // request({ url: tempUrl, method, data: { ...row } }).then(() => {
-    //   router.go(-1)
-    // })
-    request({ ...apis.buildingType.update, urlData: { id: row.buildingTypeId }, data: { ...row } })
-      .then(() => {
-        // eslint-disable-next-line no-unused-expressions
-        openNotificationWithIcon('success', '操作成功');
-        router.go(-1);
-      })
-      .catch(err => {});
-  }
+  //新增
+  // function updateType(row) {
+  //   request({ ...apis.brand.addBrand, urlData: { id: row.brandId }, data: { ...row } })
+  //     .then(() => {
+  //       // eslint-disable-next-line no-unused-expressions
+  //       openNotificationWithIcon('success', '操作成功');
+  //       router.go(-1);
+  //     })
+  //     .catch(err => {});
+  // }
 
   return (
     <Card>
       <Form {...formItemLayout} onSubmit={handleSubmit}>
       <Form.Item label="开发商名称">
-          {getFieldDecorator('name', {
+          {getFieldDecorator('brandName', {
             rules: [
               {
                 required: true,
@@ -116,17 +147,17 @@ function Edit(props) {
           })(<Input style={{width:200}}/>)}
         </Form.Item>
         <Form.Item label="开发商索引">
-          {getFieldDecorator('ind', {
+          {getFieldDecorator('indexLetter', {
             rules: [{ required: true, message: '请输入开发商索引' }],
           })(<Input style={{width:200}}/>)}
         </Form.Item>
         <Form.Item label="品牌宣传图">
-          {getFieldDecorator('img', {
+          {getFieldDecorator('brandImg', {
             rules: [{ required: true, message: '请上传品牌宣传图' }],
         })(<ImageUploader />)}
         </Form.Item>
         <Form.Item label="开发商简介">
-          {getFieldDecorator('buildingTypeName', {
+          {getFieldDecorator('brandRemark', {
             rules: [{ required: true, message: '请输入开发商简介' }],
           })(<Input.TextArea style={{width:400}} placeholder="120字内的简介"/>)}
         </Form.Item>

src/pages/building/Developers/index.jsx

@@ -1,40 +1,66 @@
-import React, { useMemo, useRef, useCallback, useState } from 'react'
-import {Button} from 'antd'
+import React, { useMemo, useRef, useCallback, useState, useEffect } from 'react'
+import {Button,message} from 'antd'
 import apis from '@/services/apis'
 import AuthButton from '@/components/AuthButton';
 import QueryTable from '@/components/QueryTable'
 import getTableColumns from './tableColumns'
 import { router } from 'umi';
+import { fetch} from '@/utils/request';
+import request from '@/utils/request'
 import getSearchFields from './searchFields'//searchbox
 
 export default (props) => {
   const ref = useRef()
   const [page, setPage] = useState({current: 1, pageSize: 10})
   const toEdit = useCallback((row) => {
-    //
     router.push({
       pathname: '/building/Developers/Edit',
       query: {
-        id: row?.id || undefined,
+        brandId: row?.brandId || undefined,
       },
-    });
+    });            
   }, [])
 
-  const onDelete = useCallback((row) => {}, [])//格式
-  const searchFields = useMemo(getSearchFields, [])//搜索框
+ 
+
+//编辑
+  // const onEdit =useCallback((row,brandId)=>{
+  //   request({
+  //     ...apis.brand.alterBrand,
+  //     urlData: { id: brandId },
+  //     data:{ ...row}
+  // }).then((data) => {
+  //     setNewsData(data)
+  // }).catch((err) => {
+  //   message.error(err.msg || err.message)
+  // })
+  // },[])
 
+//删除
+  const onDelete = useCallback((row,brandId) => {
+    request({ ...apis.brand.deleBrand, urlData: { id: brandId }, data: { ...row, } }).then((data) => {
+      ref.current.reload();//调用ref对象都有current对象
+      message.info('操作成功！')
+    }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
+  }, [])//格式
+  const searchFields = useMemo(getSearchFields, [])//搜索框
+    
   const tableColumns = useMemo(() => {
     return getTableColumns({
-      page,//可无
+      page,//
       onEdit:(e)=>toEdit(e),
       onDelete,
+      // onEdit,
     })
   }, [page])
 
   const actionRender = () => {
     return (
-      //name 名字错误
-      <AuthButton name="admin.tdBuildingType.add" noRight={null}>
+      //name
+      <AuthButton name="admin.brand.addBrand" noRight={null}>
         <Button type="primary" icon="plus" onClick={toEdit} >
           新增
         </Button>
@@ -45,9 +71,9 @@ export default (props) => {
   return (
     <>
       <QueryTable
-      //搜索组件
-        rowKey="buildingId"
-        api={apis.building.getList}
+        ref={ref}//绑定到table
+        rowKey="brandId"
+        api={apis.brand.list}
         columns={tableColumns}
         actionRender={actionRender}
         searchFields={searchFields}

src/pages/building/Developers/searchFields.js

@@ -2,7 +2,7 @@
 export default () => [
 
   {
-    name: 'name',
+    name: 'brandName',
     label: '开发商名称',
     placeholder: '请输入开发商名称',
   },

src/pages/building/Developers/tableColumns.js

@@ -1,53 +1,39 @@
 import { router } from 'umi'
-import { Button, Badge } from 'antd'
+import React, { useState, useEffect } from 'react';
+
+import { Button, Badge, message } from 'antd'
 import moment from 'moment'
 import OperButton from '@/components/OperButton'
 import AuthButton from '@/components/AuthButton'
 import withActions from '@/components/ActionList'
+import { getImgURL } from '@/utils/image';
+import request, { apis } from '@/utils/request'
 
-export default ({page, onEdit, onDelete}) => [
+export default ({page,getBrandData, onEdit, onDelete}) => [
   {
     title: '开发商索引字母',
-    key: '#',
+    dataIndex:'indexLetter',
+    key: 'indexLetter',
     align: 'center',
-    render: (t, r, index) => (page.current - 1) * page.pageSize + index + 1,//可无
   },
   {
     title: '开发商名称',
-    dataIndex: 'name',
-    key: 'name',
+    dataIndex: 'brandName',
+    key: 'brandName',
     align: 'center',
   },
   {
     title: '品牌宣传图',
-    dataIndex: 'image',
-    key: 'image',
+    dataIndex: 'brandImg',
+    key: 'brandImg',
     align: 'center',
-    render: (_, row) => {
-      if (row.image) {
-        return <img src={row.image} width={128} height={72} style={{borderRadius: '4px'}} alt="" />
-      }
-      return null
-    }
+    render:(_,record)=> <img src={getImgURL(record.brandImg)} style={{width:'165px',height:'104px'}}/>,
   },
   {
     title: '简介',
-    dataIndex: 'buildingName',
-    key: 'buildingName',
+    dataIndex: 'brandRemark',
+    key: 'brandRemark',
     align: 'center',
-    // render: (t, row) => (
-    //   <AuthButton name="admin.building.update" noRight={t}>
-    //     <Button
-    //       type="link"
-    //       onClick={() => router.push({
-    //         pathname: '/building/list/add',
-    //         query: {
-    //           id: row.buildingId,
-    //         },
-    //       })}
-    //     >{t}</Button>
-    //   </AuthButton>
-    // )
   },
   {
     title: '操作',
@@ -57,11 +43,11 @@ export default ({page, onEdit, onDelete}) => [
       <AuthButton name="admin.building.public" noRight={null}>
         <OperButton onClick={() => onEdit(row)}>编辑</OperButton>
       </AuthButton>,
-      <AuthButton name="admin.building.delete" noRight={null}>
+      <AuthButton name="admin.brabd.delete" noRight={null}>
         <OperButton.Confirm
           title="确认删除?"
           content="删除之后不可恢复"
-          onClick={() => onDelete(row)}
+          onClick={()=>onDelete(row,row.brandId)}
         >删除</OperButton.Confirm>
       </AuthButton>
     ], {noMargin: true})

src/pages/home/Recommend/index.jsx

@@ -14,22 +14,16 @@ import { fromPairs } from 'lodash';
 import { backgroundColor } from 'echarts/lib/theme/dark';
 
 
-// const a={
-//   /**
-//  *
-//  *
-//  * @param {*} props
-//  * @returns
-//  */
-
-// }
-// let(dataIndex){
-//   render(){
-//     return(
-//       <h1><input type="datetime-local" name="ckassname" id="" /></h1>
-//     )
-//   }
-// }
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+
+
+
 
 function Recommend() {
   const [exportLoding,setExportLoding] = useState(false)
@@ -70,6 +64,9 @@ function Recommend() {
 
     })
   }
+  function back(){
+    window.history.back(-1)
+  }
 
   function download(data) {
     if (!data) {
@@ -165,13 +162,7 @@ function Recommend() {
 
 
  const searchFields=[
-  // {
-  //   name:'builidingId',
-  //   label:'用户',
-  //   placeholder:'选择用户',
-  //   render:()=><BuildSelect style={{width:160}}/>
 
-  // },
   {
     name: 'project',
     label: '意向项目',
@@ -193,12 +184,11 @@ function Recommend() {
     label: '类型',
     placeholder: '类型',
     type: 'select',
-    placeholder:'全部',//错误
     options: [
-      {label: '全部'},
-      {label: '买房',value:1},
-      {label: '租房', value: 2},
-      {label: '海外', value: 3}
+      {label: '全部',value:''},
+      {label: '买房',value: '1'},
+      {label: '租房', value: '2'},
+      {label: '海外', value: '3'}
     ]
   },
   {
@@ -208,10 +198,10 @@ function Recommend() {
     type: 'select',
     placeholder:'全部',//错误
     options: [
-      {label: '全部'},
-      {label: '待回访', value: 0},
-      {label: '已回访', value: 1},
-      {label: '无效', value: 2}
+      {label: '全部',value:''},
+      {label: '待回访', value: '0'},
+      {label: '已回访', value: '1'},
+      {label: '无效', value: '2'}
     ]
   },
   ]
@@ -228,7 +218,7 @@ function Recommend() {
       <QueryTable
           rowKey="recommendCustomer"
           // recommendCustomer
-          api={apis.homeload.houseSchr}
+          api={apis.searchHouse.list}
           searchFields={searchFields}
           columns={columns}
           actionRender={actionRender}

src/pages/staff/Organization/index.jsx

@@ -1,144 +1,140 @@
-import React, { Component } from 'react';
-import { Card, Tree } from 'antd';
-const { DirectoryTree } = Tree;
-
-// function Organization(props) {
-  
-
-
-//   return (
-//     <>
-//      组织架构
-//     </>
-//   );
-// }
-
-
-// export default Organization
-
 
+import React, { Component,useState } from 'react';
+import { Card, Tree,Icon } from 'antd';
+import { render } from 'preact';
+import { turn } from 'cli-table';
+const { DirectoryTree,TreeNode } = Tree;
 const treeData = [
   {
-    title: '江苏XX软件集团',
-    key: '0-0',
-    children: [
-      {
-        title: '南京123电子科技有限公司',
-        key: '0-0-1',
-
-        // isLeaf: true,
-        children: [
-          {
-            title: '秦淮区分公司',
-            key: '0-0-1-0',
-            // isLeaf: true,
-            children: [
-              {
-                title: '制造一区',
-                key: '0-0-1-1',
-                isLeaf: true,
-              },
-              {
-                title: '总裁办公室',
-                key: '0-0-1-2',
-                isLeaf: true,
-              },
-              {
-                title: '工艺部',
-                key: '0-0-1-3',
-                isLeaf: true,
-              },
-              {
-                title: '技术部',
-                key: '0-0-1-4',
-                isLeaf: true,
-              },
-            ]
-          },
-        ]
-      },
-      {
-        title: '苏州￥￥科技股份有限公司',
-        key: '0-0-0',
-        isLeaf: true,
-      },
-      {
-        title: '宿迁ABC电商服务有限公司',
-        key: '0-0-0-1',
-        isLeaf: true,
-      },
-    ],
-  },
-  //---------------
-  {
-    title: '系统管理',
-    key: '0-2',
-    children: [
-      {
-        title: '机器设置',
-        key: '0-2-0',
-        isLeaf: true,
-      },
+    value:'江苏省公安厅',
+    defaultValue:'0',
+    parentKey:'0',
+    isEditable:false,
+    key:'0',
+    children:[
       {
-        title: '散热设置',
-        key: '0-2-1',
-        // isLeaf: true,
-        children:[
-          {
-            title:'一号风扇',
-            key:'0-2-1-0'
-          },
-          {
-            title:'二号风扇',
-            key:'0-2-1-1'
-          },
-        ]
+        value:'南京分局',
+        key:'0-1',
+        defaultValue: "0-1",
+        isEditable: false,
       },
       {
-        title: '广播设置',
-        key: '0-2-2',
-        isLeaf: true,
+        value:'苏州分局',
+        key:'0-2',
+        defaultValue: "0-2",
+        isEditable: false,
       },
     ],
   },
 ];
 
-const Demo = () => {
-  const onSelect = (keys, info) => {
-    console.log('Trigger Select', keys, info);
-  };
 
-  const onExpand = () => {
-    console.log('Trigger Expand');
+const expandedKeyArr=['0'];
+
+
+export default function TreeDemo() {
+  const[data,setData]=useState(treeData)//获取值，及时更新被修改的值。变量
+  const renderTreeNodes=(data)=>{
+    let nodeArr=data.map((item)=>{//遍历数据
+      item.title=(//修改
+        <div style={{display:'flex', minWidth: '100px'}}>
+          <span style={{ flex: 'auto' }}>{item.value}</span>
+          <span style={{ width: '6em', flex: 'none',marginLeft:'20px' }}>
+            {/* 编辑 */}
+            <Icon type="edit" onClick={()=>onDelete(item.key)} /> 
+            {/* 添加 */}
+            <Icon type="diff" onClick={()=>onAdd(item.key)} />
+            {/* 删除 */}
+            <Icon type="delete"  onClick={()=>onEdit(item.key)}/>
+          </span>
+        </div>
+      )
+      if(item.children){//如果有子项就返回下面组件
+        return(
+          <TreeNode title={item.title} key={item.key} dataRef={item}>
+            {renderTreeNodes(item.children)}
+            {/* 重新渲染节点 */}
+          </TreeNode>//title 接收的 ReactNode类型数据 自定义
+        )
+      }
+      //返回
+      return <TreeNode title={item.title} key={item.key} />
+    })
+      return nodeArr
+  };
+//添加
+  const onAdd=(key)=>{
+    // useState 里面数据是不能变的对象。需要slice返回一个新的数组
+    addNode(key.treeData);//添加节点 树形
+    setData(treeData.slice()) //设置 子项
+  }
+  //编辑
+  const onEdit=(key)=>{
+    editNode(key,treeData);
+    setData(treeData.slice());
   };
+  const editNode=(key,data)=>
+    data.forEach((item)=>{
+      if (item.key===key) {
+        item.isEditable=true;//可编辑状态更改
+      }else{
+        item.isEditable=false;
+      }
+      item.value=item.defaultValue;//当某子项处于编辑状态，改变数据，点击其他时候，此项变成不可编辑
+      if (item.children) {
+        editNode(key,item.children);
+      }
+    })  
 
+    //删除
+    const onDelete = (key) => {
+      deleteNode(key, treeData);
+      setData(treeData.slice());
+    };
+    const deleteNode = (key, data) =>
+      data.forEach((item, index) => {
+        if (item.key === key) {
+          data.splice(index, 1);//从某个位置开始删除元素
+          return;
+        } else {
+          if (item.children) {
+            deleteNode(key, item.children);
+          }
+        }
+      });
+
+  const addNode=(key,data)=>
+    data.forEach((item)=>{
+      if(item.key===key){//如果拿到的key相同则判断子项
+        if (item.children) {
+          item.children.push({
+            value:"请输入内容",
+            key:key+Math.random(100),//随机唯一的key
+          });
+        }
+        return;
+      }
+      if (item.children) {
+        addNode(key,item.children)//子项
+      }
+    })
   return (
-    <DirectoryTree
-      multiple
-      defaultExpandAll
-      onSelect={onSelect}
-      onExpand={onExpand}
-      treeData={treeData}
-    />
+    <div>
+      <Card style={{width:'90%'}}>
+        <Tree 
+        switcherIcon={<Icon type="down-square" theme="filled" />}
+        // icon={<Icon type="carry-out" />}
+        style={{paddingLeft:'60px'}} 
+        treeData={treeData}  >
+        {renderTreeNodes(data)}
+        </Tree>
+        {/* 渲染被更新 */}
+      </Card>
+    </div>
   );
-};
+}
+
+
+
 
 
-class Treetest extends Component {
-    // constructor(props) {
-    //     super(props);
-    //     //react定义数据
-    //     this.state = {
-    //     }
-    // }
-    render() {
-        return (
-          <div>
-            <Card style={{width:'60%'}}>
-              <DirectoryTree  treeData={treeData} />
-            </Card>
-          </div>
-        )
-    }
-}
-export default  Treetest;

src/services/apis.js

@@ -44,6 +44,42 @@ export default {
       logout: true,
       action: 'signout',
     },
+  },
+  //品牌开发商
+  brand:{
+    //查询
+    list:{
+      method:'GET',
+      url:`${prefix}/brand`,
+      action:'admin.brand.get'
+    },
+    //添加
+    addBrand:{
+      method:'POST',
+      url:`${prefix}/brand`,
+      action:'admin.brand.post'
+    },
+    //shanchu
+    deleBrand:{
+      method:'DELETE',
+      url:`${prefix}/brand/:id`,
+      action:'admin.brand.id.delete',
+    },
+    // 获取详情数据
+    getBrand:{
+      method:'GET',
+      url:`${prefix}/brand/:id`,
+      action:'admin.brand.id.get',
+    },
+    //修改
+    alterBrand:{
+      method:'PUT',
+      url:`${prefix}/brand/:id`,
+      action:'admin.brand.id.put'
+    }
+    
+    
+
   },
   building: {
     getList: {
@@ -208,15 +244,33 @@ export default {
       action: 'admin.taNewsType.get',
     }
   },
-  //预加 帮我找房
-  homeload: {
-    houseSchr:{
+  // 帮我找房
+  searchHouse: {
+    //查询
+    list:{
       method: 'GET',
-      url: `${prefix}/home/Recommend/searchHouse`,
-      action: 'admin.home.Recommend.searchHouse.get',
-      // action: 'admin.customer.recommend.recommender.get',
-
+      url: `${prefix}/searchHouse`,
+      action: 'admin.searchHouse.get',
+    },
+    //根据ID查询
+    IdHouse:{
+      method:'GET',
+      url:`${prefix}/searchHouse/:id`,
+      action:'admin.searchHouse.id.get',  
+    },
+    //修改
+    alterHouse:{
+      method:'PUT',
+      url:`${prefix}/searchHouse/:id`,
+      action:'admin.searchHouse.id.put',
+    },
+    //回访
+    savingHouse:{
+      method:'POST',
+      url:`${prefix}/searchHouse`,
+      action:''
     }
+
   },
 
   customer: {
@@ -311,12 +365,6 @@ export default {
       action: 'admin.customer.recommend.recommender.export.get',
     },
 
-    // //recommender
-    // homeRecommendrecommenderExport: { // 导出数据（home   推荐客户 预加）
-    //   method: 'GET',
-    //   url: `${prefix}/home/recommend/recommender/export`,
-    //   action: 'admin.home.recommend.recommender.export.get',
-    // },
     customerRecommendReportExport: { // 导出数据（报备客户）
       method: 'GET',
       url: `${prefix}/customer/recommend/report/export`,