dengzhiguo vor 6 Jahren
Ursprung
Commit
57ca72417b

+ 9 - 9
js/component/manageCenter/customer/customerMarketing/diurnalStatistics.jsx

@@ -46,7 +46,7 @@ const DiurnalStatistics = React.createClass({
 							dailyTelNo:item.values.daily.TelNo,//日电话量
 							dailyVisitNo:item.values.daily.VisitNo,//日外拜量
 							dailyFollowNo:item.values.daily.FollowNo,//日营销总量
-							dailyAVG:item.values.daily.AVG,//日人均营销量
+							dailyAVG:parseFloat(item.values.daily.AVG).toFixed(3),//日人均营销量
 							weekTelNo:item.values.week.TelNo,//周电话量
 							weekFollowNo:item.values.week.FollowNo,//周总量
 							weekVisitNo:item.values.week.VisitNo,//周外拜量
@@ -70,7 +70,7 @@ const DiurnalStatistics = React.createClass({
 							dailyTelNo:total.dailyTelNo,//日电话量
 							dailyVisitNo:total.dailyVisitNo,//日外拜量
 							dailyFollowNo:total.dailyFollowNo,//日营销总量
-							dailyAVG:total.dailyAVG,//日人均营销量
+							dailyAVG:parseFloat(total.dailyAVG).toFixed(3),//日人均营销量
 							weekTelNo:total.weeklyTelNo,//周电话量
 							weekFollowNo:total.weeklyFollowNo,//周总量
 							weekVisitNo:total.weeklyVisitNo,//周外拜量
@@ -389,12 +389,12 @@ const DiurnalStatistics = React.createClass({
 				title: '今日营销',
 				children: [
 					{
-						title: '营销总量',
+						title: '营销总量(所有)',
 						width:100,
 						dataIndex: 'dailyFollowNo',
 						key: 'nudailyFollowNom',
 						sorter: (a, b) => a.dailyFollowNo - b.dailyFollowNo,
-						sortOrder:'ascend'
+//						sortOrder:'ascend'
 					},{
 						title: '电话量',
 						width:80,
@@ -420,7 +420,7 @@ const DiurnalStatistics = React.createClass({
 				title: '周营销累计',
 				children: [
 					{
-						title: '周营销总量',
+						title: '周营销总量(所有)',
 						width:110,
 						dataIndex: 'weekFollowNo',
 						key: 'weekFollowNo',
@@ -443,7 +443,7 @@ const DiurnalStatistics = React.createClass({
 				title: '月营销累计',
 				children: [
 					{
-						title: '月营销总量',
+						title: '月营销总量(所有)',
 						width:110,
 						dataIndex: 'monthsFollowNo',
 						key: 'monthsFollowNo',
@@ -466,7 +466,7 @@ const DiurnalStatistics = React.createClass({
 				title: '年营销累计',
 				children: [
 					{
-						title: '年营销总量',
+						title: '年营销总量(所有)',
 						width:110,
 						dataIndex: 'annualFollowNo',
 						key: 'annualFollowNo',
@@ -520,6 +520,7 @@ const DiurnalStatistics = React.createClass({
 			<div className='set-content'>
 				<p style={{fontSize:'20px',marginBottom:'10px'}}>客户营销统计表(部门)</p>
 				<div className="clearfix">
+					<Button type="primary" onClick={this.tabExel} style={{ float:'right' }}>导出到表格</Button>
 					<span style={{fontSize:'16px'}}>部门机构 : </span>
 					<Select placeholder="选择部门"
                             style={{ width:'200px',marginRight:'10px' }}
@@ -527,7 +528,7 @@ const DiurnalStatistics = React.createClass({
                             onChange={(e) => { this.setState({ superId: e }) }} notFoundContent="未获取到上级组织列表">
                             {this.state.contactsOption}
 		          	</Select>
-		          	<Button type="primary" onClick={this.tabExel} >导出到表格</Button>
+		          	
                   	<Button type="primary" onClick={this.search} style={{marginLeft:'10px',marginRight:'10px'}}>搜索</Button>
 	                <Button onClick={this.reset}>重置</Button>
 				</div>
@@ -535,7 +536,6 @@ const DiurnalStatistics = React.createClass({
 					<div className="surfaceTitle">
 						<span className="nowtime">{this.state.timeState?this.state.txtTime:this.state.Nowtime}</span>
 						<span>客户营销统计表(部门)</span>
-						<span>(每日17:00统计当天数据)</span>
 					</div>
 					<div className="patent-table" id='daochu'>
 						<div className="scroll">

+ 10 - 11
js/component/manageCenter/customer/customerMarketing/diurnalStatisticsOne.jsx

@@ -45,7 +45,7 @@ const DiurnalStatisticsOne = React.createClass({
 							dailyTelNo:item.values.daily.TelNo,//日电话量
 							dailyVisitNo:item.values.daily.VisitNo,//日外拜量
 							dailyFollowNo:item.values.daily.FollowNo,//日营销总量
-							dailyAVG:item.values.daily.AVG,//日人均营销量
+							dailyAVG:parseFloat(item.values.daily.AVG).toFixed(3),//日人均营销量
 							weekTelNo:item.values.week.TelNo,//周电话量
 							weekFollowNo:item.values.week.FollowNo,//周总量
 							weekVisitNo:item.values.week.VisitNo,//周外拜量
@@ -68,7 +68,7 @@ const DiurnalStatisticsOne = React.createClass({
 							dailyTelNo:total.dailyTelNo,//日电话量
 							dailyVisitNo:total.dailyVisitNo,//日外拜量
 							dailyFollowNo:total.dailyFollowNo,//日营销总量
-							dailyAVG:total.dailyAVG,//日人均营销量
+							dailyAVG:parseFloat(total.dailyAVG).toFixed(3),//日人均营销量
 							weekTelNo:total.weeklyTelNo,//周电话量
 							weekFollowNo:total.weeklyFollowNo,//周总量
 							weekVisitNo:total.weeklyVisitNo,//周外拜量
@@ -200,7 +200,7 @@ const DiurnalStatisticsOne = React.createClass({
 	},
     //导出为exel表格
 	tabExel() {
-		var table = document.querySelector('#daochu');
+		var table = document.querySelector('#daochu1');
 		var idTmr;
 		//debugger;
 		//整个表格拷贝到EXCEL中
@@ -385,7 +385,7 @@ const DiurnalStatisticsOne = React.createClass({
 				title: '今日营销',
 				children: [
 					{
-						title: '营销总量',
+						title: '营销总量(所有)',
 						width:100,
 						dataIndex: 'dailyFollowNo',
 						key: 'nudailyFollowNom',
@@ -410,7 +410,7 @@ const DiurnalStatisticsOne = React.createClass({
 				title: '周营销累计',
 				children: [
 					{
-						title: '周营销总量',
+						title: '周营销总量(所有)',
 						width:110,
 						dataIndex: 'weekFollowNo',
 						key: 'weekFollowNo',
@@ -433,7 +433,7 @@ const DiurnalStatisticsOne = React.createClass({
 				title: '月营销累计',
 				children: [
 					{
-						title: '月营销总量',
+						title: '月营销总量(所有)',
 						width:110,
 						dataIndex: 'monthsFollowNo',
 						key: 'monthsFollowNo',
@@ -456,7 +456,7 @@ const DiurnalStatisticsOne = React.createClass({
 				title: '年营销累计',
 				children: [
 					{
-						title: '年营销总量',
+						title: '年营销总量(所有)',
 						width:110,
 						dataIndex: 'annualFollowNo',
 						key: 'annualFollowNo',
@@ -501,6 +501,7 @@ const DiurnalStatisticsOne = React.createClass({
 			<div className='set-content'>
 				<p style={{fontSize:'20px',marginBottom:'10px'}}>客户营销统计表(员工)</p>
 				<div className="clearfix">
+					<Button type="primary" onClick={this.tabExel} style={{float:'right'}}>导出到表格</Button>
 					<span style={{fontSize:'16px'}}>部门机构 : </span>
 					<Select placeholder="选择部门"
                             style={{ width:'200px',marginRight:'10px' }}
@@ -508,22 +509,20 @@ const DiurnalStatisticsOne = React.createClass({
                             onChange={(e) => { this.setState({ superId: e }) }} notFoundContent="未获取到上级组织列表">
                             {this.state.contactsOption}
 		          	</Select>
-		          	<Button type="primary" onClick={this.tabExel} >导出到表格</Button>
+		          	
                   	<Button type="primary" onClick={this.search} style={{marginLeft:'10px',marginRight:'10px'}}>搜索</Button>
 	                <Button onClick={this.reset}>重置</Button>
 				</div>
-				<div id='daochu'>
+				<div id='daochu1'>
 					<div className="surfaceTitle">
 						<span className="nowtime">{this.state.timeState?this.state.txtTime:this.state.Nowtime}</span>
 						<span>客户营销统计表(员工)</span>
-						<span>(每日17:00统计当天数据)</span>
 					</div>
 					<div className="patent-table">
 						<div className="scroll">
 		                    <Spin spinning={this.state.loading}>
 		                        <Table columns={this.state.columns}
 		                            dataSource={this.state.dataSource}
-		                            
 		                            bordered
 		                            pagination={false}
 		                            />