dengzhiguo 6 gadi atpakaļ
vecāks
revīzija
79b88b4686

+ 418 - 22
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -3,10 +3,10 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import '@/manageCenter/financialManage/distribute/public.less';
-import { Icon, Button,Form, Input, Select, Spin, Table, Switch, message, DatePicker, Modal } from 'antd';
+import { Icon, Button,Form, Input, Select, Spin, Table, Switch, message, DatePicker, Modal,Upload ,Col} from 'antd';
 import OrderDesc from '@/manageCenter/financialManage/orderDetail/orderDesc'
 import Assign from '@/manageCenter/publicComponent/assign';
-import {getProcessStatus,getApproval} from '@/tools';
+import {getProcessStatus,getApproval,getLiquidationStatus,getApprovedState,splitUrl,getjiedian,getboutique} from '@/tools';
 
 const PaiDan = React.createClass({
     loadData(pageNo) {
@@ -24,9 +24,9 @@ const PaiDan = React.createClass({
 				pageNo: pageNo || 1,
 				pageSize: this.state.pagination.pageSize,
 				specially: 4,//咨询师管理列表
-				distribution:2,//全部列表
+				distribution:this.state.distribution,//全部列表
 				name: this.state.customerName,//名称
-				orderNo: this.state.orderNo,//订单编号
+				orderNo: this.state.orderNoSearch,//订单编号
 				starTime: this.state.releaseDate[0],//开始时间
 				endTime: this.state.releaseDate[1],//结束时间
 			},
@@ -82,6 +82,7 @@ const PaiDan = React.createClass({
             selectedRowKeys: [],
             selectedRows: [],
             loading: false,
+            paginations:false,
             pagination: {
                 defaultCurrent: 1,
                 defaultPageSize: 10,
@@ -144,25 +145,88 @@ const PaiDan = React.createClass({
                     dataIndex: 'processStatus',
                     key: 'processStatus',
                     render: text => { return getProcessStatus(text)}
+                }
+            ],
+            dataSource: [],
+            searchTime: [],
+            columnsX: [
+				{
+                    title: '业务项目名称',
+                    dataIndex: 'commodityName',
+                    key: 'commodityName'
+                }, {
+                    title: '项目类别',
+                    dataIndex: 'cname',
+                    key: 'cname',
+                    
+                },{
+                    title: '项目数量',
+                    dataIndex: 'commodityQuantity',
+                    key: 'commodityQuantity'
+                }, {
+                    title: '金额(万元)',
+                    dataIndex: 'commodityPrice',
+                    key: 'commodityPrice'
+                }, {
+                    title: '负责人',
+                    dataIndex: 'contacts',
+                    key: 'contacts'
+                }, {
+                    title: '负责人电话',
+                    dataIndex: 'contactsMobile',
+                    key: 'contactsMobile'
+                }, {
+                    title: '主要项目',
+                    dataIndex: 'main',
+                    key: 'main',
+                    render:(text)=>{
+                    	return (text?'是':'否')
+                    }
+                }, {
+                    title: '项目说明',
+                    dataIndex: 'taskComment',
+                    key: 'taskComment',
+					render:(text)=>{
+						return (text&&text.length>8?text.substr(0,8)+'…':text)
+					}
                 },
                 {
                     title:'操作',
                     dataIndex: 'caozuo',
                     key: 'caouzo',
-                    render:(text,recard)=>{
+                    render:(text,record)=>{
                         return <div>
-                            <Button type="primary" style={{margin:'0 10px'}} onClick={(e)=>{e.stopPropagation(),this.evaluate(recard)}}>分配任务</Button>
+                        	{record.taskStatus==0?
+                            <Button type="primary" style={{margin:'0 10px'}} onClick={(e)=>{e.stopPropagation(),this.evaluate(record)}}>分配任务</Button>
+                        	:''}
                         </div>
                     }
                 }
-            ],
-            dataSource: [],
-            searchTime: [,]
+			],
+			dataSourceX: [],
+			ContactsLists: [{
+					title: '催款科目',
+					dataIndex: 'dunSubject',
+					key: 'dunSubject',
+					render: text=>{return getjiedian(text)}
+				},{
+					title: '金额(万)',
+					dataIndex: 'money',
+					key: 'money',
+				}, {
+					title: '催款状态',
+					dataIndex: 'dunStatus',
+					key: 'dunStatus',
+					render: (text) => {
+						return text?'已完成':'催款中'
+					}
+				},
+			],
         }
     },
     /* 分派 */
-    evaluate(recard){
-        this.state.assignData=recard;
+    evaluate(record){
+        this.state.assignData=record;
         this.setState({
             assignVisible:true
         })
@@ -174,19 +238,161 @@ const PaiDan = React.createClass({
     tableRowClick(record, index) {
         this.state.RowData = record;
         this.setState({
-            showDesc: true,
+            visible: true,
         });
+        this.xiangqing(record.orderNo);
+		this.xiangmu(record.orderNo);
+		this.jiedian(record.orderNo);
     },
+    //订单详情
+	xiangqing(orderNos) {
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context +"/api/admin/newOrder/getOrderNewDetail",
+			data: {
+				orderNo:orderNos
+			},
+			success: function(data) {
+				let theArr = [];
+				
+				if(data.error.length || data.data.list == "") {
+					if(data.error && data.error.length) {
+						message.warning(data.error[0].message);
+					};
+				} else {
+					let thisdata=data.data;
+					this.setState({
+						 orderNo: thisdata.orderNo,//订单编号
+						 contractNo: thisdata.contractNo,//合同编号
+						 userName:thisdata.userName,//客户名称
+						 signDate:thisdata.signDate,//签单时间
+						 processStatus:thisdata.processStatus,//流程状态
+	                     liquidationStatus:thisdata.liquidationStatus,//结算状态
+	                     contacts:thisdata.contacts,//企业联系人
+	                     contactMobile:thisdata.contactMobile,//联系人电话
+	                     legalPerson:thisdata.legalPerson,//法人
+	                     legalPersonTel:thisdata.legalPersonTel,//法人电话
+	                     firstAmount:thisdata.firstAmount,//签单金额
+	                     totalAmount:thisdata.totalAmount,//首付金额
+	                     approval:thisdata.approval,//特批状态
+	                     settlementAmount:thisdata.settlementAmount,//已收款项
+	                     orderRemarks:thisdata.orderRemarks,//订单留言
+	                     orgCodeUrl: thisdata.contractPictureUrl ? splitUrl(thisdata.contractPictureUrl, ',', globalConfig.avatarHost + '/upload') : [],//图片地址
+	                     salesmanName:thisdata.salesmanName,//营销员名称
+	                     salesmanMobile:thisdata.salesmanMobile,//营销员电话
+	                     financeName:thisdata.financeName,//财务名称
+	                     financeMobile:thisdata.financeMobile,//财务电话
+					})
+				};
+				
+			}.bind(this),
+		}).always(function() {
+			this.setState({
+				loading: false
+			});
+		}.bind(this));
+	},
+	//项目列表
+	xiangmu(orderNos) {
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context +"/api/admin/newOrder/getOrderTask",
+			data: {
+				orderNo:orderNos
+			},
+			success: function(data) {
+				let theArr = [];
+				
+				if(data.error.length || data.data.list == "") {
+					if(data.error && data.error.length) {
+						message.warning(data.error[0].message);
+					};
+				} else {
+					for (let i = 0; i < data.data.length; i++) {
+                        let thisdata = data.data[i];
+                        theArr.push({
+                             key: i,
+                             id:thisdata.id,
+                             orderNo:thisdata.orderNo,//订单编号
+                             commodityId:thisdata.commodityId,//项目ID
+                             commodityName:thisdata.commodityName,//项目名称
+                             cname:thisdata.cname,//项目类别
+                             commodityPrice:thisdata.commodityPrice,//项目价格
+                             commodityQuantity:thisdata.commodityQuantity,//项目数量
+                             main:thisdata.main,//是否为主要任务
+                             taskComment:thisdata.taskComment,//任务说明
+                             contacts:thisdata.contacts,//联系人
+                             contactsMobile:thisdata.contactsMobile,//联系人电话
+                             taskStatus:thisdata.taskStatus,//是否分配
+                        });
+                    };
+				};
+				this.setState({
+                    dataSourceX: theArr,
+                });
+			}.bind(this),
+		}).always(function() {
+			this.setState({
+				loading: false
+			});
+		}.bind(this));
+	},
+	//节点列表
+	jiedian(orderNos) {
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context +"/api/admin/newOrder/selectOrderDun",
+			data: {
+				orderNo:orderNos
+			},
+			success: function(data) {
+				let theArr = [];
+				let thisData=[];
+				if(data.error.length || data.data.list == "") {
+					if(data.error && data.error.length) {
+						message.warning(data.error[0].message);
+					};
+				} else {
+					for(let i = 0; i < data.data.length; i++) {
+                		thisData= data.data[i];  
+	                	theArr.push({
+	                		key:i,
+	                		dunSubject:thisData.dunSubject?thisData.dunSubject.toString():"",//催款科目
+	                		id:thisData.id,//节点Id
+	                		money:thisData.money,//催款金额
+	                		dunStatus:thisData.dunStatus,//催款状态
+	                	})
+                	}
+                	this.setState({
+                		contactList:theArr
+                	})
+				};
+				
+			}.bind(this),
+		}).always(function() {
+			this.setState({
+				loading: false
+			});
+		}.bind(this));
+	},
     closeDesc(e, s) {
         this.state.showDesc = e;
         if (s) {
             this.loadData(this.state.page);
+            
         };
     },
     closeAssign(e, s) {
         this.state.assignVisible = e;
         if (s) {
             this.loadData(this.state.page);
+            this.xiangmu(this.state.orderNo);
         };
     },
     search() {
@@ -194,6 +400,7 @@ const PaiDan = React.createClass({
     },
     reset() {
         this.state.nameSearch = '';
+        this.state.customerName='';
         this.state.releaseDate = [];
         this.state.orderNoSearch=''
         this.state.distribution=undefined;
@@ -204,6 +411,25 @@ const PaiDan = React.createClass({
             searchMore: !this.state.searchMore
         });
     },
+    //关闭详情
+	visitCancel(e){
+		this.setState({
+			visible:false
+		})
+		this.reset();
+	},
+	visitOk(e){
+		this.setState({
+			visible:false
+		})
+		this.reset();
+	},
+	resets(){
+    	this.state.orderNo='';
+    	this.state.customerName='';
+    	this.state.releaseDate[0] = undefined;
+		this.state.releaseDate[1] = undefined;
+    },
     render() { 
         const rowSelection = {
             selectedRowKeys: this.state.selectedRowKeys,
@@ -214,6 +440,11 @@ const PaiDan = React.createClass({
                 });
             }
         };
+        const formItemLayout = {
+			labelCol: { span: 8 },
+			wrapperCol: { span: 14 },
+		};
+        const FormItem = Form.Item;
         const hasSelected = this.state.selectedRowKeys.length > 0;
         const { RangePicker } = DatePicker;
         return ( <div className="user-content">
@@ -222,8 +453,8 @@ const PaiDan = React.createClass({
                 </div>
                 <div className="user-search">
                     <Input placeholder="客户名称"
-                        value={this.state.nameSearch}
-                        onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />
+                        value={this.state.customerName}
+                        onChange={(e) => { this.setState({ customerName: e.target.value }); }} />
                     <Input placeholder="订单编号"
                         value={this.state.orderNoSearch}
                         onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} />
@@ -233,7 +464,8 @@ const PaiDan = React.createClass({
                         placeholder="分派状态"
                         value={this.state.distribution}>
                         <Option value="0">未分配</Option>
-                        <Option value="1">已分配</Option>
+                        <Option value="1">部分分配</Option>
+                        <Option value="2">全部分配</Option>
                     </Select>
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
@@ -255,20 +487,184 @@ const PaiDan = React.createClass({
                             onRowClick={this.tableRowClick.bind(this)} />
                     </Spin>
                 </div>
-                <OrderDesc
-                    data={this.state.RowData}
-                    showDesc={this.state.showDesc}
-                    closeDesc={this.closeDesc.bind(this)}
-                />
                 <Assign
                     title="项目"
-                    selApi="/api/admin/financial/distributionFinance"
+                    selApi="/api/admin/orderProject/projectDistribution"
                     data={this.state.assignData}
                     showDesc={this.state.assignVisible}
                     closeDesc={this.closeAssign.bind(this)}
-                    title={'项目'}
                     fenpaiData={8}
+                    specially={1}
+                    roleName={'咨询师管理员'}
                 />
+                <Modal	
+				      className="customeDetails"
+				      footer=''
+			          title="订单详情"
+			          width='900px'
+			          visible={this.state.visible}
+			          onOk={this.visitOk}
+					  onCancel={this.visitCancel}							          							          
+			        >	
+				        <Form layout="horizontal" onSubmit={this.handleSubmit} id="demand-form" style={{paddingBottom:'40px'}} >
+				            <Spin spinning={this.state.loading}>
+				                <div className="clearfix">
+				                	<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="订单编号" >
+			                            <span>{this.state.orderNo}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="合同编号" >  
+			                            <span>{this.state.contractNo}</span>
+				                    </FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="客户名称" >  
+			                            <span>{this.state.userName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="合同签订时间" >   
+			                            <span>{this.state.signDate}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="流程状态" >  
+			                            <span>{getProcessStatus(this.state.processStatus)}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="结算状态" >  
+			                            <span>{getLiquidationStatus(this.state.liquidationStatus)}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="企业联系人" >                             
+		                                <span>{this.state.contacts}</span>
+				                    </FormItem>
+				                     <FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="联系人电话" >                             
+		                                <span>{this.state.contactMobile}</span>
+				                    </FormItem>
+				                    <FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="企业法人" >                             
+		                                <span>{this.state.legalPerson}</span>
+		                            </FormItem>
+				                     <FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="法人电话" >  
+			                             <span>{this.state.legalPersonTel}</span>
+				                    </FormItem>
+				                    <FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="签单金额(万元)" >                             
+		                                 <span>{this.state.firstAmount}</span>
+				                    </FormItem>
+				                    <FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="首付金额(万元)" >                             
+		                                <span>{this.state.totalAmount}</span>
+				                    </FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="特批立项" >  
+			                            <span>{getApprovedState(this.state.approval)}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="已收款项(万元)" >  
+			                            <span>{this.state.settlementAmount}</span>
+		                    		</FormItem>
+				                    <div className='clearfix'>
+							        	<FormItem
+								            labelCol={{ span: 4 }}
+								            wrapperCol={{ span: 16 }}
+								            label="订单留言" >
+							        	 <span>{this.state.orderRemarks}</span>
+								        </FormItem>
+							        </div>
+				                    <div className='clearfix'>
+							            <FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 18 }} label="合同扫描件">
+				                            <Upload className="demandDetailShow-upload"
+				                                listType="picture-card"
+				                                fileList={this.state.orgCodeUrl}                               
+				                                onPreview={(file) => {
+				                                    this.setState({
+				                                        previewImage: file.url || file.thumbUrl,
+				                                        previewVisible: true,
+				                                    });
+				                                }} >
+				                            </Upload>
+				                            <Modal maskClosable={false} footer={null}
+				                                visible={this.state.previewVisible}
+				                                onCancel={() => { this.setState({ previewVisible: false }) }}>
+				                                <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
+				                            </Modal>
+				                        </FormItem>
+							        </div>
+							        <div className='clearfix'>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单负责人" >  
+				                            <span>{this.state.salesmanName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单负责人电话" >  
+                            				<span>{this.state.salesmanMobile}</span>
+			                    		</FormItem>
+			                    	</div>
+			                    	<div className='clearfix'>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务负责人" >  
+				                            <span>{this.state.financeName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务负责人电话" >  
+                            				<span>{this.state.financeMobile}</span>
+			                    		</FormItem>
+			                    	</div>
+			                    	<div>
+					                	<span style={{marginLeft:'50px',fontSize:'20px'}}>催款节点</span>
+					                	{this.state.processStatus==0?<Button type='primary' onClick={this.addcontact} style={{float:'right',marginRight:'50px',marginBottom:'15px'}}>添加催款节点</Button>:""}
+					                </div>
+					                <div className="clearfix">
+					    			  <Spin spinning={this.state.loading}>
+					    			        <Form layout="horizontal" id="demand-form"  >
+										      	<Table 
+								            	 pagination={false}
+								            	 columns={this.state.ContactsLists} 
+								            	 dataSource={this.state.contactList}
+								            	 />
+						            	        <Col span={24} offset={9} style={{marginTop:'15px'}}>
+									                 
+									            </Col>
+							            	</Form> 
+									   </Spin> 
+									</div>
+						            <div>
+					                	<span style={{marginLeft:'50px',fontSize:'20px'}}>项目业务</span>
+					                	{this.state.processStatus==0?<Button type='primary' onClick={this.addDetailed} style={{float:'right',marginRight:'50px',marginBottom:'15px'}}>添加项目明细</Button>:""}
+					                </div>
+					                <div className="patent-table">
+					                    <Spin spinning={this.state.loading}>
+					                        <Table columns={this.state.columnsX}
+					                            dataSource={this.state.dataSourceX}
+					                            pagination={this.state.paginations}
+					                            onRowClick={this.tableRowClickX} 
+					                            />
+					                    </Spin>
+						            </div>
+				                </div>
+				            </Spin>
+				        </Form>
+			        </Modal>
         </div> )
     }
 })

+ 48 - 59
js/component/manageCenter/project/task/taskAssignment.jsx

@@ -6,7 +6,7 @@ import '@/manageCenter/financialManage/distribute/public.less';
 import { Icon, Button,Form, Input, Select, Spin, Table, Switch, message, DatePicker, Modal } from 'antd';
 import OrderDesc from '@/manageCenter/financialManage/orderDetail/orderDesc'
 import Assign from '@/manageCenter/publicComponent/assign';
-import {getProcessStatus,getApproval} from '@/tools';
+import {getProcessStatus,getApproval,getTaskStatus,getProjectState} from '@/tools';
 
 const Task = React.createClass({
     loadData(pageNo) {
@@ -16,18 +16,19 @@ const Task = React.createClass({
             loading: true
         });
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/admin/order/listAllSettlement",
+            url: globalConfig.context + "/api/admin/orderProject/orderTaskList",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
-                buyerName: this.state.nameSearch,//客户名称
-                orderNo:this.state.orderNoSearch,
-                distribution:this.state.distribution, //是否分配
-                startTime: this.state.releaseDate[0],
-                endTime: this.state.releaseDate[1],
+                specially:1,//经理
+                name: this.state.nameSearch,//客户名称
+                orderNo:this.state.orderNoSearch,//订单编号
+                taskId:this.state.taskId, //任务编号
+                taskStatus:this.state.taskStatus,//任务状态
+                adminName:this.state.adminName,//任务受理人
             },
             success: function (data) {
                 let theArr = [];
@@ -40,15 +41,16 @@ const Task = React.createClass({
                         let thisdata = data.data.list[i];
                         theArr.push({
                             key: i,
-                            orderNo: thisdata.orderNo,
-                            approval:thisdata.approval,
-		                    orderType:thisdata.orderType,
-		                    processStatus:thisdata.processStatus,
-                            signTotalAmount:thisdata.signTotalAmount,
-                            buyerName:thisdata.buyerName,
-                            sellerName:thisdata.sellerName,
-                            createTime:thisdata.createTime?(new Date(thisdata.createTime)).toLocaleString():'',
-                            signTime:thisdata.releaseDate?(new Date(thisdata.releaseDate)).toLocaleString():''
+                            orderNo: thisdata.orderNo,//订单编号
+                            id:thisdata.id,//任务ID
+		                    taskName:thisdata.taskName,//名称
+		                    cname:thisdata.cname,//项目品类
+                            receiverName:thisdata.receiverName,//受理人
+                            projectStatus:thisdata.projectStatus,//项目状态
+                            taskStatus:thisdata.taskStatus,//任务状态
+                            taskDate:thisdata.taskDate,//分配时间
+                            commodityQuantity:thisdata.commodityQuantity,//数量
+                            userName:thisdata.userName,//用户名
                         });
                     };
                 }
@@ -93,12 +95,12 @@ const Task = React.createClass({
             columns: [
                 {
                     title: '任务编号',
-                    dataIndex: 'orderNo1',
-                    key: 'orderNo1',
+                    dataIndex: 'id',
+                    key: 'id',
                 }, {
                     title: '任务名称',
-                    dataIndex: 'createTime',
-                    key: 'createTime',
+                    dataIndex: 'taskName',
+                    key: 'taskName',
                 },  {
                     title: '订单编号',
                     dataIndex: 'orderNo',
@@ -106,60 +108,44 @@ const Task = React.createClass({
                 },
                 {
                     title: '业务类别',
-                    dataIndex: 'buyerName2',
-                    key: 'buyerName2',
+                    dataIndex: 'cname',
+                    key: 'cname',
                 },
                 {
                     title: '客户名称',
-                    dataIndex: 'buyerName',
-                    key: 'buyerName',
-                },
-                {
-                    title: '任务负责人',
-                    dataIndex: 'buyerName1',
-                    key: 'buyerName1',
+                    dataIndex: 'userName',
+                    key: 'userName',
                 },
                 {
                     title: '任务状态',
-                    dataIndex: 'processStatus',
-                    key: 'processStatus',
-                    render: text => { return getProcessStatus(text)}
-                },
-                {
-                    title: '立项状态',
-                    dataIndex: 'approval',
-                    key: 'approval',
-                    render: text => { return getApproval(text)}
-                },
-                {
-                    title: '订单负责人',
-                    dataIndex: 'sellerName',
-                    key: 'sellerName'
+                    dataIndex: 'taskStatus',
+                    key: 'taskStatus',
+                    render: text => { return getTaskStatus(text)}
                 },
                 {
-                    title: '公示状态',
-                    dataIndex: 'sellerName13',
-                    key: 'sellerName13',
-                    render: text => { return getApproval(text)}
+                    title: '项目状态',
+                    dataIndex: 'projectStatus',
+                    key: 'projectStatus',
+                    render: text => { return getProjectState(text)}
                 },
                 {
-                    title: '分时间',
-                    dataIndex: 'sellerName12',
-                    key: 'sellerName12'
+                    title: '分配时间',
+                    dataIndex: 'taskDate',
+                    key: 'taskDate'
                 },
                 {
                     title: '任务数量',
-                    dataIndex: 'sellerName1',
-                    key: 'sellerName1'
+                    dataIndex: 'commodityQuantity',
+                    key: 'commodityQuantity'
                 },
                 {
                     title:'操作',
                     dataIndex: 'caozuo',
                     key: 'caouzo',
-                    render:(text,recard)=>{
+                    render:(text,record)=>{
                         return <div>
-                            <Button type="primary" style={{margin:'0 10px'}} onClick={(e)=>{e.stopPropagation(),this.evaluate(recard,0)}}>转交</Button>
-                            <Button type="primary" style={{margin:'0 10px'}} onClick={(e)=>{e.stopPropagation(),this.evaluate(recard,1)}}>分配任务</Button>
+                            <Button type="primary" style={{margin:'0 10px'}} onClick={(e)=>{e.stopPropagation(),this.evaluate(record,0)}}>转交</Button>
+                            <Button type="primary" style={{margin:'0 10px'}} onClick={(e)=>{e.stopPropagation(),this.evaluate(record,1)}}>分配任务</Button>
                         </div>
                     }
                 }
@@ -169,8 +155,8 @@ const Task = React.createClass({
         }
     },
     /* 分派 */
-    evaluate(recard,nub){
-        this.state.assignData=recard;
+    evaluate(record,nub){
+        this.state.assignData=record;
         this.setState({
             nub,
             assignVisible:true
@@ -267,10 +253,13 @@ const Task = React.createClass({
                 />
                 <Assign
                     title="任务"
-                    selApi={this.state.nub?"/api/admin/financial/fenpei":'/api/admin/financial/zhuanjiao'}
+                    selApi={"/api/admin/orderProject/projectDistribution"}
                     data={this.state.assignData}
                     showDesc={this.state.assignVisible}
                     closeDesc={this.closeAssign.bind(this)}
+                    fenpaiData={8}
+                    specially={0}
+                    roleName={'咨询师经理'}
                 />
         </div> )
     }

+ 8 - 1
js/component/manageCenter/publicComponent/assign.jsx

@@ -142,6 +142,7 @@ const Assign=React.createClass({
                 pageSize: 99,
                 departmentId:this.state.departmenttList,
                 name:this.state.financeNameSearch,
+                roleName:this.props.roleName?this.props.roleName:''
             },
             success: function (data) {
                 let theArr = [];
@@ -180,12 +181,18 @@ const Assign=React.createClass({
     	this.setState({
             loading: true
         });
+        console.log(this.props.data);
+        console.log(record);
         $.ajax({
             method: "post",
             dataType: "json",
             crossDomain: false,
             url: globalConfig.context +this.props.selApi,
-            data: {
+            data: this.props.fenpaiData==8?{
+            	taskId:this.props.data.id,//任务ID
+            	taskReceiverId:!this.state.contact?record.id:record.contactId,//分配人物ID
+            	specially:this.props.specially//是否是咨询师管理员
+            }:{
             	orderNo:this.props.data.orderNo,
                 financeId: !this.state.contact?record.id:record.contactId,    //分配人物id
                 approval:this.props.data.approval   //是否特批