|  | @@ -185,13 +185,10 @@ const TaskManagement=Form.create()(React.createClass({
 | 
												
													
														
															|  |                      render:(text,record,index)=>{
 |  |                      render:(text,record,index)=>{
 | 
												
													
														
															|  |                      	return (
 |  |                      	return (
 | 
												
													
														
															|  |                      		<div>
 |  |                      		<div>
 | 
												
													
														
															|  | -								{record.taskStatus<=1?<Popconfirm title={'请确认是否作废【'+record.commodityName+'】任务?'} onConfirm={(e)=>{this.startUp(record)}} okText="确认" cancelText="取消">
 |  | 
 | 
												
													
														
															|  | -							   	   <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">作废</Button>                 
 |  | 
 | 
												
													
														
															|  | -								</Popconfirm>:''}
 |  | 
 | 
												
													
														
															|  | 
 |  | +								{record.taskStatus<1&&<Popconfirm title={'请确认是否作废【'+record.commodityName+'】任务?'} onConfirm={(e)=>{this.startUp(record)}} okText="确认" cancelText="取消">
 | 
												
													
														
															|  | 
 |  | +							   	   <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">删除</Button>                 
 | 
												
													
														
															|  | 
 |  | +								</Popconfirm>}
 | 
												
													
														
															|  |  							    {record.taskStatus<1&&<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation(),this.confirmDelet(record)}} type="primary">派单</Button>}                
 |  |  							    {record.taskStatus<1&&<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation(),this.confirmDelet(record)}} type="primary">派单</Button>}                
 | 
												
													
														
															|  | -								{record.deleteSign!=2?<Popconfirm title={'请确认是否锁定【'+record.commodityName+'】任务?'} onConfirm={(e)=>{this.endUp(record)}} okText="确认" cancelText="取消">
 |  | 
 | 
												
													
														
															|  | -							   	   <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">锁定</Button>                 
 |  | 
 | 
												
													
														
															|  | -								</Popconfirm>:''}
 |  | 
 | 
												
													
														
															|  |  							</div>
 |  |  							</div>
 | 
												
													
														
															|  |  							)
 |  |  							)
 | 
												
													
														
															|  |                      }
 |  |                      }
 | 
												
											
												
													
														
															|  | @@ -365,24 +362,19 @@ const TaskManagement=Form.create()(React.createClass({
 | 
												
													
														
															|  |          this.loadData();
 |  |          this.loadData();
 | 
												
													
														
															|  |          this.businessList()
 |  |          this.businessList()
 | 
												
													
														
															|  |      },
 |  |      },
 | 
												
													
														
															|  | -    //启动
 |  | 
 | 
												
													
														
															|  | 
 |  | +    //删除
 | 
												
													
														
															|  |    	startUp(record){
 |  |    	startUp(record){
 | 
												
													
														
															|  | -  		this.removeList(true,record)
 |  | 
 | 
												
													
														
															|  | 
 |  | +  		this.removeList(record)
 | 
												
													
														
															|  |    	},
 |  |    	},
 | 
												
													
														
															|  | -  	//完成
 |  | 
 | 
												
													
														
															|  | -  	endUp(){
 |  | 
 | 
												
													
														
															|  | -  		this.removeList(false,record)
 |  | 
 | 
												
													
														
															|  | -  	},
 |  | 
 | 
												
													
														
															|  | -    removeList(state,record){
 |  | 
 | 
												
													
														
															|  | 
 |  | +    removeList(record){
 | 
												
													
														
															|  |  		this.setState({
 |  |  		this.setState({
 | 
												
													
														
															|  |  			loading: true
 |  |  			loading: true
 | 
												
													
														
															|  |  		});
 |  |  		});
 | 
												
													
														
															|  | -		let api=state?'/api/admin/techproject/startTask':'/api/admin/techproject//completeTask';
 |  | 
 | 
												
													
														
															|  |  		$.ajax({
 |  |  		$.ajax({
 | 
												
													
														
															|  |  			method: "get",
 |  |  			method: "get",
 | 
												
													
														
															|  |  			dataType: "json",
 |  |  			dataType: "json",
 | 
												
													
														
															|  |  			crossDomain: false,
 |  |  			crossDomain: false,
 | 
												
													
														
															|  | -			url: globalConfig.context + api,
 |  | 
 | 
												
													
														
															|  | 
 |  | +			url: globalConfig.context + '/api/admin/techproject/deleteProjectTask',
 | 
												
													
														
															|  |  			data: {
 |  |  			data: {
 | 
												
													
														
															|  |  				taskId:record.taskId
 |  |  				taskId:record.taskId
 | 
												
													
														
															|  |  			}
 |  |  			}
 |