git

src/pages/staff/Organization/form.jsx

@@ -180,9 +180,9 @@ const TreedataFrom = React.forwardRef((props, ref) => {
         <Button type="primary" htmlType="submit" style={{ marginLeft: '80px', marginTop: '30px' }}>
           修改
         </Button>
-        <Button type="danger">
+        {/* <Button type="danger">
           删除
-        </Button>
+        </Button> */}
       </FormItem>
     </Form>
   )

src/pages/staff/Organization/index.jsx

@@ -1,61 +1,23 @@
 
 import { Row, Col, Card, Tree, Form, TreeSelect, Input, InputNumber, Modal, Button, message } from 'antd'
+import React, { useState, useEffect } from 'react';
+import request from '@/utils/request';
+import apis from '@/services/apis';
 import moment from 'moment';
-// import React, { useEffect, useState, useCallback,useRef } from 'react';
 import TreedataFrom from './form';
-
 const { TreeNode, DirectoryTree } = Tree;
 const FormItem = Form.Item;
-
-//-----------------------------------
-const onAdd = (key) => {
-  if (expandedKeys.indexOf(key) === -1) {
-    expandedKeyArr.push(key);
-  }
-  expandedKeys(expandedKeyArr.slice());
-  addNode(key, treeData);//添加节点 树形
-  setData(treeData.slice());//添加子项
-};
-//-----------------------------------
-const confirm = data => {
-  // {...data,isPublish}
-  if (data.key !== 0) {
-    Modal.confirm({
-      title: '确认删除吗？',
-      okText: '确认',
-      cancelText: '取消',
-      onOk() {
-        message.error('失败');
-
-      },
-    });
-  } else {
-    message.error('error')
-  }
-}
-
-
-// function uuid() {
-//   var s = [];
-//   var hexDigits = "0123456789";
-//   for (var i = 0; i < 18; i++) {
-//       s[i] = hexDigits.substr(Math.floor(Math.random() * 1*10), 1);
-//   }
-
-//   var uuid = s.join("");
-//   return uuid;
-// }
-// import moment from 'moment';
-
+const { Search } = Input;
 
 const treeData =
   [
     {
-      title: '分厂厂长管理',
-      key: '0',
+      title: 'institutionId',
+      name: 'institutionName',
+      key: '0-0-0',
       selectable: false,
       children: [
-        { title: '郎岩', phone: '15920583224', remark: "", day: "1992-11-13", cardId: '511502199103223189', sex: 1, id: '0212', belon: 1, homeaddres: 1, key: '0-0-0-1' },//这个不行么 你写错了 你那是v4的写法在哪？刚刚那个啊。对
+        { name: 'institutionName', phone: '13184013427', remark: "", day: "1991-11-22", cardId: '210203197503102721', sex: 2, id: '4242', belon: 2, homeaddres: 2, key: '0-0-0-1', },
         { title: '柯琼彦', phone: '13184013427', remark: "", day: "1991-11-22", cardId: '210203197503102721', sex: 2, id: '4242', belon: 2, homeaddres: 2, key: '0-0-0-2', },
       ],
     },
@@ -74,22 +36,23 @@ const treeData =
 
 
 
-// const item = this.info.node.key 不是！！！！
+// const item = this.info.node.key 
 
 class TreeDemo extends React.Component {
   formRef = React.createRef();
 
-
   constructor(props) {
     super(props)
     this.state = {
       expandedKeys: ['0-0-0', '0-0-1'],
       autoExpandParent: false,
       checkedKeys: ['0-0-0'],
+      searchValue: '',
       selectedKeys: [],
       // treeTitle: [info.node.props],
       checked: true,
-      treeData: treeData
+      treeData: [],
+      testarr: []
     };
   }
 
@@ -112,14 +75,12 @@ class TreeDemo extends React.Component {
     console.log(valeu);
   };
 
-
+  //修改
   onChangethis = (value) => {
 
     const treeData = this.state.treeData
-
     let Data1 = this.state.treeData
     for (var i = 0; i < treeData.length; i++) {
-
       for (var j = 0; j < treeData[i].children.length; j++) {
         // console.log(Data1[i].children[j].key);
         // console.log("---------")
@@ -133,8 +94,13 @@ class TreeDemo extends React.Component {
           break
         }
       }
-
     }
+    this.setState({
+      treeData1: Data1
+    }, () => {
+      message.success('修改成功！')
+    })
+
   }
   //删除
   onDelect = (value) => {
@@ -173,8 +139,7 @@ class TreeDemo extends React.Component {
         key: info.node.props.eventKey,//event
         day: moment(info.node.props.day)
       })
-
-      console.log(values, info)
+      console.log(this.getTreeData)
 
       // moment(info.node.props.day).format('YYYY-MM-DD')
     })
@@ -182,6 +147,77 @@ class TreeDemo extends React.Component {
 
 
 
+  // getTreeData = (e) => {
+  //   request({
+  //     url: "http://localhost:8000/api/admin/institution/list",
+  //     method: 'GET',
+
+  //     // params: {leveltype: 3, cityId},
+  //     action: "admin.institution.get",
+  //   }).then((treeData) => {
+  //     setData(treeData)
+  //     console.log(this.getTreeData)
+  //   })
+  // }
+
+
+
+
+
+
+  async institutionTree(params) {
+    let arr = []
+
+    return request('/api/admin/institution/list', {
+      method: 'GET',
+      data: params,
+    }).then((testarr2) => {
+      this.setState({ testarr: testarr2 }, () => {
+        console.log("testarr2")
+        console.log(this.state.testarr)
+        // title: 'institutionId',
+        // name: 'institutionName',
+        // key: '0-0-0',
+        const arr2 = this.state.testarr
+        for (var i = 0; i < this.state.testarr.length; i++) {
+          let list = {
+            title: 'institutionId',
+            name: 'institutionName',
+            key: '0-0-0'
+          }
+          list.title = arr2[i].institutionName
+          list.key = '0' + i.toString
+          arr.push(list)
+
+        }
+
+        this.setState({
+          treeData: arr
+        })
+
+      })
+      // console.log(this.getTreeData)
+    })
+  }
+
+  componentDidMount() {
+    // fetch(`http://localhost:8000/api/admin/institution/list`, {
+    //   headers: {
+    //     Authorization: "Bearer eyJhbGciOiJIUzI1NiJ9.eyJ1c2VySWQiOiIxIiwib3JnSWQiOiIxIiwiZXhwIjoxNjI3MDQ1MjQxfQ.7FhVDoI0dEECZinRUzMzcLl-kcobkamZSqoUzTxBTRo"
+    //   }
+    // }).then((res) => {
+    //   console.log(res)
+    // }),
+    // this.institutionTree()
+    this.institutionTree([])
+
+  }
+
+
+
+
+
+
 
   renderTreeNodes = data =>
     data.map(item => {
@@ -194,11 +230,29 @@ class TreeDemo extends React.Component {
       }
       return <TreeNode key={item.key} {...item} />;
     });
+  //搜索框 
+  // onChange = e => {
+  //   const { value } = e.target;
+  //   const expandedKeys = treeData
+  //     .map(item => {
+  //       if (item.title.indexOf(value) > -1) {
+  //         return getParentKey(item.key, gData);
+  //       }
+  //       return null;
+  //     })
+  //     .filter((item, i, self) => item && self.indexOf(item) === i);
+  //   this.setState({
+  //     expandedKeys,
+  //     searchValue: value,
+  //     autoExpandParent: true,
+  //   });
+  // };
 
 
 
-  render() {
 
+  render() {
+    const { searchValue } = this.state;
     return (
       <Card>
         <Row >
@@ -207,22 +261,18 @@ class TreeDemo extends React.Component {
               <FormItem
                 label="管辖部门"
               >
-                <Button type="primary" onClick={onAdd} >
-                  增加
-                </Button>
-
+                {/* <Search style={{ marginBottom: 8 }} placeholder="Search" onChange={this.onChange} /> */}
                 <Tree
-
+                  // api={apis.Institution.instIist}
                   showLine
-                  // switcherIcon={<DownOutlined />}
-                  defaultExpandedKeys={['0-0-0']}
+                  defaultExpandedKeys={['0-0']}
                   onSelect={this.onSelect}
                   treeData={this.state.treeData}
+                // api={apis.Institution.instIist} 
                 >
                   {this.renderTreeNodes(this.state.treeData)}
                   {/* 动态渲染 */}
                 </Tree >
-                {/* 不加入生命周期不会有更改a */}
               </FormItem>
             </Card>
           </Col>
@@ -233,6 +283,8 @@ class TreeDemo extends React.Component {
                 triggerRef={this.bindRef}
                 onChangethis={this.onChangethis}
                 onSubmit={this.onChangethis}
+
+
               />
             </Card>
           </Col>

src/services/apis.js

@@ -196,7 +196,7 @@ export default {
       method: 'GET',
       action: 'admin.building.marketing,get',
     },
- 
+
     // GET /api/admin/trend/{id}
   },
   buildingType: {
@@ -1076,6 +1076,34 @@ export default {
       action: 'admin.channel.introductionList.personNumListExport.get',
     },
   },
+  //组织架构
+  Institution: {
+    instIist: {
+      url: `${prefix}/institution/list`,
+      method: 'GET',
+      action: 'admin.institution.get'
+    },
+    instSave: {
+      url: `${prefix}/institution/save`,
+      method: 'POST',
+      action: 'admin.institution.post'
+    },
+    instiDelete: {
+      url: `${prefix}/institution/:id`,
+      method: 'DELETE',
+      action: 'admin.institution.id.delete',
+    },
+    instiSearch: {
+      url: `${prefix}/institution/:id`,
+      method: 'GET',
+      action: 'admin.institution.id.get',
+    },
+    instiAlert: {
+      url: `${prefix}/institution/:id`,
+      method: 'PUT',
+      action: 'admin.institution.id.put',
+    }
+  },
   role: {
     getRoleList: {
       url: `${prefix}/taRole`,