|  | @@ -7,7 +7,7 @@ import MySettlementDetaile from "./projectManageDetaile.jsx";
 | 
	
		
			
				|  |  |  import moment from 'moment';
 | 
	
		
			
				|  |  |  import '../userMangagement.less';
 | 
	
		
			
				|  |  |  import {projectState,taskStatus,isLock,publishStatus} from '../../../../dataDic.js';
 | 
	
		
			
				|  |  | -import {getProjectState,getOrderState,getOrderType,getPaymentState,getTaskStatus,getPublishStatus} from '../../../../tools.js';
 | 
	
		
			
				|  |  | +import {getProjectState,getOrderState,getOrderType,getPaymentState,getTaskStatus,getPublishStatus,getLock} from '../../../../tools.js';
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  const TaskManagement=Form.create()(React.createClass({
 | 
	
		
			
				|  |  |  	loadData(pageNo) {
 | 
	
	
		
			
				|  | @@ -27,7 +27,7 @@ const TaskManagement=Form.create()(React.createClass({
 | 
	
		
			
				|  |  |                  buyerName:this.state.buyerNameSearch,//客户名称
 | 
	
		
			
				|  |  |                  taskStatus:this.state.orderStatusSearch, //订单状态
 | 
	
		
			
				|  |  |                  projectNo:this.state.orderNoSearch,//订单编号
 | 
	
		
			
				|  |  | -                deleteSign:this.state.deleteSignSearch,//锁定激活
 | 
	
		
			
				|  |  | +                deleteSign:this.state.deleteSign,//锁定激活
 | 
	
		
			
				|  |  |                  categoryId:this.state.categoryIdSearch,
 | 
	
		
			
				|  |  |                  deletedSign:this.state.deletedSign,
 | 
	
		
			
				|  |  |                  taskReceiverName:this.state.salesmanNameSearch,
 | 
	
	
		
			
				|  | @@ -50,7 +50,8 @@ const TaskManagement=Form.create()(React.createClass({
 | 
	
		
			
				|  |  |  	                         categoryName:thisdata.categoryName,
 | 
	
		
			
				|  |  |  	                         buyerName:thisdata.buyerName,
 | 
	
		
			
				|  |  |  	                         taskDistributionTimes:thisdata.taskDistributionTimes,
 | 
	
		
			
				|  |  | -	                         deleteSign:thisdata.deleteSign,
 | 
	
		
			
				|  |  | +	                         deletedSign:thisdata.deletedSign,//项目的锁定
 | 
	
		
			
				|  |  | +	                         deleteSign:thisdata.deleteSign,//项目任务的锁定
 | 
	
		
			
				|  |  |  	                         taskStatus:thisdata.taskStatus,
 | 
	
		
			
				|  |  |  	                         taskReceiverName:thisdata.taskReceiverName,
 | 
	
		
			
				|  |  |  	                         projectNo:thisdata.projectNo,
 | 
	
	
		
			
				|  | @@ -182,7 +183,7 @@ const TaskManagement=Form.create()(React.createClass({
 | 
	
		
			
				|  |  |                      dataIndex: 'deleteSign',
 | 
	
		
			
				|  |  |                      key: 'deleteSign',
 | 
	
		
			
				|  |  |                      render:(text)=>{
 | 
	
		
			
				|  |  | -                    	return text==2?'锁定':'未锁定'
 | 
	
		
			
				|  |  | +                    	{return getLock(text) }
 | 
	
		
			
				|  |  |                      }
 | 
	
		
			
				|  |  |                  },{
 | 
	
		
			
				|  |  |                      title: '任务创建时间',
 | 
	
	
		
			
				|  | @@ -442,6 +443,7 @@ const TaskManagement=Form.create()(React.createClass({
 | 
	
		
			
				|  |  |  		this.state.orderNoSearch='';
 | 
	
		
			
				|  |  |  		this.state.deleteSignSearch=undefined;
 | 
	
		
			
				|  |  |  		this.state.deletedSign=undefined;
 | 
	
		
			
				|  |  | +		this.state.deleteSign=undefined;
 | 
	
		
			
				|  |  |  		this.state.categoryIdSearch=undefined;
 | 
	
		
			
				|  |  |  		this.state.publishStatus=undefined;
 | 
	
		
			
				|  |  |          this.loadData();       
 | 
	
	
		
			
				|  | @@ -513,8 +515,8 @@ const TaskManagement=Form.create()(React.createClass({
 | 
	
		
			
				|  |  |                          </Select>
 | 
	
		
			
				|  |  |                          <Select placeholder="是否锁定"
 | 
	
		
			
				|  |  |                              style={{ width: 150,marginRight:'10px' }}
 | 
	
		
			
				|  |  | -                            value={this.state.deletedSign}
 | 
	
		
			
				|  |  | -                            onChange={(e) => { this.setState({ deletedSign: e }) }}>
 | 
	
		
			
				|  |  | +                            value={this.state.deleteSign}
 | 
	
		
			
				|  |  | +                            onChange={(e) => { this.setState({ deleteSign: e }) }}>
 | 
	
		
			
				|  |  |                              {
 | 
	
		
			
				|  |  |                                  isLock.map(function (item) {
 | 
	
		
			
				|  |  |                                          return <Select.Option key={item.value} >{item.key}</Select.Option>
 |