feat:处理学员的搜索

src/modules/college-manage/EmployeeManage.tsx

@@ -175,9 +175,12 @@ function EmployeeManage() {
         dataIndex: "depNameList",
         dataIndex: "depNameList",
         key: "depNameList",
         key: "depNameList",
         render: (val:string,record:RecordTypes) => {
         render: (val:string,record:RecordTypes) => {
+          if(!record.depNameList){
+            return <span></span>
+          }
           return record.depNameList.map((item,index)=>{
           return record.depNameList.map((item,index)=>{
             return <span>{item}{index<(record.depNameList.length -1)?'、':''}</span>;
             return <span>{item}{index<(record.depNameList.length -1)?'、':''}</span>;
-            })
+          })
           
           
         },
         },
       },
       },

src/modules/college-manage/components/DepartMentTabCon.jsx

@@ -112,7 +112,6 @@ function DepartMentTabCon(props) {
   function closeChooseMembersModal() {
   function closeChooseMembersModal() {
     setChooseMembersModalVisible(false);
     setChooseMembersModalVisible(false);
   }
   }
-
   function getUserList(record,treeType,current) {
   function getUserList(record,treeType,current) {
     const params = {
     const params = {
       ...query,
       ...query,
@@ -122,15 +121,17 @@ function DepartMentTabCon(props) {
       storeId: User.getStoreId(),
       storeId: User.getStoreId(),
       userId: User.getUserId(),
       userId: User.getUserId(),
     };
     };
-    if(record.id){
-      params.departmentId = record.id;
-    }else{
-      params.departmentId = null;
-    }
-    if(record.queryName){
-      params.queryName = record.queryName;
-    }else{
-      params.queryName = null;
+    if(record){
+      if(record.id){
+        params.departmentId = record.id;
+      }else{
+        params.departmentId = null;
+      }
+      if(record.queryName){
+        params.queryName = record.queryName;
+      }else{
+        params.queryName = null;
+      }  
     }
     }
     if (current) {
     if (current) {
       params.current = current;
       params.current = current;

src/modules/college-manage/components/LeftStructureTree.jsx

@@ -6,6 +6,7 @@ import User from '@/common/js/user'
 import StoreService from "@/domains/store-domain/storeService";
 import StoreService from "@/domains/store-domain/storeService";
 import { DepType }  from '@/domains/store-domain/constants';
 import { DepType }  from '@/domains/store-domain/constants';
 import Bus from '@/core/bus';
 import Bus from '@/core/bus';
+import WWOpenDataCom from '@/components/WWOpenDataCom';
 import "./LeftStructureTree.less";
 import "./LeftStructureTree.less";
 
 
 const { Search } = Input;
 const { Search } = Input;
@@ -491,7 +492,11 @@ function LeftStructureTree(props) {
                         : "78%",
                         : "78%",
                   }}
                   }}
                 >
                 >
-                  <span>{nodeData.name}</span>
+                  { props.treeType==='departMentTab'?
+                  <span><WWOpenDataCom type="departmentName" openid={nodeData.name}/></span>
+                   :
+                    <span>{nodeData.name}</span>
+                  }
                 </div>
                 </div>
                 <div className="item-count">({nodeData.departmentCount || 0})</div>
                 <div className="item-count">({nodeData.departmentCount || 0})</div>
                 { (props.treeType==='postGrouptab' || props.treeType=== 'customGroupTab') && (
                 { (props.treeType==='postGrouptab' || props.treeType=== 'customGroupTab') && (

src/modules/college-manage/components/MemberTree.jsx

@@ -2,11 +2,11 @@ import React, { useEffect, useState } from "react";
 import { withRouter } from "react-router-dom";
 import { withRouter } from "react-router-dom";
 import { Tree} from "antd";
 import { Tree} from "antd";
 import StoreService from "@/domains/store-domain/storeService";
 import StoreService from "@/domains/store-domain/storeService";
-import User from '@/common/js/user'
+import User from '@/common/js/user';
+import WWOpenDataCom from '@/components/WWOpenDataCom';
 import "./MemberTree.less";
 import "./MemberTree.less";
 import _ from 'underscore';
 import _ from 'underscore';
 const { DirectoryTree } = Tree;
 const { DirectoryTree } = Tree;
-
 function MemberTree(props) {
 function MemberTree(props) {
   const [treeData,setTreeData]=useState([]);
   const [treeData,setTreeData]=useState([]);
   useEffect(()=>{
   useEffect(()=>{
@@ -76,12 +76,12 @@ function MemberTree(props) {
                 {nodeData.userId ?
                 {nodeData.userId ?
                   <div>
                   <div>
                     <span className="icon iconfont title-icon">&#xe603;</span>
                     <span className="icon iconfont title-icon">&#xe603;</span>
-                    <span>{nodeData.userName}</span>
+                    <span><WWOpenDataCom type="userName" openid={nodeData.userName}/></span>
                   </div>
                   </div>
                   :
                   :
                   <div>
                   <div>
                     <span className="icon iconfont title-icon">&#xe604;</span>
                     <span className="icon iconfont title-icon">&#xe604;</span>
-                    <span>{nodeData.name}</span>
+                    <span><WWOpenDataCom type="departmentName" openid={nodeData.name}/></span>
                   </div>
                   </div>
                 }
                 }
               </div>
               </div>

src/modules/college-manage/components/SearchUser.jsx

+import React, { useEffect, useState } from "react";
+import { withRouter } from "react-router-dom";
+import { Input} from "antd";
+import StoreService from "@/domains/store-domain/storeService";
+import User from '@/common/js/user';
+import WWOpenDataCom from '@/components/WWOpenDataCom';
+
+const { Search } = Input;
+function SearchUser(props) {
+  return (
+    <div className="search-user">
+        <Search 
+            placeholder='搜索成员'
+            className='search search-input'
+            enterButton={<span className="icon iconfont">&#xe832;</span>}
+        />
+        <div className="drop-down">
+            <div>
+                <div>
+                    员工
+                </div>
+                <div>
+                    <div>
+                      <div>佳欢</div>
+                      <div>小麦助教</div>
+                    </div>
+                    <div>
+                      <div>佳欢</div>
+                      <div>小麦助教</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+    </div>
+  );
+}
+
+export default withRouter(SearchUser);

src/modules/college-manage/modal/NewChooseMembersModal.jsx

@@ -15,6 +15,7 @@ import search from '../../lottie/search/data.json';
 import MemberTree from '../components/MemberTree'
 import MemberTree from '../components/MemberTree'
 import { DepType } from "@/domains/store-domain/constants";
 import { DepType } from "@/domains/store-domain/constants";
 import StoreService from "@/domains/store-domain/storeService";
 import StoreService from "@/domains/store-domain/storeService";
+import SearchUser from "../components/SearchUser"
 import './ChooseMembersModal.less';
 import './ChooseMembersModal.less';
 import _ from 'underscore';
 import _ from 'underscore';
 
 
@@ -296,7 +297,8 @@ class NewChooseMembersModal extends React.Component {
                   className='search search-input'
                   className='search search-input'
                   enterButton={<span className="icon iconfont">&#xe832;</span>}
                   enterButton={<span className="icon iconfont">&#xe832;</span>}
                 /> */}
                 /> */}
-                {this.Complete()}
+                {/* {this.Complete()} */}
+                <SearchUser/>
                 <div className='container-left-body-table'>
                 <div className='container-left-body-table'>
                    <MemberTree treeDepType={treeDepType} onSelect={(record)=>{this.treeSelect(record)}} selectUserList={selectUserList}/>
                    <MemberTree treeDepType={treeDepType} onSelect={(record)=>{this.treeSelect(record)}} selectUserList={selectUserList}/>
                 </div>
                 </div>