liting2017 6 年 前
コミット
4801d89554
共有18 個のファイルを変更した43 個の追加662 個の削除を含む
  1. 0 2
      js/component/manageCenter/customer/NEW/intentionCustomer/addIntention.jsx
  2. 4 6
      js/component/manageCenter/customer/NEW/intentionCustomer/intentionCustomer.jsx
  3. 0 1
      js/component/manageCenter/customer/NEW/intentionCustomer/intentionDetail/detail/contactPerson.jsx
  4. 1 1
      js/component/manageCenter/customer/NEW/intentionCustomer/intentionDetail/detail/visitDetail.jsx
  5. 0 153
      js/component/manageCenter/customer/NEW/intentionCustomer/myClient.less
  6. 0 145
      js/component/manageCenter/customer/NEW/publicCustomer/myClient.less
  7. 14 18
      js/component/manageCenter/customer/NEW/publicCustomer/publicCustomer.jsx
  8. 7 0
      js/component/manageCenter/customer/NEW/publicCustomer/publicCustomer.less
  9. 0 145
      js/component/manageCenter/customer/NEW/query/myClient.less
  10. 1 1
      js/component/manageCenter/customer/NEW/query/queryCutomer.jsx
  11. 1 1
      js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/visitDetail.jsx
  12. 0 152
      js/component/manageCenter/customer/NEW/signCustomer/myClient.less
  13. 3 4
      js/component/manageCenter/customer/NEW/signCustomer/signCustomer.jsx
  14. 1 32
      js/component/manageCenter/leftTab.less
  15. 4 0
      js/component/manageCenter/servicesManage/projectOrder/myTask/projectManage.jsx
  16. 2 1
      js/component/manageCenter/servicesManage/projectOrder/myTask/projectManageDetaile.jsx
  17. 4 0
      js/component/manageCenter/servicesManage/projectOrder/taskManagement/projectManage.jsx
  18. 1 0
      js/component/manageCenter/servicesManage/projectOrder/taskManagement/projectManageDetaile.jsx

+ 0 - 2
js/component/manageCenter/customer/NEW/intentionCustomer/addIntention.jsx

@@ -1,6 +1,5 @@
 import React from 'react';
 import { Icon,  Modal, message,  Spin, Input, Select, Button, Form ,Col} from 'antd';
-import './myClient.less';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import {socialAttribute,customerSource} from '@/dataDic.js';
@@ -12,7 +11,6 @@ const AchievementDetailForm = Form.create()(React.createClass({
             detailApi:''
         };
     },
-
     handleSubmit(e) {
     	e.preventDefault();
         this.props.form.validateFields((err, values) => {   

+ 4 - 6
js/component/manageCenter/customer/NEW/intentionCustomer/intentionCustomer.jsx

@@ -3,7 +3,6 @@ import { Radio, Icon, Button, AutoComplete,Cascader,Input, Select, Spin, Popconf
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
-import './myClient.less';
 import { citySelect, provinceList } from '@/NewDicProvinceList';
 import AddIntention from './addIntention.jsx';
 import { socialAttribute, industry, auditStatusL, lvl, currentMember } from '@/dataDic.js';
@@ -51,11 +50,10 @@ const IntentionCustomer = Form.create()(React.createClass({
 							contactMobile: thisdata.contactMobile,
 							industry: thisdata.industry,
 							societyTag: thisdata.societyTag,
-							transferTime:thisdata.transferTime,//客户初始时间
-							lastFollowTime:thisdata.lastFollowTime,//最后跟进时间
-							transferTime:thisdata.transferTime,//客户初始时间
-							surplusFollowTime:thisdata.surplusFollowTime,//客户初始时间
-							surplusSignTime:thisdata.surplusSignTime,//客户初始时间
+							lastFollowTime:thisdata.lastFollowTime&&thisdata.lastFollowTime.split(' ')[0],
+							transferTime:thisdata.transferTime&&thisdata.transferTime.split(' ')[0],
+							surplusFollowTime:thisdata.surplusFollowTime&&thisdata.surplusFollowTime.split(' ')[0],
+							surplusSignTime:thisdata.surplusSignTime&&thisdata.surplusSignTime.split(' ')[0],
 							locationProvince: thisdata.province ? thisdata.province + '-' + thisdata.city + '-' + thisdata.area : '--'
 						});
 					};

+ 0 - 1
js/component/manageCenter/customer/NEW/intentionCustomer/intentionDetail/detail/contactPerson.jsx

@@ -3,7 +3,6 @@ import {Form,Table,Button,Spin,message,Input,Popconfirm,Col} from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 
-
 const ContactPerson = React.createClass({
 	getInitialState() {
 		return {

+ 1 - 1
js/component/manageCenter/customer/NEW/intentionCustomer/intentionDetail/detail/visitDetail.jsx

@@ -369,7 +369,7 @@ const VisitDetail = React.createClass({
 					                </div>
 					                <div className="clearfix">
 					                 	<div style={{fontSize:'18px',marginLeft:'100px',marginTop:'15px',marginBottom:'10px'}}>业务意向<Button onClick={this.addNew} style={{marginLeft:'420px',background:'green',color:'#ffffff'}}>添加新业务</Button></div>
-					                 	<div className="clearfix" style={{paddingLeft:'50px',paddingRight:'50px'}}>
+					                 	<div className="clearfix" >
 		                    			    <Spin spinning={this.state.loading}>
 										      <Table 
 										         rowKey={record => record.id}

+ 0 - 153
js/component/manageCenter/customer/NEW/intentionCustomer/myClient.less

@@ -1,153 +0,0 @@
-.user-content {
-    background: #fff;
-    padding: 20px;
-    .content-title {
-        color: #333;
-        font-size: 16px;
-        overflow: hidden;
-    }
-    .user-search {
-        margin-bottom: 10px;
-        >input {
-            width: 140px;
-        }
-        >input,
-        >button,
-        .ant-select {
-            margin-right: 10px;
-            margin-top: 10px;
-        }
-        .ant-switch {
-            margin-left: 10px;
-        }
-        .search-more {
-            margin: 10px 0;
-            >span {
-                margin-right: 10px
-            }
-        }
-    }
-}
-.tabcolor .ant-table-thead > tr > th{background: none!important;}
-.avatar-uploader,
-.avatar-uploader-trigger,
-.avatar {
-    width: 150px;
-    height: 150px;
-}
-.modal-box-title{float: left;}
-.modal-box-detail{margin-left: 10px;vertical-align: top;float: left;margin-top: 0px;width: 160px!important;}
-.avatar-uploader-trigger {
-    display: table-cell;
-    vertical-align: middle;
-    font-size: 28px;
-    color: #999;
-}
-.avatar-uploader {
-    display: block;
-    padding: 1px;
-    border: 1px dashed #d9d9d9;
-    border-radius: 6px;
-    cursor: pointer;
-    position: relative;
-    img {
-        position: absolute;
-        top: -1px;
-        left: -1px;
-        height: 150px;
-    } //
-    float: left;
-    margin-right: 20px;
-}
-.patent-addNew {
-    float: right;
-    margin-left: 20px;
-    >* {
-        float: left;
-        margin-right: 20px;
-    }
-    .addButton {
-        background: #ea0862;
-        color: #fff;
-        border: none;
-        border-radius: 4px;
-        padding: 4px 10px;
-    }
-    .addButton:hover {
-        background: #ea0862;
-    }
-}
-.ant-modal-footer{text-align: left;}
-.ant-modal-footer button{width: 100px;margin-top: 15px;margin-bottom: 15px;}
-.ant-modal-footer button:first-child{margin-left: 80px;margin-right: 30px;}
-.ant-modal-title{font-size: 20px;}
-.saveBtn{margin-left: 210px;margin-right: 30px;margin-top: 20px;margin-bottom: 50px;}
-.ContactsList{float: right;margin-right: 100px;margin-bottom: 30px;margin-top: 10px;}
-.pictures .ant-row{display: inline-block;width: 550px;}
-#demand-form {
-    .half-item {
-        float: left;
-        width: 50%;
-        margin-bottom: 10px;
-    }
-    .item-title {
-        line-height: 30px;
-        font-size: 14px;
-        color: #666;
-    }
-    .form-title {
-        font-size: 16px;
-        color: #333;
-    }
-    .keyWord-tips {
-        >button {
-            vertical-align: middle;
-        }
-    }
-    .set-submit {
-       margin-left:100px;
-       margin-bottom: 50px;
-       margin-right: 50px!important;
-       
-    }
-    .demandDetailShow-upload {
-        .anticon-eye-o {
-            margin-left: -8px;
-        }
-        .anticon-delete {
-            display: none
-        }
-    }
-    .setSubmit{
-        margin-left:200px;
-       margin-bottom: 50px;
-       margin-right: 50px!important;
-    }
-}
-
-.ant-modal-content {
-    .modal-submit {
-        margin-left: 20px;
-    }
-}
-
-.demand-order-content {
-    .ant-row {
-        margin-bottom: 20px;
-    }
-    .ant-input-number-handler-wrap {
-        display: none
-    }
-}
-.ant-table-thead {
-    .ant-table-selection-column {
-        .ant-checkbox-wrapper {
-            display: none;
-        }
-    }
-}
-.mandatory{
-    color: red;
-    margin-left: 5px;
-}
-

+ 0 - 145
js/component/manageCenter/customer/NEW/publicCustomer/myClient.less

@@ -1,145 +0,0 @@
-.user-content {
-    background: #fff;
-    padding: 20px;
-    .content-title {
-        color: #333;
-        font-size: 16px;
-        overflow: hidden;
-    }
-    .user-search {
-        margin-bottom: 10px;
-        >input {
-            width: 140px;
-        }
-        >input,
-        >button,
-        .ant-select {
-            margin-right: 10px;
-            margin-top: 10px;
-        }
-        .ant-switch {
-            margin-left: 10px;
-        }
-        .search-more {
-            margin: 10px 0;
-            >span {
-                margin-right: 10px
-            }
-        }
-    }
-}
-.tabcolor .ant-table-thead > tr > th{background: none!important;}
-.avatar-uploader,
-.avatar-uploader-trigger,
-.avatar {
-    width: 150px;
-    height: 150px;
-}
-.modal-box-title{float: left;}
-.modal-box-detail{margin-left: 10px;vertical-align: top;float: left;margin-top: 0px;width: 160px!important;}
-.avatar-uploader-trigger {
-    display: table-cell;
-    vertical-align: middle;
-    font-size: 28px;
-    color: #999;
-}
-.avatar-uploader {
-    display: block;
-    padding: 1px;
-    border: 1px dashed #d9d9d9;
-    border-radius: 6px;
-    cursor: pointer;
-    position: relative;
-    img {
-        position: absolute;
-        top: -1px;
-        left: -1px;
-        height: 150px;
-    } //
-    float: left;
-    margin-right: 20px;
-}
-.patent-addNew {
-    float: right;
-    margin-left: 20px;
-    >* {
-        float: left;
-        margin-right: 20px;
-    }
-    .addButton {
-        background: #ea0862;
-        color: #fff;
-        border: none;
-        border-radius: 4px;
-        padding: 4px 10px;
-    }
-    .addButton:hover {
-        background: #ea0862;
-    }
-}
-.ant-modal-footer{text-align: left;}
-.ant-modal-footer button{width: 100px;margin-top: 15px;margin-bottom: 15px;}
-.ant-modal-footer button:first-child{margin-left: 80px;margin-right: 30px;}
-.ant-modal-title{font-size: 20px;}
-.saveBtn{margin-left: 190px;margin-right: 30px;margin-top: 20px;margin-bottom: 50px;}
-.ContactsList{float: right;margin-right: 100px;margin-bottom: 30px;margin-top: 10px;}
-.pictures .ant-row{display: inline-block;width: 550px;}
-#demand-form {
-    .half-item {
-        float: left;
-        width: 50%;
-        margin-bottom: 10px;
-    }
-    .item-title {
-        line-height: 30px;
-        font-size: 14px;
-        color: #666;
-    }
-    .form-title {
-        font-size: 16px;
-        color: #333;
-    }
-    .keyWord-tips {
-        >button {
-            vertical-align: middle;
-        }
-    }
-    .set-submit {
-        margin-right: 20px;
-    }
-    .demandDetailShow-upload {
-        .anticon-eye-o {
-            margin-left: -8px;
-        }
-        .anticon-delete {
-            display: none
-        }
-    }
-}
-
-.ant-modal-content {
-    .modal-submit {
-        margin-left: 20px;
-    }
-}
-
-.demand-order-content {
-    .ant-row {
-        margin-bottom: 20px;
-    }
-    .ant-input-number-handler-wrap {
-        display: none
-    }
-}
-.ant-table-thead {
-    .ant-table-selection-column {
-        .ant-checkbox-wrapper {
-            display: none;
-        }
-    }
-}
-.mandatory{
-    color: red;
-    margin-left: 5px;
-}
-

+ 14 - 18
js/component/manageCenter/customer/NEW/publicCustomer/publicCustomer.jsx

@@ -2,8 +2,8 @@ import React from 'react';
 import { Button,Cascader,Input, Select, Spin, Table, message, Form } from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
-import './myClient.less';
 import { citySelect, provinceList } from '@/NewDicProvinceList';
+import './publicCustomer.less';
 
 const QueryCustomer = React.createClass({
 	loadData(pageNo, apiUrl) {
@@ -36,15 +36,16 @@ const QueryCustomer = React.createClass({
 						theArr.push({
 							key: i,
 							id: thisdata.uid,
-							type: thisdata.type,
 							name: thisdata.name,
-							status: thisdata.status,
 							contacts: thisdata.contacts,
 							contactMobile: thisdata.contactMobile,
 							industry: thisdata.industry,
-							createTime: thisdata.createTime,
-							businessAudit: thisdata.businessAudit,
-							auditStatus: thisdata.auditStatus,
+							societyTag: thisdata.societyTag,
+							lastFollowTime:thisdata.lastFollowTime&&thisdata.lastFollowTime.split(' ')[0],
+							transferTime:thisdata.transferTime&&thisdata.transferTime.split(' ')[0],
+							surplusFollowTime:thisdata.surplusFollowTime&&thisdata.surplusFollowTime.split(' ')[0],
+							surplusSignTime:thisdata.surplusSignTime&&thisdata.surplusSignTime.split(' ')[0],
+							locationProvince: thisdata.province ? thisdata.province + '-' + thisdata.city + '-' + thisdata.area : '--'
 						});
 					};
 					this.state.pagination.current = data.data.pageNo;
@@ -72,8 +73,7 @@ const QueryCustomer = React.createClass({
 			dataSource:[],
 			loading:false,
 			selectedRowKeys: [],
-			selectedRowKey: [],
-			selectedRows: [],
+			selectedRows:[],
 			selectedData:[],
 			pagination: {
 				defaultCurrent: 1,
@@ -101,7 +101,7 @@ const QueryCustomer = React.createClass({
 					key: 'contacts',
 				},{
 					title: '联系电话',
-					dataIndex: 'contactss',
+					dataIndex: 'contactMobile',
 					key: 'contactss',
 				},
 				{
@@ -111,15 +111,10 @@ const QueryCustomer = React.createClass({
 				},
 				{
 					title: '转换时间',
-					dataIndex: 'createTimes',
-					key: 'createTimes',
+					dataIndex: 'transferTime',
+					key: 'transferTime',
 				}, 
 				{
-					title: '客户状态',
-					dataIndex: 'contactst',
-					key: 'contactst',
-				},
-				{
 					title: '操作',
 					dataIndex: 'abc',
 					key: 'abc',
@@ -138,7 +133,7 @@ const QueryCustomer = React.createClass({
 			laodingt:true
 		});
 		let selectIds=[];
-		this.state.selectedData.map((item)=>{
+		this.state.selectedRows.map((item)=>{
 			selectIds.push(`${item.id}`)
 		});
 		$.ajax({
@@ -224,7 +219,7 @@ const QueryCustomer = React.createClass({
 			selectedRowKeys: this.state.selectedRowKeys,
 			onChange: (selectedRowKeys, selectedRows) => {
 				this.setState({
-					selectedRows: selectedRows,
+					selectedRows:selectedRows,
 					selectedRowKeys: selectedRowKeys
 				});
 			},
@@ -234,6 +229,7 @@ const QueryCustomer = React.createClass({
 					recordt: recordt.id
 				})
 			},
+			
 		};
 		const hasSelected = this.state.selectedRowKeys.length > 0;
 		return(

+ 7 - 0
js/component/manageCenter/customer/NEW/publicCustomer/publicCustomer.less

@@ -0,0 +1,7 @@
+.ant-table-thead .ant-table-selection-column .ant-checkbox-wrapper{
+    display: inline-block!important;
+}
+
+thead  tr .ant-table-selection-column  span .ant-checkbox-inner{
+    display: inline-block;
+}

+ 0 - 145
js/component/manageCenter/customer/NEW/query/myClient.less

@@ -1,145 +0,0 @@
-.user-content {
-    background: #fff;
-    padding: 20px;
-    .content-title {
-        color: #333;
-        font-size: 16px;
-        overflow: hidden;
-    }
-    .user-search {
-        margin-bottom: 10px;
-        >input {
-            width: 140px;
-        }
-        >input,
-        >button,
-        .ant-select {
-            margin-right: 10px;
-            margin-top: 10px;
-        }
-        .ant-switch {
-            margin-left: 10px;
-        }
-        .search-more {
-            margin: 10px 0;
-            >span {
-                margin-right: 10px
-            }
-        }
-    }
-}
-.tabcolor .ant-table-thead > tr > th{background: none!important;}
-.avatar-uploader,
-.avatar-uploader-trigger,
-.avatar {
-    width: 150px;
-    height: 150px;
-}
-.modal-box-title{float: left;}
-.modal-box-detail{margin-left: 10px;vertical-align: top;float: left;margin-top: 0px;width: 160px!important;}
-.avatar-uploader-trigger {
-    display: table-cell;
-    vertical-align: middle;
-    font-size: 28px;
-    color: #999;
-}
-.avatar-uploader {
-    display: block;
-    padding: 1px;
-    border: 1px dashed #d9d9d9;
-    border-radius: 6px;
-    cursor: pointer;
-    position: relative;
-    img {
-        position: absolute;
-        top: -1px;
-        left: -1px;
-        height: 150px;
-    } //
-    float: left;
-    margin-right: 20px;
-}
-.patent-addNew {
-    float: right;
-    margin-left: 20px;
-    >* {
-        float: left;
-        margin-right: 20px;
-    }
-    .addButton {
-        background: #ea0862;
-        color: #fff;
-        border: none;
-        border-radius: 4px;
-        padding: 4px 10px;
-    }
-    .addButton:hover {
-        background: #ea0862;
-    }
-}
-.ant-modal-footer{text-align: left;}
-.ant-modal-footer button{width: 100px;margin-top: 15px;margin-bottom: 15px;}
-.ant-modal-footer button:first-child{margin-left: 80px;margin-right: 30px;}
-.ant-modal-title{font-size: 20px;}
-.saveBtn{margin-left: 190px;margin-right: 30px;margin-top: 20px;margin-bottom: 50px;}
-.ContactsList{float: right;margin-right: 100px;margin-bottom: 30px;margin-top: 10px;}
-.pictures .ant-row{display: inline-block;width: 550px;}
-#demand-form {
-    .half-item {
-        float: left;
-        width: 50%;
-        margin-bottom: 10px;
-    }
-    .item-title {
-        line-height: 30px;
-        font-size: 14px;
-        color: #666;
-    }
-    .form-title {
-        font-size: 16px;
-        color: #333;
-    }
-    .keyWord-tips {
-        >button {
-            vertical-align: middle;
-        }
-    }
-    .set-submit {
-        margin-right: 20px;
-    }
-    .demandDetailShow-upload {
-        .anticon-eye-o {
-            margin-left: -8px;
-        }
-        .anticon-delete {
-            display: none
-        }
-    }
-}
-
-.ant-modal-content {
-    .modal-submit {
-        margin-left: 20px;
-    }
-}
-
-.demand-order-content {
-    .ant-row {
-        margin-bottom: 20px;
-    }
-    .ant-input-number-handler-wrap {
-        display: none
-    }
-}
-.ant-table-thead {
-    .ant-table-selection-column {
-        .ant-checkbox-wrapper {
-            display: none;
-        }
-    }
-}
-.mandatory{
-    color: red;
-    margin-left: 5px;
-}
-

+ 1 - 1
js/component/manageCenter/customer/NEW/query/queryCutomer.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Button,Cascader,Input, Select, Spin, Table, message, Form } from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
-import './myClient.less';
+
 import { citySelect, provinceList } from '@/NewDicProvinceList';
 import Detaile from './detail.jsx';
 

+ 1 - 1
js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/visitDetail.jsx

@@ -305,7 +305,7 @@ const VisitDetail = React.createClass({
 					                </div>
 					                <div className="clearfix">
 					                 	<div style={{fontSize:'18px',marginLeft:'100px',marginTop:'15px',marginBottom:'10px'}}>业务意向</div>
-					                 	<div className="clearfix" style={{paddingLeft:'50px',paddingRight:'50px'}}>
+					                 	<div className="clearfix">
 		                    			    <Spin spinning={this.state.loading}>
 										      <Table 
 										         rowKey={record => record.id}

+ 0 - 152
js/component/manageCenter/customer/NEW/signCustomer/myClient.less

@@ -1,152 +0,0 @@
-.user-content {
-    background: #fff;
-    padding: 20px;
-    .content-title {
-        color: #333;
-        font-size: 16px;
-        overflow: hidden;
-    }
-    .user-search {
-        margin-bottom: 10px;
-        >input {
-            width: 140px;
-        }
-        >input,
-        >button,
-        .ant-select {
-            margin-right: 10px;
-            margin-top: 10px;
-        }
-        .ant-switch {
-            margin-left: 10px;
-        }
-        .search-more {
-            margin: 10px 0;
-            >span {
-                margin-right: 10px
-            }
-        }
-    }
-}
-.tabcolor .ant-table-thead > tr > th{background: none!important;}
-.avatar-uploader,
-.avatar-uploader-trigger,
-.avatar {
-    width: 150px;
-    height: 150px;
-}
-.modal-box-title{float: left;}
-.modal-box-detail{margin-left: 10px;vertical-align: top;float: left;margin-top: 0px;width: 160px!important;}
-.avatar-uploader-trigger {
-    display: table-cell;
-    vertical-align: middle;
-    font-size: 28px;
-    color: #999;
-}
-.avatar-uploader {
-    display: block;
-    padding: 1px;
-    border: 1px dashed #d9d9d9;
-    border-radius: 6px;
-    cursor: pointer;
-    position: relative;
-    img {
-        position: absolute;
-        top: -1px;
-        left: -1px;
-        height: 150px;
-    } //
-    float: left;
-    margin-right: 20px;
-}
-.patent-addNew {
-    float: right;
-    margin-left: 20px;
-    >* {
-        float: left;
-        margin-right: 20px;
-    }
-    .addButton {
-        background: #ea0862;
-        color: #fff;
-        border: none;
-        border-radius: 4px;
-        padding: 4px 10px;
-    }
-    .addButton:hover {
-        background: #ea0862;
-    }
-}
-.ant-modal-footer{text-align: left;}
-.ant-modal-footer button{width: 100px;margin-top: 15px;margin-bottom: 15px;}
-.ant-modal-footer button:first-child{margin-left: 80px;margin-right: 30px;}
-.ant-modal-title{font-size: 20px;}
-.saveBtn{margin-left: 190px;margin-right: 30px;margin-top: 20px;margin-bottom: 50px;}
-.ContactsList{float: right;margin-right: 100px;margin-bottom: 30px;margin-top: 10px;}
-.pictures .ant-row{display: inline-block;width: 550px;}
-#demand-form {
-    .half-item {
-        float: left;
-        width: 50%;
-        margin-bottom: 10px;
-    }
-    .item-title {
-        line-height: 30px;
-        font-size: 14px;
-        color: #666;
-    }
-    .form-title {
-        font-size: 16px;
-        color: #333;
-    }
-    .keyWord-tips {
-        >button {
-            vertical-align: middle;
-        }
-    }
-    .set-submit {
-       margin-left:100px;
-       margin-bottom: 50px;
-       margin-right: 50px!important;
-    }
-    .demandDetailShow-upload {
-        .anticon-eye-o {
-            margin-left: -8px;
-        }
-        .anticon-delete {
-            display: none
-        }
-    }
-    .setSubmit{
-       margin-left:200px;
-       margin-bottom: 50px;
-       margin-right: 50px!important;
-    }
-}
-
-.ant-modal-content {
-    .modal-submit {
-        margin-left: 20px;
-    }
-}
-
-.demand-order-content {
-    .ant-row {
-        margin-bottom: 20px;
-    }
-    .ant-input-number-handler-wrap {
-        display: none
-    }
-}
-.ant-table-thead {
-    .ant-table-selection-column {
-        .ant-checkbox-wrapper {
-            display: none;
-        }
-    }
-}
-.mandatory{
-    color: red;
-    margin-left: 5px;
-}
-

+ 3 - 4
js/component/manageCenter/customer/NEW/signCustomer/signCustomer.jsx

@@ -3,7 +3,6 @@ import { Radio, Icon, Button, AutoComplete,Cascader,Input, Select, Spin, Popconf
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
-import './myClient.less';
 import { citySelect, provinceList } from '@/NewDicProvinceList';
 import { socialAttribute, industry, auditStatusL, lvl, currentMember } from '@/dataDic.js';
 import { getSocialAttribute, beforeUploadFile } from '@/tools.js';
@@ -51,9 +50,9 @@ const IntentionCustomer = Form.create()(React.createClass({
 							contacts:thisdata.contacts,
 							contactMobile:thisdata.contactMobile,
 							societyTag:thisdata.societyTag,
-							transferTime:thisdata.transferTime,
-							lastSignTime:thisdata.lastSignTime,
-							lastFollowTime:thisdata.lastFollowTime,
+							transferTime:thisdata.transferTime&&thisdata.transferTime.split(' ')[0],
+							lastSignTime:thisdata.lastSignTime&&thisdata.lastSignTime.split(' ')[0],
+							lastFollowTime:thisdata.lastFollowTime&&thisdata.lastFollowTime.split(' ')[0],
 							locationProvince: thisdata.province ? thisdata.province + '-' + thisdata.city+ '-' + thisdata.area : '--'
 						});
 					};

+ 1 - 32
js/component/manageCenter/leftTab.less

@@ -7,43 +7,12 @@
         float: left;
         border-right: none;
         overflow-y: auto;
-        //background: #e8f2fc;
         .ant-menu-submenu {
             .ant-menu-submenu-title {
-                //         padding: 0!important;
-                //         margin: 0;
-                //         border-right: none;
-                //         text-align: center;
                 font-size: 16px;
-                //         color: #4466bf;
-                //         background: #d5e4f7;
-                //         border-top: 1px solid #f2f8fd;
-                //         border-bottom: 1px solid #c0d2e4;
-                //         &:after {
-                //             font-size: 24px;
-                //         } 
             }
         }
-        //.ant-menu-submenu-selected {
-        //     .ant-menu-submenu-title {
-        //         background: #fff;
-        //border-left: 3px solid #58a3ff;
-        //     }
-        //}
-        // .ant-menu-item {
-        //     padding-left: 0!important;
-        //     text-align: center;
-        //     background: #fafafa;
-        //     font-size: 14px;
-        //     color: #333;
-        //     border-bottom: 1px solid #c0d2e4;
-        // }
-        // .ant-menu-item-selected {
-        //     background: #fff;
-        //     color: #4466bf;
-        //     font-size: 16px;
-        //     border-right: none;
-        // }
+      
     }
 }
 .containers{

+ 4 - 0
js/component/manageCenter/servicesManage/projectOrder/myTask/projectManage.jsx

@@ -404,6 +404,9 @@ const MyTask=Form.create()(React.createClass({
         this.loadData();
         this.businessList()
     },
+    close(s){
+    	this.state.showDesc=s
+    },
     //启动
   	startUp(record){
   		this.removeList(true,record)
@@ -551,6 +554,7 @@ const MyTask=Form.create()(React.createClass({
 	                    </Spin>
 	                </div>
 	                <MySettlementDetaile
+	                	close={this.close}
 	                    datauser={this.state.datauser}
 	                    showDesc={this.state.showDesc}
 	                     />

+ 2 - 1
js/component/manageCenter/servicesManage/projectOrder/myTask/projectManageDetaile.jsx

@@ -98,7 +98,8 @@ const MySettlementDetaile = Form.create()(React.createClass({
 	handleCancel(){
 		this.setState({
 			visible:false
-		})
+		});
+		this.props.close(false);
 	},
 	render() {
 		const FormItem = Form.Item

+ 4 - 0
js/component/manageCenter/servicesManage/projectOrder/taskManagement/projectManage.jsx

@@ -404,6 +404,9 @@ const TaskManagement=Form.create()(React.createClass({
             showDesc: true
         });
     },
+    close(s){
+    	this.state.showDesc=s;
+    },
     searchOrder(){
     	this.contactList();
     },
@@ -504,6 +507,7 @@ const TaskManagement=Form.create()(React.createClass({
 	                    </Spin>
 	                </div>
 	                <MySettlementDetaile
+	                	close={this.close}
 	                    datauser={this.state.datauser}
 	                    showDesc={this.state.showDesc}
 	                     />

+ 1 - 0
js/component/manageCenter/servicesManage/projectOrder/taskManagement/projectManageDetaile.jsx

@@ -57,6 +57,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 		this.setState({
 			visible:false
 		})
+		this.props.close(false)
 	},
 	render() {
 		const FormItem = Form.Item