liting2017 před 7 roky
rodič
revize
560c071860

+ 1 - 4
js/component/dataDic.js

@@ -2059,12 +2059,9 @@ module.exports = {
 	        key: "已立项"
 	    },{
 	        value: "3",
-	        key: "进行中"
-	    },{
-	        value: "4",
 	        key: "已结项"
 	    }, {
-	        value: "5",
+	        value: "4",
 	        key: "已撤项"
 	    }
     ],

+ 9 - 25
js/component/manageCenter/servicesManage/projectOrder/orderOrder/projectOrder.jsx

@@ -193,7 +193,6 @@ const ProjectOrder=Form.create()(React.createClass({
                     	return (
                     		<div >
 								{record.projectStage<2&&<Button style={{marginRight:'5px'}} type="primary" onClick={(e) =>{ e.stopPropagation(),this.edit(record) }}>立项</Button>}                 
-								{record.projectStage>=2&&<Button style={{marginRight:'5px'}} type="primary" onClick={(e) =>{ e.stopPropagation(),this.Knot(record)}}>结项</Button>}                 
 							</div>
 							)
                     }
@@ -209,32 +208,23 @@ const ProjectOrder=Form.create()(React.createClass({
     //立项
     edit(record) {
     	this.setState({
-    		KnotState:true,
     		signBillVisible:true
     	})
-    	this.editData(record,1)
-    },
-    //结项
-    Knot(record){
-    	this.setState({
-    		KnotState:false,
-    		signBillVisible:true
-    	})
-    	this.editData(record,0)
+    	this.editData(record)
     },
+   
     noProject(){
     	this.setState({
     		signBillVisible:false
     	})
     },
     //立项。结项前数据获取
-    editData(xhr,state){
-    	let api =state?'/api/admin/techproject/toSetUpProject':'api/jiexiang-shuju';
+    editData(xhr){
     	$.ajax({
 			method: "get",
 			dataType: "json",
 			crossDomain: false,
-			url: globalConfig.context + api,
+			url: globalConfig.context +'/api/admin/techproject/toSetUpProject',
 			data: {
 				orderNo:xhr.orderNo,
 				buyerName:xhr.buyerName
@@ -267,12 +257,11 @@ const ProjectOrder=Form.create()(React.createClass({
 		this.setState({
 			loading: true
 		});
-		let api=this.state.KnotState?'/api/admin/techproject/setUpProject':'/api/admin/jiexiang';
 		$.ajax({
 			method: "get",
 			dataType: "json",
 			crossDomain: false,
-			url: globalConfig.context +api ,
+			url: globalConfig.context +'/api/admin/techproject/setUpProject' ,
 			data: {
 				orderNo:this.state.orderNo,
 				signDate:this.state.signDate,
@@ -283,7 +272,7 @@ const ProjectOrder=Form.create()(React.createClass({
 				loading: false
 			});
 			if(!data.error.length) {
-				message.success('操作成功!');
+				message.success('立项成功!');
 				this.noProject();
 				this.loadData(this.state.pageNo);			
 			} else {
@@ -402,7 +391,7 @@ const ProjectOrder=Form.create()(React.createClass({
 	            <Modal maskClosable={false} visible={this.state.signBillVisible}
                         onOk={this.noProject} onCancel={this.noProject}
                         width='800px'
-                        title={this.state.KnotState?'项目立项':'项目结项'}                   
+                        title='项目立项'                  
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal" onSubmit={this.projectSubmit} id="demand-form">
@@ -418,23 +407,18 @@ const ProjectOrder=Form.create()(React.createClass({
 					                            label="客户名称" >   
 				                                   <span>{this.state.buyerName}</span>
 					                    </FormItem>
-					                    <FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label={this.state.KnotState?"立项时间":'结项时间'}>   
-				                                   <span>{this.state.signDate}</span>
-					                    </FormItem>
 						                <div className='clearfix'>
 								        	<FormItem
 									            labelCol={{ span: 4 }}
 									            wrapperCol={{ span: 16 }}
-									            label={this.state.KnotState?"立项说明":'结项说明'} >
+									            label="立项说明" >
 									                <Input type="textarea" placeholder="请输入备注" rows={4}  value={this.state.signComment} 
 										    				onChange={(e)=>{this.setState({signComment:e.target.value})}}/>			                      
 									        </FormItem>
 								        </div>
 				                    </div>
 			                    <FormItem wrapperCol={{ span: 12, offset: 4 }} className="half-middle">
-			                        <Button className="submitSave" type="primary" htmlType="submit">{this.state.KnotState?"确定立项":'确定结项'}</Button>  
+			                        <Button className="submitSave" type="primary" htmlType="submit">确定立项</Button>  
 			                        <Button className="submitSave" type="ghost" onClick={this.noProject}>返回</Button>
 			                    </FormItem> 
 			                </Spin>

+ 37 - 58
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManage.jsx

@@ -172,6 +172,7 @@ const ProjectOrder=Form.create()(React.createClass({
                     	return (
                     		<div>
 								{record.projectStatus==2||record.projectStatus==5?<Button style={{marginRight:'5px'}} type="primary" onClick={(e) =>{ e.stopPropagation(),this.Knot(record)}}>项目管理</Button>:''}                
+								{record.projectStatus==2&&<Button style={{marginRight:'5px'}} type="primary" onClick={(e) =>{ e.stopPropagation(),this.Knots(record)}}>结项</Button>}           
 								{record.projectStatus==1||record.projectStatus==5?<Popconfirm title={'您将作废项目【'+record.roleName+'】,系统将自动同步作废项目任务及项目资料单,请确认'} onConfirm={(e)=>{this.scrapOrder(record)}} okText="确认" cancelText="取消">
 							   	   <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">作废</Button>                 
 								</Popconfirm>:''}
@@ -183,6 +184,17 @@ const ProjectOrder=Form.create()(React.createClass({
             dataSource: [],
         };
     },
+     //结项
+    Knots(record){
+    	this.setState({
+    		contractId:record.id,
+    		serial:record.serialNumber,
+    		buyerName:record.buyerName,
+    		KnotState:false,
+    		signBillVisible:true
+    	})
+    	this.editData(record)
+    },
     //部门
 	departmentList() {
 		this.setState({
@@ -261,15 +273,6 @@ const ProjectOrder=Form.create()(React.createClass({
         this.loadData();
         this.departmentList()
     },
-    //立项
-    edit(record) {
-    	this.setState({
-    		newProject:false,
-    		Kid:record.id,
-    		signBillVisible:true
-    	})
-    	this.editData(record)
-    },
     //项目管理
     Knot(record){
     	this.state.userDetaile=true;
@@ -285,52 +288,40 @@ const ProjectOrder=Form.create()(React.createClass({
     		signBillVisible:false
     	})
     },
-    //立项。结项前数据获取
-    editData(xhr){
-    	$.ajax({
-			method: "POST",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context + 'api/lixiang-shuju',
-			data: {
-				id:xhr.id,
-			},
-			success: function (data) {
-                if (!data.data) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    };
-                } else {
-                   
-                };
-			}.bind(this)},
-    	).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
+    closeDesc(e, s) {
+    	this.state.userDetaile=false;
+        this.state.showDesc = e;
+        if (s) {
+            this.loadData(this.state.pageNo);
+        };
+    },
+    noProject(){
+    	this.setState({
+    		signBillVisible:false
+    	})
     },
-    //立项、结项保存操作
-	projectSubmit(e){
+    //结项
+    projectSubmit(e){
 		e.preventDefault();
 		this.setState({
 			loading: true
 		});
-		let api=this.state.KnotState?'/api/admin/lixiang':'/api/admin/jiexiang';
 		$.ajax({
-			method: "POST",
+			method: "get",
 			dataType: "json",
 			crossDomain: false,
-			url: globalConfig.context +api ,
+			url: globalConfig.context +'/api/admin/techproject/revokeOrComplete' ,
 			data: {
-				id:this.state.Kid,
+				contractId:this.state.contractId,
+				operatorType:1,
+				completeComment:this.state.signComment,
 			}
 		}).done(function(data) {
 			this.setState({
 				loading: false
 			});
 			if(!data.error.length) {
-				message.success('操作成功!');
+				message.success('结项成功!');
 				this.noProject();
 				this.loadData(this.state.pageNo);			
 			} else {
@@ -338,13 +329,6 @@ const ProjectOrder=Form.create()(React.createClass({
 			}
 		}.bind(this));
 	},
-    closeDesc(e, s) {
-    	this.state.userDetaile=false;
-        this.state.showDesc = e;
-        if (s) {
-            this.loadData(this.state.pageNo);
-        };
-    },
     searchSwitch() {
 		this.setState({
 			newProject:false,
@@ -476,7 +460,7 @@ const ProjectOrder=Form.create()(React.createClass({
 	                    showDesc={this.state.showDesc}
 	                    closeDesc={this.closeDesc} />
 	            </div >
-	            <Modal maskClosable={false} visible={this.state.signBillVisible}
+	             <Modal maskClosable={false} visible={this.state.signBillVisible}
                         onOk={this.noProject} onCancel={this.noProject}
                         width='800px'
                         title='项目立项'                  
@@ -488,30 +472,25 @@ const ProjectOrder=Form.create()(React.createClass({
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="项目编号" >   
-				                                   <span></span>
+				                                   <span>{this.state.serial}</span>
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="客户名称" >   
-				                                   <span></span>
-					                    </FormItem>
-					                    <FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="立项时间">   
-				                                   <span></span>
+				                                   <span>{this.state.buyerName}</span>
 					                    </FormItem>
 						                <div className='clearfix'>
 								        	<FormItem
 									            labelCol={{ span: 4 }}
 									            wrapperCol={{ span: 16 }}
 									            label="立项说明" >
-									                <Input type="textarea" placeholder="请输入备注" rows={4}  value={this.state.introduction} 
-										    				onChange={(e)=>{this.setState({introduction:e.target.value})}}/>			                      
+									                <Input type="textarea" placeholder="请输入备注" rows={4}  value={this.state.signComment} 
+										    				onChange={(e)=>{this.setState({signComment:e.target.value})}}/>			                      
 									        </FormItem>
 								        </div>
 				                    </div>
 			                    <FormItem wrapperCol={{ span: 12, offset: 4 }} className="half-middle">
-			                        <Button className="submitSave" type="primary" htmlType="submit">{this.state.KnotState?"确定立项":'确定结项'}</Button>  
+			                        <Button className="submitSave" type="primary" htmlType="submit">确定立项</Button>  
 			                        <Button className="submitSave" type="ghost" onClick={this.noProject}>返回</Button>
 			                    </FormItem> 
 			                </Spin>

+ 8 - 30
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManageDetaile.jsx

@@ -676,45 +676,24 @@ const MySettlementDetaile = Form.create()(React.createClass({
 		});
 	},
 	//任务项目各种骚操作
-	unlock(){ //解锁
-		this.removeList('1')
-	},
-	lock(){ //锁定
-		this.removeList('2')
-	},
 	removeItem(){ //撤项
-		this.removeList('3')
+		this.removeList(0)
 	},
 	Knot(){ //结项
-		this.removeList('4')
+		this.removeList(1)
 	},
 	removeList(e){
-		if(!e) return false;
 		this.setState({
 			loading: true
 		});
-		let api='';
-		switch (e){
-			case '1': //解锁
-			  api='/api/jiesuo' 
-			break;
-			case '2': //锁定
-			  api='/api/suoding'
-			break;
-			case '3': //撤项
-			  api='/api/chexiang'
-			break;
-			case '4': //结项
-			  api='/api/jiexiang'
-			break;
-		};
 		$.ajax({
-			method: "POST",
+			method: "get",
 			dataType: "json",
 			crossDomain: false,
-			url: globalConfig.context + api,
+			url: globalConfig.context + '/api/admin/techproject/revokeOrComplete',
 			data: {
-				id:this.props.datauser.id
+				contractId:this.props.datauser.id,
+				operatorType:e
 			}
 		}).done(function(data) {
 			this.setState({
@@ -745,6 +724,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			}
 		}else{
 			this.setState({
+				customerArr:[],
 				customerName:'',
 				autoId:'',
 				signComment:'',
@@ -885,10 +865,8 @@ const MySettlementDetaile = Form.create()(React.createClass({
 					            {!this.props.projectState?<div>
 					            </div>:
 					            <div style={{marginTop:'30px',paddingLeft:'100px'}}>
-					            	<Button type="primary" onClick={this.removeItem}>撤项</Button>  
+					            	<Button type="danger" onClick={this.removeItem}>撤项</Button>  
 						            <Button type="primary" onClick={this.Knot} style={{margin:'15px'}}>结项</Button>
-						            <Button type="danger" onClick={this.lock}>锁定</Button>
-						            <Button type="primary" onClick={this.unlock} style={{margin:'15px'}}>解锁</Button>
 						            <Button type="ghost" onClick={this.handleCancel}>返回</Button>
 					            </div>}
 		                    </div>