软件锁升级tab的选中获取

dist/api/contact_detail.json

@@ -0,0 +1,58 @@
+{
+    "code": 200,
+    "draw": null,
+    "recordsTotal": 0,
+    "recordsFiltered": 0,
+    "data": [
+        {
+            "key":"0",
+            "id":"0",
+            "number":"1",
+            "clientname": "张挺贵",
+            "position": "科员",
+            "telephone": "13877552520",
+            "phone": "0775-4259178",
+            "companyname": "广西五鸿建设集团有限公司贺州分公司"
+        },
+        {
+            "key":"1",
+            "id":"1",
+            "number":"2",
+            "clientname": "张挺贵",
+            "position": "",
+            "telephone": "13877552520",
+            "phone": "0775-4259178",
+            "companyname": "广西五鸿建设集团有限公司贺州分公司"
+        },
+        {
+            "key":"2",
+            "id":"2",
+            "number":"3",
+            "clientname": "张挺贵",
+            "position": "科员",
+            "telephone": "13877552520",
+            "phone": "0775-4259178",
+            "companyname": "广西五鸿建设集团有限公司贺州分公司"
+        },
+        {
+            "key":"3",
+            "id":"3",
+            "number":"4",
+            "clientname": "李平",
+            "position": "科员",
+            "telephone": "13877552520",
+            "phone": "0775-4259178",
+            "companyname": "建安公司"
+        },
+        {
+            "key":"4",
+            "id":"4",
+            "number":"5",
+            "clientname": "林星峰  ",
+            "position": "副局长",
+            "telephone": "13877552520",
+            "phone": "0775-4259178",
+            "companyname": "霍林郭勒旗交通运输局"
+        }
+            ]
+}

dist/js/vendors.bundle.js

@@ -21439,7 +21439,7 @@ return Popper;
     DIALOG: '.modal-dialog',
     MODAL_BODY: '.modal-body',
     DATA_TOGGLE: '[data-toggle="modal"]',
-    DATA_DISMISS: '[data-dismiss="modal"]:first',
+	DATA_DISMISS: '[data-dismiss="modal"]:first',
     FIXED_CONTENT: '.fixed-top, .fixed-bottom, .is-fixed, .sticky-top',
     STICKY_CONTENT: '.sticky-top'
     /**

src/common/lockBinding/index.js

@@ -1,75 +0,0 @@
-import React, { PureComponent } from 'react';
-import { connect } from 'react-redux';
-// import { BrowserRouter, Route,Link } from 'react-router-dom';
-import { actionCreators } from './store';
-import { message,Tag,Spin, Table } from 'antd';
-
-const error = (msg) => {
-  message.error(msg);
-};
-
-class lockBinding extends PureComponent {
-  render() {
-    //const {locksotreDetail,loading,columns,data,pagination} = this.props;
-    //let lockDetail2 = locksotreDetail.toJS();
-    // console.log(lockDetail2)
-    return (
-      <div className="modal fade" id="lock-binding" role="dialog" aria-hidden="true" data-backdrop="static">
-        <div className="modal-dialog modal-lg">
-          <div className="modal-content clearfix">
-            <div className="dialog-sheet">
-              <button type="button" className="close" data-dismiss="modal" aria-label="Close">
-                  <span aria-hidden="true"><i className="fal fa-times"></i></span>
-              </button>
-              <div className="m-4">
-                <div className="input-group bg-white shadow-inset-2">
-                  <div className="input-group-prepend">
-                    <span className="input-group-text bg-transparent border-right-0">
-                      <i className="fal fa-search"></i>
-                    </span>
-                  </div>
-                  <input type="text" className="form-control border-left-0 bg-transparent pl-0" placeholder="搜索联系人（姓名、手机、QQ、公司名称）"/>
-                </div>
-              </div>
-            </div>
-            <div className="p-4 border-top d-flex justify-content-center">
-              <ul className="nav nav-pills" role="tablist">
-                <li className="nav-item"><a className="nav-link active" data-toggle="tab" href="#">借出</a></li>
-                <li className="nav-item"><a className="nav-link" data-toggle="tab" href="#2">销售</a></li>
-                <li className="nav-item"><a className="nav-link" data-toggle="tab" href="#">赠送</a></li>
-              </ul>
-            </div>
-            <div className="modal-search-height border-top border-bottom">
-              <div className="slimScrol2 p-4 modal-search-result">
-                <div className="card p-3 mb-3" title="点击关联该联系人">
-                  <div className="row"><div className="col-1 pr-0">张三</div><div className="col-1 pr-0">处长</div><div className="col-2 pr-0">15800000001</div><div className="col-2 pr-0">1231233</div><div className="col-4 pr-0">珠海纵横创新软件有限公司</div><div className="col-auto ml-auto pl-0"><a href="#" className="btn btn-xs btn-outline-primary waves-effect waves-themed">选择ta</a></div></div>
-                </div>
-                <div className="card pointer-hover p-3 mb-3" title="点击关联该联系人">
-                  <div className="row"><div className="col-1 pr-0">张三</div><div className="col-1 pr-0"></div><div className="col-2 pr-0">15800000001</div><div className="col-2 pr-0">1231233</div><div className="col-4 pr-0">珠海纵横创新软件有限公司</div><div className="col-auto ml-auto pl-0"><a href="#" className="btn btn-xs btn-outline-primary waves-effect waves-themed">选择ta</a></div></div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  // 渲染完成时调回
-  componentDidMount() {
-  }
-}
-
-const mapStateToProps = (state) => {
-  return {
-  }
-}
-
-// 要改变store里的内容需要调用dispatch方法
-const mapDispathToProps = (dispatch) => {
-  return {
-  }
-}
-
-export default connect(mapStateToProps, mapDispathToProps)(lockBinding);
-

src/common/lockBinding/store/actionCreators.js

@@ -1,61 +0,0 @@
-import * as constants from './constants';
-import { fromJS } from 'immutable';
-import * as config from '../../../common/config.js';
-import axios from '../../axios_auth.js';
-// import axios from 'axios';
-
-//Loading
-export const changeLoading = () => {
-    return (dispatch) => {
-        dispatch({
-            type: constants.CHANGE_LOCK_DETAIL_LOADING,
-            data: true,
-        });
-    }
-}
-
-export const getlocksotreDetail = (key,error) => {
-    return (dispatch) => {
-        //console.log(data)
-        axios.get(config.CLD2API + '/product/longleDetail/'+key).then((res) => {
-            const data = res.data;
-            if (data.code === 200) {
-                data.data.productList=data.data.product.split("+");
-                //console.log(data.data.productList);
-                dispatch({
-                    type: constants.CHANGE_LOCK_DETAIL,
-                    data: data.data,
-                });
-            } else {
-                error('软件锁详情请求失败');
-            }
-        }).catch((e) => {
-            error('软件锁详情请求失败');
-        })
-    }
-};
-
-//获取记录内容
-export const getLockService = (error) => {
-    return (dispatch) => {
-        axios.get(config.LOCALAPI+config.PATHAPI +'lock_service.json').then((res) => {
-            const data = res.data;
-            for(var i=0;i < data.data.length;i++){
-                //console.log(data.data[i].product);
-                //console.log(data.data[i].product.split("+"));
-                data.data[i].productService=data.data[i].product.split("+");
-            }
-            if (data.code === 200) {
-                //console.log(data.data[0].product);
-                dispatch({
-                    type: constants.CHANGE_LOCK_RECORD,
-                    data: data.data,
-                });
-            } else {
-                error("请求数据失败");
-            }
-        }).catch((e) => {
-            error(e);
-        })
-    }
-};

src/common/lockBinding/store/constants.js

@@ -1,4 +0,0 @@
-export const CHANGE_LOCK_DETAIL = 'lockDetail/change_lock_detail';
-export const CHANGE_INPUT_VALUE = 'lockDetail/change_input_value';
-export const CHANGE_LOCK_DETAIL_LOADING = 'lockDetail/change_lock_detail_loading';
-export const CHANGE_LOCK_RECORD = 'lockDetail/change_lock_record';

src/common/lockBinding/store/reducer.js

@@ -1,111 +0,0 @@
-import * as constants from './constants';
-import React from 'react';
-//锁定state不可修改，导致错误y
-import { fromJS } from 'immutable';
-import { Tag } from 'antd';
-
-const defaultState = fromJS({
-	locksotreDetail: {},
-	loading: true,
-	pagination:false,
-	columns:[
-		{
-			title: '',
-			dataIndex: 'number',
-			key: 'number',
-		},
-		{
-			title: '类型/时间',
-			dataIndex: 'status',
-			key: 'status',
-		},
-		{
-			title: '服务内容',
-			dataIndex: 'product',
-			key: 'product',
-		},
-	],
-	data: [
-	],
-});
-
-
-export default (state = defaultState, action) => {
-	let columns = state.get('columns').toJS();
-    switch (action.type) {
-		case constants.CHANGE_LOCK_DETAIL_LOADING:
-			return state.set('loading', action.data);
-		case constants.CHANGE_LOCK_DETAIL:
-			return state.merge({
-				loading: false,
-				locksotreDetail: fromJS(action.data)
-			});
-		case constants.CHANGE_LOCK_RECORD:
-			let reCord='';
-			columns.forEach((element,value) => {
-				if(element.title==='类型/时间'){
-					reCord=value;
-				}
-				//console.log(value)
-			});
-			//console.log(columnsBak);
-			if(reCord!==''){
-				columns[reCord]=renderRecord(columns[reCord]);
-			}
-			let serVice='';
-			columns.forEach((element,value) => {
-				if(element.title==='服务内容'){
-					serVice=value;
-				}
-				//console.log(value)
-			});
-			if(serVice!==''){
-				columns[serVice]=renderService(columns[serVice]);
-			}
-			return state.merge({
-				loading: false,
-				data: fromJS(action.data),
-				//更新记录内容
-				columns: fromJS(columns),
-			});
-		default:
-			return state;
-	}
-}
-
-function renderRecord(columns){
-	let columnsTypeTime=columns;
-	if(columns.title==='类型/时间'){
-		columnsTypeTime = {
-			...columns,
-			render: (text, record) =>{
-				//console.log(record)
-				return (
-					<div key="2"  >
-					{text} <a href="#">{record.client}</a><br></br><a href="#">@{record.category}</a> <span className="text-muted">{record.createTime}</span>
-					</div>
-			)}
-		}
-	}
-	return columnsTypeTime;
-}
-
-function renderService(columns){
-	let columnsService=columns;
-	if(columns.title==='服务内容'){
-		columnsService = {
-			...columns,
-			render: (text, record) =>{
-				//console.log(record)
-				return (
-					<div key="2">
-					{/* <Tag color="#886ab5">{record.productService}</Tag> */}
-					{record.productService.map((tag,index) => (
-						<Tag className="mb-1" color="#886ab5" key={tag+index}>{tag}</Tag>
-					))}
-					</div>
-			)}
-		}
-	}
-	return columnsService;
-}

src/common/lockType/index.js

@@ -0,0 +1,221 @@
+import React, { PureComponent } from 'react';
+import { connect } from 'react-redux';
+// import { BrowserRouter, Route,Link } from 'react-router-dom';
+import { actionCreators } from './store';
+import { message,Input,List,Radio} from 'antd';
+
+const { Search } = Input;
+const error = (msg) => {
+  message.error(msg);
+};
+
+class lockType extends PureComponent {
+  render() {
+    const {loading,handlelockTypeSearch,data,lead,handleChangeLSGraido} = this.props;
+    let locksearchlist2 = data.toJS();
+    //console.log(locksearchlist2)
+    return (
+      <div>
+      {/* 借出、赠送、销售 */}
+      <div className="modal fade" id="lock-binding" role="dialog" aria-hidden="true" data-backdrop="static">
+        <div className="modal-dialog modal-lg">
+          <div className="modal-content clearfix">
+            <div className="dialog-sheet">
+              <button type="button" className="close" data-dismiss="modal" aria-label="Close">
+                  <span aria-hidden="true"><i className="fal fa-times"></i></span>
+              </button>
+              <div className="m-4">
+                <div className="input-group bg-white shadow-inset-2">
+                <Search
+                  placeholder="搜索联系人（姓名、手机、QQ、公司名称）"
+                  onSearch={value => handlelockTypeSearch(value)}
+                  onKeyUp={(e) => handlelockTypeSearch(e.target.value,'keyup')}
+                  loading={loading}
+                />
+                </div>
+              </div>
+            </div>
+            <div>
+              {/* <div className="ml-4 mr-4 alert alert-warning">暂时没有搜索的数据</div> */}
+              <div className="p-4 border-top d-flex justify-content-center">
+                <Radio.Group buttonStyle="solid" onChange={(e) => handleChangeLSGraido(e)}value={lead}>
+                  <Radio.Button value="lead">借出</Radio.Button>
+                  <Radio.Button value="sale">销售</Radio.Button>
+                  <Radio.Button value="give">赠送</Radio.Button>
+                </Radio.Group>
+                {/* <ul className="nav nav-pills" role="tablist">
+                  <li className="nav-item"><a className="nav-link active" data-toggle="tab" href="#">借出</a></li>
+                  <li className="nav-item"><a className="nav-link" data-toggle="tab" href="#2">销售</a></li>
+                  <li className="nav-item"><a className="nav-link" data-toggle="tab" href="#3">赠送</a></li>
+                </ul> */}
+              </div>
+              <div className="modal-search-height border-top border-bottom">
+                <div className="slimScrol2 p-4 modal-search-result">
+                  {
+                    locksearchlist2.map((item, index) => {
+                      return (
+                        <List.Item key={index}>
+                          <div className="card p-3 width100" title="点击关联该联系人">
+                            <div className="row"><div className="col-1 pr-0">{item.clientname}</div><div className="col-1 pr-0">{item.position}</div><div className="col-2 pr-0">{item.telephone}</div><div className="col-2 pr-0">{item.phone}</div><div className="col-4 pr-0">{item.companyname}</div><div className="col-auto ml-auto pl-0"><button className="btn btn-xs btn-outline-primary waves-effect waves-themed" value="a">选择ta</button></div></div>
+                          </div>
+                        </List.Item>
+                      )
+                    })
+                  }
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      {/* 升级软件锁 */}
+      <div className="modal fade" id="lokc-update" role="dialog" aria-hidden="true" data-backdrop="static">
+        <div className="modal-dialog modal-dialog-centered">
+          <div className="modal-content">
+            <div className="modal-header">
+              <h4 className="modal-title">升级软件锁</h4>
+              <button type="button" className="close" data-dismiss="modal" aria-label="Close">
+                <span aria-hidden="true"><i className="fal fa-times"></i></span>
+              </button>
+            </div>
+            <div className="modal-body">
+              <div className="form-group">
+                <label className="form-label">新增产品</label>
+                {/* <label className="form-label" for="example-datec">新增产品</label> */}
+                <select className="form-control" id="example-datec">
+                  <option>重庆养护（营改增）</option>
+                  <option>广东业主专业（新定额）</option>
+                  <optgroup label="广东业主专业（新定额）">
+                      <option>广东业主专业（新定额）</option>
+                  </optgroup>
+                </select>
+              </div>
+            </div>
+            <div className="modal-footer">
+              <button type="button" className="btn btn-secondary waves-effect waves-themed" data-dismiss="modal">关闭</button>
+              <button type="button" className="btn btn-primary waves-effect waves-themed">确认升级</button>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      {/* 更换软件锁 */}
+      <div className="modal fade" id="lokc-replace" role="dialog" aria-hidden="true" data-backdrop="static">
+        <div className="modal-dialog modal-dialog-centered">
+          <div className="modal-content">
+            <div className="modal-header">
+              <h4 className="modal-title">更换软件锁</h4>
+              <button type="button" className="close" data-dismiss="modal" aria-label="Close">
+                <span aria-hidden="true"><i className="fal fa-times"></i></span>
+              </button>
+            </div>
+            <div className="modal-body">
+              <div className="form-group">
+                <label className="form-label">新锁号</label>
+                <input className="form-control" id="example-date" type="text"/>
+              </div>
+            </div>
+            <div className="modal-footer">
+              <button type="button" className="btn btn-secondary waves-effect waves-themed" data-dismiss="modal">关闭</button>
+              <button type="button" className="btn btn-primary waves-effect waves-themed">确认更换</button>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      {/* 收回软件锁 */}
+      <div className="modal fade" id="add-retrieve" role="dialog" aria-hidden="true" data-backdrop="static">
+        <div className="modal-dialog modal-dialog-centered">
+          <div className="modal-content">
+            <div className="modal-header">
+              <h4 className="modal-title">确认收回</h4>
+              <button type="button" className="close" data-dismiss="modal" aria-label="Close">
+                  <span aria-hidden="true"><i className="fal fa-times"></i></span>
+              </button>
+            </div>
+            <div className="modal-body">
+              收回锁号 <b>HNYH-0654</b>
+            </div>
+            <div className="modal-footer">
+              <button type="button" className="btn btn-secondary waves-effect waves-themed" data-dismiss="modal">关闭</button>
+              <button type="button" className="btn btn-primary waves-effect waves-themed">确认收回</button>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      {/* 备注 */}
+      <div className="modal fade" id="add-remark" role="dialog" aria-hidden="true" data-backdrop="static">
+        <div className="modal-dialog modal-dialog-centered">
+          <div className="modal-content">
+            <div className="modal-header">
+              <h4 className="modal-title">备注信息</h4>
+              <button type="button" className="close" data-dismiss="modal" aria-label="Close">
+                <span aria-hidden="true"><i className="fal fa-times"></i></span>
+              </button>
+            </div>
+            <div className="modal-body">
+              <div className="form-group">
+                <label className="form-label">备注</label>
+                <textarea className="form-control" id="example-textarea" rows="3" placeholder="填写详细服务内容"></textarea>
+              </div>
+            </div>
+            <div className="modal-footer">
+              <button type="button" className="btn btn-secondary waves-effect waves-themed" data-dismiss="modal">关闭</button>
+              <button type="button" className="btn btn-primary waves-effect waves-themed">确认添加</button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    );
+  }
+
+  // 渲染完成时调回
+  componentDidMount() {
+  }
+}
+
+let delaySwitch = null;
+
+const mapStateToProps = (state) => {
+  return {
+    loading: state.getIn(['locktype', 'loading']),
+    data: state.getIn(['locktype', 'data']),
+    locksearchValue: state.getIn(['locktype', 'locksearchValue']),
+    lead: state.getIn(['locktype', 'lead']),
+    sale: state.getIn(['locktype', 'sale']),
+    give: state.getIn(['locktype', 'give']),
+  }
+}
+
+// 要改变store里的内容需要调用dispatch方法
+const mapDispathToProps = (dispatch) => {
+  return {
+    handlelockTypeSearch(locksearchValue,keyup) {
+      //借出、销售、赠送搜索
+      dispatch(actionCreators.changeLoading());
+      // 获得用户需要的数据并更新渲染页面
+      //dispatch(actionCreators.getSearchlist(locksearchValue));
+      if(keyup === 'keyup'){
+        if(delaySwitch != null){
+          clearTimeout(delaySwitch);
+        }
+        delaySwitch = setTimeout(() => {
+          dispatch(actionCreators.getSearchlist(locksearchValue));
+        },350);
+      }
+      else{
+        dispatch(actionCreators.getSearchlist(locksearchValue));
+      }
+    },
+    //借出选中返回值
+    handleChangeLSGraido(e) {
+      dispatch(actionCreators.changeLead(e.target.value));
+    },
+  }
+}
+
+export default connect(mapStateToProps, mapDispathToProps)(lockType);
+

src/common/lockType/store/actionCreators.js

@@ -0,0 +1,49 @@
+import * as constants from './constants';
+import { fromJS } from 'immutable';
+import * as config from '../../../common/config.js';
+import axios from '../../axios_auth.js';
+// import axios from 'axios';
+
+//Loading
+export const changeLoading = () => {
+    return (dispatch) => {
+        dispatch({
+            type: constants.CHANGE_LOCKTYPE_LOADING,
+            data: true,
+        });
+    }
+}
+
+export const changeLead = (lead) => {
+    return (dispatch) => {
+        dispatch({
+            type: constants.CHANGE_LEAD,
+            data: lead,
+        });
+    }
+}
+
+//获取搜索内容
+export const getSearchlist = (locksearchValue) => {
+    return (dispatch) => {
+        axios.get(config.LOCALAPI+config.PATHAPI +'contact_detail.json', {
+            params: {
+                locksearchValue:locksearchValue,
+            },
+        }).then((res) => {
+            const data = res.data;
+            if (data.code === 200) {
+                // console.log(locksearchValue);
+                dispatch({
+                    type: constants.CHANGE_LOCKTYPE_SEARCHLIST,
+                    data: data.data,
+                    locksearchValue:locksearchValue,
+                });
+            } else {
+                error("请求数据失败");
+            }
+        }).catch((e) => {
+            error(e);
+        })
+    }
+};

src/common/lockType/store/constants.js

@@ -0,0 +1,3 @@
+export const CHANGE_LOCKTYPE_LOADING = 'locktype/change_locktype_loading';
+export const CHANGE_LOCKTYPE_SEARCHLIST = 'locktype/change_locktype_searchlist';
+export const CHANGE_LEAD = 'locktype/change_lead';

src/common/lockType/store/reducer.js

@@ -0,0 +1,96 @@
+import * as constants from './constants';
+import React from 'react';
+//锁定state不可修改，导致错误y
+import { fromJS } from 'immutable';
+import { Tag } from 'antd';
+
+const defaultState = fromJS({
+	loading: true,
+	locksearchValue: '',
+	lead:'lead',
+	sale:'sale',
+	give:'give',
+	// columns:[
+	// 	{
+	// 		title: '联系人',
+	// 		dataIndex: 'clientname',
+	// 		key: 'clientname',
+	// 	},
+	// 	{
+	// 		title: '职位',
+	// 		dataIndex: 'position',
+	// 		key: 'position',
+	// 	},
+	// 	{
+	// 		title: '手机号',
+	// 		dataIndex: 'telephone',
+	// 		key: 'telephone',
+	// 	},
+	// 	{
+	// 		title: '固话',
+	// 		dataIndex: 'phone',
+	// 		key: 'phone',
+	// 	},
+	// 	{
+	// 		title: '公司名称',
+	// 		dataIndex: 'companyname',
+	// 		key: 'companyname',
+	// 	},
+	// ],
+	data: [
+		// {
+		// 	key: '1',
+		// 	clientname: '张挺贵',
+		// 	position: '科员',
+		// 	telephone: '13877552520',
+		// 	phone: '0775-4259178',
+		// 	companyname: '广西五鸿建设集团有限公司贺州分公司',
+		// },
+		// {
+		// 	key: '2',
+		// 	clientname: '张挺贵',
+		// 	position: '科员',
+		// 	telephone: '13877552520',
+		// 	phone: '0775-4259178',
+		// 	companyname: '广西五鸿建设集团有限公司贺州分公司',
+		// },
+		// {
+		// 	key: '3',
+		// 	clientname: '张挺贵',
+		// 	position: '科员',
+		// 	telephone: '13877552520',
+		// 	phone: '0775-4259178',
+		// 	companyname: '广西五鸿建设集团有限公司贺州分公司',
+		// },
+		// {
+		// 	key: '4',
+		// 	clientname: '李平',
+		// 	position: '科员',
+		// 	telephone: '13877552520',
+		// 	phone: '0775-4259178',
+		// 	companyname: '建安公司',
+		// },
+	],
+});
+
+
+export default (state = defaultState, action) => {
+	//let columns = state.get('columns').toJS();
+    switch (action.type) {
+		case constants.CHANGE_LOCKTYPE_LOADING:
+			return state.set('loading', action.data);
+		case constants.CHANGE_LEAD:
+			//console.log(action.data);
+			localStorage.setItem('locktype/change_lead', action.data);
+			return state.set('lead', action.data);
+		case constants.CHANGE_LOCKTYPE_SEARCHLIST:
+			return state.merge({
+				loading: false,
+				data: fromJS(action.data),
+				locksearchValue:action.locksearchValue,
+			});
+			
+		default:
+			return state;
+	}
+}

src/common/popupstockDetail/index.js

@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 // import { BrowserRouter, Route,Link } from 'react-router-dom';
 import { actionCreators } from './store';
 import { message, Tag, Spin, Table } from 'antd';
-import Lockbinding from '../../common/lockBinding';
+import Locktype from '../../common/lockType';
 
 const error = (msg) => {
   message.error(msg);
@@ -29,7 +29,7 @@ class lockDetailPopups extends PureComponent {
   render() {
     const { locksotreDetail, loading, columns, data, pagination } = this.props;
     let lockDetail2 = locksotreDetail.toJS();
-    // console.log(lockDetail2)
+    //console.log(lockDetail2)
     return (
 
       <div className="modal fade" id="lockDetail" role="dialog" aria-hidden="true" data-backdrop="static">
@@ -157,7 +157,7 @@ class lockDetailPopups extends PureComponent {
             </div>
           </div>
         </div>
-        <Lockbinding  />
+        <Locktype />
       </div>
 
     );

src/common/popupstockDetail/store/constants.js

@@ -1,4 +1,4 @@
-export const CHANGE_LOCK_DETAIL = 'lockDetail/change_lock_detail';
-export const CHANGE_INPUT_VALUE = 'lockDetail/change_input_value';
+export const CHANGE_LOCK_DETAIL = 'lockDetail/change_lock_detail';     //不是路径，是定义的一个标注名称
+//export const CHANGE_INPUT_VALUE = 'lockDetail/change_input_value';
 export const CHANGE_LOCK_DETAIL_LOADING = 'lockDetail/change_lock_detail_loading';
 export const CHANGE_LOCK_RECORD = 'lockDetail/change_lock_record';

src/product/lock_store/index.js

@@ -159,7 +159,7 @@ const mapDispathToProps = (dispatch) => {
       },
       //获得表格数据
       handleLockstoreList(pagination,support){
-        // console.log(support)
+        //console.log(support)
         dispatch(actionCreators.changeLoading());
         dispatch(actionCreators.getLockstoreList(pagination,support));
         

src/product/lock_store/store/actionCreators.js

@@ -54,10 +54,12 @@ export const changeLoading = () => {
     }
 }
 
+
+// searchValue  获得用户输入的值
 export const getLockstoreList = (pagination,support,searchValue) =>{
     return(dispatch) =>{
         // console.log('searchValue:'+searchValue);
-        // console.log('support:'+searchValue);
+        //console.log('support:'+searchValue);
         // console.log('typeof:'+typeof searchValue);
         //console.log(support);
         let sortField = localStorage.getItem("product_lock_store_sortField");
@@ -71,6 +73,8 @@ export const getLockstoreList = (pagination,support,searchValue) =>{
         if(typeof searchValue === 'undefined'){
             searchValue = support.searchValue;
         }
+        //请求/product/longle 携带 searchValue（即是用户输入的值） 接口返回用户需要的数据 res
+        // 发送一个get请求
         axios.get(config.CLD2API + '/product/longle', {
             params: {
                 current: pagination.current,
@@ -80,6 +84,7 @@ export const getLockstoreList = (pagination,support,searchValue) =>{
                 searchValue:searchValue,
                 
             },
+            // axios请求正确
         }).then((res) => {
             const data = res.data;
             //字符串转数组
@@ -102,6 +107,7 @@ export const getLockstoreList = (pagination,support,searchValue) =>{
             } else {
                 console.log(data);
             }
+            // axios请求错误
         }).catch((e) => {
             console.log(e);
             console.log('error');

src/product/lock_store/store/reducer.js

@@ -161,7 +161,7 @@ export default (state = defaultState, action) => {
 				return state.set('sort', sort);
 			}
 		case constants.CHANGE_LOCKSTORE_SORTFIELD:
-			// console.log(action.data);
+			//console.log(action.data);
 			localStorage.setItem('product_lock_store_sortField', action.data);
 			return state.set('sortField', action.data);
 		case constants.CHANGE_LOCKSTORE_SORT:

src/product/store/reducer.js

@@ -3,7 +3,7 @@ import { reducer as commonReducer } from '../common/store';
 import { reducer as lockStoreReducer } from '../lock_store/store';
 import { reducer as lockCountReducer } from '../lock_count/store';
 import { reducer as popupstockReducer } from '../../common/popupstockDetail/store';
-import { reducer as lockbindingReducer } from '../../common/lockBinding/store';
+import { reducer as locktypeReducer } from '../../common/lockType/store';
 
 
 
@@ -12,7 +12,7 @@ const reducer = combineReducers({
     lockstore: lockStoreReducer,
     lockcount: lockCountReducer,
     popupstock:popupstockReducer,
-    lockbinding:lockbindingReducer,
+    locktype:locktypeReducer,
 });
 
 export default reducer;