Переглянути джерело

Merge branch 'master' of ssh://git.jishutao.com:55555/jishutao/web

dengzhiguo 7 роки тому
батько
коміт
18dc17d699

+ 15 - 2
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManage.jsx

@@ -33,7 +33,8 @@ const ProjectOrder=Form.create()(React.createClass({
                 financeLeaderSearch:this.state.financeLeaderSearch,//财务负责人
                 orderNo:this.state.orderNoSearch,//订单编号
                 deletedSign:this.state.deleteSignSearch,//锁定激活
-                serialNumber:this.state.serialNumberSearch //项目编号
+                serialNumber:this.state.serialNumberSearch,//项目编号
+                principalName:this.state.principalNameSearch
             },
             success: function (data) {
                 let theArr = [];
@@ -61,6 +62,7 @@ const ProjectOrder=Form.create()(React.createClass({
 	                         buyerType:thisdata.buyerType,
 	                         salesmanName:thisdata.salesmanName,
 	                         departmentName:thisdata.departmentName,
+	                         principalName:thisdata.principalName
                         });
                     };
                     this.state.pagination.current = data.data.pageNo;
@@ -157,6 +159,10 @@ const ProjectOrder=Form.create()(React.createClass({
                     dataIndex: 'salesmanName',
                     key: 'salesmanName',
                 },{
+                    title: '项目负责人',
+                    dataIndex: 'principalName',
+                    key: 'principalName',
+                },{
                     title: '订单部门',
                     dataIndex: 'departmentName',
                     key: 'departmentName',
@@ -209,7 +215,6 @@ const ProjectOrder=Form.create()(React.createClass({
                     title: '业务品类',
                     dataIndex: 'projectType',
                     key: 'projectType',
-                    render:(text)=>{return getOrderType(text) }
                 },{
                     title: '项目状态',
                     dataIndex: 'projectStatus',
@@ -233,6 +238,10 @@ const ProjectOrder=Form.create()(React.createClass({
                     dataIndex: 'salesmanName',
                     key: 'salesmanName',
                 },{
+                    title: '项目负责人',
+                    dataIndex: 'principalName',
+                    key: 'principalName',
+                },{
                     title: '订单部门',
                     dataIndex: 'departmentName',
                     key: 'departmentName',
@@ -458,6 +467,7 @@ const ProjectOrder=Form.create()(React.createClass({
     reset() {
     	this.state.buyerNameSearch='';
     	this.state.serialNumberSearch='';
+    	this.state.principalNameSearch='';
     	this.state.releaseDate[0] = undefined;
 		this.state.releaseDate[1] = undefined;
 		this.state.releaseDateOrder[0] = undefined;
@@ -500,6 +510,9 @@ const ProjectOrder=Form.create()(React.createClass({
 	                    <Input placeholder="客户名称" style={{width:'150px'}}
 	                        value={this.state.buyerNameSearch}
 	                        onChange={(e) => { this.setState({ buyerNameSearch: e.target.value }); }} />
+	                    <Input placeholder="项目负责人" style={{width:'150px',marginRight:'10px'}}
+		                        value={this.state.principalNameSearch}
+		                        onChange={(e) => { this.setState({ principalNameSearch: e.target.value }); }} /> 
 	                    <span style={{fontSize:'14px',marginRight:'5px'}}>立项时间:</span>    
 	                    <RangePicker
 		                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,

+ 51 - 6
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManageDetaile.jsx

@@ -58,6 +58,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			projectVisible:false,
 			selectedRowKey:[],
 			orderSelect:false,
+			transferState:false,
 			orgCodeUrl:[],
 			customerArr:[],
 			checkedKeys: [],
@@ -137,9 +138,13 @@ const MySettlementDetaile = Form.create()(React.createClass({
                     key: 'abc',
                     render:(text,record,index)=>{
                     	return (
-                    	    <Popconfirm title={'您确认将订单分配给【'+record.departmentName+'-'+record.name+'】进行业务跟进?'} onConfirm={(e)=>{this.confirmSelect(record)}} okText="确认" cancelText="取消">
-							    <Button style={{marginRight:'5px'}} type="primary">选定</Button>                 
-							</Popconfirm>
+	                    		<div>{this.state.transferState?<Popconfirm title={'您确认转交给【'+record.departmentName+'-'+record.name+'】'} onConfirm={(e)=>{this.transterSelect(record)}} okText="确认" cancelText="取消">
+									    <Button style={{marginRight:'5px'}} type="primary">转交</Button>                 
+									</Popconfirm>:
+		                    	    <Popconfirm title={'您确认将订单分配给【'+record.departmentName+'-'+record.name+'】进行业务跟进?'} onConfirm={(e)=>{this.confirmSelect(record)}} okText="确认" cancelText="取消">
+									    <Button style={{marginRight:'5px'}} type="primary">选定</Button>                 
+									</Popconfirm>}
+								</div>
 							)
                     }
                 }
@@ -447,8 +452,10 @@ const MySettlementDetaile = Form.create()(React.createClass({
     	this.setState({
     		taskIds:index.taskId,
     		userDetaile:false,
-    		distributionVisible:true
+    		distributionVisible:true,
+    		transferState:false,
     	});
+    	this.resetOrder();
     },
     distributionCancel(){
     	this.setState({
@@ -541,6 +548,35 @@ const MySettlementDetaile = Form.create()(React.createClass({
             };
         }.bind(this));
     },
+    //指派
+     //选定对象
+    transterSelect(record){
+    	this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/techproject/transferProject",
+            data: {
+            	contractId:this.state.id,
+            	projectReceiveId:record.id,
+            	orderNo:this.state.orderNok||''
+            }
+        }).done(function (data) {
+            if (!data.error.length) {
+                message.success('转交成功!');
+                this.setState({
+                    loading: false,
+                });
+                this.distributionOk();
+                this.loaduser(this.props.datauser);
+            } else {
+                message.warning(data.error[0].message);
+            };
+        }.bind(this));
+    },
     searchOrder(){
     	this.contactList();
     },
@@ -724,6 +760,14 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			}
 		}.bind(this));
 	},
+	//负责人转交
+	transfer(){
+		this.setState({
+			distributionVisible:true,
+			transferState:true,
+		});
+		this.resetOrder();
+	},
 	tableRowClick(record, index) {
         this.setState({
         	addTaskState:false,
@@ -825,6 +869,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			                            {...formItemLayout}
 			                            label="项目负责人" >  
 			                            <span>{orderDetaiel.principalName}</span>
+			                            {!this.props.queryProject?<Button onClick={this.transfer} style={{'float':"right"}}>转交</Button>:''}
 		                    		</FormItem>
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
@@ -1114,7 +1159,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			        <Modal maskClosable={false} visible={this.state.distributionVisible}
                         onOk={this.distributionOk} onCancel={this.distributionCancel}
                         width='800px'
-                        title='分派任务单'                     
+                        title={this.state.transferState?'转交责任人':'分派任务单' }                    
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal"  id="demand-form" style={{paddingBottom:'40px'}} >
@@ -1130,7 +1175,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			                                    })
 			                                }
 				                    </Select>
-				                    <Input placeholder="咨询师" style={{width:'150px',marginLeft:'10px'}}
+				                    <Input placeholder={this.state.transferState?"责任人":"咨询师"} style={{width:'150px',marginLeft:'10px'}}
 				                        value={this.state.financeNameSearch}
 				                        onChange={(e) => { this.setState({ financeNameSearch: e.target.value }); }} />  
 				                    <Button type="primary" onClick={this.searchOrder} style={{marginLeft:'10px',marginRight:'10px'}}>搜索</Button>

Різницю між файлами не показано, бо вона завелика
+ 8 - 1363
package-lock.json