caipin 5 年之前
父節點
當前提交
55b4bd2b77

+ 1 - 20
src/common/dataTable/index.js

@@ -83,21 +83,6 @@ class dataTable extends PureComponent {
         // console.log(value);
     }
     handleColumnVisible(index,visible){
-        //console.log(index);
-        // let visible=localStorage.getItem('contact_client_Column_'+index);
-        //console.log(visible);
-        
-        // let column=dt.columns(index);
-        // console.log(column.visible());
-        // //console.log(!column.visible());
-        // column.visible(false);
-
-
-        // setTimeout(() => {
-        //     console.log('dd');
-        //     column.visible(1);
-        //   }, 350);
-
         let column=dt.columns(index);
         //column.visible(visible);
         //let visible=1;
@@ -110,8 +95,6 @@ class dataTable extends PureComponent {
         }else{
             column.visible(0);
         }
-        
-        //column.visible(visible);
     }
 
 }
@@ -123,9 +106,7 @@ const mapStateToProps = (state) => {
 
 const mapDispathToProps = (dispatch) => {
     return {
-        ddd(){
-
-        }
+        
     }
 }
 

+ 9 - 257
src/common/popups/index.js

@@ -4,13 +4,16 @@ import { connect } from 'react-redux';
 
 // import { actionCreators } from './store';
 
+import Client from './client';
+
+
 class popups extends PureComponent {
 
 
   render() {
     return (
 
-      <div className="modal fade" id="detail"  role="dialog" aria-hidden="true" data-backdrop="static">
+      <div className="modal fade" id="detail" role="dialog" aria-hidden="true" data-backdrop="static">
         <div className="modal-dialog modal-xl">
           <div className="modal-content">
             <div className="dialog-sheet">
@@ -25,6 +28,7 @@ class popups extends PureComponent {
 
 
 
+                  {this.props.mainView === 'client' && <Client />}
 
 
 
@@ -34,262 +38,7 @@ class popups extends PureComponent {
 
 
 
-                  <div className="save-tips">
-                    <div className="alert bg-warning-700 text-white p-2 m-1" role="alert">
-                      <div className="d-flex align-items-center">
-                        <div className="alert-icon">
-                          <i className="fal fa-info-circle"></i>
-                        </div>
-                        <div className="flex-1">
-                          <span className="h5">内容已经修改</span>
-                        </div>
-                        <a href="#" className="btn btn-sm text-white width-8">取消</a>
-                        <a href="#" className="btn btn-light btn-sm width-8">保存</a>
-                      </div>
-                    </div>
-                  </div>
-                  <div className="sheet-panel-header d-flex justify-content-between mx-4">
-                    <div>
-                      <a href="#" data-toggle="tooltip" data-placement="top" title="" data-original-title="上一条记录" className="mr-2 disabled"><i className="far fa-chevron-up"></i></a>
-                      <a href="#" data-toggle="tooltip" data-placement="top" title="" data-original-title="下一条记录" className="mr-2"><i className="far fa-chevron-down"></i></a>
-                      <a href="#" data-toggle="tooltip" data-placement="top" title="" data-original-title="新页面打开"><i className="fal fa-external-link"></i></a>
-                    </div>
-                    <div>
-                    </div>
-                  </div>
-                  <div className="sheet-panel-content">
-                    <div className="sheet-panel-form slimScroll1 mx-4">
-                      <div className="form-header mt-3">
-                        <div className="d-flex justify-content-between"><span className="text-muted">联系人</span><span className="text-muted">陈特 创建于 2019年5月6日 14:55</span></div>
-                        <legend>张三</legend>
-                      </div>
-                      <div className="cldform clearfix">
-                        <div className="cldform-line"></div>
-                        <div className="cldform-item">
-                          <div className="cldform-label">姓名</div>
-                          <div className="cldform-control">
-                            <div className="cldform-contarl-box cldform-contarl-textareabox"><span>张三</span></div>
-                          </div>
-                        </div>
-                        <div className="cldform-line"></div>
-                        <div className="cldform-item">
-                          <div className="cldform-label">姓名</div>
-                          <div className="cldform-control">
-                            {/* <textarea className="cldform-contarl-textarea" style="height:36px;width:100%">张三</textarea> */}
-                          </div>
-                        </div>
-                        <div className="cldform-line"></div>
-                        <div className="cldform-item cldform-item-wauto">
-                          <div className="cldform-label">联系人地区</div>
-                          <div className="cldform-control">
-                            <div className="cldform-contarl-box cldform-contarl-textareabox" data-toggle="dropdown"><span className="cldform-contarl-dropdown">广东省 / 珠海市 / 香洲区<i className="far fa-map-marker-alt mt-1"></i></span></div>
-                            <div className="dropdown-menu" >
-                              <ul className="nav nav-tabs nav-tabs-clean justify-content-center" role="tablist">
-                                <li className="nav-item"><a className="nav-link text-center active" data-toggle="tab" href="#tab-province2" role="tab" aria-selected="true">省份</a></li>
-                                <li className="nav-item"><a className="nav-link" data-toggle="tab" href="#tab-city2" role="tab" aria-selected="false">市区</a></li>
-                                <li className="nav-item"><a className="nav-link" data-toggle="tab" href="#tab-area2" role="tab" aria-selected="false">县区</a></li>
-                              </ul>
-                              <div className="tab-content p-3">
-                                <div className="tab-pane city-item fade active show" id="tab-province2" role="tabpanel" aria-labelledby="tab-province">
-
-                                  <button type="button" className="btn btn-xs btn-outline-default">北京市</button><button type="button" className="btn btn-xs btn-outline-default">天津市</button><button type="button" className="btn btn-xs btn-outline-default">河北省</button>
-                                  <button
-                                    type="button" className="btn btn-xs btn-outline-default">山西省</button><button type="button" className="btn btn-xs btn-outline-default">内蒙古自治区</button>
-
-                                  <button type="button" className="btn btn-xs btn-outline-default">黑龙江省</button><button type="button" className="btn btn-xs btn-outline-default">吉林省</button><button type="button" className="btn btn-xs btn-outline-default">辽宁省</button>
-
-                                  <button type="button" className="btn btn-xs btn-outline-default">山东省</button><button type="button" className="btn btn-xs btn-outline-default">江苏省</button><button type="button" className="btn btn-xs btn-outline-default">安徽省</button>
-                                  <button
-                                    type="button" className="btn btn-xs btn-outline-default">上海市</button><button type="button" className="btn btn-xs btn-outline-default">浙江省</button><button type="button" className="btn btn-xs btn-outline-default">江西省</button><button type="button" className="btn btn-xs btn-outline-default">福建省</button>
-
-                                  <button type="button" className="btn btn-xs btn-outline-default">河南省</button><button type="button" className="btn btn-xs btn-outline-default">湖北省</button><button type="button" className="btn btn-xs btn-outline-default">湖南省</button>
-
-                                  <button type="button" className="btn btn-xs btn-primary">广东省</button><button type="button" className="btn btn-xs btn-outline-default">广西壮族自治区</button><button type="button" className="btn btn-xs btn-outline-default">海南省</button>
-                                  <button type="button" className="btn btn-xs btn-outline-default">四川省</button><button type="button" className="btn btn-xs btn-outline-default">贵州省</button><button type="button" className="btn btn-xs btn-outline-default">云南省</button>
-                                  <button
-                                    type="button" className="btn btn-xs btn-outline-default">重庆市</button><button type="button" className="btn btn-xs btn-outline-default">西藏自治区</button>
-
-                                  <button type="button" className="btn btn-xs btn-outline-default">陕西省</button><button type="button" className="btn btn-xs btn-outline-default">甘肃省</button><button type="button" className="btn btn-xs btn-outline-default">宁夏回族自治区</button>
-                                  <button
-                                    type="button" className="btn btn-xs btn-outline-default">青海省</button><button type="button" className="btn btn-xs btn-outline-default">新疆维吾尔自治区</button>
-
-                                  <button
-                                    type="button" className="btn btn-xs btn-outline-default">台湾省</button>
-                                  <button
-                                    type="button" className="btn btn-xs btn-outline-default">香港特别行政区</button><button type="button" className="btn btn-xs btn-outline-default">澳门特别行政区</button>
-                                </div>
-                                <div className="tab-pane city-item fade" id="tab-city2" role="tabpanel" aria-labelledby="tab-city"><button type="button" className="btn btn-xs btn-outline-default">广州市</button><button type="button" className="btn btn-xs btn-outline-default">深圳市</button><button type="button" className="btn btn-xs btn-primary">珠海市</button><button type="button"
-                                  className="btn btn-xs btn-outline-default">汕头市</button><button type="button" className="btn btn-xs btn-outline-default">佛山市</button><button type="button" className="btn btn-xs btn-outline-default">韶关市</button><button type="button" className="btn btn-xs btn-outline-default">湛江市</button>
-                                  <button
-                                    type="button" className="btn btn-xs btn-outline-default">肇庆市</button><button type="button" className="btn btn-xs btn-outline-default">江门市</button><button type="button" className="btn btn-xs btn-outline-default">茂名市</button><button type="button" className="btn btn-xs btn-outline-default">惠州市</button>
-                                  <button
-                                    type="button" className="btn btn-xs btn-outline-default">梅州市</button><button type="button" className="btn btn-xs btn-outline-default">汕尾市</button><button type="button" className="btn btn-xs btn-outline-default">河源市</button><button type="button" className="btn btn-xs btn-outline-default">阳江市</button>
-                                  <button
-                                    type="button" className="btn btn-xs btn-outline-default">清远市</button><button type="button" className="btn btn-xs btn-outline-default">东莞市</button><button type="button" className="btn btn-xs btn-outline-default">中山市</button><button type="button" className="btn btn-xs btn-outline-default">潮州市</button>
-                                  <button
-                                    type="button" className="btn btn-xs btn-outline-default">揭阳市</button><button type="button" className="btn btn-xs btn-outline-default">云浮市</button></div>
-                                <div className="tab-pane city-item fade" id="tab-area2" role="tabpanel" aria-labelledby="tab-area"><button type="button" className="btn btn-xs btn-primary">香洲区</button><button type="button" className="btn btn-xs btn-outline-default">金湾区</button><button type="button" className="btn btn-xs btn-outline-default">斗门区</button></div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                        <div className="cldform-line"></div>
-                        <div className="cldform-item">
-                          <div className="cldform-label">客户名称</div>
-                          <div className="cldform-control">
-                            <div className="cldform-contarl-box cldform-contarl-textareabox"><div className="card p-2 text-primary"><div className="d-flex justify-content-between"><a href="#com-detail" data-toggle="modal" data-target="#com-detail">珠海纵横创新软件有限公司1</a><span>
-                              <a href="#" className="btn btn-outline-danger btn-xs btn-icon mr-1" data-toggle="modal" data-target="#remover-com"><i className="far fa-unlink" data-toggle="tooltip" data-placement="left" data-original-title="移除客户"></i></a>
-                              <a href="#" className="btn btn-outline-primary btn-xs btn-icon" data-toggle="modal" data-target="#link-com"><i className="far fa-retweet" data-toggle="tooltip" data-placement="left" data-original-title="更换客户"></i></a></span></div></div></div>
-                          </div>
-                        </div>
-                        <div className="cldform-line"></div>
-                        <div className="cldform-item">
-                          <div className="cldform-label">客户名称</div>
-                          <div className="cldform-control">
-                            <div className="cldform-contarl-box cldform-contarl-textareabox"><span><a href="#link-com" data-toggle="modal" data-target="#link-com"><i className="far fa-link"></i> 关联客户</a></span></div>
-                          </div>
-                        </div>
-                        <div className="cldform-line"></div>
-                        <div className="cldform-item cldform-item-half pr-3">
-                          <div className="cldform-label">性别</div>
-                          <div className="cldform-control">
-                            <div className="cldform-contarl-box cldform-contarl-textareabox" data-toggle="dropdown"><span className="cldform-contarl-dropdown">男<i className="far fa-angle-down mt-1"></i></span></div>
-                            <div className="dropdown-menu" >
-                              <button className="dropdown-item">男</button>
-                              <button className="dropdown-item">女</button>
-                            </div>
-                          </div>
-                        </div>
-                        <div className="cldform-item cldform-item-half pl-3">
-                          <div className="cldform-label">昵称</div>
-                          <div className="cldform-control">
-                            <div className="cldform-contarl-box cldform-contarl-textareabox"><span>陈(特)工:</span></div>
-                          </div>
-                        </div>
-                        <div className="cldform-line"></div>
-                        <div className="cldform-item cldform-item-half pr-3">
-                          <div className="cldform-label">手机</div>
-                          <div className="cldform-control">
-                            <div className="cldform-contarl-box cldform-contarl-textareabox"><span>15800000001</span></div>
-                          </div>
-                        </div>
-                        <div className="cldform-item cldform-item-half pl-3">
-                          <div className="cldform-label">QQ</div>
-                          <div className="cldform-control">
-                            <div className="cldform-contarl-box cldform-contarl-textareabox"><span>1234567</span></div>
-                          </div>
-                        </div>
-                        <div className="cldform-line"></div>
-                        <div className="cldform-item cldform-item-half pr-3">
-                          <div className="cldform-label">电话</div>
-                          <div className="cldform-control">
-                            <div className="cldform-contarl-box cldform-contarl-textareabox"><span>0756-3850891</span></div>
-                          </div>
-                        </div>
-                        <div className="cldform-item cldform-item-half pl-3">
-                          <div className="cldform-label">邮箱</div>
-                          <div className="cldform-control">
-                            <div className="cldform-contarl-box cldform-contarl-textareabox"><span>914630468@qq.com</span></div>
-                          </div>
-                        </div>
-                        <div className="cldform-line"></div>
-                        <div className="cldform-item cldform-item-half pr-3">
-                          <div className="cldform-label">传真</div>
-                          <div className="cldform-control">
-                            <div className="cldform-contarl-box cldform-contarl-textareabox"><span>0756-3850891</span></div>
-                          </div>
-                        </div>
 
-                        <div className="cldform-line"></div>
-                        <div className="cldform-item cldform-item-half pr-3">
-                          <div className="cldform-label">部门</div>
-                          <div className="cldform-control">
-                            {/* <textarea class="cldform-contarl-textarea " data-toggle="dropdown" style="height:36px;width:100%" placeholder="输入新部门"></textarea> */}
-                            {/* <div class="dropdown-menu" style="width:320px">
-                              <div class="row m-3">
-                                <div class="custom-control custom-radio custom-control-inline col-4 mr-0 mb-1">
-                                  <input type="radio" class="custom-control-input" id="department1" name="departmentradio" />
-                                  <label class="custom-control-label" for="department1">部门1</label>
-                                </div>
-                                <div class="custom-control custom-radio custom-control-inline col-4 mr-0 mb-1">
-                                  <input type="radio" class="custom-control-input" id="department2" name="departmentradio" />
-                                  <label class="custom-control-label" for="department2">部门2</label>
-                                </div>
-                                <div class="custom-control custom-radio custom-control-inline col-4 mr-0 mb-1">
-                                  <input type="radio" class="custom-control-input" id="department3" name="departmentradio" />
-                                  <label class="custom-control-label" for="department3">部门3</label>
-                                </div>
-                              </div>
-                            </div> */}
-                          </div>
-                        </div>
-                        <div className="cldform-item cldform-item-half pl-3">
-                          <div className="cldform-label">职务</div>
-                          <div className="cldform-control">
-                            <div className="cldform-contarl-box cldform-contarl-textareabox"><span>科长</span></div>
-                          </div>
-                        </div>
-                        <div className="cldform-line"></div>
-                        <div className="cldform-item">
-                          <div className="cldform-label">办公室</div>
-                          <div className="cldform-control">
-                            <div className="cldform-contarl-box cldform-contarl-textareabox"><span>2楼</span></div>
-                          </div>
-                        </div>
-                        <div className="cldform-line"></div>
-                        <div className="cldform-item">
-                          <div className="cldform-label">联系人地址</div>
-                          <div className="cldform-control">
-                            <div className="cldform-contarl-box cldform-contarl-textareabox"><span>银桦路8号深发展大厦24D</span></div>
-                          </div>
-                        </div>
-
-                        <div className="cldform-line"></div>
-                        <div className="cldform-item">
-                          <div className="cldform-label">联系人乘车</div>
-                          <div className="cldform-control">
-                            <div className="cldform-contarl-box cldform-contarl-textareabox text-muted"><span>填写文本内容</span></div>
-                          </div>
-                        </div>
-                        <div className="cldform-line"></div>
-                        <div className="cldform-item">
-                          <div className="cldform-label">联系人地标</div>
-                          <div className="cldform-control">
-                            <div className="cldform-contarl-box cldform-contarl-textareabox text-muted"><span>填写文本内容</span></div>
-                          </div>
-                        </div>
-                        <div className="cldform-line"></div>
-                        <div className="cldform-item">
-                          <div className="cldform-label">联系人住宿</div>
-                          <div className="cldform-control">
-                            <div className="cldform-contarl-box cldform-contarl-textareabox text-muted"><span>填写文本内容</span></div>
-                          </div>
-                        </div>
-                        <div className="cldform-line"></div>
-                        <div className="cldform-item">
-                          <div className="cldform-label">备注</div>
-                          <div className="cldform-control">
-                            <div className="cldform-contarl-box cldform-contarl-textareabox text-muted"><span>填写文本内容</span></div>
-                          </div>
-                        </div>
-                        <div className="cldform-line"></div>
-                        <div className="cldform-item">
-                          <div className="cldform-label">个人标签</div>
-                          <div className="cldform-control">
-                            <div className="cldform-contarl-box cldform-contarl-textareabox cldform-contarl-blank"><span className="badge badge-pill tagcol-01">标签</span><span className="badge badge-pill tagcol-02">特别关注</span><a title="添加标签" className="badge badge-secondary tagcol-08" href="" data-toggle="dropdown"><i className="far fa-plus"></i></a><div className="dropdown-menu"></div></div></div>
-                        </div>
-                        <div className="cldform-line"></div>
-                        <div className="cldform-item">
-                          <div className="cldform-label">协作标签</div>
-                          <div className="cldform-control">
-                            <div className="cldform-contarl-box cldform-contarl-textareabox cldform-contarl-blank"><span className="badge tagcol-11">协作标签1</span><span className="badge tagcol-12">协作标签2</span><a title="添加标签" className="badge badge-secondary tagcol-08" href="" data-toggle="dropdown"><i className="far fa-plus"></i></a><div className="dropdown-menu">
-
-                            </div>
-                            </div></div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
 
 
 
@@ -305,7 +54,6 @@ class popups extends PureComponent {
 
 
 
-                  
                 </div>
                 {/* <div class="sheet-right-panel col p-0">
                   <div class="sheet-panel-tabs mx-4 mt-4">
@@ -508,6 +256,10 @@ class popups extends PureComponent {
     );
   }
 
+  componentDidMount() {
+    console.log('sdfsdf');
+  }
+
 }
 
 const mapStateToProps = (state) => {

+ 13 - 72
src/contact/client/index.js

@@ -10,7 +10,7 @@ import DataTable from '../../common/dataTable';
 
 // import '../style.css';
 // import { get } from 'immutable';
-import ClientPopups from '../../common/popups'
+import Popups from '../../common/popups';
 
 // const client =(props)=>{
 //     const { searchValue,columns,clientThead,handleInputSearchValue } = props;
@@ -53,7 +53,7 @@ class client extends PureComponent {
   }
 
   render() {
-    const { handleInputChange, columns, columnsData, handleSearch, handleColumnsShow, handleColumnBindEvent } = this.props;
+    const { handleInputChange, columns, columnsData, handleSearch, handleColumnsShow, handleColumnBindEvent,handleClientPopups } = this.props;
 
     return (
       <Fragment>
@@ -180,72 +180,11 @@ value={searchValue} onChange={handleInputSearchValue}
                 <div className="panel-container show ">
                   <div className="panel-content " >
                     {/* this.constructClientColumns()  this.constructClientThead()   */}
-                    <DataTable onRef={(ref) => dt = ref} url={`/contact/client`} columnBindEvent={handleColumnBindEvent} columnsData={columnsData} columns={columns.toJS()} />
-
-                    {/* <table id="dt-basic-example"  className="table table-bordered table-hover table-striped w-100">
-                      <thead>
-                        <tr>
-                          <th>联系人</th>
-                          <th>客户名称</th>
-                          <th>手机</th>
-                          <th>电话</th>
-                          <th>QQ</th>
-                          <th>部门</th>
-                          <th>职务</th>
-                          <th>办公室</th>
-                          <th>地区</th>
-                          <th>个人标签</th>
-                          <th>协作标签</th>
-                          <th>地址</th>
-                          <th>乘车</th>
-                          <th>地标</th>
-                          <th>住宿</th>
-                          <th>备注</th>
-                          <th>软件锁</th>
-                          <th>大司空</th>
-                          <th>养护云</th>
-                          <th>创建人</th>
-                        </tr>
-                      </thead>
-                      <tbody>
-
-                         {
-                           
-                          this.props.clientList.map((item) => {
-                            return (
-                              <tr key={item.get('id')} >
-                                <td><a href="#detail" data-toggle="modal" data-target="#detail">{item.get('clientname')}</a></td>
-                                <td><a href="#com-detail" data-toggle="modal" data-target="#com-detail">{item.get('companyname')}</a></td>
-                                <td>{item.get('telephone')}</td>
-                                <td>{item.get('phone')}</td>
-                                <td>{item.get('qq')}</td>
-                                <td>{item.get('department')}</td>
-                                <td>{item.get('position')}</td>
-                                <td>{item.get('office')}</td>
-                                <td>{item.get('local')}</td>
-                                <td>个人标签</td>
-                                <td><span className="badge tagcol-01">
-                                  <span className="d-inline-block text-truncate text-truncate-xs">这是一条标签名字很长很长的标签</span></span><span className="badge tagcol-02">
-                                    <span className="d-inline-block text-truncate text-truncate-xs">特别关注</span>
-                                  </span>
-                                  <a data="添加标签" className="badge badge-secondary tagcol-08" href="" data-toggle="dropdown"><i className="far fa-plus"></i></a>
-                                </td>
-                                <td>{item.get('address')}</td>
-                                <td>{item.get('ride')}</td>
-                                <td>{item.get('landmarks')}</td>
-                                <td>{item.get('stay')}</td>
-                                <td>{item.get('mark')}</td>
-                                <td><a href="#lock-detail" data-toggle="modal" data-target="#lock-detail">HNYH-0654</a></td>
-                                <td>大司空</td>
-                                <td>养护云</td>
-                                <td>创建人</td>
-                              </tr>
-                            )
-                          })
-                        } 
-                      </tbody>
+                    <DataTable onRef={(ref) => dt = ref} url={`/contact/client`}  columnsData={columnsData} columns={columns.toJS()}
+                    columnBindEvent={handleColumnBindEvent} columnPopups={handleClientPopups}
+                    />
 
-                    </table> */}
+                    
 
 
 
@@ -260,7 +199,7 @@ value={searchValue} onChange={handleInputSearchValue}
 
         </main>
 
-        <ClientPopups />
+        <Popups mainView={'client'}  />
       </Fragment>
     );
   }
@@ -335,17 +274,19 @@ const mapDispathToProps = (dispatch) => {
     //构建列的点击事件
     handleColumnBindEvent(res) {
       console.log(this);
-      for (var i = 0 ; i < res.data.length; i++) {
-        res.data[i].clientname = `<a onClick="abc()" href="#detail" data-toggle="modal" data-target="#detail">${res.data[i].clientname}</a>`;
+      for (var i = 0; i < res.data.length; i++) {
+        // res.data[i].clientname =(<a  href="#detail" data-toggle="modal" data-target="#detail">${res.data[i].clientname}</a>);
+        res.data[i].clientname = `<a href="#detail" data-toggle="modal" data-target="#detail">${res.data[i].clientname}</a>`;
       }
       return res;
     },
-    
+    handleClientPopups(){
+      console.log('ddd222');
+    },
     //要操作子组件-更新父组件的值,把父组件的方法传递过去
 
     //-----
   }
 }
 
-
 export default connect(mapStateToProps, mapDispathToProps)(client);

+ 1 - 1
src/contact/client/store/reducer.js

@@ -2,7 +2,7 @@ import * as constants from './constants';
 import { fromJS } from 'immutable';
 
 const defaultState = fromJS({
-	clientList: [],
+	clientID: '',
 	columns: [
 		{ data: "clientname" },
 		{ data: "companyname" },

+ 2 - 3
src/contact/contact.js

@@ -3,7 +3,7 @@ import { Provider,connect } from 'react-redux';
 import { BrowserRouter, Route,Link } from 'react-router-dom';
 //import store from './store';
 
-import {Client} from './indexComponents';
+import {Client,Company} from './indexComponents';
 import { actionCreators } from './common/store';
 
 
@@ -53,7 +53,7 @@ class contact extends Component {
           <div className="page-content-wrapper">
                
                 <Route path='/contact' exact component={Client} ></Route>
-                <Route path='/contact/company' exact render={()=><div>使用统计--------------------------------=================================-------------------</div>} ></Route>
+                <Route path='/contact/company' exact component={Company} ></Route>
                 {/* render={()=>{<div>使用统计--------------------------------=================================-------------------</div>}} */}
           </div>
             </BrowserRouter>
@@ -75,7 +75,6 @@ const mapStateToProps = (state) => {
 const mapDispathToProps = (dispatch) => {
   return {
     handleMenuActive(value) {
-     
       dispatch(actionCreators.menuActive(value));
     },
   }

+ 3 - 3
src/contact/indexComponents.js

@@ -1,3 +1,3 @@
-import  Client from './client';
-
-export { Client }
+import Client from './client';
+import Company from './company';
+export { Client, Company }

+ 2 - 0
src/contact/store/reducer.js

@@ -1,5 +1,6 @@
 import { combineReducers } from 'redux-immutable';
 import { reducer as clientReducer } from '../client/store';
+import { reducer as companyReducer } from '../company/store';
 import { reducer as commonContactReducer } from '../common/store';
 import { reducer as popupsReducer } from '../../common/popups/store';
 
@@ -8,6 +9,7 @@ import { reducer as popupsReducer } from '../../common/popups/store';
 const reducer = combineReducers({
     commonContact: commonContactReducer,
     client: clientReducer,
+    company: companyReducer,
     popups:popupsReducer,
 });