1

dist/css/cld-custom.css

@@ -1,4 +1,19 @@
 /* app dialog */
+.modal {
+  z-index: 949
+}
+.modal-backdrop{
+  z-index: 940
+}
+.page-header {
+  z-index:900
+}
+.nav-function-minify:not(.nav-function-top) .page-sidebar,.nav-function-hidden:not(.nav-function-top) .page-sidebar {
+  z-index: 901
+}
+.page-sidebar{
+  z-index: 902
+}
 .dialog-sheet{
   position: relative;
 }
@@ -174,7 +189,7 @@
   cursor: pointer;
 }
 .sheet-panel-log{
-  height:306px;
+  height:256px;
 }
 .sheet-btns {
   height:24px;
@@ -199,7 +214,7 @@
   background-color:#8E44AD;
 }
 .tagcol-04{
-  background-color:#f90000;
+  background-color:#CC3333;
 }
 .tagcol-05{
   background-color:#B8651B;
@@ -210,7 +225,6 @@
 .tagcol-07{
   background-color:#efd200;
 }
-
 .tagcol-01-s{
   color:#16A085;
 }
@@ -232,7 +246,50 @@
 .tagcol-07-s{
   color:#efd200;
 }
-.tagcol-01,.tagcol-02,.tagcol-03,.tagcol-04,.tagcol-05,.tagcol-06,.tagcol-07,.tagcol-08{
+.tagcol-11{
+  background-color:#F8AC59;
+}
+.tagcol-12{
+  background-color:#FF69B4;
+}
+.tagcol-13{
+  background-color:#999999;
+}
+.tagcol-14{
+  background-color:#00D8FF;
+}
+.tagcol-15{
+  background-color:#009000;
+}
+.tagcol-16{
+  background-color:#9933CC;
+}
+.tagcol-17{
+  background-color:#996633;
+}
+.tagcol-11-s{
+  color:#F8AC59;
+}
+.tagcol-12-s{
+  color:#FF69B4;
+}
+.tagcol-13-s{
+  color:#999999;
+}
+.tagcol-14-s{
+  color:#00D8FF;
+}
+.tagcol-15-s{
+  color:#009000;
+}
+.tagcol-16-s{
+  color:#9933CC;
+}
+.tagcol-17-s{
+  color:#996633;
+}
+.tagcol-01,.tagcol-02,.tagcol-03,.tagcol-04,.tagcol-05,.tagcol-06,.tagcol-07,.tagcol-08,.tagcol-11,.tagcol-12,.tagcol-13,.tagcol-14,.tagcol-15,.tagcol-16,.tagcol-17,.tagcol-18{
   color:#fff;
   margin:0 1px;
+  line-height:10px;
 }

src/common/popups/company.js

@@ -3,39 +3,42 @@ import { connect } from 'react-redux';
 import { Input, Cascader } from 'antd';
 
 
-const options = [{
-    value: 'zhejiang',
-    label: '浙江',
-    children: [{
-      value: 'hangzhou',
-      label: '杭州',
-      children: [{
-        value: 'xihu',
-        label: '西湖',
-      }],
-    }],
-  }, {
-    value: 'jiangsu',
-    label: '江苏',
-    children: [{
-      value: 'nanjing',
-      label: '南京',
-      children: [{
-        value: 'zhonghuamen',
-        label: '中华门',
-      }],
-    }],
-  }];
+const options = [
+    {
+        value: 'zhejiang',
+        label: '浙江',
+        children: [{
+            value: 'hangzhou',
+            label: '杭州',
+            children: [{
+                value: 'xihu',
+                label: '西湖',
+            }],
+        }],
+    },
+    {
+        value: 'jiangsu',
+        label: '江苏',
+        children: [{
+            value: 'nanjing',
+            label: '南京',
+            children: [{
+                value: 'zhonghuamen',
+                label: '中华门',
+            }],
+        }],
+    }
+];
 
 class company extends PureComponent {
 
 
 
-    
+
     render() {
         const { companyDetail } = this.props;
         let companyDetail2 = companyDetail.toJS();
-        
+
         return (
             <Fragment>
 
@@ -66,9 +69,9 @@ class company extends PureComponent {
                         <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>
+                                <span className="text-muted">{companyDetail2.staffDetial.username} 创建于 {companyDetail2.create_time}</span>
                             </div>
-                            <legend>{companyDetail.companyname}</legend>
+                            <legend>{companyDetail2.companyname}</legend>
                         </div>
                         <div className="cldform clearfix">
                             <div className="cldform-line"></div>
@@ -79,31 +82,29 @@ class company extends PureComponent {
                                         value={companyDetail2.companyname}
                                         onClick={() => console.log('false')}
                                         onChange={() => console.log('sdf')}
-                                        disabled={false}
                                     />
-                                    <div style={{ display: 'none' }} className="cldform-contarl-box cldform-contarl-textareabox"><span>{companyDetail2.companyname}</span></div>
                                 </div>
                             </div>
                             <div className="cldform-line"></div>
                             <div className="cldform-item cldform-item-wauto">
                                 <div className="cldform-label">公司地区</div>
                                 <div className="cldform-control">
-                                <Cascader  options={options} placeholder="公司地区" />
-                                   
+                                    <Cascader options={options} defaultValue={['zhejiang', 'hangzhou', 'xihu']} placeholder="公司地区" />
+
                                 </div>
                             </div>
                             <div className="cldform-line"></div>
                             <div className="cldform-item cldform-item-wauto">
                                 <div className="cldform-label">公司性质</div>
                                 <div className="cldform-control">
-                                    <Cascader  options={options} placeholder="公司性质" />
+                                    <Cascader options={options} placeholder="公司性质" />
                                 </div>
                             </div>
                             <div className="cldform-line"></div>
                             <div className="cldform-item">
                                 <div className="cldform-label">公司地址</div>
                                 <div className="cldform-control">
-                                <Input id="2"
+                                    <Input id="2"
                                         value={companyDetail2.address}
                                     />
                                 </div>
@@ -112,41 +113,53 @@ class company extends PureComponent {
                             <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-3850888</span></div>
+                                    <Input id="2"
+                                        value={companyDetail2.fax}
+                                    />
                                 </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 text-muted"><span>填写文本内容</span></div>
+                                    <Input id="2"
+                                        value={companyDetail2.webservice}
+                                    />
                                 </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>
+                                    <Input id="2"
+                                        value={companyDetail2.ride}
+                                    />
                                 </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>
+                                    <Input id="2"
+                                        value={companyDetail2.landmarks}
+                                    />
                                 </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>
+                                    <Input id="2"
+                                        value={companyDetail2.stay}
+                                    />
                                 </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>
+                                    <Input id="2"
+                                        value={companyDetail2.remarks}
+                                    />
                                 </div>
                             </div>
                         </div>

src/common/popups/index.js

@@ -1,20 +1,24 @@
 import React, { PureComponent } from 'react';
 import { connect } from 'react-redux';
-import { Spin } from 'antd';
+import { Spin,message  } from 'antd';
+import 'antd/dist/antd.css';
 import { actionCreators } from './store';
-// import { BrowserRouter, Route,Link } from 'react-router-dom';
-
-// import { actionCreators } from './store';
 
 import Client from './client';
 import Company from './company';
 
-class popups extends PureComponent {
+const error = (msg) => {
+  message.error({
+    content: msg,
+  });
+};
 
+class popups extends PureComponent {
 
+  
   render() {
-    const { companyDetail } = this.props;
-
+    const { companyDetail,loading,mainView } = this.props;
+    
     return (
 
       <div className="modal fade" id="detail" role="dialog" aria-hidden="true" data-backdrop="static">
@@ -22,21 +26,21 @@ class popups extends PureComponent {
 
         <div className="modal-dialog modal-xl">
           <div className="modal-content">
-            <Spin size="large" spinning={false} >
+            
               <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="sheet-box row m-0">
-                  <div className="sheet-left-panel">
-
 
 
 
+                <Spin size="large" spinning={loading} >
+                <div className="sheet-box row m-0">
+                  <div className="sheet-left-panel">
 
 
-                    {this.props.mainView === 'client' && <Client />}
-                    {this.props.mainView === 'company' && <Company />}
+                    {mainView === 'client' && <Client />}
+                    {mainView === 'company' && <Company />}
 
 
 
@@ -254,10 +258,23 @@ class popups extends PureComponent {
                     </div>
                   </div>
                 </div> */}
+
+
+
+
+
+
+
+
                 </div>
+                </Spin>
+
+
+
+
               </div>
 
-            </Spin>
+           
           </div>
         </div>
 
@@ -270,7 +287,7 @@ class popups extends PureComponent {
     this.props.onRef(this);
   }
 
-  handleCompanyPopups(key){
+  handleCompanyPopups(key) {
     const { handleCompanyPopups } = this.props;
     handleCompanyPopups(key);
   }
@@ -281,14 +298,15 @@ const mapStateToProps = (state) => {
   return {
     popupsClientId: state.getIn(['popups', 'popupsClientId']),
     companyDetail: state.getIn(['popups', 'companyDetail']),
+    loading: state.getIn(['popups', 'loading']),
   }
 }
 
 const mapDispathToProps = (dispatch) => {
   return {
     handleCompanyPopups(key) {
-      console.log('ajax data');
-      //dispatch(actionCreators.changeLoading());
+      dispatch(actionCreators.changeLoading());
+      dispatch(actionCreators.getCompanyDetail(key,error));
     },
   }
 }

src/common/popups/store/actionCreators.js

@@ -1,52 +1,35 @@
 import * as constants from './constants';
 import { fromJS } from 'immutable';
-
+import * as config from '../../../common/config.js';
 import axios from '../../../common/axios_auth.js';
-// import axios from 'axios';
-
-
 
-//actionType
-export const searchFocus = () => ({
-    type: constants.SEARCH_FOCUS
-});
-
-export const getList = () => {
+export const getCompanyDetail = (key,error) => {
     return (dispatch) => {
-        axios.get('/api/submenuList.json').then((res) => {
+        axios.get(config.CLD2API + '/contact/companyDetail/'+key).then((res) => {
             const data = res.data;
-            dispatch(changeList(data.data));
-        }).catch(() => {
-            console.log('error');
+            if (data.code === 200) {
+                dispatch({
+                    type: constants.CHANGE_COMPANY_DETAIL,
+                    data: data.data,
+                });
+            } else {
+                error('公司详情请求失败');
+            }
+        }).catch((e) => {
+            error('公司详情请求失败');
         })
     }
 };
 
-export const changeInputValue = (value) => (  {
-    type: constants.CHANGE_INPUTVALUE,
-    data:fromJS(value),
-});
-
-const changeList = (data) => ({
-    type: constants.CHANGE_LIST,
-    data: fromJS(data),
-    // totalPage: Math.ceil(data.length / 10)
-});
-
-// export const searchBlur = () => ({
-// 	type: constants.SEARCH_BLUR
-// });
-
-// export const mouseEnter = () => ({
-// 	type: constants.MOUSE_ENTER
-// });
+//loading
+export const changeLoading = () => {
+    return (dispatch) => {
+        dispatch({
+            type: constants.CHANGE_COMPANYDETAIL_LOADING,
+            data: true,
+        });
+    }
+}
 
-// export const mouseLeave = () => ({
-// 	type: constants.MOUSE_LEAVE
-// });
 
-// export const changePage = (page) => ({
-// 	type: constants.CHANGE_PAGE,
-// 	page
-// });
 

src/common/popups/store/constants.js

@@ -1,5 +1,5 @@
-export const SEARCH_FOCUS = 'submenu/SEARCH_FOCUS';
-export const CHANGE_LIST ='submenu/CHANGE_LIST';
-export const CHANGE_INPUTVALUE ='submenu/CHANGE_INPUTVALUE';
+export const CHANGE_COMPANY_DETAIL = 'popups/change_company_detail';
+export const CHANGE_COMPANYDETAIL_LOADING = 'popups/change_companydetail_loading';
+
 
 

src/common/popups/store/reducer.js

@@ -4,27 +4,22 @@ import { fromJS } from 'immutable';
 
 const defaultState = fromJS({
 	popupsClientId: '',
-
-	companyDetail: { 
-		companyname: '',
-		local:'',
-		nature:'',
-		address:'',
-		fax:'',
-		webservice:'',
-		ride:'',
-		stay:'',
-		landmarks:'',
-		remark:'',
-	 },
+	companyDetail: {staffDetial:{}},
+	loading: true,
+	districtOptions:[],
 });
 
 
 export default (state = defaultState, action) => {
 
 	switch (action.type) {
-		// 	case constants.SEARCH_FOCUS:
-		// 		return state.set('focused', true);
+		case constants.CHANGE_COMPANY_DETAIL:
+			return state.merge({
+				loading: false,
+				companyDetail: fromJS(action.data)
+			});
+		case constants.CHANGE_COMPANYDETAIL_LOADING:
+			return state.set('loading', action.data);
 		// 	case constants.SEARCH_BLUR:
 		// 		return state.set('focused', false);
 		// 	case constants.CHANGE_LIST:

src/common/store/reducer.js

@@ -3,6 +3,7 @@ import { fromJS } from 'immutable';
 
 const defaultState = fromJS({
 	csrfToken:'',
+	staff:{}
 });
 
 export default (state = defaultState, action) => {

src/contact/company/index.js

@@ -4,7 +4,7 @@ import StaffHeader from '../../common/staffHeader';
 import { actionCreators } from './store';
 
 import { Table, Radio, Input, Space, Tag } from 'antd';
-import { AudioOutlined } from '@ant-design/icons';
+// import { AudioOutlined } from '@ant-design/icons';
 import 'antd/dist/antd.css';
 
 
@@ -159,8 +159,6 @@ class company extends PureComponent {
 
         </main>
 
-
-
         <Popups mainView={'company'} onRef={(ref) => popupsObj = ref} />
 
 
@@ -236,6 +234,7 @@ const mapDispathToProps = (dispatch) => {
     },
     //弹出详情页点击触发
     handleCompanyPopups(key) {
+
       popupsObj.handleCompanyPopups(key);
       // console.log(popupsObj);
       // console.log(key);

src/contact/company/store/reducer.js

@@ -146,7 +146,7 @@ export default (state = defaultState, action) => {
 		case constants.CHANGE_COMPANY_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>,
+				render: (text, record) => <a onClick={() => action.props.handleCompanyPopups(record.key)} href="#detail" data-toggle="modal" data-target="#detail"  >{text}</a>,
 			}
 			columns[0] = columnsDetail;
 			let pagination = {

src/contact/store/reducer.js

@@ -3,7 +3,7 @@ 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';
-
+import { reducer as commonStore } from '../../common/store';
 
 
 const reducer = combineReducers({
@@ -11,6 +11,7 @@ const reducer = combineReducers({
     client: clientReducer,
     company: companyReducer,
     popups:popupsReducer,
+    common:commonStore,
 });
 
 export default reducer;

src/login/store/actionCreators.js

@@ -36,7 +36,9 @@ export const login = (parameter) => {
             const data = res.data;
             if (data.code === 200) {
                 window.location.href = '/contact/company';
-            } 
+            } else{
+                alert('登录不正确');
+            }
         }).catch((e) => {
             console.log('error');
         })