dengzhiguo 6 years ago
parent
commit
8007584746

+ 1 - 1
js/component/manageCenter/order/orderNew/chargeback.jsx

@@ -89,7 +89,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 			data: {
 				pageNo: pageNo || 1,
 				pageSize: this.state.pagination.pageSize,
-				name: this.state.name,//名称
+				name: this.state.customerName,//名称
 				orderNo: this.state.orderNo,//订单编号
 				starTime: this.state.releaseDate[0],//开始时间
 				endTime: this.state.releaseDate[1],//结束时间

+ 1 - 1
js/component/manageCenter/order/orderNew/reject.jsx

@@ -89,7 +89,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 				pageNo: pageNo || 1,
 				pageSize: this.state.pagination.pageSize,
 				specially: 2,//审核列表
-				name: this.state.name,//名称
+				name: this.state.customerName,//名称
 				orderNo: this.state.orderNo,//订单编号
 				starTime: this.state.releaseDate[0],//开始时间
 				endTime: this.state.releaseDate[1],//结束时间

+ 1 - 1
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -144,7 +144,7 @@ const PaiDan = React.createClass({
                     title: '分派状态',
                     dataIndex: 'processStatus',
                     key: 'processStatus',
-                    render: text => { return getProcessStatus(text)}
+                    render: text => { return text==5||text==6?getProcessStatus(text):'未分配'}
                 }
             ],
             dataSource: [],

+ 656 - 8
js/component/manageCenter/project/project/projectQuery.jsx

@@ -1,12 +1,660 @@
 import React,{Component} from 'react';
-class Task extends React.Component {
-    constructor(props) {
-        super(props);
-        this.state = {  }
-    }
+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,Upload ,Col} from 'antd';
+import OrderDesc from '@/manageCenter/financialManage/orderDetail/orderDesc'
+import Assign from '@/manageCenter/publicComponent/assign';
+import {getProcessStatus,getApproval,getLiquidationStatus,getApprovedState,splitUrl,getjiedian,getboutique} from '@/tools';
+
+const PaiDan = React.createClass({
+    loadData(pageNo) {
+        this.state.data = [];
+        this.setState({
+            page:pageNo,
+            loading: true
+        });
+       $.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context +"/api/admin/newOrder/orderNewList",
+			data: {
+				pageNo: pageNo || 1,
+				pageSize: this.state.pagination.pageSize,
+				specially: 4,//咨询师管理列表
+				distribution:this.state.distribution,//全部列表
+				name: this.state.customerName,//名称
+				orderNo: this.state.orderNoSearch,//订单编号
+				starTime: this.state.releaseDate[0],//开始时间
+				endTime: this.state.releaseDate[1],//结束时间
+			},
+            success: function (data) {
+                let theArr = [];
+                if (!data.data || !data.data.list) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                } else {
+                    for (let i = 0; i < data.data.list.length; i++) {
+                        let thisdata = data.data.list[i];
+                        theArr.push({
+                            key: i,
+                            id:thisdata.id,//任务ID
+                            orderNo: thisdata.orderNo,//订单编号
+	                         totalAmount:thisdata.totalAmount,//签单金额
+	                         processStatus:thisdata.processStatus,//流程状态
+	                         liquidationStatus:thisdata.liquidationStatus,//结算状态
+	                         approval:thisdata.approval,//特批状态
+	                         signDate:thisdata.signDate,//签单时间
+	                         userName:thisdata.userName,//客户名称
+	                         salesmanName:thisdata.salesmanName,//营销员名称
+	                         financeName:thisdata.financeName,//财务名称
+	                         consultantName:thisdata.consultantName,//项目负责人
+	                         createDate:thisdata.createDate,//下单时间
+                        });
+                    };
+                }
+                this.state.pagination.current = data.data.pageNo;
+                this.state.pagination.total = data.data.totalCount;
+                if(data.data&&data.data.list&&!data.data.list.length){
+					this.state.pagination.current=0
+					this.state.pagination.total=0
+				}
+                this.setState({
+                    dataSource: theArr,
+                    pagination: this.state.pagination
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
+    getInitialState() {
+        return {
+            searchMore: true,
+            assignVisible:false,
+            releaseDate: [],
+            boHuivisible:false,
+            selectedRowKeys: [],
+            selectedRows: [],
+            loading: false,
+            paginations:false,
+            pagination: {
+                defaultCurrent: 1,
+                defaultPageSize: 10,
+                showQuickJumper: true,
+                pageSize: 10,
+                onChange: function (page) {
+                    this.loadData(page);
+                }.bind(this),
+                showTotal: function (total) {
+                    return '共' + total + '条数据';
+                }
+            },
+            columns: [
+                {
+                    title: '订单编号',
+                    dataIndex: 'orderNo',
+                    key: 'orderNo',
+                },
+                {
+                    title: '签单客户',
+                    dataIndex: 'userName',
+                    key: 'userName',
+                }, {
+                    title: '下单时间',
+                    dataIndex: 'createDate',
+                    key: 'createDate',
+                },  {
+                    title: '签单时间',
+                    dataIndex: 'signDate',
+                    key: 'signDate',
+                },
+                {
+                    title: '订单总金额(万)',
+                    dataIndex: 'totalAmount',
+                    key: 'totalAmount'
+                },
+                {
+                    title: '是否特批',
+                    dataIndex: 'approval',
+                    key: 'approval',
+                    render: text => { return getApproval(text)}
+                },
+                {
+                    title: '订单负责人',
+                    dataIndex: 'salesmanName',
+                    key: 'salesmanName'
+                },
+                {
+                    title: '财务负责人',
+                    dataIndex: 'financeName',
+                    key: 'financeName'
+                },
+                {
+                    title: '项目负责人',
+                    dataIndex: 'consultantName',
+                    key: 'consultantName'
+                },
+                {
+                    title: '分派状态',
+                    dataIndex: 'processStatus',
+                    key: 'processStatus',
+                    render: text => { return text==5||text==6?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)
+					}
+                }
+			],
+			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(record){
+        this.state.assignData=record;
+        this.setState({
+            assignVisible:true
+        })
+    },
+   
+    componentWillMount() {
+        this.loadData();
+    },
+    tableRowClick(record, index) {
+        this.state.RowData = record;
+        this.setState({
+            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() {
+        this.loadData();
+    },
+    reset() {
+        this.state.nameSearch = '';
+        this.state.customerName='';
+        this.state.releaseDate = [];
+        this.state.orderNoSearch=''
+        this.state.distribution=undefined;
+        this.loadData();
+    },
+    searchSwitch() {
+        this.setState({
+            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() { 
-        return (<div>项目查询</div>  );
+        const rowSelection = {
+            selectedRowKeys: this.state.selectedRowKeys,
+            onChange: (selectedRowKeys, selectedRows) => {
+                this.setState({
+                    selectedRows: selectedRows.slice(-1),
+                    selectedRowKeys: selectedRowKeys.slice(-1)
+                });
+            }
+        };
+        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">
+            <div className="content-title">
+                    <span>项目派单管理</span>
+                </div>
+                <div className="user-search">
+                    <Input placeholder="客户名称"
+                        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 }); }} />
+                    <Select 
+                        onChange={(e)=>{this.setState({distribution:e})}} 
+                        style={{width:160,marginRight:5}} 
+                        placeholder="分派状态"
+                        value={this.state.distribution}>
+                        <Option value="0">未分配</Option>
+                        <Option value="1">部分分配</Option>
+                        <Option value="2">全部分配</Option>
+                    </Select>
+                    <Button type="primary" onClick={this.search}>搜索</Button>
+                    <Button onClick={this.reset}>重置</Button>
+                    <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch.bind(this)} /></span>
+                    <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
+                        <span>订单时间 :</span>
+                        <RangePicker
+                            value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
+                            this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
+                            onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
+                    </div>
+                </div>
+                <div className="patent-table">
+                    <Spin spinning={this.state.loading}>
+                        <Table columns={this.state.columns}
+                            dataSource={this.state.dataSource}
+                            rowSelection={rowSelection}
+                            pagination={this.state.pagination}
+                            onRowClick={this.tableRowClick.bind(this)} />
+                    </Spin>
+                </div>
+                <Assign
+                    title="项目"
+                    selApi="/api/admin/orderProject/projectDistribution"
+                    data={this.state.assignData}
+                    showDesc={this.state.assignVisible}
+                    closeDesc={this.closeAssign.bind(this)}
+                    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> )
     }
-}
+})
  
-export default Task;
+export default PaiDan;

+ 106 - 9
js/component/manageCenter/project/task/myTask.jsx

@@ -7,8 +7,8 @@ import '@/manageCenter/financialManage/distribute/public.less';
 import { Icon, Button,Form, Input, Select, Upload,Col,Spin, Table, Switch, message, DatePicker, Modal } from 'antd';
 import OrderDesc from '@/manageCenter/financialManage/orderDetail/orderDesc'
 import Assign from '@/manageCenter/publicComponent/assign';
-import {getProcessStatus,getApproval,getTaskStatus,getLiquidationStatus,getApprovedState,getProjectState,splitUrl,getjiedian} from '@/tools';
-import {projectState,taskStatus } from '@/dataDic.js';
+import {getProcessStatus,getApproval,getTaskStatus,getLiquidationStatus,getApprovedState,getProjectStatus,splitUrl,getjiedian} from '@/tools';
+import {projectStates,taskStatus ,projectStatus} from '@/dataDic.js';
 const FormItem =Form.Item;
 
 const Task = React.createClass({
@@ -29,7 +29,7 @@ const Task = React.createClass({
                 specially:0,//个人
                 name: this.state.nameSearch,//客户名称
                 orderNo:this.state.orderNoSearch,//订单编号
-                taskId:this.state.taskId, //任务编号
+                taskId:this.state.taskNoSearch, //任务编号
                 taskStatus:this.state.taskStatus,//任务状态
                 adminName:this.state.adminName,//任务受理人
             },
@@ -131,7 +131,7 @@ const Task = React.createClass({
                     title: '项目状态',
                     dataIndex: 'projectStatus',
                     key: 'projectStatus',
-                    render: text => { return getProjectState(text)}
+                    render: text => { return getProjectStatus(text)}
                 },
                 {
                     title: '分配时间',
@@ -144,8 +144,7 @@ const Task = React.createClass({
                     key: 'caouzo',
                     render:(text,record)=>{
                         return <div>
-                            <Button type="primary" style={{margin:'0 10px'}} onClick={(e)=>{e.stopPropagation(),this.evaluate(record,'咨询师经理')}}>转交</Button>
-                            <Button type="primary" style={{margin:'0 10px'}} onClick={(e)=>{e.stopPropagation(),this.evaluate(record,'咨询师')}}>分配任务</Button>
+                            <Button type="primary" style={{margin:'0 10px'}} onClick={(e)=>{e.stopPropagation(),this.okCancel(record)}}>添加工时</Button>
                         </div>
                     }
                 }
@@ -173,7 +172,7 @@ const Task = React.createClass({
         });
         this.xiangqing(record.id);
     },
-    //点击确认退单
+    //点击修改任务详情
 	tijiaoOk(){
 		let attachmentUrls = [];
         if (this.state.attachmentUrl.length) {
@@ -216,7 +215,44 @@ const Task = React.createClass({
 			if(!data.error.length) {
 				message.success('保存成功!');
 				this.visitCancel();
-				this.handleCancel();
+			} else {
+				message.warning(data.error[0].message);
+			}
+		}.bind(this));
+	},
+	//点击修改任务详情
+	tianjiaOk(){
+		let attachmentUrls = [];
+        if (this.state.attachmentUrl.length) {
+            let picArr = [];
+            this.state.attachmentUrl.map(function (item) {
+				if ( item.response && item.response.data && item.response.data.length ){
+					picArr.push(item.response.data);
+				}
+            });
+            attachmentUrls = picArr.join(",");
+        };
+         
+		$.ajax({
+			method: "POST",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context +'/api/admin/orderProject/addTaskHours' ,
+			data: {
+				taskId:this.state.taskId,//任务编号
+				hours:this.state.hours,//工时
+				remarks:this.state.remarks,//说明
+				taskDate:this.state.taskDate,//日期
+				taskComment:this.state.taskComment,//说明
+				
+			}
+		}).done(function(data) {
+			this.setState({
+				loading: false
+			});
+			if(!data.error.length) {
+				message.success('保存成功!');
+				this.noCancel();
 			} else {
 				message.warning(data.error[0].message);
 			}
@@ -299,6 +335,20 @@ const Task = React.createClass({
             this.loadData(this.state.page);
         };
     },
+    //添加工时
+	okCancel(record){
+		this.setState({
+			lookVisible:true,
+			taskId:record.id
+		})
+	},
+	//关闭添加工时
+	noCancel(){
+		this.setState({
+			lookVisible:false
+		})
+		this.reset();
+	},
     search() {
         this.loadData();
     },
@@ -319,6 +369,11 @@ const Task = React.createClass({
 		this.state.contactMobile='';//联系人电话
 		this.state.legalPerson='';//法人
 		this.state.legalPersonTel='';//法人电话
+		this.state.taskId='';//任务编号
+		this.state.hours='';//工时
+		this.state.remarks='';//说明
+		this.state.taskDate='';//日期
+		this.state.taskComment='';//说明
         this.state.nameSearch = '';
         this.state.releaseDate = [];
         this.state.orderNoSearch='';
@@ -479,7 +534,7 @@ const Task = React.createClass({
 				                            value={this.state.projectStatus}
 				                            onChange={(e)=>{this.setState({projectStatus:e})}}>
 				                            {
-			                                    projectState.map(function (item) {
+			                                    projectStatus.map(function (item) {
 			                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
 			                                    })
 			                                }
@@ -566,6 +621,48 @@ const Task = React.createClass({
 				            </Spin>
 				        </Form>
 			        </Modal>
+			        <Modal maskClosable={false} visible={this.state.lookVisible}
+                        onOk={this.noCancel} onCancel={this.noCancel}
+                        width='500px'
+                        title={'添加工时'}                     
+                        footer=''
+                        className="admin-desc-content">
+			            <Form layout="horizontal"  id="demand-form">
+			                <Spin spinning={this.state.loading}>
+			                 		<div className='clearfix'>
+			                			<FormItem  {...formItemLayout} label="工作日期">
+	                                        <DatePicker 
+	                                        	style={{marginTop:"2px",width: '200px',height:"32px" }}
+	                                            showTime
+	                                            format="YYYY-MM-DD"
+	                                            onOk={(e)=>{}}
+	                                            value={this.state.taskDate ? moment(this.state.taskDate) : null}
+	                                            onChange={(data, dataString) => { this.setState({ taskDate: dataString }); }} />
+	                                    </FormItem>
+									</div>
+									<div className='clearfix'>
+			                			<FormItem 
+				                            {...formItemLayout}
+				                            label="工作时长" >   
+			                                    <Input placeholder="请输入工作时长" value={this.state.hours} style={{width:'200px'}}
+			                                    onChange={(e)=>{this.setState({hours:e.target.value})}} ref="commodityQuantity"/>
+					                    </FormItem>
+									</div>	
+				                   <div className='clearfix'>
+				                    	<FormItem
+								           {...formItemLayout}
+								            label="工作内容" >
+								                <Input type="textarea" placeholder="请输入备注" rows={4}  value={this.state.remarks} 
+									    				onChange={(e)=>{this.setState({remarks:e.target.value})}}/>	
+								        </FormItem>
+				                    </div>	
+				                    <div className='clearfix'>
+						                   <Button className="cancel" type="primary" onClick={this.tianjiaOk} style={{marginLeft:"100px"}} htmlType="submit">确定</Button>
+			                               <Button className="cancel" type="ghost" onClick={this.noCancel} style={{marginLeft:"50px"}}>取消</Button>
+	                            	</div>
+			                </Spin>
+			            </Form >
+			        </Modal>
         </div> )
     }
 })

+ 2 - 6
js/component/manageCenter/project/task/taskAssignment.jsx

@@ -377,7 +377,7 @@ const Task = React.createClass({
         const { RangePicker } = DatePicker;
         return ( <div className="user-content">
             <div className="content-title">
-                    <span>任务派单管理</span>
+                    <span>任务派单</span>
                 </div>
                 <div className="user-search">
                     <Input placeholder="客户名称"
@@ -417,16 +417,12 @@ const Task = React.createClass({
                     closeDesc={this.closeAssign.bind(this)}
                     fenpaiData={8}
                     specially={0}
-<<<<<<< HEAD
                     roleName={this.state.nub}
-=======
-                    roleName={this.state.nub?'咨询师':'咨询师经理'}
->>>>>>> 29f0453ff88cd1dc1d10b9537d5ea89040bf8e40
                 />
                 <Modal	
 				      className="customeDetails"
 				      footer=''
-			          title="订单详情"
+			          title="任务详情"
 			          width='900px'
 			          visible={this.state.visible}
 			          onOk={this.visitOk}

+ 541 - 8
js/component/manageCenter/project/task/taskQuery.jsx

@@ -1,13 +1,546 @@
-
 import React,{Component} from 'react';
-class Task extends React.Component {
-    constructor(props) {
-        super(props);
-        this.state = {  }
-    }
+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, Upload,Col,Spin, Table, Switch, message, DatePicker, Modal } from 'antd';
+import OrderDesc from '@/manageCenter/financialManage/orderDetail/orderDesc'
+import Assign from '@/manageCenter/publicComponent/assign';
+import {getProcessStatus,getApproval,getTaskStatus,getLiquidationStatus,getApprovedState,getProjectState,splitUrl} from '@/tools';
+const FormItem =Form.Item;
+
+const Task = React.createClass({
+    loadData(pageNo) {
+        this.state.data = [];
+        this.setState({
+            page:pageNo,
+            loading: true
+        });
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/orderProject/orderTaskList",
+            data: {
+                pageNo: pageNo || 1,
+                pageSize: this.state.pagination.pageSize,
+                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 = [];
+                if (!data.data || !data.data.list) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                } else {
+                    for (let i = 0; i < data.data.list.length; i++) {
+                        let thisdata = data.data.list[i];
+                        theArr.push({
+                            key: i,
+                            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,//用户名
+                        });
+                    };
+                }
+                this.state.pagination.current = data.data.pageNo;
+                this.state.pagination.total = data.data.totalCount;
+                if(data.data&&data.data.list&&!data.data.list.length){
+					this.state.pagination.current=0
+					this.state.pagination.total=0
+				}
+                this.setState({
+                    dataSource: theArr,
+                    pagination: this.state.pagination
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
+    getInitialState() {
+        return {
+            searchMore: true,
+            assignVisible:false,
+            releaseDate: [],
+            roleName:'',
+            boHuivisible:false,
+            selectedRowKeys: [],
+            selectedRows: [],
+            paginations:false,
+            loading: false,
+            pagination: {
+                defaultCurrent: 1,
+                defaultPageSize: 10,
+                showQuickJumper: true,
+                pageSize: 10,
+                onChange: function (page) {
+                    this.loadData(page);
+                }.bind(this),
+                showTotal: function (total) {
+                    return '共' + total + '条数据';
+                }
+            },
+            columns: [
+                {
+                    title: '任务编号',
+                    dataIndex: 'id',
+                    key: 'id',
+                }, {
+                    title: '任务名称',
+                    dataIndex: 'taskName',
+                    key: 'taskName',
+                },  {
+                    title: '订单编号',
+                    dataIndex: 'orderNo',
+                    key: 'orderNo',
+                },
+                {
+                    title: '业务类别',
+                    dataIndex: 'cname',
+                    key: 'cname',
+                },
+                {
+                    title: '客户名称',
+                    dataIndex: 'userName',
+                    key: 'userName',
+                },
+                {
+                    title: '任务状态',
+                    dataIndex: 'taskStatus',
+                    key: 'taskStatus',
+                    render: text => { return getTaskStatus(text)}
+                },
+                {
+                    title: '项目状态',
+                    dataIndex: 'projectStatus',
+                    key: 'projectStatus',
+                    render: text => { return getProjectState(text)}
+                },
+                {
+                    title: '分配时间',
+                    dataIndex: 'taskDate',
+                    key: 'taskDate'
+                },
+                {
+                    title: '任务数量',
+                    dataIndex: 'commodityQuantity',
+                    key: 'commodityQuantity'
+                }
+            ],
+            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)
+					}
+                }
+			],
+			dataSourceX: [],
+        }
+    },
+    /* 分派 */
+    evaluate(record,nub){
+        this.state.assignData=record;
+        this.setState({
+        	nub,
+            assignVisible:true
+        })
+    },
+   
+    componentWillMount() {
+        this.loadData();
+    },
+    tableRowClick(record, index) {
+        this.state.RowData = record;
+        this.setState({
+            visible: true,
+        });
+        this.xiangqing(record.orderNo);
+		this.xiangmu(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));
+	},
+	 //关闭详情
+	visitCancel(e){
+		this.setState({
+			visible:false
+		})
+		this.reset();
+	},
+	visitOk(e){
+		this.setState({
+			visible:false
+		})
+		this.reset();
+	},
+    closeDesc(e, s) {
+        this.state.showDesc = e;
+        if (s) {
+            this.loadData(this.state.page);
+        };
+    },
+    closeAssign(e, s) {
+    	this.state.roleName='';
+        this.state.assignVisible = e;
+        if (s) {
+            this.loadData(this.state.page);
+        };
+    },
+    search() {
+        this.loadData();
+    },
+    reset() {
+        this.state.nameSearch = '';
+        this.state.releaseDate = [];
+        this.state.orderNoSearch='';
+        this.state.taskNoSearch='';
+        this.state.distribution=undefined;
+        this.loadData();
+    },
+    searchSwitch() {
+        this.setState({
+            searchMore: !this.state.searchMore
+        });
+    },
     render() { 
-        return (<div>任务查询</div>  );
+        const rowSelection = {
+            selectedRowKeys: this.state.selectedRowKeys,
+            onChange: (selectedRowKeys, selectedRows) => {
+                this.setState({
+                    selectedRows: selectedRows.slice(-1),
+                    selectedRowKeys: selectedRowKeys.slice(-1)
+                });
+            }
+        };
+        const formItemLayout = {
+            labelCol: { span: 8 },
+            wrapperCol: { span: 14 },
+        };
+        const hasSelected = this.state.selectedRowKeys.length > 0;
+        const { RangePicker } = DatePicker;
+        return ( <div className="user-content">
+            <div className="content-title">
+                    <span>任务查询</span>
+                </div>
+                <div className="user-search">
+                    <Input placeholder="客户名称"
+                        value={this.state.nameSearch}
+                        onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />
+                    <Input placeholder="订单编号"
+                        value={this.state.orderNoSearch}
+                        onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} />
+                    <Input placeholder="任务编号"
+                        value={this.state.taskNoSearch}
+                        onChange={(e) => { this.setState({ taskNoSearch: e.target.value }); }} />
+                    <Button type="primary" onClick={this.search}>搜索</Button>
+                    <Button onClick={this.reset}>重置</Button>
+                    {/* <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch.bind(this)} /></span>
+                    <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
+                        <span>订单时间 :</span>
+                        <RangePicker
+                            value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
+                            this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
+                            onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
+                    </div> */}
+                </div>
+                <div className="patent-table">
+                    <Spin spinning={this.state.loading}>
+                        <Table columns={this.state.columns}
+                            dataSource={this.state.dataSource}
+                            rowSelection={rowSelection}
+                            pagination={this.state.pagination}
+                            onRowClick={this.tableRowClick.bind(this)} />
+                    </Spin>
+                </div>
+                <Assign
+                    title="任务"
+                    selApi={"/api/admin/orderProject/projectDistribution"}
+                    data={this.state.assignData}
+                    showDesc={this.state.assignVisible}
+                    closeDesc={this.closeAssign.bind(this)}
+                    fenpaiData={8}
+                    specially={0}
+                    roleName={this.state.nub}
+                />
+                <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 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.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> )
     }
-}
+})
  
 export default Task;