dengzhiguo 6 years ago
parent
commit
71669d4f7c

+ 33 - 6
js/component/manageCenter/customer/customerMarketing/timeStatistics.jsx

@@ -263,6 +263,10 @@ const DiurnalStatistics = React.createClass({
 			visible: false,
 			showDesc: false,
 			timeState:false,
+			weekColor:true,
+			monthColor:false,
+			quarterColor:false,
+			yearColor:false,
 			Dtime:undefined,
 			selTime:'',
 			columns: [
@@ -428,21 +432,45 @@ const DiurnalStatistics = React.createClass({
 		this.state.releaseDate[0] = undefined;//开始时间清零
 		this.state.releaseDate[1] = undefined;//结束时间清零
 		this.totalData(0);
+		this.setState({
+			weekColor:true,
+			monthColor:false,
+			quarterColor:false,
+			yearColor:false
+		})
 	},
 	month(){
 		this.state.releaseDate[0] = undefined;//开始时间清零
 		this.state.releaseDate[1] = undefined;//结束时间清零
 		this.totalData(1);
+		this.setState({
+			weekColor:false,
+			monthColor:true,
+			quarterColor:false,
+			yearColor:false
+		})
 	},
 	quarter(){
 		this.state.releaseDate[0] = undefined;//开始时间清零
 		this.state.releaseDate[1] = undefined;//结束时间清零
 		this.totalData(2);
+		this.setState({
+			weekColor:false,
+			monthColor:false,
+			quarterColor:true,
+			yearColor:false
+		})
 	},
 	year(){
 		this.state.releaseDate[0] = undefined;//开始时间清零
 		this.state.releaseDate[1] = undefined;//结束时间清零
 		this.totalData(3);
+		this.setState({
+			weekColor:false,
+			monthColor:false,
+			quarterColor:false,
+			yearColor:true
+		})
 	},
 	//重构排序
 	tabChange(pagination,filter,sorter){
@@ -473,10 +501,10 @@ const DiurnalStatistics = React.createClass({
                             onChange={(e) => { this.setState({ superId: e }) }} notFoundContent="未获取到上级组织列表">
                             {this.state.contactsOption}
 		          	</Select>
-		          	<Button onClick={this.week} style={{marginRight:'5px'}}>本周</Button>
-		          	<Button onClick={this.month} style={{marginRight:'5px'}}>本月</Button>
-		          	<Button onClick={this.quarter} style={{marginRight:'5px'}}>本季</Button>
-		          	<Button onClick={this.year} style={{marginRight:'5px'}}>本年</Button>
+		          	<Button onClick={this.week} style={{marginRight:'5px'}} type={this.state.weekColor?"primary":''}>本周</Button>
+		          	<Button onClick={this.month} style={{marginRight:'5px'}} type={this.state.monthColor?"primary":''}>本月</Button>
+		          	<Button onClick={this.quarter} style={{marginRight:'5px'}} type={this.state.quarterColor?"primary":''}>本季</Button>
+		          	<Button onClick={this.year} style={{marginRight:'5px'}} type={this.state.yearColor?"primary":''}>本年</Button>
 		          	<span className="titleTime" style={{marginRight:'5px'}}>起止时间:</span>
 						<RangePicker
                             value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
@@ -487,8 +515,7 @@ const DiurnalStatistics = React.createClass({
 				</div>
 				<div id='daochu'>
 					<div className="surfaceTitle">
-						<span className="nowtime">{this.state.timeState?this.state.txtTime:this.state.Nowtime}</span>
-						<span>客户营销统计表(部门)</span>
+				   	<span>客户营销统计表(部门)</span>
 					</div>
 					<div className="patent-table" id='daochu'>
 						<div className="scroll">

+ 32 - 5
js/component/manageCenter/customer/customerMarketing/timeStatisticsOne.jsx

@@ -261,6 +261,10 @@ const DiurnalStatisticsOne = React.createClass({
 			visible: false,
 			showDesc: false,
 			timeState:false,
+			weekColor:true,
+			monthColor:false,
+			quarterColor:false,
+			yearColor:false,
 			Dtime:undefined,
 			selTime:'',
 			columns: [
@@ -442,21 +446,45 @@ const DiurnalStatisticsOne = React.createClass({
 		this.state.releaseDate[0] = undefined;//开始时间清零
 		this.state.releaseDate[1] = undefined;//结束时间清零
 		this.totalData(0);
+		this.setState({
+			weekColor:true,
+			monthColor:false,
+			quarterColor:false,
+			yearColor:false
+		})
 	},
 	month(){
 		this.state.releaseDate[0] = undefined;//开始时间清零
 		this.state.releaseDate[1] = undefined;//结束时间清零
 		this.totalData(1);
+		this.setState({
+			weekColor:false,
+			monthColor:true,
+			quarterColor:false,
+			yearColor:false
+		})
 	},
 	quarter(){
 		this.state.releaseDate[0] = undefined;//开始时间清零
 		this.state.releaseDate[1] = undefined;//结束时间清零
 		this.totalData(2);
+		this.setState({
+			weekColor:false,
+			monthColor:false,
+			quarterColor:true,
+			yearColor:false
+		})
 	},
 	year(){
 		this.state.releaseDate[0] = undefined;//开始时间清零
 		this.state.releaseDate[1] = undefined;//结束时间清零
 		this.totalData(3);
+		this.setState({
+			weekColor:false,
+			monthColor:false,
+			quarterColor:false,
+			yearColor:true
+		})
 	},
 	componentWillMount() {
 		this.totalData(0);
@@ -481,10 +509,10 @@ const DiurnalStatisticsOne = React.createClass({
                             onChange={(e) => { this.setState({ superId: e }) }} notFoundContent="未获取到上级组织列表">
                             {this.state.contactsOption}
 		          	</Select>
-		          	<Button onClick={this.week} style={{marginRight:'5px'}}>本周</Button>
-		          	<Button onClick={this.month} style={{marginRight:'5px'}}>本月</Button>
-		          	<Button onClick={this.quarter} style={{marginRight:'5px'}}>本季</Button>
-		          	<Button onClick={this.year} style={{marginRight:'5px'}}>本年</Button>
+		          	<Button onClick={this.week} style={{marginRight:'5px'}} type={this.state.weekColor?"primary":''}>本周</Button>
+		          	<Button onClick={this.month} style={{marginRight:'5px'}} type={this.state.monthColor?"primary":''}>本月</Button>
+		          	<Button onClick={this.quarter} style={{marginRight:'5px'}} type={this.state.quarterColor?"primary":''}>本季</Button>
+		          	<Button onClick={this.year} style={{marginRight:'5px'}} type={this.state.yearColor?"primary":''}>本年</Button>
 		          	<span className="titleTime" style={{marginRight:'5px'}}>起止时间:</span>
 						<RangePicker
                             value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
@@ -495,7 +523,6 @@ const DiurnalStatisticsOne = React.createClass({
 				</div>
 				<div id='daochu1'>
 					<div className="surfaceTitle">
-						<span className="nowtime">{this.state.timeState?this.state.txtTime:this.state.Nowtime}</span>
 						<span>客户营销统计表(员工)</span>
 					</div>
 					<div className="patent-table">

+ 6 - 1
js/component/manageCenter/order/myOrder/servicesOrder/myService.jsx

@@ -57,7 +57,8 @@ const MyService=Form.create()(React.createClass({
 	                         orderChannel:thisdata.orderChannel,
 	                         salesmanName:thisdata.salesmanName,
 	                         active:thisdata.active,
-	                         signTime:thisdata.signTime
+	                         signTime:thisdata.signTime,
+	                         financeName:thisdata.financeName
                         });
                     };
                     this.state.pagination.current = data.data.pageNo;
@@ -162,6 +163,10 @@ const MyService=Form.create()(React.createClass({
                     title: '订单负责人',
                     dataIndex: 'salesmanName',
                     key: 'salesmanName'
+                },{
+                    title: '财务负责人',
+                    dataIndex: 'financeName',
+                    key: 'financeName'
                 },
                 {
                     title: '操作',

+ 5 - 0
js/component/manageCenter/servicesManage/projectOrder/myTask/projectManageDetaile.jsx

@@ -314,6 +314,11 @@ const MySettlementDetaile = Form.create()(React.createClass({
 					                            label="资料负责人" >
 						                    	<span>{orderDetaiel.taskReceiverName}</span>
 				                    	</FormItem>
+				                    	<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="订单部门" >
+						                    	<span>{orderDetaiel.departmentName}</span>
+				                    	</FormItem>
 							        </div>
 							        <div className='clearfix'>
 								        <FormItem 

+ 5 - 1
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManageDetaile.jsx

@@ -1151,7 +1151,11 @@ const MySettlementDetaile = Form.create()(React.createClass({
 				                            label="结算状态" >  
 				                            <span>{getPaymentState(orderArr.liquidationStatus)}</span>
 			                    		</FormItem>
-			                    		
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单部门" >  
+				                            <span>{orderArr.departmentName}</span>
+			                    		</FormItem>
 					                    <div className='clearfix'>
 								        	<FormItem className="half-item"
 					                            {...formItemLayout}

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

@@ -162,6 +162,11 @@ const MySettlementDetaile = Form.create()(React.createClass({
 					                    	<span>{orderDetaiel.taskAllocatorName}</span>
 				                    	</FormItem>
 				                    	<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单部门" >
+					                    	<span>{orderDetaiel.departmentName}</span>
+				                    	</FormItem>
+				                    	<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="派单时间" >
 						                    	<span>{orderDetaiel.taskDistributionTime}</span>