Browse Source

select长度修改

dev01 2 years ago
parent
commit
0bef72f4e6
22 changed files with 732 additions and 725 deletions
  1. 1 1
      js/component/common/departmentList/index.jsx
  2. 401 400
      js/component/manageCenter/customer/customerMarketing/diurnalStatistics.jsx
  3. 2 2
      js/component/manageCenter/customer/signcustomer/index.jsx
  4. 6 0
      js/component/manageCenter/customer/signcustomer/statistics.jsx
  5. 83 81
      js/component/manageCenter/order/orderNew/arrearsList.jsx
  6. 1 1
      js/component/manageCenter/order/orderNew/billing.jsx
  7. 1 1
      js/component/manageCenter/order/orderNew/changeComponent/searchInput.js
  8. 18 17
      js/component/manageCenter/order/orderNew/inquiry.jsx
  9. 1 1
      js/component/manageCenter/order/orderNew/myprojectvip.jsx
  10. 1 1
      js/component/manageCenter/order/source/index.jsx
  11. 1 1
      js/component/manageCenter/project/project/outsourceTaskAssignment.jsx
  12. 1 1
      js/component/manageCenter/project/project/projectAssignment.jsx
  13. 1 1
      js/component/manageCenter/project/project/projectQuery.jsx
  14. 1 1
      js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx
  15. 1 1
      js/component/manageCenter/project/task/businessManagement/index.jsx
  16. 1 1
      js/component/manageCenter/project/task/myTask.jsx
  17. 206 209
      js/component/manageCenter/project/task/myTaskCount.jsx
  18. 1 1
      js/component/manageCenter/project/task/myTaskOutsource.jsx
  19. 1 1
      js/component/manageCenter/project/task/taskAssignment.jsx
  20. 1 1
      js/component/manageCenter/project/task/taskCount.jsx
  21. 1 1
      js/component/manageCenter/project/task/taskQuery.jsx
  22. 1 1
      package.json

+ 1 - 1
js/component/common/departmentList/index.jsx

@@ -52,7 +52,7 @@ class DepartmentList extends Component{
         return(
             <Select
                 placeholder="订单部门"
-                style={{ width: 150, marginRight: 10 }}
+                style={{ width: 200, marginRight: 10 }}
                 value={this.props.value}
                 onChange={e => {
                     this.props.onChange(e);

+ 401 - 400
js/component/manageCenter/customer/customerMarketing/diurnalStatistics.jsx

@@ -1,16 +1,16 @@
 import React from 'react';
-import { Select, Spin, Input, Table, Button ,DatePicker, Form  , Tabs , Switch,message} from 'antd';
+import { Select, Spin, Input, Table, Button, DatePicker, Form, Tabs, Switch, message } from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import './report.less';
 import DiurnalStatisticsOne from './diurnalStatisticsOne.jsx';
 import { post } from '../../../dataDic.js';
-import {ChooseList} from "../../order/orderNew/chooseList";
+import { ChooseList } from "../../order/orderNew/chooseList";
 const TabPane = Tabs.TabPane;
 
 const DiurnalStatistics = React.createClass({
 	loadData(totalArr) {
-		let total=totalArr;
+		let total = totalArr;
 		this.setState({
 			loading: true
 		});
@@ -20,70 +20,70 @@ const DiurnalStatistics = React.createClass({
 			crossDomain: false,
 			url: globalConfig.context + "/api/admin/report/sales/marketingStatistics",
 			data: {
-				type:'1',
-				depId:this.state.superId,//部门机构
+				type: '1',
+				depId: this.state.superId,//部门机构
 			},
-			success: function(data) {
+			success: function (data) {
 				let thedata = data.data;
 				let theArr = [];
-				if(!thedata) {
-					if(data.error && data.error.length) {
+				if (!thedata) {
+					if (data.error && data.error.length) {
 						message.warning(data.error[0].message);
 					};
 					thedata = {};
 				} else {
-					thedata.map(function(item, index) {
-						let nub=index+1;
+					thedata.map(function (item, index) {
+						let nub = index + 1;
 						theArr.push({
 							key: index,
-							theNumber:false,
-							nub:nub,
+							theNumber: false,
+							nub: nub,
 							id: item.id,
-							departmentId:item.departmentId,//部门ID
-							departmentName:item.departmentName,//部门名称
-							departmentManagerName:item.departmentManagerName,//部门负责人名称
-							departmentNumber:item.departmentNumber, //部门人数
-							privateCustomersCount:item.privateCustomersCount,// 部门客户数
-							dataCount:item.dataCount,// 新增客户数
-							dailyTelNo:item.dayTelNo,//日电话量
-							dailyVisitNo:item.dayVisitNo,//日外拜量
-							dailyFollowNo:item.dayFollowNo,//日营销总量
-							dailyAVG:parseFloat(item.dayAVG).toFixed(2),//日人均营销量
-							weekTelNo:item.weeklyTelNo,//周电话量
-							weekFollowNo:item.weeklyFollowNo,//周总量
-							weekVisitNo:item.weeklyVisitNo,//周外拜量
-							monthsTelNo:item.monthTelNo,//月电话量
-							monthsFollowNo:item.monthFollowNo,//月总量
-							monthsVisitNo:item.monthVisitNo,//月外拜量
-							annualTelNo:item.yearTelNo,//年电话量
-							annualFollowNo:item.yearFollowNo,//年总量
-							annualVisitNo:item.yearVisitNo,//年外拜量
-							
+							departmentId: item.departmentId,//部门ID
+							departmentName: item.departmentName,//部门名称
+							departmentManagerName: item.departmentManagerName,//部门负责人名称
+							departmentNumber: item.departmentNumber, //部门人数
+							privateCustomersCount: item.privateCustomersCount,// 部门客户数
+							dataCount: item.dataCount,// 新增客户数
+							dailyTelNo: item.dayTelNo,//日电话量
+							dailyVisitNo: item.dayVisitNo,//日外拜量
+							dailyFollowNo: item.dayFollowNo,//日营销总量
+							dailyAVG: parseFloat(item.dayAVG).toFixed(2),//日人均营销量
+							weekTelNo: item.weeklyTelNo,//周电话量
+							weekFollowNo: item.weeklyFollowNo,//周总量
+							weekVisitNo: item.weeklyVisitNo,//周外拜量
+							monthsTelNo: item.monthTelNo,//月电话量
+							monthsFollowNo: item.monthFollowNo,//月总量
+							monthsVisitNo: item.monthVisitNo,//月外拜量
+							annualTelNo: item.yearTelNo,//年电话量
+							annualFollowNo: item.yearFollowNo,//年总量
+							annualVisitNo: item.yearVisitNo,//年外拜量
+
 						})
 					})
 				}
-				if(theArr.length){
+				if (theArr.length) {
 					theArr.push(
 						{
-							key:9999999,
-							theNumber:true,
-							departmentName:'合计',							
-							departmentNumber:total.departmentNumber, //部门人数
-							privateCustomersCount:total.privateCustomersCount,// 部门客户数
-							dataCount:total.dataCount,// 新增客户数
-							dailyTelNo:total.dayTelNo,//日电话量
-							dailyVisitNo:total.dayVisitNo,//日外拜量
-							dailyFollowNo:total.dayFollowNo,//日营销总量
-							dailyAVG:parseFloat(total.dayAVG).toFixed(2),//日人均营销量
-							weekTelNo:total.weeklyTelNo,//周电话量
-							weekFollowNo:total.weeklyFollowNo,//周总量
-							weekVisitNo:total.weeklyVisitNo,//周外拜量
-							monthsTelNo:total.monthTelNo,//月电话量
-							monthsFollowNo:total.monthFollowNo,//月总量
-							monthsVisitNo:total.monthVisitNo,//月外拜量
-							annualTelNo:total.yearTelNo,//年电话量
-							annualFollowNo:total.yearFollowNo,//年总量
-							annualVisitNo:total.yearVisitNo,//年外拜量
+							key: 9999999,
+							theNumber: true,
+							departmentName: '合计',
+							departmentNumber: total.departmentNumber, //部门人数
+							privateCustomersCount: total.privateCustomersCount,// 部门客户数
+							dataCount: total.dataCount,// 新增客户数
+							dailyTelNo: total.dayTelNo,//日电话量
+							dailyVisitNo: total.dayVisitNo,//日外拜量
+							dailyFollowNo: total.dayFollowNo,//日营销总量
+							dailyAVG: parseFloat(total.dayAVG).toFixed(2),//日人均营销量
+							weekTelNo: total.weeklyTelNo,//周电话量
+							weekFollowNo: total.weeklyFollowNo,//周总量
+							weekVisitNo: total.weeklyVisitNo,//周外拜量
+							monthsTelNo: total.monthTelNo,//月电话量
+							monthsFollowNo: total.monthFollowNo,//月总量
+							monthsVisitNo: total.monthVisitNo,//月外拜量
+							annualTelNo: total.yearTelNo,//年电话量
+							annualFollowNo: total.yearFollowNo,//年总量
+							annualVisitNo: total.yearVisitNo,//年外拜量
 						}
 					)
 				}
@@ -91,7 +91,7 @@ const DiurnalStatistics = React.createClass({
 					dataSource: theArr,
 				})
 			}.bind(this),
-		}).always(function() {
+		}).always(function () {
 			this.setState({
 				loading: false
 			});
@@ -107,110 +107,110 @@ const DiurnalStatistics = React.createClass({
 			crossDomain: false,
 			url: globalConfig.context + "/api/admin/report/sales/countMarketingStatistics",
 			data: {
-				type:'1',
-				depId:this.state.superId,//部门机构
+				type: '1',
+				depId: this.state.superId,//部门机构
 			},
-			success: function(data) {
+			success: function (data) {
 				let thedata = data.data;
 				let theArr = [];
-				if(!thedata) {
-					if(data.error && data.error.length) {
+				if (!thedata) {
+					if (data.error && data.error.length) {
 						message.warning(data.error[0].message);
 					};
 					thedata = {};
-				} 
+				}
 				this.loadData(thedata)
 				this.selectSuperId();
 			}.bind(this),
-		}).always(function() {
+		}).always(function () {
 			this.setState({
 				loading: false
 			});
 		}.bind(this));
 	},
 	//时间选择
-    selTime(value,index){
-    	this.setState({
-    		Dtime:value,
-    		selTime:index
-    	})
-    },
-    //获取上级组织
-    selectSuperId() {  
-    	this.state.data = []
-         $.ajax({
-                method: "get",
-                dataType: "json",
-                crossDomain: false,
-                url: globalConfig.context + "/api/admin/organization/selectSuperId",
-                data:{
-                  
-                },
-                success: function (data) {                	  
-                		let theArr = [];
-                		let theId=[];//用于保存上级组织的ID和名称
-					    let thedata=data.data;
-					    if (!thedata) {
-		                    if (data.error && data.error.length) {
-		                        message.warning(data.error[0].message);
-		                    };	
-		                    thedata = {}; 
-		              };   
-					    var contactIds=[];
-				        for(var i=0;i<data.data.length;i++){
-		                    let theData = data.data[i];
-		                    theArr.push(
-		                        <Select.Option value={theData.id} key={theData.id}>{theData.name}</Select.Option>
-		                    );
-		                    theId.push(
-		                        [theData.id,theData.name]
-		                    );
-		                };
-						this.setState({	
-							SuperArr:thedata,
-		                    contactsOption: theArr, 
-		                    theId: theId, 
-		                    orderStatusOptions:data.data,
-	                    });
-	                    
-					}.bind(this),
-				}).always(function () {
+	selTime(value, index) {
+		this.setState({
+			Dtime: value,
+			selTime: index
+		})
+	},
+	//获取上级组织
+	selectSuperId() {
+		this.state.data = []
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + "/api/admin/organization/selectSuperId",
+			data: {
+
+			},
+			success: function (data) {
+				let theArr = [];
+				let theId = [];//用于保存上级组织的ID和名称
+				let thedata = data.data;
+				if (!thedata) {
+					if (data.error && data.error.length) {
+						message.warning(data.error[0].message);
+					};
+					thedata = {};
+				};
+				var contactIds = [];
+				for (var i = 0; i < data.data.length; i++) {
+					let theData = data.data[i];
+					theArr.push(
+						<Select.Option value={theData.id} key={theData.id}>{theData.name}</Select.Option>
+					);
+					theId.push(
+						[theData.id, theData.name]
+					);
+				};
 				this.setState({
-	                loading: false
-	            });
-	        }.bind(this));
+					SuperArr: thedata,
+					contactsOption: theArr,
+					theId: theId,
+					orderStatusOptions: data.data,
+				});
+
+			}.bind(this),
+		}).always(function () {
+			this.setState({
+				loading: false
+			});
+		}.bind(this));
 	},
 	//判断浏览器类型
 	getExplorer() {
 		var explorer = window.navigator.userAgent;
 		//ie 
-		if(explorer.indexOf("MSIE") >= 0) {
+		if (explorer.indexOf("MSIE") >= 0) {
 			return 'ie';
 		}
 		//firefox 
-		else if(explorer.indexOf("Firefox") >= 0) {
+		else if (explorer.indexOf("Firefox") >= 0) {
 			return 'Firefox';
 		}
 		//Chrome
-		else if(explorer.indexOf("Chrome") >= 0) {
+		else if (explorer.indexOf("Chrome") >= 0) {
 			return 'Chrome';
 		}
 		//Opera
-		else if(explorer.indexOf("Opera") >= 0) {
+		else if (explorer.indexOf("Opera") >= 0) {
 			return 'Opera';
 		}
 		//Safari
-		else if(explorer.indexOf("Safari") >= 0) {
+		else if (explorer.indexOf("Safari") >= 0) {
 			return 'Safari';
 		}
 	},
-    //导出为exel表格
+	//导出为exel表格
 	tabExel() {
 		var table = document.querySelector('#daochu');
 		var idTmr;
 		//debugger;
 		//整个表格拷贝到EXCEL中
-		if(this.getExplorer() == 'ie') {
+		if (this.getExplorer() == 'ie') {
 			var curTbl = document.getElementById(tableid);
 			var oXL = new ActiveXObject("Excel.Application");
 			//创建AX对象excel 
@@ -231,7 +231,7 @@ const DiurnalStatistics = React.createClass({
 			//设置excel可见属性
 			try {
 				var fname = oXL.Application.GetSaveAsFilename("Excel.xls", "Excel Spreadsheets (*.xls), *.xls");
-			} catch(e) {
+			} catch (e) {
 				print("Nested catch caught " + e);
 			} finally {
 				oWB.SaveAs(fname);
@@ -245,31 +245,31 @@ const DiurnalStatistics = React.createClass({
 				idTmr = window.setInterval("Cleanup();", 1);
 			}
 		} else {
-			this.tableToExcel(table,this.getExplorer());
+			this.tableToExcel(table, this.getExplorer());
 		}
 		function Cleanup() {
 			window.clearInterval(idTmr);
 			CollectGarbage();
 		}
 	},
-	tableToExcel(table,name) {
+	tableToExcel(table, name) {
 		var uri = 'data:application/vnd.ms-excel;base64,',
 			template = '<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns="http://www.w3.org/TR/REC-html40"><head><!--[if gte mso 9]><xml><x:ExcelWorkbook><x:ExcelWorksheets><x:ExcelWorksheet><x:Name>{worksheet}</x:Name><x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet></x:ExcelWorksheets></x:ExcelWorkbook></xml><![endif]--></head><body><table>{table}</table></body></html>',
-			base64 = function(s) {
+			base64 = function (s) {
 				return window.btoa(unescape(encodeURIComponent(s)))
 			},
-			format = function(s, c) {
+			format = function (s, c) {
 				return s.replace(/{(\w+)}/g,
-					function(m, p) {
+					function (m, p) {
 						return c[p];
 					})
 			}
-			if(!table.nodeType) table = document.getElementById(table);
-			var ctx = {
-				worksheet: name || 'Worksheet',
-				table: table.innerHTML
-			};
-			window.location.href = uri + base64(format(template, ctx))
+		if (!table.nodeType) table = document.getElementById(table);
+		var ctx = {
+			worksheet: name || 'Worksheet',
+			table: table.innerHTML
+		};
+		window.location.href = uri + base64(format(template, ctx))
 	},
 	getInitialState() {
 		return {
@@ -278,235 +278,235 @@ const DiurnalStatistics = React.createClass({
 			loading: false,
 			visible: false,
 			showDesc: false,
-			timeState:false,
-			Dtime:undefined,
-			selTime:'',
+			timeState: false,
+			Dtime: undefined,
+			selTime: '',
 			columns: [
-			{
-				title: '序号',
-				dataIndex: 'nub',
-				width:50,
-				key: 'nub',
-				fixed:false,
-				render:(text,record)=>{
-				     if(!record.theNumber){
-				     	return text
-				     }else{
-				     	return {
-				     		children: text,
-      						props: {
-      							colSpan:0
-      						},
-				     	}
-				     	
-				     }
-				     
-				}
-			},
-			{
-				title: '部门',
-				dataIndex: 'departmentName',
-				key: 'departmentName',
-				width:230,
-				fixed:false,
-				render:(text,record)=>{
-				     if(!record.theNumber){
-				     	return text//&&text.length>6?<span title={text}>{text.substr(0,6)+'…'}</span>:text
-				     }else{
-				     	return {
-				     		children: text,
-      						props: {
-      							colSpan:3
-      						},
-				     	}
-				     	
-				     }
-				     
-				}
-			}, {
-				title: '总经理',
-				width:100,
-				fixed:false,
-				dataIndex: 'departmentManagerName',
-				key: 'departmentManagerName',
-				render:(text,record)=>{
-				     if(!record.theNumber){
-				     	return text
-				     }else{
-				     	return {
-				     		children: text,
-      						props: {
-      							colSpan:0
-      						},
-				     	}
-				     	
-				     }
-				     
-				}
-			},
-			{
-				title: '部门人数',
-				width:100,
-				fixed:false,
-				dataIndex: 'departmentNumber',
-				key: 'departmentNumber',
-				render:(text,record)=>{
-				     if(!record.theNumber){
-				     	return text
-				     }else{
-				     	return {
-				     		children: text,
-      						props: {
-      							colSpan:1
-      						},
-				     	}
-				     	
-				     }
-				     
-				}
-			},
-			{
-				title: '部门客户数',
-				width:100,
-				fixed:false,
-				dataIndex: 'privateCustomersCount',
-				key: 'privateCustomersCount',
-				render:(text,record)=>{
-				     if(!record.theNumber){
-				     	return text
-				     }else{
-				     	return {
-				     		children: text,
-      						props: {
-      							colSpan:1
-      						},
-				     	}
-				     	
-				     }
-				     
-				}
-			},{
-				title: '新增客户数',
-				width:100,
-				fixed:false,
-				dataIndex: 'dataCount',
-				key: 'dataCount',
-				render:(text,record)=>{
-				     if(!record.theNumber){
-				     	return text
-				     }else{
-				     	return {
-				     		children: text,
-      						props: {
-      							colSpan:1
-      						},
-				     	}
-				     	
-				     }
-				     
-				}
-			},
-			{			
-				title: '今日营销',
-				children: [
-					{
-						title: '营销总量(所有)',
-						width:100,
-						dataIndex: 'dailyFollowNo',
-						key: 'nudailyFollowNom',
-						sorter: (a, b) => a.dailyFollowNo - b.dailyFollowNo,
-//						sortOrder:'ascend'
-					},{
-						title: '电话量',
-						width:80,
-						dataIndex: 'dailyTelNo',
-						key: 'dailyTelNo',
-						sorter: (a, b) => a.dailyTelNo - b.dailyTelNo,
-					},{
-						title: '外拜量',
-						width:80,
-						dataIndex: 'dailyVisitNo',
-						key: 'dailyVisitNo',
-						sorter: (a, b) => a.dailyVisitNo - b.dailyVisitNo,
-					},{
-						title: '人均营销量',
-						width:110,
-						dataIndex: 'dailyAVG',
-						key: 'dailyAVG',
-						sorter: (a, b) => a.dailyAVG - b.dailyAVG,
+				{
+					title: '序号',
+					dataIndex: 'nub',
+					width: 50,
+					key: 'nub',
+					fixed: false,
+					render: (text, record) => {
+						if (!record.theNumber) {
+							return text
+						} else {
+							return {
+								children: text,
+								props: {
+									colSpan: 0
+								},
+							}
+
+						}
+
 					}
-				],
-			}, 
-			{   
-				title: '周营销累计',
-				children: [
-					{
-						title: '周营销总量(所有)',
-						width:110,
-						dataIndex: 'weekFollowNo',
-						key: 'weekFollowNo',
-						sorter: (a, b) => a.weekFollowNo - b.weekFollowNo,
-					},{
-						title: '电话量',
-						width:80,
-						dataIndex: 'weekTelNo',
-						key: 'weekTelNo',
-						sorter: (a, b) => a.weekTelNo - b.weekTelNo,
-					},{
-						title: '外拜量',
-						width:80,
-						dataIndex: 'weekVisitNo',
-						key: 'weekVisitNo',
-						sorter: (a, b) => a.weekVisitNo - b.weekVisitNo,
+				},
+				{
+					title: '部门',
+					dataIndex: 'departmentName',
+					key: 'departmentName',
+					width: 230,
+					fixed: false,
+					render: (text, record) => {
+						if (!record.theNumber) {
+							return text//&&text.length>6?<span title={text}>{text.substr(0,6)+'…'}</span>:text
+						} else {
+							return {
+								children: text,
+								props: {
+									colSpan: 3
+								},
+							}
+
+						}
+
 					}
-				],
-			},{
-				title: '月营销累计',
-				children: [
-					{
-						title: '月营销总量(所有)',
-						width:110,
-						dataIndex: 'monthsFollowNo',
-						key: 'monthsFollowNo',
-						sorter: (a, b) => a.monthsFollowNo - b.monthsFollowNo,
-					},{
-						title: '电话量',
-						width:80,
-						dataIndex: 'monthsTelNo',
-						key: 'monthsTelNo',
-						sorter: (a, b) => a.monthsTelNo - b.monthsTelNo,
-					},{
-						title: '外拜量',
-						width:80,
-						dataIndex: 'monthsVisitNo',
-						key: 'monthsVisitNo',
-						sorter: (a, b) => a.monthsVisitNo - b.monthsVisitNo,
+				}, {
+					title: '总经理',
+					width: 100,
+					fixed: false,
+					dataIndex: 'departmentManagerName',
+					key: 'departmentManagerName',
+					render: (text, record) => {
+						if (!record.theNumber) {
+							return text
+						} else {
+							return {
+								children: text,
+								props: {
+									colSpan: 0
+								},
+							}
+
+						}
+
+					}
+				},
+				{
+					title: '部门人数',
+					width: 100,
+					fixed: false,
+					dataIndex: 'departmentNumber',
+					key: 'departmentNumber',
+					render: (text, record) => {
+						if (!record.theNumber) {
+							return text
+						} else {
+							return {
+								children: text,
+								props: {
+									colSpan: 1
+								},
+							}
+
+						}
+
 					}
-				],
-			},{
-				title: '年营销累计',
-				children: [
-					{
-						title: '年营销总量(所有)',
-						width:110,
-						dataIndex: 'annualFollowNo',
-						key: 'annualFollowNo',
-						sorter: (a, b) => a.annualFollowNo - b.annualFollowNo,
-					},{
-						title: '电话量',
-						width:80,
-						dataIndex: 'annualTelNo',
-						key: 'annualTelNo',
-						sorter: (a, b) => a.annualTelNo - b.annualTelNo,
-					},{
-						title: '外拜量',
-						width:80,
-						dataIndex: 'annualVisitNo',
-						key: 'annualVisitNo',
-						sorter: (a, b) => a.annualVisitNo - b.annualVisitNo,
+				},
+				{
+					title: '部门客户数',
+					width: 100,
+					fixed: false,
+					dataIndex: 'privateCustomersCount',
+					key: 'privateCustomersCount',
+					render: (text, record) => {
+						if (!record.theNumber) {
+							return text
+						} else {
+							return {
+								children: text,
+								props: {
+									colSpan: 1
+								},
+							}
+
+						}
+
 					}
-				],
-			}
+				}, {
+					title: '新增客户数',
+					width: 100,
+					fixed: false,
+					dataIndex: 'dataCount',
+					key: 'dataCount',
+					render: (text, record) => {
+						if (!record.theNumber) {
+							return text
+						} else {
+							return {
+								children: text,
+								props: {
+									colSpan: 1
+								},
+							}
+
+						}
+
+					}
+				},
+				{
+					title: '今日营销',
+					children: [
+						{
+							title: '营销总量(所有)',
+							width: 100,
+							dataIndex: 'dailyFollowNo',
+							key: 'nudailyFollowNom',
+							sorter: (a, b) => a.dailyFollowNo - b.dailyFollowNo,
+							//						sortOrder:'ascend'
+						}, {
+							title: '电话量',
+							width: 80,
+							dataIndex: 'dailyTelNo',
+							key: 'dailyTelNo',
+							sorter: (a, b) => a.dailyTelNo - b.dailyTelNo,
+						}, {
+							title: '外拜量',
+							width: 80,
+							dataIndex: 'dailyVisitNo',
+							key: 'dailyVisitNo',
+							sorter: (a, b) => a.dailyVisitNo - b.dailyVisitNo,
+						}, {
+							title: '人均营销量',
+							width: 110,
+							dataIndex: 'dailyAVG',
+							key: 'dailyAVG',
+							sorter: (a, b) => a.dailyAVG - b.dailyAVG,
+						}
+					],
+				},
+				{
+					title: '周营销累计',
+					children: [
+						{
+							title: '周营销总量(所有)',
+							width: 110,
+							dataIndex: 'weekFollowNo',
+							key: 'weekFollowNo',
+							sorter: (a, b) => a.weekFollowNo - b.weekFollowNo,
+						}, {
+							title: '电话量',
+							width: 80,
+							dataIndex: 'weekTelNo',
+							key: 'weekTelNo',
+							sorter: (a, b) => a.weekTelNo - b.weekTelNo,
+						}, {
+							title: '外拜量',
+							width: 80,
+							dataIndex: 'weekVisitNo',
+							key: 'weekVisitNo',
+							sorter: (a, b) => a.weekVisitNo - b.weekVisitNo,
+						}
+					],
+				}, {
+					title: '月营销累计',
+					children: [
+						{
+							title: '月营销总量(所有)',
+							width: 110,
+							dataIndex: 'monthsFollowNo',
+							key: 'monthsFollowNo',
+							sorter: (a, b) => a.monthsFollowNo - b.monthsFollowNo,
+						}, {
+							title: '电话量',
+							width: 80,
+							dataIndex: 'monthsTelNo',
+							key: 'monthsTelNo',
+							sorter: (a, b) => a.monthsTelNo - b.monthsTelNo,
+						}, {
+							title: '外拜量',
+							width: 80,
+							dataIndex: 'monthsVisitNo',
+							key: 'monthsVisitNo',
+							sorter: (a, b) => a.monthsVisitNo - b.monthsVisitNo,
+						}
+					],
+				}, {
+					title: '年营销累计',
+					children: [
+						{
+							title: '年营销总量(所有)',
+							width: 110,
+							dataIndex: 'annualFollowNo',
+							key: 'annualFollowNo',
+							sorter: (a, b) => a.annualFollowNo - b.annualFollowNo,
+						}, {
+							title: '电话量',
+							width: 80,
+							dataIndex: 'annualTelNo',
+							key: 'annualTelNo',
+							sorter: (a, b) => a.annualTelNo - b.annualTelNo,
+						}, {
+							title: '外拜量',
+							width: 80,
+							dataIndex: 'annualVisitNo',
+							key: 'annualVisitNo',
+							sorter: (a, b) => a.annualVisitNo - b.annualVisitNo,
+						}
+					],
+				}
 			],
 			dataSource: [],
 		};
@@ -518,11 +518,11 @@ const DiurnalStatistics = React.createClass({
 		this.state.superId = undefined;//部门机构清零
 		this.totalData()
 		this.setState({
-			order:"false"
+			order: "false"
 		})
 	},
 	//重构排序
-	tabChange(pagination,filter,sorter){
+	tabChange(pagination, filter, sorter) {
 		console.log(pagination)
 		console.log(sorter)
 	},
@@ -542,30 +542,30 @@ const DiurnalStatistics = React.createClass({
 	componentWillMount() {
 		//this.loadData();
 		this.totalData();
-		let times=new Date();
-		let nowTime=times.getFullYear()+'年'+(times.getMonth()+1)+'月'+times.getDate()+'日';
+		let times = new Date();
+		let nowTime = times.getFullYear() + '年' + (times.getMonth() + 1) + '月' + times.getDate() + '日';
 		this.setState({
-			Nowtime:nowTime
+			Nowtime: nowTime
 		})
 	},
 	render() {
 		let departmentArr = this.state.departmentArr || [];
-		return(
+		return (
 			<div className='set-content'>
-				<p style={{fontSize:'20px',marginBottom:'10px'}}>客户营销统计表(部门)</p>
+				<p style={{ fontSize: '20px', marginBottom: '10px' }}>客户营销统计表(部门)</p>
 				<Tabs defaultActiveKey="1" className="test">
 					<TabPane tab="搜索" key="1">
-						<div className="clearfix" style={{paddingTop:'11px'}}>
-							<Button type="primary" onClick={this.tabExel} style={{ float:'right' }}>导出到表格</Button>
-							<span style={{fontSize:'16px'}}>部门机构 : </span>
+						<div className="clearfix" style={{ paddingTop: '11px' }}>
+							<Button type="primary" onClick={this.tabExel} style={{ float: 'right' }}>导出到表格</Button>
+							<span style={{ fontSize: '16px' }}>部门机构 : </span>
 							<Select placeholder="选择部门"
-									style={{ width:'200px',marginRight:'10px' }}
-									value={this.state.superId}
-									onChange={(e) => { this.setState({ superId: e }) }} notFoundContent="未获取到上级组织列表">
-									{this.state.contactsOption}
+								style={{ width: '200px', marginRight: '10px' }}
+								value={this.state.superId}
+								onChange={(e) => { this.setState({ superId: e }) }} notFoundContent="未获取到上级组织列表">
+								{this.state.contactsOption}
 							</Select>
 
-							<Button type="primary" onClick={this.search} style={{marginLeft:'10px',marginRight:'10px'}}>搜索</Button>
+							<Button type="primary" onClick={this.search} style={{ marginLeft: '10px', marginRight: '10px' }}>搜索</Button>
 							<Button onClick={this.reset}>重置</Button>
 						</div>
 					</TabPane>
@@ -583,27 +583,28 @@ const DiurnalStatistics = React.createClass({
 				</Tabs>
 				<div id='daochu'>
 					<div className="surfaceTitle">
-						<span className="nowtime" style={{fontWeight:'bold'}}>{this.state.timeState?this.state.txtTime:this.state.Nowtime}</span>
-						<span style={{fontWeight:'bold'}}>客户营销统计表(部门)</span>
+						<span className="nowtime" style={{ fontWeight: 'bold' }}>{this.state.timeState ? this.state.txtTime : this.state.Nowtime}</span>
+						<span style={{ fontWeight: 'bold' }}>客户营销统计表(部门)</span>
 					</div>
 					<div className="patent-table" id='daochu'>
 						<div className="scroll">
-		                    <Spin spinning={this.state.loading}>
-		                        <Table columns={
-									this.state.changeList
-										? this.state.changeList
-										: this.state.columns
+							<Spin spinning={this.state.loading}>
+								<Table
+									columns={
+										this.state.changeList
+											? this.state.changeList
+											: this.state.columns
 									}
-		                            dataSource={this.state.dataSource}
-		                            //scroll={{ x: 600,y:500}}
-		                            bordered
-		                            onChange={this.tabChange}
-		                            pagination={false}
-		                            />
-		                    </Spin>
-		                </div>
-		            </div>
-	            </div>
+									dataSource={this.state.dataSource}
+									//scroll={{ x: 600,y:500}}
+									bordered
+									onChange={this.tabChange}
+									pagination={false}
+								/>
+							</Spin>
+						</div>
+					</div>
+				</div>
 			</div>
 		)
 	}
@@ -611,19 +612,19 @@ const DiurnalStatistics = React.createClass({
 
 
 
-const Tablees=Form.create()(React.createClass({
+const Tablees = Form.create()(React.createClass({
 	//详情tab切换数据处理
 	callbacks(e) {
 		this.setState({
 			callnubs: e,
 		})
-		if(e == '1') {
-			
+		if (e == '1') {
+
 		}
-		if(e == '2') {
-			
+		if (e == '2') {
+
 		}
-		
+
 	},
 	getInitialState() {
 		return {
@@ -631,16 +632,16 @@ const Tablees=Form.create()(React.createClass({
 		}
 	},
 	render() {
-		return(
-			<div className="clearfix" style={{marginTop:'0px',marginLeft:'10px'}}>
-			    <Tabs onChange={this.callbacks} type="card" activeKey={this.state.callnubs} style={{paddingLeft:'15px',paddingRight:'15px',marginRight:'20px'}}>
-			         <TabPane tab="客户营销统计表(部门)" key="1" >
-			         	<DiurnalStatistics />
-			         </TabPane>
-					 <TabPane tab="客户营销统计表(员工)" key="2">
-					 	<DiurnalStatisticsOne />
-					 </TabPane>
-			    </Tabs>
+		return (
+			<div className="clearfix" style={{ marginTop: '0px', marginLeft: '10px' }}>
+				<Tabs onChange={this.callbacks} type="card" activeKey={this.state.callnubs} style={{ paddingLeft: '15px', paddingRight: '15px', marginRight: '20px' }}>
+					<TabPane tab="客户营销统计表(部门)" key="1" >
+						<DiurnalStatistics />
+					</TabPane>
+					<TabPane tab="客户营销统计表(员工)" key="2">
+						<DiurnalStatisticsOne />
+					</TabPane>
+				</Tabs>
 			</div>
 		);
 	}

+ 2 - 2
js/component/manageCenter/customer/signcustomer/index.jsx

@@ -684,11 +684,11 @@ class SignCustomer extends Component {
                   <Select
                     placeholder="选择归属部门"
                     style={{ width: 200 }}
-                    value={searchInfor.followDep}
+                    value={searchInfor.depId}
                     onChange={(e) => {
                       this.setState({
                         searchInfor: Object.assign(searchInfor, {
-                          followDep: e,
+                          depId: e,
                         }),
                       });
                     }}

+ 6 - 0
js/component/manageCenter/customer/signcustomer/statistics.jsx

@@ -41,11 +41,13 @@ class SignStatistics extends Component {
           title: "签单客户",
           dataIndex: "userCount",
           key: "userCount",
+          sorter: (a, b) => a.userCount - b.userCount,
         },
         {
           title: "签单个数",
           dataIndex: "orderCount",
           key: "orderCount",
+          sorter: (a, b) => a.orderCount - b.orderCount,
           onCellClick: (r) => {
             let cellData = {};
             cellData["aid"] = r.id
@@ -69,11 +71,13 @@ class SignStatistics extends Component {
           title: "签单总金额(万元)",
           dataIndex: "totalAmount",
           key: "totalAmount",
+          sorter: (a, b) => a.totalAmount - b.totalAmount,
         },
         {
           title: "新签数",
           dataIndex: "newSignNumber",
           key: "newSignNumber",
+          sorter: (a, b) => a.newSignNumber - b.newSignNumber,
           onCellClick: (r) => {
             let cellData = {};
             cellData["aid"] = r.id
@@ -107,6 +111,7 @@ class SignStatistics extends Component {
           title: "复购数",
           dataIndex: "repeatSignNumber",
           key: "repeatSignNumber",
+          sorter: (a, b) => a.repeatSignNumber - b.repeatSignNumber,
           onCellClick: (r) => {
             let cellData = {};
             cellData["aid"] = r.id
@@ -140,6 +145,7 @@ class SignStatistics extends Component {
           title: "渠道签单数",
           dataIndex: "channelSignNumber",
           key: "channelSignNumber",
+          sorter: (a, b) => a.channelSignNumber - b.channelSignNumber,
           onCellClick: (r) => {
             let cellData = {};
             cellData["aid"] = r.id

+ 83 - 81
js/component/manageCenter/order/orderNew/arrearsList.jsx

@@ -22,8 +22,8 @@ import {
   ShowModal,
 } from "@/tools.js";
 import "./customer.less";
-import {ChooseList} from "./chooseList";
-import {getProjectName} from "../../../tools";
+import { ChooseList } from "./chooseList";
+import { getProjectName } from "../../../tools";
 import DepartmentList from "../../../common/departmentList";
 
 const ArrearsList = Form.create()(
@@ -98,7 +98,7 @@ const ArrearsList = Form.create()(
           defaultPageSize: 10,
           showQuickJumper: true,
           pageSize: 10,
-          modalVisible:false,
+          modalVisible: false,
           onChange: function (page) {
             this.loadData(page);
           }.bind(this),
@@ -128,14 +128,14 @@ const ArrearsList = Form.create()(
             key: "userName",
             render: text => {
               return (
-                  <Tooltip title={text}>
-                    <div style={{
-                      maxWidth:'150px',
-                      overflow:'hidden',
-                      textOverflow: "ellipsis",
-                      whiteSpace:'nowrap',
-                    }}>{text}</div>
-                  </Tooltip>
+                <Tooltip title={text}>
+                  <div style={{
+                    maxWidth: '150px',
+                    overflow: 'hidden',
+                    textOverflow: "ellipsis",
+                    whiteSpace: 'nowrap',
+                  }}>{text}</div>
+                </Tooltip>
               )
             }
           },
@@ -198,16 +198,16 @@ const ArrearsList = Form.create()(
               return getLiquidationStatus(text);
             },
           },
-            {
-              title: "催收科目",
-              dataIndex: "type",
-              key: "type",
-                render: text => {
-                  if(text == 0) {
-                    return "按时触发应收欠款"
-                  }
-                }
-            },
+          {
+            title: "催收科目",
+            dataIndex: "type",
+            key: "type",
+            render: text => {
+              if (text == 0) {
+                return "按时触发应收欠款"
+              }
+            }
+          },
           {
             title: "催款状态",
             dataIndex: "dunStatus",
@@ -240,7 +240,7 @@ const ArrearsList = Form.create()(
             key: "legalTimes",
           },
         ],
-        legalColumns:[
+        legalColumns: [
           {
             title: "序号",
             dataIndex: "key",
@@ -276,7 +276,7 @@ const ArrearsList = Form.create()(
             dataIndex: "type",
             key: "type",
             width: 140,
-            render:(text,data) => {
+            render: (text, data) => {
               let status;
               if (data.status == 0) {
                 status = "否";
@@ -308,8 +308,8 @@ const ArrearsList = Form.create()(
             width: 140,
           },
         ],
-        legalDataSource:[],
-        legalPagination:{
+        legalDataSource: [],
+        legalPagination: {
           defaultCurrent: 1,
           defaultPageSize: 10,
           showQuickJumper: true,
@@ -390,14 +390,14 @@ const ArrearsList = Form.create()(
         changeList: newArr
       });
     },
-    viewLegal(){
+    viewLegal() {
       console.log(this.state.rowkey);
-      if(this.state.recordt == undefined || this.state.recordt == [] || this.state.rowkey.length == 0  ) {
+      if (this.state.recordt == undefined || this.state.recordt == [] || this.state.rowkey.length == 0) {
         message.info("请选择查看的单号")
         return
       }
       this.setState({
-        modalVisible:true
+        modalVisible: true
       })
       $.ajax({
         method: "get",
@@ -405,9 +405,9 @@ const ArrearsList = Form.create()(
         crossDomain: false,
         url: globalConfig.context + "/api/admin/lagalAffairs/lagalAffairsLogList",
         data: {
-          pageNo:  1,
+          pageNo: 1,
           pageSize: 10,
-          orderNo:this.state.recordt
+          orderNo: this.state.recordt
         },
         success: function (data) {
           let theArr = []
@@ -428,11 +428,11 @@ const ArrearsList = Form.create()(
               legalPagination: this.state.legalPagination
             });
             this.state.legalPagination.total = data.data.totalCount;
-              this.state.legalPagination.current = data.data.pageNo;
-            }
-            if (data.data && data.data.list && !data.data.list.length) {
-              this.state.legalPagination.total = 0;
-            }  
+            this.state.legalPagination.current = data.data.pageNo;
+          }
+          if (data.data && data.data.list && !data.data.list.length) {
+            this.state.legalPagination.total = 0;
+          }
         }.bind(this),
       }).always(
         function () {
@@ -456,12 +456,12 @@ const ArrearsList = Form.create()(
             modalVisible: false,
             selectedRows: selectedRows.slice(-1),
             selectedRowKeys: selectedRowKeys.slice(-1),
-          },() =>{
+          }, () => {
             this.setState({
-              rowkey:this.state.selectedRowKeys
+              rowkey: this.state.selectedRowKeys
             })
           });
-         
+
         },
         onSelect: (recordt) => {
           this.setState({
@@ -506,12 +506,12 @@ const ArrearsList = Form.create()(
                   }}
                 />
                 <Input
-                    placeholder="合同编号"
-                    style={{ width: "150px", marginRight: 10 }}
-                    value={this.state.contractNo}
-                    onChange={(e) => {
-                      this.setState({ contractNo: e.target.value });
-                    }}
+                  placeholder="合同编号"
+                  style={{ width: "150px", marginRight: 10 }}
+                  value={this.state.contractNo}
+                  onChange={(e) => {
+                    this.setState({ contractNo: e.target.value });
+                  }}
                 />
                 <Input
                   placeholder="营销员名称"
@@ -526,10 +526,10 @@ const ArrearsList = Form.create()(
                   }}
                 />
                 <DepartmentList
-                    value={this.state.departmenttSearch}
-                    onChange={e => {
-                      this.setState({ departmenttSearch: e });
-                    }}/>
+                  value={this.state.departmenttSearch}
+                  onChange={e => {
+                    this.setState({ departmenttSearch: e });
+                  }} />
                 <span style={{ marginRight: "10px" }}>下单时间 :</span>
                 <RangePicker
                   value={[
@@ -558,14 +558,16 @@ const ArrearsList = Form.create()(
                     this.setState({ chufaDate: dataString });
                   }}
                 />
-                <Button
-                  type="primary"
-                  onClick={this.search}
-                  style={{ marginLeft: "10px", marginRight: 10 }}
-                >
-                  搜索
-                </Button>
-                <Button onClick={this.reset}>重置</Button>
+                <div>
+                  <Button
+                    type="primary"
+                    onClick={this.search}
+                    style={{ marginLeft: "10px", marginRight: 10 }}
+                  >
+                    搜索
+                  </Button>
+                  <Button onClick={this.reset}>重置</Button>
+                </div>
               </TabPane>
               <TabPane tab="导出催款列表" key="2">
                 <Button
@@ -579,16 +581,16 @@ const ArrearsList = Form.create()(
               <TabPane tab="更改表格显示数据" key="3">
                 <div style={{ marginLeft: 10 }}>
                   <ChooseList
-                      columns={this.state.columns}
-                      changeFn={this.changeList}
-                      changeList={this.state.changeList}
-                      top={55}
-                      margin={11}
+                    columns={this.state.columns}
+                    changeFn={this.changeList}
+                    changeList={this.state.changeList}
+                    top={55}
+                    margin={11}
                   />
                 </div>
               </TabPane>
               <TabPane tab="查看" key="4">
-              <Button
+                <Button
                   // disabled={ this.state.rowkey.length == 0 ? true : false}
                   type="primary"
                   onClick={this.viewLegal}
@@ -601,32 +603,32 @@ const ArrearsList = Form.create()(
             <div className="patent-table">
               <Spin spinning={this.state.loading}>
                 <Table
-                    columns={
-                      this.state.changeList
-                          ? this.state.changeList
-                          : this.state.columns
-                    }
+                  columns={
+                    this.state.changeList
+                      ? this.state.changeList
+                      : this.state.columns
+                  }
                   dataSource={this.state.dataSource}
                   pagination={this.state.pagination}
                   scroll={{ x: "max-content", y: 0 }}
-                  rowSelection={rowSelection} 
+                  rowSelection={rowSelection}
                   bordered
                   size="small"
                 />
               </Spin>
             </div>
-          <Modal
-          title="欠款法务列表"
-          footer=""
-          width={1000}
-          visible={this.state.modalVisible}
-          onCancel={()=>{
-            this.setState({
-              modalVisible:false
-            })
-          }}
-        >
-          <Spin spinning={this.state.loadLegal}>
+            <Modal
+              title="欠款法务列表"
+              footer=""
+              width={1000}
+              visible={this.state.modalVisible}
+              onCancel={() => {
+                this.setState({
+                  modalVisible: false
+                })
+              }}
+            >
+              <Spin spinning={this.state.loadLegal}>
                 <Table
                   columns={this.state.legalColumns}
                   dataSource={this.state.legalDataSource}
@@ -636,7 +638,7 @@ const ArrearsList = Form.create()(
                   size="small"
                 />
               </Spin>
-        </Modal>
+            </Modal>
           </div>
         </div>
       );

+ 1 - 1
js/component/manageCenter/order/orderNew/billing.jsx

@@ -1922,7 +1922,7 @@ const MyService = Form.create()(
                     />
                     <Select
                       placeholder="订单部门"
-                      style={{ width: 150, marginRight: 10 }}
+                      style={{ width: 200, marginRight: 10 }}
                       value={this.state.departmenttList}
                       onChange={(e) => {
                         this.setState({ departmenttList: e });

+ 1 - 1
js/component/manageCenter/order/orderNew/changeComponent/searchInput.js

@@ -247,7 +247,7 @@ class SearchInput extends Component {
     const SearchSelectData = [
       {
         placeholder: "订单部门",
-        width: 120,
+        width: 200,
         defaultValue: undefined,
         content: this.state.departmentArr,
         getValue: value => {

+ 18 - 17
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -2376,7 +2376,7 @@ const IntentionCustomer = Form.create()(
                   />
                   <Select
                     placeholder="订单部门"
-                    style={{ width: 140, marginRight: 10 }}
+                    style={{ width: 200, marginRight: 10 }}
                     value={this.state.departmenttList}
                     onChange={(e) => {
                       this.setState({ departmenttList: e });
@@ -2455,7 +2455,7 @@ const IntentionCustomer = Form.create()(
                     <Option value="0">非会员</Option>
                   </Select>
                   <Select
-                    style={{ width: 140 }}
+                    style={{ width: 160 }}
                     placeholder="流程状态"
                     value={this.state.processStatusSearch}
                     onChange={e => {
@@ -2473,21 +2473,6 @@ const IntentionCustomer = Form.create()(
                     <Option value="5">已部分派咨询师经理</Option>
                     <Option value="6">已部全部派咨询师经理</Option>
                   </Select>
-                  <span style={{ marginRight: "10px" }}>下单时间 :</span>
-                  <RangePicker
-                    value={[
-                      this.state.releaseDate[0]
-                        ? moment(this.state.releaseDate[0])
-                        : null,
-                      this.state.releaseDate[1]
-                        ? moment(this.state.releaseDate[1])
-                        : null,
-                    ]}
-                    onChange={(data, dataString) => {
-                      this.setState({ releaseDate: dataString });
-                    }}
-                  />
-
                   <Button
                     type="primary"
                     onClick={this.search}
@@ -2499,6 +2484,22 @@ const IntentionCustomer = Form.create()(
                   <Button onClick={this.reset}>
                     重置 <Icon type="reload" />
                   </Button>
+                  <div>
+                    <span style={{ marginRight: "10px" }}>下单时间 :</span>
+                    <RangePicker
+                      value={[
+                        this.state.releaseDate[0]
+                          ? moment(this.state.releaseDate[0])
+                          : null,
+                        this.state.releaseDate[1]
+                          ? moment(this.state.releaseDate[1])
+                          : null,
+                      ]}
+                      onChange={(data, dataString) => {
+                        this.setState({ releaseDate: dataString });
+                      }}
+                    />
+                  </div>
                 </div>
               </TabPane>
               <TabPane tab="查看" key="3">

+ 1 - 1
js/component/manageCenter/order/orderNew/myprojectvip.jsx

@@ -576,7 +576,7 @@ const MyProjectVip = React.createClass({
               />
               <Select
                 placeholder="订单部门"
-                style={{ width: 190, marginRight: 10 }}
+                style={{ width: 200, marginRight: 10 }}
                 value={searchValues["depId"]
                   ? searchValues["depId"]
                   : undefined}

+ 1 - 1
js/component/manageCenter/order/source/index.jsx

@@ -453,7 +453,7 @@ class Source extends Component {
                 <FormItem>
                   <Select
                     placeholder={"请选择部门"}
-                    style={{ width: 150 }}
+                    style={{ width: 200 }}
                     value={searchValues["depId"]
                       ? searchValues["depId"]
                       : undefined}

+ 1 - 1
js/component/manageCenter/project/project/outsourceTaskAssignment.jsx

@@ -1022,7 +1022,7 @@ const OutsourceTaskAssignment = React.createClass({
               />
               <Select
                 placeholder="选择部门"
-                style={{ width: 150, marginRight: "10px" }}
+                style={{ width: 200, marginRight: "10px" }}
                 value={this.state.departmenttSearch}
                 onChange={(e) => {
                   this.setState({ departmenttSearch: e });

+ 1 - 1
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -1032,7 +1032,7 @@ const PaiDan = React.createClass({
               />
               <Select
                 placeholder="选择部门"
-                style={{ width: 150, marginRight: "10px" }}
+                style={{ width: 200, marginRight: "10px" }}
                 value={this.state.departmenttSearch}
                 onChange={(e) => {
                   this.setState({ departmenttSearch: e });

+ 1 - 1
js/component/manageCenter/project/project/projectQuery.jsx

@@ -745,7 +745,7 @@ const PaiDan = React.createClass({
               />
               <Select
                 placeholder="选择部门"
-                style={{ width: 150, marginRight: "10px" }}
+                style={{ width: 200, marginRight: "10px" }}
                 value={this.state.departmenttSearch}
                 onChange={(e) => {
                   this.setState({ departmenttSearch: e });

+ 1 - 1
js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx

@@ -1108,7 +1108,7 @@ const zxsglyOutSourcingPaiDan = React.createClass({
               />
               <Select
                 placeholder="选择部门"
-                style={{ width: 150, marginRight: "10px" }}
+                style={{ width: 200, marginRight: "10px" }}
                 value={this.state.departmenttSearch}
                 onChange={e => {
                   this.setState({ departmenttSearch: e });

+ 1 - 1
js/component/manageCenter/project/task/businessManagement/index.jsx

@@ -331,7 +331,7 @@ class BusinessManagement extends Component {
                                 />
                                 <Select
                                     placeholder="选择部门"
-                                    style={{ width: 150, marginRight: '10px' }}
+                                    style={{ width: 200, marginRight: '10px' }}
                                     value={this.state.departmenttSearch}
                                     onChange={(e) => {
                                         this.setState({ departmenttSearch: e })

+ 1 - 1
js/component/manageCenter/project/task/myTask.jsx

@@ -3583,7 +3583,7 @@ const Task = React.createClass({
                             </Select>
                             <Select
                                 placeholder="选择部门"
-                                style={{ width: 150, marginRight: '10px' }}
+                                style={{ width: 200, marginRight: '10px' }}
                                 value={this.state.departmenttSearch}
                                 onChange={(e) => {
                                     this.setState({ departmenttSearch: e })

+ 206 - 209
js/component/manageCenter/project/task/myTaskCount.jsx

@@ -26,7 +26,7 @@ import {
   getprovince,
   getProjectName,
 } from "@/tools.js";
-import {ChooseList} from "../../order/orderNew/chooseList";
+import { ChooseList } from "../../order/orderNew/chooseList";
 import PatentSchedule from './patentSchedule';
 import DeclarationProgress from "../../../common/declarationProgress";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
@@ -43,7 +43,7 @@ const MyTaskCount = Form.create()(
         crossDomain: false,
         url: globalConfig.context + "/api/admin/organization/selectSuperId",
         data: {},
-        success: function(data) {
+        success: function (data) {
           let thedata = data.data;
           let theArr = [];
           if (!thedata) {
@@ -51,7 +51,7 @@ const MyTaskCount = Form.create()(
               message.warning(data.error[0].message);
             }
           } else {
-            thedata.map(function(item, index) {
+            thedata.map(function (item, index) {
               theArr.push({
                 key: index,
                 name: item.name,
@@ -64,7 +64,7 @@ const MyTaskCount = Form.create()(
           });
         }.bind(this)
       }).always(
-        function() {
+        function () {
         }.bind(this)
       );
     },
@@ -99,7 +99,7 @@ const MyTaskCount = Form.create()(
             depId: this.state.departmenttList, //部门ID
             outsource: this.state.outsourceSearch
           },
-          success: function(data) {
+          success: function (data) {
             let theArr = [];
             if (data.error.length || data.data.list == "") {
               if (data.error && data.error.length) {
@@ -147,7 +147,7 @@ const MyTaskCount = Form.create()(
             });
           }.bind(this)
         }).always(
-          function() {
+          function () {
             this.setState({
               loading: false
             });
@@ -171,7 +171,7 @@ const MyTaskCount = Form.create()(
             depId: this.state.departmenttList, //部门ID
             outsource: this.state.outsourceSearch
           },
-          success: function(data) {
+          success: function (data) {
             let theArr = [];
             if (data.error.length || data.data.list == "") {
               if (data.error && data.error.length) {
@@ -196,7 +196,7 @@ const MyTaskCount = Form.create()(
             });
           }.bind(this)
         }).always(
-          function() {
+          function () {
             this.setState({
               loading: false
             });
@@ -213,7 +213,7 @@ const MyTaskCount = Form.create()(
         declarationBatch: 1,
         dataInfor: {},
         selectedRowKeys: [],
-        timeRecordparse:{},
+        timeRecordparse: {},
         orgCodeUrl: [],
         paginations: false,
         pagination: {
@@ -221,10 +221,10 @@ const MyTaskCount = Form.create()(
           defaultPageSize: 10,
           showQuickJumper: true,
           pageSize: 10,
-          onChange: function(page) {
+          onChange: function (page) {
             this.loadData(page);
           }.bind(this),
-          showTotal: function(total) {
+          showTotal: function (total) {
             return "共" + total + "条数据";
           }
         },
@@ -257,14 +257,14 @@ const MyTaskCount = Form.create()(
             key: "userName",
             render: text => {
               return (
-                  <Tooltip title={text}>
-                    <div style={{
-                      maxWidth:'150px',
-                      overflow:'hidden',
-                      textOverflow: "ellipsis",
-                      whiteSpace:'nowrap',
-                    }}>{text}</div>
-                  </Tooltip>
+                <Tooltip title={text}>
+                  <div style={{
+                    maxWidth: '150px',
+                    overflow: 'hidden',
+                    textOverflow: "ellipsis",
+                    whiteSpace: 'nowrap',
+                  }}>{text}</div>
+                </Tooltip>
               )
             }
           },
@@ -377,9 +377,9 @@ const MyTaskCount = Form.create()(
             key: "commodityName",
             render: (text, record) => {
               return (
-                  <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+                <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
               )
-          }
+            }
           },
           {
             title: "项目类别",
@@ -535,7 +535,7 @@ const MyTaskCount = Form.create()(
         data: {
           id: id
         },
-        success: function(data) {
+        success: function (data) {
           if (data.error.length || data.data.list == "") {
             if (data.error && data.error.length) {
               message.warning(data.error[0].message);
@@ -558,10 +558,10 @@ const MyTaskCount = Form.create()(
               taskComment: thisdata.taskComment, //说明
               attachmentUrl: thisdata.attachmentUrl
                 ? splitUrl(
-                    thisdata.attachmentUrl,
-                    ",",
-                    globalConfig.avatarHost + "/upload"
-                  )
+                  thisdata.attachmentUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload"
+                )
                 : [], //图片地址
               salesmanName: thisdata.salesmanName, //订单负责人
               startDate: thisdata.startDate, //启动日期
@@ -588,7 +588,7 @@ const MyTaskCount = Form.create()(
               outsourceName: thisdata.outsourceName, //外包公司名称
               outsourcePrice: thisdata.outsourcePrice, //外包价格
               declarationBatch: thisdata.declarationBatch,
-              bpType:thisdata.bpType,//0 正常 1专利 2软著 3审计 4双软 5高新 6商标
+              bpType: thisdata.bpType,//0 正常 1专利 2软著 3审计 4双软 5高新 6商标
               cSort: thisdata.sort,
               specialComment: thisdata.specialComment,
               urgentDay: thisdata.urgentDay, //有无材料
@@ -597,16 +597,16 @@ const MyTaskCount = Form.create()(
               setUpStatus: thisdata.setUpStatus,
               setUpTime: thisdata.setUpTime,
               highTechStatus: thisdata.highTechStatus,
-              acceptCount:thisdata.acceptCount,       //受理数
-              certificatesCount:thisdata.certificatesCount, //授权数
-              rejectCount:thisdata.rejectCount,       //驳回数
-              commodityQuantity:thisdata.commodityQuantity, //派单项目数
+              acceptCount: thisdata.acceptCount,       //受理数
+              certificatesCount: thisdata.certificatesCount, //授权数
+              rejectCount: thisdata.rejectCount,       //驳回数
+              commodityQuantity: thisdata.commodityQuantity, //派单项目数
               timeRecordparse: thisdata.timeRecord ? JSON.parse(thisdata.timeRecord) : {},
             });
           }
         }.bind(this)
       }).always(
-        function() {
+        function () {
           this.setState({
             loading: false
           });
@@ -637,7 +637,7 @@ const MyTaskCount = Form.create()(
         data: {
           orderNo: orderNos
         },
-        success: function(data) {
+        success: function (data) {
           let thisdata = data.data;
           let ProvinceCityArr = [];
           let ProvinceS = thisdata.locationProvince; //省
@@ -666,12 +666,12 @@ const MyTaskCount = Form.create()(
               ProvinceCity: ProvinceCityArr,
               postalAddress: thisdata.postalAddress, //详细地址
               outsource: thisdata.outsource,
-              deleteSign:thisdata.deleteSign,
+              deleteSign: thisdata.deleteSign,
             });
           }
         }.bind(this)
       }).always(
-        function() {
+        function () {
           this.setState({
             loading: false
           });
@@ -690,7 +690,7 @@ const MyTaskCount = Form.create()(
         data: {
           tid: record.id
         },
-        success: function(data) {
+        success: function (data) {
           let theArr = [];
           let thisData = [];
           if (!thisData) {
@@ -717,7 +717,7 @@ const MyTaskCount = Form.create()(
           }
         }.bind(this)
       }).always(
-        function() {
+        function () {
           this.setState({
             loading: false
           });
@@ -736,7 +736,7 @@ const MyTaskCount = Form.create()(
         data: {
           id: this.state.id
         },
-        success: function(data) {
+        success: function (data) {
           let theArr = [];
 
           if (data.error.length || data.data.list == "") {
@@ -761,7 +761,7 @@ const MyTaskCount = Form.create()(
           });
         }.bind(this)
       }).always(
-        function() {
+        function () {
           this.setState({
             loading: false
           });
@@ -785,7 +785,7 @@ const MyTaskCount = Form.create()(
         data: {
           orderNo: orderNos
         },
-        success: function(data) {
+        success: function (data) {
           let theArr = [];
 
           if (data.error.length || data.data.list == "") {
@@ -804,7 +804,7 @@ const MyTaskCount = Form.create()(
           });
         }.bind(this)
       }).always(
-        function() {
+        function () {
           this.setState({
             loading: false
           });
@@ -893,7 +893,7 @@ const MyTaskCount = Form.create()(
         taskComment: record.taskComment, //备注
         main: record.main.toString(), //是否为主要
         addnextVisible: true,
-        dataInfor:record,
+        dataInfor: record,
         addState: 0
       });
     },
@@ -983,7 +983,7 @@ const MyTaskCount = Form.create()(
         data: {
           flag: 0
         },
-        success: function(data) {
+        success: function (data) {
           let theArr = [];
           let thedata = data.data;
           if (!thedata) {
@@ -1008,7 +1008,7 @@ const MyTaskCount = Form.create()(
           });
         }.bind(this)
       }).always(
-        function() {
+        function () {
           this.loadData(this.state.ispage);
         }.bind(this)
       );
@@ -1032,7 +1032,7 @@ const MyTaskCount = Form.create()(
         wrapperCol: { span: 14 }
       };
       const utils = {
-        getSatisfaction: function(num) {
+        getSatisfaction: function (num) {
           switch (num) {
             case 0:
               return "未收回";
@@ -1042,7 +1042,7 @@ const MyTaskCount = Form.create()(
               return "其它";
           }
         },
-        getChargeback: function(num) {
+        getChargeback: function (num) {
           switch (num) {
             case 0:
               return "已完成";
@@ -1131,7 +1131,7 @@ const MyTaskCount = Form.create()(
                 />
                 <Select
                   placeholder="订单部门"
-                  style={{ width: 150, marginRight: 10 }}
+                  style={{ width: 200, marginRight: 10 }}
                   value={this.state.departmenttList}
                   onChange={(e) => {
                     this.setState({ departmenttList: e });
@@ -1145,7 +1145,7 @@ const MyTaskCount = Form.create()(
                 </Select>
                 <Select
                   placeholder="项目类别"
-                  style={{ width: "150", marginRight: "10px" }}
+                  style={{ width: 120, marginRight: "10px" }}
                   value={this.state.cid}
                   onChange={(e) => {
                     this.setState({ cid: e });
@@ -1156,7 +1156,7 @@ const MyTaskCount = Form.create()(
                 </Select>
                 <Select
                   placeholder="是否外包"
-                  style={{ width: "150", marginRight: "10px" }}
+                  style={{ width: 100, marginRight: "10px" }}
                   value={this.state.outsourceSearch}
                   onChange={(e) => {
                     this.setState({ outsourceSearch: e });
@@ -1207,11 +1207,11 @@ const MyTaskCount = Form.create()(
               <TabPane tab="更改表格显示数据" key="3">
                 <div style={{ marginLeft: 10 }}>
                   <ChooseList
-                      columns={this.state.columns}
-                      changeFn={this.changeList}
-                      changeList={this.state.changeList}
-                      top={55}
-                      margin={11}
+                    columns={this.state.columns}
+                    changeFn={this.changeList}
+                    changeList={this.state.changeList}
+                    top={55}
+                    margin={11}
                   />
                 </div>
               </TabPane>
@@ -1221,8 +1221,8 @@ const MyTaskCount = Form.create()(
                 <Table
                   columns={
                     this.state.changeList
-                        ? this.state.changeList
-                        : this.state.columns
+                      ? this.state.changeList
+                      : this.state.columns
                   }
                   dataSource={this.state.dataSource}
                   pagination={this.state.pagination}
@@ -1251,21 +1251,21 @@ const MyTaskCount = Form.create()(
             >
               <Spin spinning={this.state.loading}>
                 <div className="clearfix">
-                  <div style={{position:"absolute",top:'-52px',left:'81px',zIndex:10000}}>
-                    <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                  <div style={{ position: "absolute", top: '-52px', left: '81px', zIndex: 10000 }}>
+                    <OrderItemStatus deleteSign={this.state.deleteSign} />
                   </div>
                   <div className="clearfix">
                     <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="项目状态"
+                      className="half-item"
+                      {...formItemLayout}
+                      label="项目状态"
                     >
                       <span>{getProjectName(parseInt(this.state.projectStatus))}</span>
                       <Button
-                          type="primary"
-                          size="small"
-                          style={{ marginTop: '5px', position: 'absolute' }}
-                          onClick={this.caozuorizhi}
+                        type="primary"
+                        size="small"
+                        style={{ marginTop: '5px', position: 'absolute' }}
+                        onClick={this.caozuorizhi}
                       >
                         操作日志
                       </Button>
@@ -1322,9 +1322,9 @@ const MyTaskCount = Form.create()(
                     </FormItem>
                     {
                       <FormItem
-                          className="half-item"
-                          {...formItemLayout}
-                          label="(满意度)备注"
+                        className="half-item"
+                        {...formItemLayout}
+                        label="(满意度)备注"
                       >
                         <span>{this.state.retrieveContent}</span>
                       </FormItem>
@@ -1341,14 +1341,14 @@ const MyTaskCount = Form.create()(
                     <div style={{
                       paddingLeft: '8%',
                     }}>
-                      <div style={{color:'#000',fontWeight:500}}>
+                      <div style={{ color: '#000', fontWeight: 500 }}>
                         特别说明
-                        <span style={{color: '#58a3ff',}}>(针对项目的特殊情况说明)</span>
+                        <span style={{ color: '#58a3ff', }}>(针对项目的特殊情况说明)</span>
                       </div>
                       <div style={{
-                        display:'flex',
+                        display: 'flex',
                       }}>
-                        <span style={{paddingRight:'10px',whiteSpace:"nowrap"}}>备注:</span>
+                        <span style={{ paddingRight: '10px', whiteSpace: "nowrap" }}>备注:</span>
                         <span style={{
                           flex: 1,
                           wordBreak: 'break-all',
@@ -1369,44 +1369,40 @@ const MyTaskCount = Form.create()(
                     {/*贯标需要显示*/}
                     {
                       this.state.isIso ?
-                          <div>
-                            <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="认证费"
-                            >
-                                <span>
-                                  {
-                                    this.state.ifCertificationFee === 1 ? '包含' : '不包含'
-                                  }
-                                </span>
-                            </FormItem>
-                            {this.state.ifCertificationFee === 1 ?<FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="认证费(万元)"
-                            >
-                                <span>
-                                    {
-                                      this.state.certificationFee
-                                    }
-                                </span>
-                            </FormItem> : null}
-                            {this.state.ifCertificationFee === 1 ? <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label=""
-                            /> : null}
-                            {this.state.ifCertificationFee === 1 ? <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="付款公司名称"
-                            >
-                                <span>
-                                    {this.state.certificationCorporate}
-                                </span>
-                            </FormItem>:null}
-                          </div> : null
+                        <div>
+                          <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="认证费"
+                          >
+                            <span>
+                              {this.state.ifCertificationFee === 1 ? '包含' : '不包含'}
+                            </span>
+                          </FormItem>
+                          {this.state.ifCertificationFee === 1 ? <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="认证费(万元)"
+                          >
+                            <span>
+                              {this.state.certificationFee}
+                            </span>
+                          </FormItem> : null}
+                          {this.state.ifCertificationFee === 1 ? <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label=""
+                          /> : null}
+                          {this.state.ifCertificationFee === 1 ? <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="付款公司名称"
+                          >
+                            <span>
+                              {this.state.certificationCorporate}
+                            </span>
+                          </FormItem> : null}
+                        </div> : null
                     }
                     <FormItem
                       className="half-item"
@@ -1479,9 +1475,9 @@ const MyTaskCount = Form.create()(
                     >
                       <span>{this.state.userName}</span>
                       <EnterpriseNameChange
-                          type='journal'
-                          style={{ marginLeft: 10 }}
-                          enterpriseId={this.state.orderUid}/>
+                        type='journal'
+                        style={{ marginLeft: 10 }}
+                        enterpriseId={this.state.orderUid} />
                     </FormItem>
                     <FormItem
                       className="half-item"
@@ -1591,66 +1587,66 @@ const MyTaskCount = Form.create()(
                   <div className="clearfix">
                     <h3 className="sub-title">项目申报进度</h3>
                     <DeclarationProgress
-                        timeRecordparse={this.state.timeRecordparse}
-                        startDate={this.state.startDate}
-                        taskDate={this.state.taskDate}
-                        list={[
-                          {id:4,name:'完成时间',value:this.state.endDate},
-                          {id:6,name:'受理时间',value:this.state.acceptDate},
-                          {id:8,name:'公示时间',value:this.state.publicityDate},
-                          {id:10,name:'发证时间',value:this.state.licenceDate},
-                          {id:15,name:'立项金额',value:this.state.setUpAmount}
-                        ]}/>
+                      timeRecordparse={this.state.timeRecordparse}
+                      startDate={this.state.startDate}
+                      taskDate={this.state.taskDate}
+                      list={[
+                        { id: 4, name: '完成时间', value: this.state.endDate },
+                        { id: 6, name: '受理时间', value: this.state.acceptDate },
+                        { id: 8, name: '公示时间', value: this.state.publicityDate },
+                        { id: 10, name: '发证时间', value: this.state.licenceDate },
+                        { id: 15, name: '立项金额', value: this.state.setUpAmount }
+                      ]} />
                     {/*专利显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
                     {
                       this.state.bpType === 1 || this.state.bpType === 6 ?
-                          <div>
-                            <FormItem
-                                labelCol={{ span: 3 }}
-                                wrapperCol={{ span: 16 }}
-                                label="是否高新企业"
-                            >
-                                <span>
-                                  {
-                                    this.state.highTechStatus === 1 ? '是':
-                                        this.state.highTechStatus === 0 ? '否' : ''
-                                  }
-                                </span>
-                            </FormItem>
-                            <FormItem/>
-                            <PatentSchedule
-                                readOnly
-                                bpType={this.state.bpType}
-                                taskId={this.state.id}
-                                acceptCount={this.state.acceptCount}
-                                certificatesCount={this.state.certificatesCount}
-                                rejectCount={this.state.rejectCount}
-                                commodityQuantity={this.state.commodityQuantity}
-                                refresh={()=>{this.xiangqing(this.state.id)}}
-                            />
-                          </div> :
-                          <div>
-                            {/*高新和科技项目显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
-                            {/*cSort: 3 科技项目  6: 会员*/}
-                            {(this.state.bpType  === 5 || this.state.cSort === 3) && <FormItem
-                              className="half-item"
-                              {...formItemLayout}
-                              label="申报批次"
-                            >
-                              <span>{this.state.declarationBatch}</span>
-                            </FormItem>}
-                            {/*只有科技项目才有是否到款*/}
-                            {/*cSort: 3 科技项目  6: 会员*/}
-                            {this.state.cSort === 3 && <FormItem
-                              className="half-item"
-                              {...formItemLayout}
-                              label="是否到款"
-                            >
-                              <span>
-                                {this.state.arrivalMoney ? "已到企业" : "未到企业"}
-                              </span>
-                            </FormItem>}
-                          </div>}
+                        <div>
+                          <FormItem
+                            labelCol={{ span: 3 }}
+                            wrapperCol={{ span: 16 }}
+                            label="是否高新企业"
+                          >
+                            <span>
+                              {
+                                this.state.highTechStatus === 1 ? '是' :
+                                  this.state.highTechStatus === 0 ? '否' : ''
+                              }
+                            </span>
+                          </FormItem>
+                          <FormItem />
+                          <PatentSchedule
+                            readOnly
+                            bpType={this.state.bpType}
+                            taskId={this.state.id}
+                            acceptCount={this.state.acceptCount}
+                            certificatesCount={this.state.certificatesCount}
+                            rejectCount={this.state.rejectCount}
+                            commodityQuantity={this.state.commodityQuantity}
+                            refresh={() => { this.xiangqing(this.state.id) }}
+                          />
+                        </div> :
+                        <div>
+                          {/*高新和科技项目显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                          {/*cSort: 3 科技项目  6: 会员*/}
+                          {(this.state.bpType === 5 || this.state.cSort === 3) && <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="申报批次"
+                          >
+                            <span>{this.state.declarationBatch}</span>
+                          </FormItem>}
+                          {/*只有科技项目才有是否到款*/}
+                          {/*cSort: 3 科技项目  6: 会员*/}
+                          {this.state.cSort === 3 && <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="是否到款"
+                          >
+                            <span>
+                              {this.state.arrivalMoney ? "已到企业" : "未到企业"}
+                            </span>
+                          </FormItem>}
+                        </div>}
                   </div>
                   {this.state.bpType !== 1 && this.state.bpType !== 6 ? <div className="clearfix">
                     <FormItem
@@ -1752,16 +1748,16 @@ const MyTaskCount = Form.create()(
           >
             <div className="clearfix">
               <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="项目状态"
+                className="half-item"
+                {...formItemLayout}
+                label="项目状态"
               >
                 <span>{getProjectName(parseInt(this.state.projectStatus))}</span>
                 <Button
-                    type="primary"
-                    size="small"
-                    style={{ marginTop: '5px', position: 'absolute' }}
-                    onClick={this.caozuorizhi}
+                  type="primary"
+                  size="small"
+                  style={{ marginTop: '5px', position: 'absolute' }}
+                  onClick={this.caozuorizhi}
                 >
                   操作日志
                 </Button>
@@ -1816,9 +1812,9 @@ const MyTaskCount = Form.create()(
               </FormItem>
               {
                 <FormItem
-                    className="half-item"
-                    {...formItemLayout}
-                    label="(满意度)备注"
+                  className="half-item"
+                  {...formItemLayout}
+                  label="(满意度)备注"
                 >
                   <span>{this.state.retrieveContent}</span>
                 </FormItem>
@@ -1830,23 +1826,23 @@ const MyTaskCount = Form.create()(
             {/*软著显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
             {this.state.bpType === 2 ? <div className="clearfix">
               <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="加急天数"
+                className="half-item"
+                {...formItemLayout}
+                label="加急天数"
               >
                 {
                   this.state.urgentDay === 1 ? '是' :
-                      this.state.urgentDay === 0 ? '否' : ''
+                    this.state.urgentDay === 0 ? '否' : ''
                 }
               </FormItem>
               <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="有无材料"
+                className="half-item"
+                {...formItemLayout}
+                label="有无材料"
               >
                 {
-                  this.state.ifMaterial === 1 ? '是':
-                      this.state.ifMaterial === 0 ? '否': ''
+                  this.state.ifMaterial === 1 ? '是' :
+                    this.state.ifMaterial === 0 ? '否' : ''
                 }
               </FormItem>
             </div> : null}
@@ -1854,14 +1850,14 @@ const MyTaskCount = Form.create()(
               <div style={{
                 paddingLeft: '8%',
               }}>
-                <div style={{color:'#000',fontWeight:500}}>
+                <div style={{ color: '#000', fontWeight: 500 }}>
                   特别说明
-                  <span style={{color: '#58a3ff',}}>(针对项目的特殊情况说明)</span>
+                  <span style={{ color: '#58a3ff', }}>(针对项目的特殊情况说明)</span>
                 </div>
                 <div style={{
-                  display:'flex',
+                  display: 'flex',
                 }}>
-                  <span style={{paddingRight:'10px',whiteSpace:"nowrap"}}>备注:</span>
+                  <span style={{ paddingRight: '10px', whiteSpace: "nowrap" }}>备注:</span>
                   <span style={{
                     flex: 1,
                     wordBreak: 'break-all',
@@ -1930,9 +1926,9 @@ const MyTaskCount = Form.create()(
               >
                 <span>{this.state.userName}</span>
                 <EnterpriseNameChange
-                    type='journal'
-                    style={{ marginLeft: 10 }}
-                    enterpriseId={this.state.orderUid}/>
+                  type='journal'
+                  style={{ marginLeft: 10 }}
+                  enterpriseId={this.state.orderUid} />
               </FormItem>
               <FormItem
                 className="half-item"
@@ -2063,19 +2059,19 @@ const MyTaskCount = Form.create()(
             <div className="clearfix">
               <h3 className="sub-title">项目申报进度</h3>
               <DeclarationProgress
-                  timeRecordparse={this.state.timeRecordparse}
-                  startDate={this.state.startDate}
-                  taskDate={this.state.taskDate}
-                  list={[
-                    {id:4,name:'完成时间',value:this.state.endDate},
-                    {id:6,name:'受理时间',value:this.state.acceptDate},
-                    {id:8,name:'公示时间',value:this.state.publicityDate},
-                    {id:10,name:'发证时间',value:this.state.licenceDate},
-                    {id:15,name:'立项金额',value:this.state.setUpAmount}
-                  ]}/>
+                timeRecordparse={this.state.timeRecordparse}
+                startDate={this.state.startDate}
+                taskDate={this.state.taskDate}
+                list={[
+                  { id: 4, name: '完成时间', value: this.state.endDate },
+                  { id: 6, name: '受理时间', value: this.state.acceptDate },
+                  { id: 8, name: '公示时间', value: this.state.publicityDate },
+                  { id: 10, name: '发证时间', value: this.state.licenceDate },
+                  { id: 15, name: '立项金额', value: this.state.setUpAmount }
+                ]} />
               {/*高新和科技项目显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
               {/*cSort: 3 科技项目  6: 会员*/}
-              {(this.state.bpType  === 5 || this.state.cSort === 3) && <FormItem
+              {(this.state.bpType === 5 || this.state.cSort === 3) && <FormItem
                 className="half-item"
                 {...formItemLayout}
                 label="申报批次"
@@ -2137,11 +2133,12 @@ const MyTaskCount = Form.create()(
               </Spin>
             </div>
           </Modal>
-          {this.state.addnextVisible && <ProjectDetailsReadOnly
+          {this.state.addnextVisible &&
+            <ProjectDetailsReadOnly
               infor={this.state.dataInfor}
               visible={this.state.addnextVisible}
               onCancel={this.nextCancel}
-          />}
+            />}
         </div>
       );
     }

+ 1 - 1
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -3222,7 +3222,7 @@ const MyTaskOutsource = React.createClass({
               />
               <Select
                 placeholder="选择部门"
-                style={{ width: 150, marginRight: "10px" }}
+                style={{ width: 200, marginRight: "10px" }}
                 value={this.state.departmenttSearch}
                 onChange={(e) => {
                   this.setState({ departmenttSearch: e });

+ 1 - 1
js/component/manageCenter/project/task/taskAssignment.jsx

@@ -1019,7 +1019,7 @@ const Task = React.createClass({
               />
               <Select
                 placeholder="选择部门"
-                style={{ width: 150, marginRight: "10px" }}
+                style={{ width: 200, marginRight: "10px" }}
                 value={this.state.departmenttSearch}
                 onChange={(e) => {
                   this.setState({ departmenttSearch: e });

+ 1 - 1
js/component/manageCenter/project/task/taskCount.jsx

@@ -1161,7 +1161,7 @@ const IntentionCustomer = Form.create()(
                 />
                 <Select
                   placeholder="订单部门"
-                  style={{ width: 150, marginRight: 10 }}
+                  style={{ width: 200, marginRight: 10 }}
                   value={this.state.departmenttList}
                   onChange={(e) => {
                     this.setState({ departmenttList: e });

+ 1 - 1
js/component/manageCenter/project/task/taskQuery.jsx

@@ -1099,7 +1099,7 @@ const Task = React.createClass({
               />
               <Select
                 placeholder="选择部门"
-                style={{ width: 150, marginRight: "10px" }}
+                style={{ width: 200, marginRight: "10px" }}
                 value={this.state.departmenttSearch}
                 onChange={(e) => {
                   this.setState({ departmenttSearch: e });

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "afanti",
-  "version": "1.2.32",
+  "version": "1.2.33",
   "description": "",
   "main": "index.js",
   "scripts": {