1

src/contact/company/index.js

@@ -3,15 +3,22 @@ import { connect } from 'react-redux';
 import StaffHeader from '../../common/staffHeader';
 import { actionCreators } from './store';
 
-import { Table, Modal, Spin, Space, Tag } from 'antd';
+import { Table, Radio, Spin, Space, Tag } from 'antd';
 import 'antd/dist/antd.css';
 import Popups from '../../common/popups';
 
+const radioStyle = {
+  display: 'block',
+  height: '30px',
+  lineHeight: '30px',
+};
+
 let popupsObj = null;
 class company extends PureComponent {
 
   render() {
-    const { handleInputChange, columnsVisible, companyList, pagination, handleCompanyData, loading, columns, handleColumnsShow } = this.props;
+    const { columnsVisible, companyList, pagination, handleCompanyData, loading, columns, sortField, sort,
+      handleColumnsShow, handleInputChange, handleCompanySortField } = this.props;
 
     return (
       <Fragment>
@@ -93,40 +100,31 @@ value={searchValue} onChange={handleInputSearchValue}
                   <div className="col-auto pl-0">
                     <button className="btn btn-sm btn-default" data-toggle="dropdown"><i className="fal fa-sort-amount-down"></i> 排序</button>
                     <div className="dropdown-menu dropdown-menu-right" id="paixu">
-                      {/* <ul className="list-unstyled px-3 pt-2 mb-0">
-                        <li className="mb-2">
-                          <div className="custom-control custom-radio">
-                            <input type="radio" className="custom-control-input" id="pai1" name="paizhi" checked="" />
-                            <label className="custom-control-label" forHtml="pai1">添加时间</label>
-                          </div>
-                        </li>
-                        <li className="mb-2">
-                          <div className="custom-control custom-radio">
-                            <input type="radio" className="custom-control-input" id="pai2" name="paizhi" />
-                            <label className="custom-control-label" forHtml="pai2">编辑时间</label>
-                          </div>
-                        </li>
+                      <ul className="list-unstyled px-3 pt-2 mb-0">
                         <li className="mb-2">
-                          <div className="custom-control custom-radio">
-                            <input type="radio" className="custom-control-input" id="pai3" name="paizhi" />
-                            <label className="custom-control-label" forHtml="pai3">记录时间</label>
-                          </div>
+                        
+                          <Radio.Group onChange={(e) => handleCompanySortField(pagination.toJS(),this.props,e)} value={sortField}>
+                            <Radio style={radioStyle} value='CREATETIME'>
+                              添加时间
+                          </Radio>
+                            <Radio style={radioStyle} value='UPDATETIME'>
+                              编辑时间
+                          </Radio>
+                          </Radio.Group>
                         </li>
                       </ul>
                       <ul className="list-unstyled px-3 pt-2 mb-0 border-top">
                         <li className="mb-2">
-                          <div className="custom-control custom-radio">
-                            <input type="radio" className="custom-control-input" id="pdown" name="paixu" checked="" />
-                            <label className="custom-control-label" forHtml="pdown">降序</label>
-                          </div>
+                          <Radio.Group onChange={this.onChange} value={sort}>
+                            <Radio style={radioStyle} value='DESC'>
+                              递减
+                          </Radio>
+                            <Radio style={radioStyle} value='ASC'>
+                              递增
+                          </Radio>
+                          </Radio.Group>
                         </li>
-                        <li className="mb-2">
-                          <div className="custom-control custom-radio">
-                            <input type="radio" className="custom-control-input" id="pup" name="paixu" />
-                            <label className="custom-control-label" forHtml="pup">升序</label>
-                          </div>
-                        </li>
-                      </ul> */}
+                      </ul>
                     </div>
                   </div>
 
@@ -147,83 +145,6 @@ value={searchValue} onChange={handleInputSearchValue}
                       dataSource={companyList.toJS()}
                     />
 
-                    {/* <DataTable url={`/contact/client`} list={companyList} columnsData={columnsData} popups={handleCompanyPopups}  /> */}
-
-
-
-                    {/* this.constructClientColumns()  this.constructClientThead()   */}
-
-                    {/* <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>
-
-                         {
-                           
-                           companyList.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>
-
-                    </table> */}
-
-
-
-
-
-
-
                   </div>
                 </div>
               </div>
@@ -242,9 +163,9 @@ value={searchValue} onChange={handleInputSearchValue}
   }
 
   componentDidMount() {
-    const { handleCompanyData, handleColumnsAllShow, pagination, handleCompanyPopups } = this.props;
-    handleColumnsAllShow();
+    const { handleCompanyData, handleColumnsAllShow, pagination } = this.props;
     handleCompanyData(pagination.toJS(), {}, {}, this.props);
+    //handleColumnsAllShow();
   }
 
 }
@@ -254,14 +175,13 @@ value={searchValue} onChange={handleInputSearchValue}
 
 const mapStateToProps = (state) => {
   return {
-    companyData: state.getIn(['company', 'companyData']),
-
     columnsVisible: state.getIn(['company', 'columnsVisible']),
     companyList: state.getIn(['company', 'companyList']),
     pagination: state.getIn(['company', 'pagination']),
     loading: state.getIn(['company', 'loading']),
     columns: state.getIn(['company', 'columns']),
-
+    sortField: state.getIn(['company', 'sortField']),
+    sort: state.getIn(['company', 'sort']),
 
     companyDetail: state.getIn(['popups', 'companyDetail']),
 
@@ -271,21 +191,19 @@ const mapStateToProps = (state) => {
 const mapDispathToProps = (dispatch) => {
   return {
     //列隐藏显示
-    handleInputChange(e, index) {//---此方法可能废弃
-
-      //dt.handleColumnVisible(index, e.target.value);
-    },
     handleColumnsShow(index) {
       dispatch(actionCreators.toggleColumns(index));
     },
-    handleColumnsAllShow() {
-      dispatch(actionCreators.toggleColumnsAll());
-    },
     //获得客户数据
     handleCompanyData(pagination, filters, sorter, props) {
       dispatch(actionCreators.changeLoading());
       dispatch(actionCreators.getCompanyLIst(pagination, props));
-      //(list.size === 0) && dispatch(actionCreators.getCompanyLIst());
+    },
+    //排序设置
+    handleCompanySortField(pagination, props,e) {
+      dispatch(actionCreators.changeSortField(e.target.value));
+      props.sortField;
+      //dispatch(actionCreators.getCompanyLIst(pagination, props));
     },
     //弹出详情页点击触发
     handleCompanyPopups(key) {

src/contact/company/store/actionCreators.js

@@ -22,6 +22,14 @@ export const toggleColumnsAll = (dt) => {
 };
 
 //获得数据
+export const changeSortField = (sortField) => {
+    return (dispatch) => {
+        dispatch({
+            type: constants.CHANGE_COMPANY_SORTFIELD,
+            data: sortField,
+        });
+    }
+}
 export const changeLoading = () => {
     return (dispatch) => {
         dispatch({
@@ -30,25 +38,30 @@ export const changeLoading = () => {
         });
     }
 }
-export const getCompanyLIst = (pagination,props) => {
+export const getCompanyLIst = (pagination, props) => {
     return (dispatch) => {
+
+        // changeList(pagination,props,dispatch);
+
+        const { sortField, sort } = props;
+        console.log(props);
         axios.get(config.CLD2API + '/contact/company', {
             params: {
                 current: pagination.current,
                 pageSize: pagination.pageSize,
+                sortField: sortField,
+                sort: sort,
             },
         }).then((res) => {
             const data = res.data;
-
             if (data.code === 200) {
                 //let d2=JSON.parse(data.list);
-                //console.log(d2);
                 //dispatch(changeList(JSON.parse(d2)));
                 dispatch({
                     type: constants.CHANGE_COMPANY_DATA,
                     data: data,
-                    pagination:pagination,
-                    props:props
+                    pagination: pagination,
+                    props: props
                 });
             } else {
                 console.log(data);
@@ -57,36 +70,40 @@ export const getCompanyLIst = (pagination,props) => {
             console.log(e);
             console.log('error');
         })
+        
     }
 };
 
 
+// const changeList = (pagination,props,dispatch) => {
+//     const { sortField, sort } = props;
+//     axios.get(config.CLD2API + '/contact/company', {
+//         params: {
+//             current: pagination.current,
+//             pageSize: pagination.pageSize,
+//             sortField: sortField,
+//             sort: sort,
+//         },
+//     }).then((res) => {
+//         const data = res.data;
+//         if (data.code === 200) {
+//             dispatch({
+//                 type: constants.CHANGE_COMPANY_DATA,
+//                 data: data,
+//                 pagination: pagination,
+//                 props: props
+//             });
+//         } else {
+//             console.log(data);
+//         }
+//     }).catch((e) => {
+//         console.log(e);
+//         console.log('error');
+//     })
+// }
 
-//actionType
-// export const searchFocus = () => ({
-//     type: constants.SEARCH_FOCUS
-// });
-
-// export const getList = () => {
-//     return (dispatch) => {
-//         axios.get('/api/submenuList.json').then((res) => {
-//             const data = res.data;
-//             dispatch(changeList(data.data));
-//         }).catch(() => {
-//             console.log('error');
-//         })
-//     }
-// };
-
-// export const changeInputValue = (value) => (  {
-//     type: constants.CHANGE_INPUTVALUE,
-//     data:fromJS(value),
-// });
+   
 
-const changeList = (data) => ({
-    type: constants.CHANGE_COMPANY_DATA,
-    data: fromJS(data),
-});
 
 
 

src/contact/company/store/constants.js

@@ -1,5 +1,7 @@
 export const CHANGE_COMPANY_DATA = 'company/change_company_data';
 export const CHANGE_COMPANY_LOADING= 'company/change_company_loading';
+export const CHANGE_COMPANY_SORTFIELD= 'company/change_company_sortField';
+export const CHANGE_COMPANY_SORT= 'company/change_company_sort';
 
 export const TOGGLE_COLUMNS = 'company/toggle_columns';
 export const TOGGLE_COLUMNS_ALL = 'company/toggle_columns_all';

src/contact/company/store/reducer.js

@@ -10,82 +10,82 @@ const defaultState = fromJS({
 		showSizeChanger: false
 	},
 	loading: false,
+	sortField:'CREATETIME',
+	sort:'DESC',
 	columns: [
 		{
 			title: '客户名称',
-			dataIndex: 'clientname',
-			key: 'clientname',
-			visible: true
+			dataIndex: 'companyname',
+			key: 'companyname',
 		},
 		{
 			title: '地区',
-			dataIndex: 'companyname',
-			key: 'companyname',
+			dataIndex: 'local',
+			key: 'local',
 		},
 		{
 			title: '标签',
-			dataIndex: 'telephone',
-			key: 'telephone',
+			dataIndex: 'nature',
+			key: 'nature',
 		},
 		{
 			title: '单位性质',
-			dataIndex: 'telephone',
-			key: 'telephone',
+			dataIndex: 'nature',
+			key: 'nature',
 		},
 		{
 			title: '公司地址',
-			dataIndex: 'telephone',
-			key: 'telephone',
+			dataIndex: 'address',
+			key: 'address',
 		},
 		{
 			title: '公司传真',
-			dataIndex: 'telephone',
-			key: 'telephone',
+			dataIndex: 'fax',
+			key: 'fax',
 		},
 		{
 			title: '网址',
-			dataIndex: 'telephone',
-			key: 'telephone',
+			dataIndex: 'webservice',
+			key: 'webservice',
 		},
 		{
 			title: '乘车路线',
-			dataIndex: 'telephone',
-			key: 'telephone',
+			dataIndex: 'ride',
+			key: 'ride',
 		},
 		{
 			title: '地标建筑',
-			dataIndex: 'telephone',
-			key: 'telephone',
+			dataIndex: 'landmarks',
+			key: 'landmarks',
 		},
 		{
 			title: '参考住宿',
-			dataIndex: 'telephone',
-			key: 'telephone',
+			dataIndex: 'stay',
+			key: 'stay',
 		},
 		{
 			title: '备注',
-			dataIndex: 'telephone',
-			key: 'telephone',
+			dataIndex: 'remarks',
+			key: 'remarks',
 		},
 	],
+	columnsVisible: [
+		// { columnsName: '客户名称', columnsValue: true, dataKey: "companyname" },
+		{ columnsName: '地区', columnsValue: true, dataKey: "local" },
+		{ columnsName: '标签', columnsValue: true, dataKey: "nature" },
+		{ columnsName: '单位性质', columnsValue: true, dataKey: "nature" },
+		{ columnsName: '公司地址', columnsValue: true, dataKey: "address" },
+		{ columnsName: '公司传真', columnsValue: true, dataKey: "fax" },
+		{ columnsName: '网址', columnsValue: true, dataKey: "webservice" },
+		{ columnsName: '乘车路线', columnsValue: true, dataKey: "ride" },
+		{ columnsName: '地标建筑', columnsValue: true, dataKey: "landmarks" },
+		{ columnsName: '参考住宿', columnsValue: true, dataKey: "stay" },
+		{ columnsName: '备注', columnsValue: true, dataKey: "remarks" },
+	],
 	companyPopupsDetail: {
 		companyDetail: {},
 
 	},
-
-	columnsVisible: [
-		// { columnsName: '客户名称', columnsValue: true, dataKey: "clientname" },
-		{ columnsName: '地区', columnsValue: true, dataKey: "companyname" },
-		{ columnsName: '标签', columnsValue: true, dataKey: "telephone" },
-		{ columnsName: '单位性质', columnsValue: true, dataKey: "telephone" },
-		{ columnsName: '公司地址', columnsValue: true, dataKey: "telephone" },
-		{ columnsName: '公司传真', columnsValue: true, dataKey: "telephone" },
-		{ columnsName: '网址', columnsValue: true, dataKey: "telephone" },
-		{ columnsName: '乘车路线', columnsValue: true, dataKey: "telephone" },
-		{ columnsName: '地标建筑', columnsValue: true, dataKey: "telephone" },
-		{ columnsName: '参考住宿', columnsValue: true, dataKey: "telephone" },
-		{ columnsName: '备注', columnsValue: true, dataKey: "telephone" },
-	],
 });
 
 
@@ -106,19 +106,22 @@ export default (state = defaultState, action) => {
 				columnsVisible: fromJS(columnsVisible),
 				columns: fromJS(columnsBak)
 			});
-		case constants.TOGGLE_COLUMNS_ALL:
-			for (var i = 0,ci=1; i <= columnsVisible.length; i++,ci++) {
-				var isAccept = localStorage.getItem("contact_company_Column_" + i);
-				if (isAccept === 'false') {
-					columnsVisible[i].columnsValue = false;
-				}
-			}
-			var columnsBak=refreshColumns(columnsVisible,columns);
+		// case constants.TOGGLE_COLUMNS_ALL:
+		// 	for (var i = 0,ci=1; i <= columnsVisible.length; i++,ci++) {
+		// 		var isAccept = localStorage.getItem("contact_company_Column_" + i);
+		// 		if (isAccept === 'false') {
+		// 			columnsVisible[i].columnsValue = false;
+		// 		}
+		// 	}
+		// 	var columnsBak=refreshColumns(columnsVisible,columns);
 
-			return state.merge({
-				columnsVisible: fromJS(columnsVisible),
-				columns: fromJS(columnsBak)
-			});
+		// 	return state.merge({
+		// 		columnsVisible: fromJS(columnsVisible),
+		// 		columns: fromJS(columnsBak)
+		// 	});
+		//设置列表排序
+		case constants.CHANGE_COMPANY_SORTFIELD:
+			return state.set('sortField', action.data);
 		//读取锁定-获得客户data
 		case constants.CHANGE_COMPANY_LOADING:
 			return state.set('loading', action.data);
@@ -132,11 +135,19 @@ export default (state = defaultState, action) => {
 				...action.pagination,
 				total: action.data.recordsTotal,
 			}
+
+			for (var i = 0,ci=1; i <= columnsVisible.length; i++,ci++) {
+				var isAccept = localStorage.getItem("contact_company_Column_" + i);
+				if (isAccept === 'false') {
+					columnsVisible[i].columnsValue = false;
+				}
+			}
+			var columnsBak=refreshColumns(columnsVisible,columns);
 			return state.merge({
 				pagination: fromJS(pagination),
 				companyList: fromJS(action.data.data),
 				loading: false,
-				columns: fromJS(columns)
+				columns: fromJS(columnsBak)
 			});
 		default:
 			return state;
@@ -146,7 +157,7 @@ export default (state = defaultState, action) => {
 
 function refreshColumns(columnsVisible,columns){
 	let columnsBak=[];
-	columnsBak.push(columns[1]);
+	columnsBak.push(columns[0]);
 	for (var i = 0; i < columnsVisible.length; i++) {
 		if(columnsVisible[i].columnsValue){
 			columnsBak.push({

src/product/lock_store/index.js

@@ -2,18 +2,15 @@ import React, { PureComponent } from 'react';
 import { connect } from 'react-redux';
 //import { BrowserRouter, Route,Link } from 'react-router-dom';
 import StaffHeader from '../../common/staffHeader'
-// import DataTable from '../../common/dataTable';
+
 import { Table } from 'antd';
 import 'antd/dist/antd.css';
 
 import { actionCreators } from './store';
 
-let dt = null;
-
 class lock_store extends PureComponent {
     render() {
-        const { handleInputChange,handleLockstoreDate, handleSearch, columns, columnsData, pagination,loading,handleColumnsShow,columnsNum,lockStore} = this.props;
-       
+        
         return (
             <div>
         <StaffHeader />
@@ -31,22 +28,22 @@ class lock_store extends PureComponent {
                     <button className="btn btn-sm btn-default" type="button" data-toggle="modal" data-target="#filter"><i className="fal fa-filter"></i> 筛选</button>
                   </div>
                   <div className="col-auto ml-auto">
-                      <button className="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown">已显示{columnsNum}列</button>
+                      <button className="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown">已显示列</button>
                       <div className="dropdown-menu">
                         <ul className="list-unstyled px-3 pt-2 mb-0">
-                        {
+                        {/* {
                           columnsData.map((item, index) => {
                             return (
                               <li key={index} className="mb-2">
                                 <div className="custom-control custom-switch">
                                   <input type="checkbox" name={index} onChange={(e) => handleInputChange(e, index)} value={item.get('columnsValue')} checked={item.get('columnsValue')} className="custom-control-input" id={"lie" + index} />
                                   <label onClick={() => handleColumnsShow(index)} htmlFor={"lie" + index} className="custom-control-label" >{item.get('columnsName')}</label>
-                                  {/* onClick={() => handleColumnsShow(index)} */}
+                                 
                                 </div>
                               </li>
                             )
                           })
-                        }
+                        } */}
                         </ul>
                       </div>
                   </div>
@@ -88,12 +85,7 @@ class lock_store extends PureComponent {
                   {/* <!--数据内容区--> */}
                   <div className="panel-content">
                    <Table
-                      onChange={(pagination, filters, sorter) => handleLockstoreDate(pagination, filters, sorter, this.props)}
-                      pagination={pagination.toJS()}
-                      loading={loading}
-                      bordered
-                      columns={columns.toJS()}
-                      dataSource={lockStore.toJS()}
+                     
                   /> 
                   {/* 接口路径 */}
                   {/* <DataTable onRef={(ref) => dt = ref} url={`/contact/client`} columnBindEvent={handleColumnBindEvent} columnsData={columnsData} columns={columns.toJS()}/> */}
@@ -111,10 +103,7 @@ class lock_store extends PureComponent {
 
     //组件即将要被挂在的时候执行的方法--
     componentDidMount(){
-      const {handleLockstoreDate,handleColumnsAllShow, pagination} = this.props;
-      handleColumnsAllShow();
-     
-      handleLockstoreDate(pagination.toJS(), {}, {}, this.props);
+      
     }
 
 }
@@ -126,13 +115,7 @@ let delaySwitch = null;
  */
 const mapStateToProps = (state) => {
     return {
-      handleLockstoreDate:state.getIn(['lockstore','handleLockstoreDate']),
-      pagination: state.getIn(['lockstore', 'pagination']),
-      loading: state.getIn(['lockstore', 'loading']),
-      columns: state.getIn(['lockstore', 'columns']),
-      columnsData: state.getIn(['lockstore', 'columnsData']),
-      lockStore: state.getIn(['lockstore', 'lockStore']),
-
+     
       
     }
 }
@@ -143,57 +126,7 @@ const mapStateToProps = (state) => {
  */
 const mapDispathToProps = (dispatch) => {
     return {
-      handleClientData(list) {
-        (list.size === 0) && dispatch(actionCreators.getClientLIst());
-      },
-
-      handleSearch(serchValue) {
-        //e.target --可以获得dom
-        if (delaySwitch != null) {
-          clearTimeout(delaySwitch);
-        }
-        delaySwitch = setTimeout(() => {
-          let filter = {
-            searchValue: serchValue.value
-          };
-          dt.handleSearch(filter);
-        }, 350);
-      },
-
-        handleInputFocus(list) {
-            //发送给store--提取出action--避免发送重复的ajax请求
-            (list.size === 0) && dispatch(actionCreators.getList());
-            dispatch(actionCreators.searchFocus());
-        },
-
-        handleInputChange(e, index){
-          // dispatch(actionCreators.changeInputValue(ivalueElem.value));
-          dt.handleColumnVisible(index, e.target.value);
-        },
-        handleColumnsShow(index) {
-          dispatch(actionCreators.toggleColumns(index));
-        },
-        handleColumnsAllShow() {
-          dispatch(actionCreators.toggleColumnsAll(dt));
-        },
-        handleLockstoreDate(pagination, filters, sorter, props) {
-          // console.log(pagination);
-          dispatch(actionCreators.changeLoading());
-          dispatch(actionCreators.getCompanyLIst(pagination, props));
-          //(list.size === 0) && dispatch(actionCreators.getCompanyLIst());
-        },
-        handleCompanyPopups(key) {
-          popupsObj.handleCompanyPopups(key);
-          // console.log(popupsObj);
-          // console.log(key);
-        },
-        // 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>`;
-        //   }
-        //   return res;
-        // },
+      
     }
 }
 

src/product/lock_store/store/actionCreators.js

@@ -2,92 +2,6 @@ import * as constants from './constants';
 import { fromJS } from 'immutable';
 
 import axios from '../../../common/axios_auth.js';
-// import axios from 'axios';
 
 
 
-export const toggleColumns = (index) => {
-    return (dispatch) => {
-        dispatch({
-            type: constants.TOGGLE_COLUMNS,
-            data: index,
-        });
-    }
-};
-export const toggleColumnsAll = (dt) => {
-    return (dispatch) => {
-        dispatch({
-            type: constants.TOGGLE_COLUMNS_ALL,
-            dt:dt
-        });
-    }
-};
-
-export const changeLoading = () => {
-    return (dispatch) => {
-        dispatch({
-            type: constants.CHANGE_LOCKSTORE_LOADING,
-            data: true,
-        });
-    }
-}
-
-export const getCompanyLIst = (pagination,props) => {
-    return (dispatch) => {
-        axios.get(config.CLD2API + '/contact/client', {
-            params: {
-                current: pagination.current,
-                pageSize: pagination.pageSize,
-            },
-        }).then((res) => {
-            const data = res.data;
-
-            if (data.code === 200) {
-                dispatch({
-                    type: constants.CHANGE_LOCKSTORE_DATA,
-                    data: data,
-                    pagination:pagination,
-                    props:props
-                });
-            } else {
-                console.log(data);
-            }
-        }).catch((e) => {
-            console.log(e);
-            console.log('error');
-        })
-    }
-};
-
-// export const getClientLIst = (pagination,props) => {
-//     return (dispatch) => {
-//         axios.get(config.CLD2API+'/contact/client').then((res) => {
-//         // axios.get('/api/lock_store.json').then((res) => {
-//             const data = res.data;
-            
-//             if(data.code===200){
-                
-//                 let d2=data.data;
-//                 console.log(data.data);
-//                 dispatch(changeList(data.data));
-//                 //dispatch(changeList(JSON.parse(data.list)));
-//                 // console.log(d2);
-//                 // dispatch({
-//                 //     type: constants.CHANGE_LOCKSTORE_DATA,
-//                 //     data: fromJS(d2),
-//                 // });
-//             }else{
-//                 console.log(data);
-//             }
-//         }).catch((e) => {
-//             console.log(e);
-//             console.log('error');
-//         })
-//     }
-// };
-
-
-const changeList = (data) => ({
-    type: constants.CHANGE_LOCKSTORE_DATA,
-    data: fromJS(data),
-});

src/product/lock_store/store/constants.js

@@ -1,11 +1,4 @@
-export const SEARCH_FOCUS = 'submenu/SEARCH_FOCUS';
-export const CHANGE_LIST ='submenu/CHANGE_LIST';
-export const CHANGE_INPUTVALUE ='submenu/CHANGE_INPUTVALUE';
-export const CHANGE_LOCKSTORE_DATA = 'product/change_lockstore_data';
-export const TOGGLE_COLUMNS = 'client/toggle_columns';
-export const TOGGLE_COLUMNS_ALL = 'client/toggle_columns_all';
-
-export const CHANGE_CLIENT_DATA = 'client/change_client_data';
+
 
 
 

src/product/lock_store/store/reducer.js

@@ -4,172 +4,17 @@ import { fromJS } from 'immutable';
 
 
 const defaultState = fromJS({
-	lockStore:[],
-	pagination: {
-		current: 1,
-		pageSize: 10,
-		showSizeChanger: false
-	},
-	loading: false,
-	columns: [
-		{
-			title: '锁号',
-			dataIndex: 'clientname',
-			key: 'clientname',
-			visible: true
-		},
-		{
-			title: '产品',
-			dataIndex: 'companyname',
-			key: 'companyname',
-		},
-		{
-			title: '办事处',
-			dataIndex: 'telephone',
-			key: 'telephone',
-			visible: true
-		},
-		{
-			title: '出库时间',
-			dataIndex: 'phone',
-			key: 'phone',
-		},
-		{
-			title: '销售/借出/赠送时间',
-			dataIndex: 'qq',
-			key: 'qq',
-			visible: true
-		},
-		{
-			title: '责任人',
-			dataIndex: 'department',
-			key: 'department',
-		},
-		{
-			title: '状态',
-			dataIndex: 'position',
-			key: 'position',
-			visible: true
-		},
-		{
-			title: '联系人',
-			dataIndex: 'office',
-			key: 'office',
-		},
-		// { data: "clientname" },
-		// { data: "companyname" },
-		// { data: "telephone" },
-		// { data: "phone" },
-		// { data: "qq" },
-		// { data: "department" },
-		// { data: "position" },
-		// { data: "office" },
-	],
-	companyPopupsDetail: {
-		companyDetail: {},
-
-	},
-	columnsData:[
-		{columnsName:'锁号',columnsValue:true,dataKey: "clientname"},
-		{columnsName:'产品',columnsValue:true,dataKey: "companyname"},
-		{columnsName:'办事处',columnsValue:true,dataKey: "telephone"},
-		{columnsName:'出库时间',columnsValue:true,dataKey: "phone"},
-		{columnsName:'销售/借出/赠送时间',columnsValue:true,dataKey: "qq"},
-		{columnsName:'责任人',columnsValue:true,dataKey: "department"},
-		{columnsName:'状态',columnsValue:true,dataKey: "position"},
-		{columnsName:'联系人',columnsValue:true,dataKey: "office"},
-
-	],
+	
 
 
 });
 
 
 export default (state = defaultState, action) => {
-	let columns = state.get('columns').toJS();
-	let columnsData=state.get('columnsData').toJS();
-	let countFalse=0;
-	let columnNumData=0;
+	
     switch(action.type) {
-		case constants.TOGGLE_COLUMNS:
-			columnsData[action.data].columnsValue=!columnsData[action.data].columnsValue;
-			//存储
-			localStorage.setItem('product_lock_store_Column_'+action.data, columnsData[action.data].columnsValue);
-			var columnsBak=refreshColumns(columnsData,columns);
-			return state.merge({
-				columnsData: fromJS(columnsData),
-				columns: fromJS(columnsBak)
-			});
-			// for(var i=0;i<=columnsData.length;i++){
-			// 	var isAccept=localStorage.getItem("product_lock_store_Column_"+i);
-			// 	if(isAccept==="false"){
-			// 		columnsData[i].columnsValue=false;
-			// 		countFalse++;
-			// 	}
-			// }
-			// console.log(countFalse);
-			//columnNumData=columnsData.length-countFalse;
-			//console.log(columnsData);
-			//return state.set('columnsData', fromJS(columnsData));
-			// return state.merge({
-			// 	columnsNum: columnNumData,
-			// 	columnsData: fromJS(columnsData),
-			// });
-		case constants.TOGGLE_COLUMNS_ALL:
-			countFalse=0;
-			for(var i=1;i<=columnsData.length;i++){
-				var isAccept=localStorage.getItem("product_lock_store_Column_"+i);
-				if(isAccept==="false"){
-					columnsData[i].columnsValue=false;
-					action.dt.handleColumnVisible(i,false);
-					countFalse++;
-				}
-			}
-			columnNumData=columnsData.length-countFalse;
-			// console.log(columnNumData);
-			var columnsBak=refreshColumns(columnsData,columns);
-			return state.merge({
-				columnsNum: columnNumData,
-				columnsData: fromJS(columnsData),
-				columns: fromJS(columnsBak),
-			});
-			//return state.set('columnsNum', columnNumData);
-			//return state.set('columnsData', fromJS(columnsData));
-		case constants.CHANGE_LOCKSTORE_LOADING:
-			return state.set('loading', action.data);
-		case constants.CHANGE_LOCKSTORE_DATA:
-			let columnsDetail = {
-				...columns[0],
-				render: (text, record) => <a href="#detail" data-toggle="modal" data-target="#detail" onClick={() => action.props.handleCompanyPopups(record.key)} >{text}</a>,
-			}
-			columns[0] = columnsDetail;
-			let pagination = {
-				...action.pagination,
-				total: action.data.recordsTotal,
-			}
-			return state.merge({
-				pagination: fromJS(pagination),
-				lockStore: fromJS(action.data.data),
-				loading: false,
-				columns: fromJS(columns)
-			});
-			//return state.set('lockStore', action.data);
+		
 		default:
 			return state;
 	}
 }
-
-function refreshColumns(columnsData,columns){
-	let columnsBak=[];
-	columnsBak.push(columns[1]);
-	for (var i = 0; i < columnsData.length; i++) {
-		if(columnsData[i].columnsValue){
-			columnsBak.push({
-				title: columnsData[i].columnsName,
-				dataIndex: columnsData[i].dataKey,
-				key: columnsData[i].dataKey,
-			});
-		}
-	}
-	return columnsBak;
-};