liting2017 7 lat temu
rodzic
commit
bb841553f2

+ 0 - 1
js/component/manageCenter/order/myOrder/servicesOrder/addService.jsx

@@ -396,7 +396,6 @@ const NewService = Form.create()(React.createClass({
 		})
 	},
 	tableRowClick(record, index) {
-		console.log(this.props.datauser.active)
         this.setState({
         	active:this.props.datauser.active,
         	editFw:record,

+ 2 - 1
js/component/manageCenter/servicesManage/projectOrder/myTask/projectManage.jsx

@@ -65,7 +65,8 @@ const MyTask=Form.create()(React.createClass({
                 	pageNo:pageNo,
                     dataSource: theArr,
                     pagination: this.state.pagination,
-                    selectedRowKeys:[]
+                    selectedRowKeys:[],
+                    showDesc:false,
                 });
             }.bind(this),
         }).always(function () {

+ 7 - 15
js/component/manageCenter/servicesManage/projectOrder/taskManagement/projectManage.jsx

@@ -185,13 +185,10 @@ const TaskManagement=Form.create()(React.createClass({
                     render:(text,record,index)=>{
                     	return (
                     		<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.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>
 							)
                     }
@@ -365,24 +362,19 @@ const TaskManagement=Form.create()(React.createClass({
         this.loadData();
         this.businessList()
     },
-    //启动
+    //删除
   	startUp(record){
-  		this.removeList(true,record)
+  		this.removeList(record)
   	},
-  	//完成
-  	endUp(){
-  		this.removeList(false,record)
-  	},
-    removeList(state,record){
+    removeList(record){
 		this.setState({
 			loading: true
 		});
-		let api=state?'/api/admin/techproject/startTask':'/api/admin/techproject//completeTask';
 		$.ajax({
 			method: "get",
 			dataType: "json",
 			crossDomain: false,
-			url: globalConfig.context + api,
+			url: globalConfig.context + '/api/admin/techproject/deleteProjectTask',
 			data: {
 				taskId:record.taskId
 			}