liting2017 7 years ago
parent
commit
44adcbb6f6

+ 12 - 0
js/component/dataDic.js

@@ -2093,5 +2093,17 @@ module.exports = {
 	        value: "2",
 	        value: "2",
 	        key: "变更完成"
 	        key: "变更完成"
 	    }
 	    }
+    ], //变更状态	
+    distributeState:[
+    	{
+	        value: "0",
+	        key: "未分派"
+	    },{
+	        value: "1",
+	        key: "部分分派"
+	    }, {
+	        value: "2",
+	        key: "全部分派"
+	    }
     ],
     ],
 };
 };

+ 1 - 1
js/component/manageCenter/customer/customerData/myClient.jsx

@@ -2102,7 +2102,7 @@ const MyClient = Form.create()(React.createClass({
                             };
                             };
                         }} >
                         }} >
                         <Button>上传批量内容</Button>
                         <Button>上传批量内容</Button>
-                    </Upload>                        
+                    </Upload>   
 	               {adminData.isSuperAdmin?<Popconfirm title="是否删除?" onConfirm={this.delectRow} okText="是" cancelText="否">
 	               {adminData.isSuperAdmin?<Popconfirm title="是否删除?" onConfirm={this.delectRow} okText="是" cancelText="否">
 							     <Button type="danger" style={{marginLeft:'10px'}}
 							     <Button type="danger" style={{marginLeft:'10px'}}
 	                       			 disabled={!hasSelected} 
 	                       			 disabled={!hasSelected} 

+ 0 - 1
js/component/manageCenter/customer/individualCustomer/individualCustomer.jsx

@@ -2173,7 +2173,6 @@ const IndividualCustomer = Form.create()(React.createClass({
                         }} >
                         }} >
                         <Button>上传批量内容</Button>
                         <Button>上传批量内容</Button>
                     </Upload>                        
                     </Upload>                        
-										
 					{adminData.isSuperAdmin?<Button style={{ marginRight:'10px' ,marginLeft:'10px'}} type='danger'
 					{adminData.isSuperAdmin?<Button style={{ marginRight:'10px' ,marginLeft:'10px'}} type='danger'
 	                        disabled={!hasSelected} 
 	                        disabled={!hasSelected} 
 	                        onClick={this.delectRow}>删除<Icon type="minus" />
 	                        onClick={this.delectRow}>删除<Icon type="minus" />

+ 27 - 0
js/component/manageCenter/operate/messagePush/systemMessage.jsx

@@ -1061,6 +1061,32 @@ const SystemMessage=Form.create()(React.createClass({
 			managerIdOrganization:e
 			managerIdOrganization:e
 		})
 		})
 	},
 	},
+	//修复数据
+	repairData(){
+		this.setState({
+            loading: true
+        });
+         $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context +"/api/admin/order/repairData" ,
+            success: function (data) {
+               if (!data.data) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                }
+               if(!data.error.length){
+                	message.success('操作成功');
+                }
+             }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+	},
     addClick() {
     addClick() {
     	this.state.addTitle= undefined;//消息标题
     	this.state.addTitle= undefined;//消息标题
     	this.state.addContent= undefined;//消息内容
     	this.state.addContent= undefined;//消息内容
@@ -1364,6 +1390,7 @@ const SystemMessage=Form.create()(React.createClass({
             <div className="user-content" >
             <div className="user-content" >
                 <div className="content-title">
                 <div className="content-title">
 	                <div className="user-search">
 	                <div className="user-search">
+	                	<Button type="danger" className="addButton" onClick={this.repairData}>修复数据</Button>
 	                	<Button type="primary" className="addButton" onClick={this.addClick}>创建系统消息<Icon type="plus" /></Button>
 	                	<Button type="primary" className="addButton" onClick={this.addClick}>创建系统消息<Icon type="plus" /></Button>
 	                	<Button type="primary" onClick={this.bianji} style={!this.state.bianjiMore ? { display: 'none',float:'right',marginRight:'10px'} : {display: 'inline-block',float:'right',marginRight:'10px'}} disabled={!hasSelected}>编辑</Button>
 	                	<Button type="primary" onClick={this.bianji} style={!this.state.bianjiMore ? { display: 'none',float:'right',marginRight:'10px'} : {display: 'inline-block',float:'right',marginRight:'10px'}} disabled={!hasSelected}>编辑</Button>
 	                	<div style={!this.state.bianjiMore ? { display: 'none',float:'right',marginRight:'10px'} : {display: 'inline-block',float:'right',marginRight:'10px',marginTop:'10px'}}>
 	                	<div style={!this.state.bianjiMore ? { display: 'none',float:'right',marginRight:'10px'} : {display: 'inline-block',float:'right',marginRight:'10px',marginTop:'10px'}}>

+ 38 - 6
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManage.jsx

@@ -6,8 +6,8 @@ import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message,
 import MySettlementDetaile from "./projectManageDetaile.jsx";
 import MySettlementDetaile from "./projectManageDetaile.jsx";
 import moment from 'moment';
 import moment from 'moment';
 import '../userMangagement.less';
 import '../userMangagement.less';
-import {projectState,orderState} from '../../../../dataDic.js';
-import {getProjectState,getOrderState,getOrderType,getPaymentState,getApprovedState} from '../../../../tools.js';
+import {projectState,orderState,distributeState} from '../../../../dataDic.js';
+import {getProjectState,getOrderState,getOrderType,getPaymentState,getApprovedState,getDistributeState} from '../../../../tools.js';
 
 
 const ProjectOrder=Form.create()(React.createClass({
 const ProjectOrder=Form.create()(React.createClass({
 	loadData(pageNo) {
 	loadData(pageNo) {
@@ -34,7 +34,8 @@ const ProjectOrder=Form.create()(React.createClass({
                 orderNo:this.state.orderNoSearch,//订单编号
                 orderNo:this.state.orderNoSearch,//订单编号
                 deletedSign:this.state.deleteSignSearch,//锁定激活
                 deletedSign:this.state.deleteSignSearch,//锁定激活
                 serialNumber:this.state.serialNumberSearch,//项目编号
                 serialNumber:this.state.serialNumberSearch,//项目编号
-                principalName:this.state.principalNameSearch
+                principalName:this.state.principalNameSearch,
+                taskDistribution:this.state.distributeSearch
             },
             },
             success: function (data) {
             success: function (data) {
                 let theArr = [];
                 let theArr = [];
@@ -62,7 +63,8 @@ const ProjectOrder=Form.create()(React.createClass({
 	                         buyerType:thisdata.buyerType,
 	                         buyerType:thisdata.buyerType,
 	                         salesmanName:thisdata.salesmanName,
 	                         salesmanName:thisdata.salesmanName,
 	                         departmentName:thisdata.departmentName,
 	                         departmentName:thisdata.departmentName,
-	                         principalName:thisdata.principalName
+	                         principalName:thisdata.principalName,
+	                         taskDistribution:thisdata.taskDistribution
                         });
                         });
                     };
                     };
                     this.state.pagination.current = data.data.pageNo;
                     this.state.pagination.current = data.data.pageNo;
@@ -177,13 +179,19 @@ const ProjectOrder=Form.create()(React.createClass({
                     key: 'approval',
                     key: 'approval',
                      render:(text)=>{return getApprovedState(text) }
                      render:(text)=>{return getApprovedState(text) }
                 },{
                 },{
+                    title: '分派情况',
+                    dataIndex: 'taskDistribution',
+                    key: 'taskDistribution',
+                     render:(text)=>{return getDistributeState(text) }
+                },
+                {
                 	title: '操作',
                 	title: '操作',
                     dataIndex: 'rr',
                     dataIndex: 'rr',
                     key: 'rr',
                     key: 'rr',
                     render:(text,record,index)=>{
                     render:(text,record,index)=>{
                     	return (
                     	return (
                     		<div>
                     		<div>
-								{record.projectStatus==2||record.projectStatus==5?<Button style={{marginRight:'5px'}} type="primary" onClick={(e) =>{ e.stopPropagation(),this.Knot(record)}}>项目管理</Button>:''}                
+								{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==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="取消">
 								{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>                 
 							   	   <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">作废</Button>                 
@@ -255,6 +263,11 @@ const ProjectOrder=Form.create()(React.createClass({
                     dataIndex: 'approval',
                     dataIndex: 'approval',
                     key: 'approval',
                     key: 'approval',
                      render:(text)=>{return getApprovedState(text) }
                      render:(text)=>{return getApprovedState(text) }
+                },{
+                    title: '分派情况',
+                    dataIndex: 'taskDistribution',
+                    key: 'taskDistribution',
+                     render:(text)=>{return getDistributeState(text) }
                 }
                 }
             ],
             ],
             dataSource: [],
             dataSource: [],
@@ -484,6 +497,7 @@ const ProjectOrder=Form.create()(React.createClass({
 		this.state.orderStatusSearch = undefined;
 		this.state.orderStatusSearch = undefined;
 		this.state.salesmanNameSearch = '';
 		this.state.salesmanNameSearch = '';
 		this.state.orderNoSearch='';
 		this.state.orderNoSearch='';
+		this.state.distributeSearch=undefined;
 		this.state.deleteSignSearch=undefined;
 		this.state.deleteSignSearch=undefined;
         this.loadData();       
         this.loadData();       
     },
     },
@@ -521,7 +535,16 @@ const ProjectOrder=Form.create()(React.createClass({
 	                    <Input placeholder="项目负责人" style={{width:'150px',marginRight:'10px'}}
 	                    <Input placeholder="项目负责人" style={{width:'150px',marginRight:'10px'}}
 		                        value={this.state.principalNameSearch}
 		                        value={this.state.principalNameSearch}
 		                        onChange={(e) => { this.setState({ principalNameSearch: e.target.value }); }} /> 
 		                        onChange={(e) => { this.setState({ principalNameSearch: e.target.value }); }} /> 
-	                    <span style={{fontSize:'14px',marginRight:'5px'}}>立项时间:</span>    
+	                    <Select placeholder="分派情况" style={{width:'150px',marginLeft:'10px'}}
+	                            value={this.state.distributeSearch}
+	                            onChange={(e) => { this.setState({ distributeSearch: e }) }}>
+	                            {
+	                                distributeState.map(function (item) {
+	                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
+	                                })
+	                            }
+	                    </Select>
+	                    <span style={{fontSize:'14px',marginRight:'5px'}}>立项时间:</span>
 	                    <RangePicker
 	                    <RangePicker
 		                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
 		                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
 		                        this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
 		                        this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
@@ -548,6 +571,15 @@ const ProjectOrder=Form.create()(React.createClass({
 	                                })
 	                                })
 	                            }
 	                            }
 	                        </Select>
 	                        </Select>
+	                        <Select placeholder="分派情况" style={{width:'150px',marginLeft:'10px'}}
+	                            value={this.state.distributeSearch}
+	                            onChange={(e) => { this.setState({ distributeSearch: e }) }}>
+	                            {
+	                                distributeState.map(function (item) {
+	                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
+	                                })
+	                            }
+	                        </Select>
 	                        <Input placeholder="订单负责人" style={{width:'150px',margin:'10px'}}
 	                        <Input placeholder="订单负责人" style={{width:'150px',margin:'10px'}}
 		                        value={this.state.salesmanNameSearch}
 		                        value={this.state.salesmanNameSearch}
 		                        onChange={(e) => { this.setState({ salesmanNameSearch: e.target.value }); }} />
 		                        onChange={(e) => { this.setState({ salesmanNameSearch: e.target.value }); }} />

+ 3 - 1
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManageDetaile.jsx

@@ -339,6 +339,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
                     loading: false,
                     loading: false,
                 });
                 });
                 this.loadData();
                 this.loadData();
+                this.props.closeDesc(false, true);
             } else {
             } else {
                 message.warning(data.error[0].message);
                 message.warning(data.error[0].message);
             };
             };
@@ -515,7 +516,6 @@ const MySettlementDetaile = Form.create()(React.createClass({
             	//subOrSame:!this.state.lvRadio?"SUB":"SAME"
             	//subOrSame:!this.state.lvRadio?"SUB":"SAME"
             },
             },
             success: function (data) {
             success: function (data) {
-            	console.log(data)
                 let theArr = [];
                 let theArr = [];
                 if (!data.data) {
                 if (!data.data) {
                     if (data.error && data.error.length) {
                     if (data.error && data.error.length) {
@@ -593,6 +593,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
                 });
                 });
                 this.distributionOk();
                 this.distributionOk();
                 this.loadData();
                 this.loadData();
+                this.props.closeDesc(false, true);
             } else {
             } else {
                 message.warning(data.error[0].message);
                 message.warning(data.error[0].message);
             };
             };
@@ -774,6 +775,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 						message.success('保存成功!');
 						message.success('保存成功!');
 						this.nextCancel();
 						this.nextCancel();
 						this.loadData();
 						this.loadData();
+						this.props.closeDesc(false, true);
 					} else {
 					} else {
 						message.warning(data.error[0].message);
 						message.warning(data.error[0].message);
 					}
 					}

+ 15 - 1
js/component/tools.js

@@ -70,7 +70,8 @@ import {
     client,
     client,
     stick,
     stick,
     taskStatus,
     taskStatus,
-    changeState
+    changeState,
+    distributeState
 } from './dataDic.js';
 } from './dataDic.js';
 
 
 import { provinceList} from './NewDicProvinceList.js';
 import { provinceList} from './NewDicProvinceList.js';
@@ -1327,5 +1328,18 @@ module.exports = {
             });
             });
             return theType;
             return theType;
         }
         }
+	},
+	//分派情况
+	getDistributeState:function(e){
+   		if (e||e==0) {
+   			let str=e.toString()
+            let theType = '';
+            distributeState.map(function (item) {
+                if (item.value == str) {
+                    theType = item.key;
+                };
+            });
+            return theType;
+        }
 	}
 	}
 }
 }