liting2017 7 years ago
parent
commit
aa0b5072c0

+ 4 - 44
js/component/manageCenter/customer/report/departmentReport.jsx

@@ -61,7 +61,8 @@ const PersonalReport = React.createClass({
 						})
 					})
 				}
-				theArr.push(
+				if(theArr.length){
+					theArr.push(
 						{
 							key:9999999,
 							theNumber:true,
@@ -78,8 +79,8 @@ const PersonalReport = React.createClass({
 							annuallyOrderAmount:total.annuallyTotalAmount,//年签单业绩
 						}
 					)
+				}
 				this.setState({
-					
 					dataSource: theArr,
 				})
 			}.bind(this),
@@ -118,46 +119,6 @@ const PersonalReport = React.createClass({
 			});
 		}.bind(this));
 	},
-	departmentList() {
-		this.setState({
-			loading: true
-		});
-		$.ajax({
-			method: "post",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context + "/api/admin/organization/selectSuperId",
-			data: {
-
-			},
-			success: function(data) {
-				let thedata = data.data;
-				let theArr = [];
-				if(!thedata) {
-					if(data.error && data.error.length) {
-						message.warning(data.error[0].message);
-					};
-					thedata = {};
-				} else {
-					thedata.map(function(item, index) {
-						theArr.push({
-							key: index,
-							name: item.name,
-							id: item.id,
-							depNo: item.depNo
-						})
-					})
-				}
-				this.setState({
-					departmentArr: theArr,
-				})
-			}.bind(this),
-		}).always(function() {
-			this.setState({
-				loading: false
-			});
-		}.bind(this));
-	},
 	//时间选择
     selTime(value,index){
     	this.setState({
@@ -205,7 +166,7 @@ const PersonalReport = React.createClass({
 				fixed:true,
 				render:(text,record)=>{
 				     if(!record.theNumber){
-				     	return text
+				     	return text&&text.length>6?<span title={text}>{text.substr(0,6)+'…'}</span>:text
 				     }else{
 				     	return {
 				     		children: text,
@@ -564,7 +525,6 @@ const PersonalReport = React.createClass({
 		this.totalData()
 	},
 	componentWillMount() {
-		this.departmentList();
 		this.totalData();
 		let times=new Date();
 		let nowTime=times.getFullYear()+'年'+(times.getMonth()+1)+'月'+times.getDate()+'日';

+ 24 - 22
js/component/manageCenter/customer/report/personalReport.jsx

@@ -72,27 +72,29 @@ const PersonalReport = React.createClass({
 				if(!data.data.length){
 					this.state.pagination.total=0;
 				};
-				theArr.push(
-						{
-							key:9999999,
-							theNumber:true,
-							nub:data.data.length+1,
-							name:'',
-							position:'', //职务
-							enrollTime:'',// 入职时间
-							departmentName:'合计',
-							dailyOrderCount:total.dailyTotalCount,//日签单业绩
-							dailyOrderAmount:total.dailyTotalAmount,//日签单业绩
-							weeklyOrderCount:total.weeklyTotalCount,//周签单业绩
-							weeklyOrderAmount:total.weeklyTotalAmount,//周签单业绩
-							monthlyOrderCount:total.monthlyTotalCount,//月签单业绩
-							monthlyOrderAmount:total.monthlyTotalAmount,//月签单业绩
-							quarterlyOrderCount:total.quarterlyTotalCount,//季签单业绩
-							quarterlyOrderAmount:total.quarterlyTotalAmount,//季签单业绩
-							annuallyOrderCount:total.annuallyTotalCount,//年签单业绩
-							annuallyOrderAmount:total.annuallyTotalAmount,//年签单业绩
-						}
-					)
+				if(theArr.length){
+					theArr.push(
+							{
+								key:9999999,
+								theNumber:true,
+								nub:data.data.length+1,
+								name:'',
+								position:'', //职务
+								enrollTime:'',// 入职时间
+								departmentName:'合计',
+								dailyOrderCount:total.dailyTotalCount,//日签单业绩
+								dailyOrderAmount:total.dailyTotalAmount,//日签单业绩
+								weeklyOrderCount:total.weeklyTotalCount,//周签单业绩
+								weeklyOrderAmount:total.weeklyTotalAmount,//周签单业绩
+								monthlyOrderCount:total.monthlyTotalCount,//月签单业绩
+								monthlyOrderAmount:total.monthlyTotalAmount,//月签单业绩
+								quarterlyOrderCount:total.quarterlyTotalCount,//季签单业绩
+								quarterlyOrderAmount:total.quarterlyTotalAmount,//季签单业绩
+								annuallyOrderCount:total.annuallyTotalCount,//年签单业绩
+								annuallyOrderAmount:total.annuallyTotalAmount,//年签单业绩
+							}
+						)
+					}
 				this.setState({
                     dataSource: theArr,
                     pagination: this.state.pagination,
@@ -243,7 +245,7 @@ const PersonalReport = React.createClass({
 				key: 'departmentName',
 				render:(text,record)=>{
 				     if(!record.theNumber){
-				     	return text
+				     	return text&&text.length>6?<span title={text}>{text.substr(0,6)+'…'}</span>:text
 				     }else{
 				     	return {
 				     		children: text,