liting2017 6 年之前
父节点
当前提交
8c353d7e16

+ 344 - 12
js/component/account/order/consumptionOrder.jsx

@@ -1,13 +1,345 @@
-import {Component} from 'react';
+/* 
+	update:2018/07/16
+	author:liting
+*/
 
-class Order extends Component {
-    constructor(props) {
-        super(props);
-        this.state = {  }
-    }
-    render() { 
-        return ( <div>111</div> );
-    }
-}
- 
-export default Order;
+import React from 'react';
+import $ from 'jquery/src/ajax';
+import { Form, Button, Input, Select, Spin, Table, message, Modal, Tooltip, Switch, DatePicker } from 'antd';
+import { getOrderType } from '@/tools.js';
+import moment  from 'moment';
+//主体
+const Order = Form.create()(
+	React.createClass({
+		loadData(pageNo) {
+			this.state.data = [];
+			this.setState({
+				loading: true,
+				page: pageNo
+			});
+			$.ajax({
+				method: 'get',
+				dataType: 'json',
+				crossDomain: false,
+				url: globalConfig.context + '/api/user/jtOrder/list',
+				data: {
+					pageNo: pageNo || 1,
+					pageSize: this.state.pagination.pageSize,
+					orderNo: this.state.numberSearch,
+					userType:0,
+					commodityName: this.state.entryNameSearch,
+					sellerName: this.state.companyNameSearch,
+					startCreateDate: this.state.releaseDate[0],
+					endCreateDate: 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,
+								sellerId: thisdata.sellerId,
+								buyerId:thisdata.buyerId,
+								orderNo:thisdata.orderNo,
+								commodityType:thisdata.commodityType,
+								orderAmount:thisdata.orderAmount,
+								commodityName:thisdata.commodityName,
+								sellerName:thisdata.sellerName!=null?thisdata.sellerName:'佚名',
+								sellerMobile:thisdata.sellerMobile,
+								createTime: thisdata.createTime ? new Date(thisdata.createTime).toLocaleString() : ''
+							});
+						}
+						this.state.pagination.current = data.data.pageNo;
+						this.state.pagination.total = data.data.totalCount;
+					}
+					this.setState({
+						dataSource: theArr,
+						pagination: this.state.pagination
+					});
+				}.bind(this)
+			}).always(
+				function() {
+					this.setState({
+						loading: false
+					});
+				}.bind(this)
+			);
+		},
+		getInitialState() {
+			return {
+				searchMore: true,
+				selectedRowKeys: [],
+				selectedRows: [],
+				loading: false,
+				releaseDate: [],
+				pagination: {
+					defaultCurrent: 1,
+					defaultPageSize: 10,
+					showQuickJumper: true,
+					pageSize: 10,
+					onChange: function(page) {
+						this.loadData(page);
+						this.setState({
+							selectedRowKeys: []
+						});
+					}.bind(this),
+					showTotal: function(total) {
+						return '共' + total + '条数据';
+					}
+				},
+				columns: [
+					{
+						title: '订单编号',
+						dataIndex: 'orderNo',
+						key: 'orderNo'
+					},
+					{
+						title: '订单类型',
+						dataIndex: 'commodityType',
+						key: 'commodityType',
+						render: (text) => {
+							return getOrderType(text);
+						}
+					},
+					{
+						title: '订单日期',
+						dataIndex: 'createTime',
+						key: 'createTime'
+					},
+					{
+						title: '订单金额',
+						dataIndex: 'orderAmount',
+                        key: 'orderAmount',
+                        render:(text)=>{
+                            return text?text:'面议'
+                        }
+					},
+					{
+						title: '项目名称',
+						dataIndex: 'commodityName',
+						key: 'commodityName',
+						render: (text) => {
+							return (
+								<Tooltip title={text}>
+									{text && text.length > 6 ? text.substr(0, 6) + '...' : text}
+								</Tooltip>
+							);
+						}
+					},
+					{
+						title: '服务商',
+						dataIndex: 'sellerName',
+						key: 'sellerName',
+						
+					},
+					{
+						title: '联系方式',
+						dataIndex: 'sellerMobile',
+						key: 'sellerMobile'
+					},
+					
+				],
+				dataSource: []
+			};
+		},
+		componentWillMount() {
+			this.loadData();
+		},
+		//项目列表整行点击
+		tableRowClick(record, index) {
+			this.state.RowData = record;
+			this.setState({
+				editvisible: true
+			});
+		},
+		edithandleCancel(e) {
+			this.setState({
+				editvisible: false
+			});
+		},
+		search() {
+			this.loadData();
+		},
+		//搜索部分的清零
+		reset() {
+			this.state.numberSearch = '';
+			this.state.typeSearch = undefined;
+			this.state.companyNameSearch = '';
+			this.state.entryNameSearch = '';
+			this.state.releaseDate = [];
+			this.state.searchMore=true;
+			this.loadData();
+		},
+		searchSwitch() {
+			this.setState({
+				searchMore: !this.state.searchMore
+			});
+		},
+		render() {
+			const FormItem = Form.Item;
+			const rowSelection = {
+				selectedRowKeys: this.state.selectedRowKeys,
+				onChange: (selectedRowKeys, selectedRows) => {
+					this.setState({
+						selectedRows: selectedRows.slice(-1),
+						selectedRowKeys: selectedRowKeys.slice(-1)
+					});
+				}
+			};
+			const { RangePicker } = DatePicker;
+			const theData = this.state.RowData || {};
+			return (
+				<div className="user-content">
+					<div className="content-title">
+						<span>我的订单</span>
+					</div>
+					<div className="user-search">
+						<Input
+							placeholder="订单编号"
+							style={{ width: '150px', marginRight: '10px', marginBottom: '10px' }}
+							value={this.state.numberSearch}
+							onChange={(e) => {
+								this.setState({ numberSearch: e.target.value });
+							}}
+						/>
+						<Input
+							placeholder="公司名称"
+							style={{ width: '150px', marginRight: '10px', marginBottom: '10px' }}
+							value={this.state.companyNameSearch}
+							onChange={(e) => {
+								this.setState({ companyNameSearch: e.target.value });
+							}}
+						/>
+						<Input
+							placeholder="项目名称"
+							style={{ width: '150px', marginRight: '10px', marginBottom: '10px' }}
+							value={this.state.entryNameSearch}
+							onChange={(e) => {
+								this.setState({ entryNameSearch: e.target.value });
+							}}
+						/>
+						<Button type="primary" onClick={this.search} style={{ marginRight: '10px' }}>
+							搜索
+						</Button>
+						<Button onClick={this.reset} style={{ marginRight: '10px' }}>
+							重置
+						</Button>
+						<span>
+							更多搜索<Switch  checked={!this.state.searchMore} onChange={this.searchSwitch} />
+						</span>
+						<div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
+							<span style={{ marginRight: 10 }}>发布时间 :</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}
+							/>
+						</Spin>
+					</div>
+					<div className="patent-desc">
+						<Modal
+							className="customeDetails"
+							title="订单详情"
+							width="1000px"
+							visible={this.state.editvisible}
+							onOk={this.edithandleCancel}
+							onCancel={this.edithandleCancel}
+							footer=""
+						>
+							<Form layout="horizontal" onSubmit={this.edithandleSubmit} id="demand-form">
+								<Spin spinning={this.state.loading}>
+									<div className="clearfix">
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="订单编号"
+										>
+											<span>{theData.orderNo}</span>
+										</FormItem>
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="订单类型"
+										>
+											<span>{getOrderType(theData.commodityType)}</span>
+										</FormItem>
+									</div>
+									<div className="clearfix">
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="订单日期"
+										>
+											<span>{theData.createTime}</span>
+										</FormItem>
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="订单金额"
+										>
+											<span>{theData.orderAmount ? theData.orderAmount + '万元' : '面议'}</span>
+										</FormItem>
+									</div>
+									<div className="clearfix">
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="项目名称"
+										>
+											<span>{theData.commodityName}</span>
+										</FormItem>
+									</div>
+									<div className="clearfix">
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="服务商"
+										>
+											<span>{theData.sellerName}</span>
+										</FormItem>
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="联系方式"
+										>
+											<span>{theData.sellerMobile}</span>
+										</FormItem>
+									</div>
+								</Spin>
+							</Form>
+						</Modal>
+					</div>
+				</div>
+			);
+		}
+	})
+);
+
+export default Order;

+ 41 - 101
js/component/account/order/serviceOrder.jsx

@@ -22,16 +22,16 @@ const Order = Form.create()(
 				method: 'get',
 				dataType: 'json',
 				crossDomain: false,
-				url: globalConfig.context + '/portal/service/jtProject/list',
+				url: globalConfig.context + '/api/user/jtOrder/list',
 				data: {
 					pageNo: pageNo || 1,
 					pageSize: this.state.pagination.pageSize,
-					number: this.state.numberSearch,
-					type: this.state.typeSearch,
-					entryName: this.state.entryNameSearch,
-					companyName: this.state.companyNameSearch,
-					start: this.state.releaseDate[0],
-					end: this.state.releaseDate[1]
+					orderNo: this.state.numberSearch,
+					userType:1,
+					commodityName: this.state.entryNameSearch,
+					buyerName: this.state.companyNameSearch,
+					startCreateDate: this.state.releaseDate[0],
+					endCreateDate: this.state.releaseDate[1]
 				},
 				success: function(data) {
 					let theArr = [];
@@ -44,9 +44,14 @@ const Order = Form.create()(
 							let thisdata = data.data.list[i];
 							theArr.push({
 								key: i,
-								id: thisdata.id,
-								name: thisdata.name,
-								number: thisdata.number,
+								sellerId: thisdata.sellerId,
+								buyerId:thisdata.buyerId,
+								orderNo:thisdata.orderNo,
+								commodityType:thisdata.commodityType,
+								orderAmount:thisdata.orderAmount,
+								commodityName:thisdata.commodityName,
+								buyerName:thisdata.buyerName,
+								buyerMobile:thisdata.buyerMobile,
 								createTime: thisdata.createTime ? new Date(thisdata.createTime).toLocaleString() : ''
 							});
 						}
@@ -91,31 +96,31 @@ const Order = Form.create()(
 				columns: [
 					{
 						title: '订单编号',
-						dataIndex: 'name',
-						key: 'bname'
+						dataIndex: 'orderNo',
+						key: 'orderNo'
 					},
 					{
 						title: '订单类型',
-						dataIndex: 'cname',
-						key: 'cname',
+						dataIndex: 'commodityType',
+						key: 'commodityType',
 						render: (text) => {
 							return getOrderType(text);
 						}
 					},
 					{
 						title: '订单日期',
-						dataIndex: 'superName',
-						key: 'superName'
+						dataIndex: 'createTime',
+						key: 'createTime'
 					},
 					{
 						title: '订单金额',
-						dataIndex: 'price',
-						key: 'price'
+						dataIndex: 'orderAmount',
+						key: 'orderAmount'
 					},
 					{
 						title: '项目名称',
-						dataIndex: 'memberPrice',
-						key: 'memberPrice',
+						dataIndex: 'commodityName',
+						key: 'commodityName',
 						render: (text) => {
 							return (
 								<Tooltip title={text}>
@@ -125,27 +130,17 @@ const Order = Form.create()(
 						}
 					},
 					{
-						title: '联系人',
-						dataIndex: 'activityFlag',
-						key: 'activityFlag'
+						title: '消费者',
+						dataIndex: 'buyerName',
+						key: 'buyerName',
+						
 					},
 					{
 						title: '联系方式',
-						dataIndex: 'activityFlag1',
-						key: 'activityFlag1'
+						dataIndex: 'buyerMobile',
+						key: 'buyerMobile'
 					},
-					{
-						title: '消费者',
-						dataIndex: 'activityFlag12',
-						key: 'activityFlag12',
-						render: (text) => {
-							return (
-								<Tooltip title={text}>
-									{text && text.length > 6 ? text.substr(0, 6) + '...' : text}
-								</Tooltip>
-							);
-						}
-					}
+					
 				],
 				dataSource: []
 			};
@@ -153,47 +148,12 @@ const Order = Form.create()(
 		componentWillMount() {
 			this.loadData();
 		},
-		detailes(recard) {
-			this.setState({
-				loading: true
-			});
-			$.ajax({
-				method: 'get',
-				dataType: 'json',
-				crossDomain: false,
-				url: globalConfig.context + '/api/user/jtBusiness/project/detail',
-				data: {
-					id: recard.id
-				},
-				success: function(data) {
-					let thisData = data.data;
-					if (!thisData) {
-						if (data.error && data.error.length) {
-							message.warning(data.error[0].message);
-						}
-						thisData = {};
-					}
-					this.setState({
-						id: thisData.id,
-						data: thisData,
-						createTime: thisData.createTime ? new Date(thisData.createTime).toLocaleString() : ''
-					});
-				}.bind(this)
-			}).always(
-				function() {
-					this.setState({
-						loading: false
-					});
-				}.bind(this)
-			);
-		},
 		//项目列表整行点击
 		tableRowClick(record, index) {
 			this.state.RowData = record;
 			this.setState({
 				editvisible: true
 			});
-			this.detailes(record);
 		},
 		edithandleCancel(e) {
 			this.setState({
@@ -230,7 +190,7 @@ const Order = Form.create()(
 				}
 			};
 			const { RangePicker } = DatePicker;
-			const theData = this.state.data || {};
+			const theData = this.state.RowData || {};
 			return (
 				<div className="user-content">
 					<div className="content-title">
@@ -245,18 +205,6 @@ const Order = Form.create()(
 								this.setState({ numberSearch: e.target.value });
 							}}
 						/>
-						<Select
-							placeholder="订单类型"
-							style={{ width: '200px', marginRight: '10px' }}
-							value={this.state.typeSearch}
-							onChange={(e) => {
-								this.setState({ typeSearch: e });
-							}}
-						>
-							{orderType.map(function(item) {
-								return <Select.Option key={item.value}>{item.key}</Select.Option>;
-							})}
-						</Select>
 						<Input
 							placeholder="公司名称"
 							style={{ width: '150px', marginRight: '10px', marginBottom: '10px' }}
@@ -325,7 +273,7 @@ const Order = Form.create()(
 											wrapperCol={{ span: 12 }}
 											label="订单编号"
 										>
-											<span>{theData.name}</span>
+											<span>{theData.orderNo}</span>
 										</FormItem>
 										<FormItem
 											className="half-item"
@@ -333,7 +281,7 @@ const Order = Form.create()(
 											wrapperCol={{ span: 12 }}
 											label="订单类型"
 										>
-											<span>{getOrderType(theData.type)}</span>
+											<span>{getOrderType(theData.commodityType)}</span>
 										</FormItem>
 									</div>
 									<div className="clearfix">
@@ -343,7 +291,7 @@ const Order = Form.create()(
 											wrapperCol={{ span: 12 }}
 											label="订单日期"
 										>
-											<span>{this.state.createTime}</span>
+											<span>{theData.createTime}</span>
 										</FormItem>
 										<FormItem
 											className="half-item"
@@ -351,7 +299,7 @@ const Order = Form.create()(
 											wrapperCol={{ span: 12 }}
 											label="订单金额"
 										>
-											<span>{theData.isHot ? theData.isHot + '万元' : ''}</span>
+											<span>{theData.orderAmount ? theData.orderAmount + '万元' : ''}</span>
 										</FormItem>
 									</div>
 									<div className="clearfix">
@@ -361,7 +309,7 @@ const Order = Form.create()(
 											wrapperCol={{ span: 12 }}
 											label="项目名称"
 										>
-											<span>{theData.name}</span>
+											<span>{theData.commodityName}</span>
 										</FormItem>
 									</div>
 									<div className="clearfix">
@@ -369,9 +317,9 @@ const Order = Form.create()(
 											className="half-item"
 											labelCol={{ span: 8 }}
 											wrapperCol={{ span: 12 }}
-											label="联系人"
+											label="消费者"
 										>
-											<span>{theData.memberPrice1}</span>
+											<span>{theData.buyerName}</span>
 										</FormItem>
 										<FormItem
 											className="half-item"
@@ -379,15 +327,7 @@ const Order = Form.create()(
 											wrapperCol={{ span: 12 }}
 											label="联系方式"
 										>
-											<span>{theData.activityFlag1}</span>
-										</FormItem>
-										<FormItem
-											className="half-item"
-											labelCol={{ span: 8 }}
-											wrapperCol={{ span: 12 }}
-											label="消费者"
-										>
-											<span>{theData.activityPrice}</span>
+											<span>{theData.buyerMobile}</span>
 										</FormItem>
 									</div>
 								</Spin>

+ 24 - 2
js/component/administration/business/businessCategory.jsx

@@ -92,6 +92,7 @@ const BusinessCategory=Form.create()(React.createClass({
                             id: thisdata.id,//品类ID
                             sort:thisdata.sort,//品类序号
                             number: thisdata.number,//品类编号
+                            module:thisdata.module?String(thisdata.module):undefined,
                             name: thisdata.name,//品类名称
                             layer:thisdata.layer,
                             superId:thisdata.superId,
@@ -179,7 +180,8 @@ const BusinessCategory=Form.create()(React.createClass({
             visible: true,
             name:'',
             addFirst:1,
-            superId:recard.id
+            superId:recard.id,
+            module:recard.module
         });
     },
 	//编辑保存
@@ -259,6 +261,7 @@ const BusinessCategory=Form.create()(React.createClass({
             addFirst:0,
             name:'',
             superId:'',
+            module:'0'
         });
     },
     //新增保存
@@ -275,7 +278,8 @@ const BusinessCategory=Form.create()(React.createClass({
             data: {
                 name:this.state.name,
                 superId:this.state.superId,
-                layer:this.state.addFirst?'2':'1'
+                layer:this.state.addFirst?'2':'1',
+                module:this.state.module
             }
         }).done(function (data) {
             if (!data.error.length) {
@@ -434,6 +438,17 @@ const BusinessCategory=Form.create()(React.createClass({
 				                           		<span className="mandatory" style={{color:'red',marginLeft:'5px'}}>*</span>
 					                    </FormItem>
 				                    </div>
+                                    <div className="clearfix">
+				                    	<FormItem
+					                            labelCol={{ span: 7 }}
+					                        	wrapperCol={{ span: 12 }}
+					                            label="所属模块" >
+                                               {!this.state.addFirst? <Select value ={this.state.module} onChange={(e)=>{this.setState({module:e})}}>
+                                                    <Select.Option value='0'>科技服务</Select.Option>
+                                                    <Select.Option value="1">知识产权服务</Select.Option>
+                                                </Select>:<span>{this.state.module?'知识产权服务':'科技服务'}</span>}
+					                    </FormItem>
+				                    </div>
 				                    <div className="clearfix">
 					                    <FormItem  
 					                    	labelCol={{ span: 7 }}
@@ -509,6 +524,13 @@ const BusinessCategory=Form.create()(React.createClass({
 					                        <span>{theData.layerName}</span>
 					                    </FormItem>
 					                </div>
+                                    <FormItem
+					                            labelCol={{ span: 7 }}
+					                        	wrapperCol={{ span: 12 }}
+					                            label="所属模块" >
+                                              
+                                                <span>{theData.module?'知识产权服务':'科技服务'}</span>
+					                    </FormItem>
 					                <div className="clearfix">
 				                    	<FormItem 
 						                    labelCol={{ span: 7 }}

+ 51 - 97
js/component/administration/order/order.jsx

@@ -22,16 +22,16 @@ const Order = Form.create()(
 				method: 'get',
 				dataType: 'json',
 				crossDomain: false,
-				url: globalConfig.context + '/portal/service/jtProject/list',
+				url: globalConfig.context + '/api/admin/jtOrder/list',
 				data: {
 					pageNo: pageNo || 1,
 					pageSize: this.state.pagination.pageSize,
-					number: this.state.numberSearch,
-					type: this.state.typeSearch,
-					entryName: this.state.entryNameSearch,
-					companyName: this.state.companyNameSearch,
-					start: this.state.releaseDate[0],
-					end: this.state.releaseDate[1]
+					orderNo: this.state.numberSearch,
+					commodityName: this.state.entryNameSearch,
+					sellerName: this.state.companyNameSearch,
+					buyerName: this.state.employerNameSearch,
+					startCreateDate: this.state.releaseDate[0],
+					endCreateDate: this.state.releaseDate[1]
 				},
 				success: function(data) {
 					let theArr = [];
@@ -44,9 +44,16 @@ const Order = Form.create()(
 							let thisdata = data.data.list[i];
 							theArr.push({
 								key: i,
-								id: thisdata.id,
-								name: thisdata.name,
-								number: thisdata.number,
+								sellerId: thisdata.sellerId,
+								buyerId:thisdata.buyerId,
+								orderNo:thisdata.orderNo,
+								commodityType:thisdata.commodityType,
+								orderAmount:thisdata.orderAmount,
+								commodityName:thisdata.commodityName,
+								buyerName:thisdata.buyerName,
+								buyerMobile:thisdata.buyerMobile,
+								sellerName:thisdata.sellerName,
+								sellerMobile:thisdata.sellerMobile,
 								createTime: thisdata.createTime ? new Date(thisdata.createTime).toLocaleString() : ''
 							});
 						}
@@ -91,31 +98,31 @@ const Order = Form.create()(
 				columns: [
 					{
 						title: '订单编号',
-						dataIndex: 'name',
-						key: 'bname'
+						dataIndex: 'orderNo',
+						key: 'orderNo'
 					},
 					{
 						title: '订单类型',
-						dataIndex: 'cname',
-						key: 'cname',
+						dataIndex: 'commodityType',
+						key: 'commodityType',
 						render: (text) => {
 							return getOrderType(text);
 						}
 					},
 					{
 						title: '订单日期',
-						dataIndex: 'superName',
-						key: 'superName'
+						dataIndex: 'createTime',
+						key: 'createTime'
 					},
 					{
 						title: '订单金额',
-						dataIndex: 'price',
-						key: 'price'
+						dataIndex: 'orderAmount',
+						key: 'orderAmount'
 					},
 					{
 						title: '项目名称',
-						dataIndex: 'memberPrice',
-						key: 'memberPrice',
+						dataIndex: 'commodityName',
+						key: 'commodityName',
 						render: (text) => {
 							return (
 								<Tooltip title={text}>
@@ -125,43 +132,36 @@ const Order = Form.create()(
 						}
 					},
 					{
-						title: '消费者',
-						dataIndex: 'activityPrice',
-						key: 'activityPrice',
-						render: (text) => {
-							return getOrderType(text);
-						}
-					},
-					{
 						title: '消费者联系人',
-						dataIndex: 'activityFlag',
-						key: 'activityFlag'
+						dataIndex: 'buyerName',
+						key: 'buyerName',
+						render:(text)=>{
+							return text?text:'佚名'
+						}
 					},
 					{
 						title: '消费者联系方式',
-						dataIndex: 'activityFlag1',
-						key: 'activityFlag1'
+						dataIndex: 'buyerMobile',
+						key: 'buyerMobile',
+						render:(text)=>{
+							return text&&text.length>1?text:'暂无'
+						}
 					},
 					{
-						title: '服务商',
-						dataIndex: 'activityFlag12',
-						key: 'activityFlag12',
-						render: (text) => {
-							return (
-								<Tooltip title={text}>
-									{text && text.length > 6 ? text.substr(0, 6) + '...' : text}
-								</Tooltip>
-							);
-						}
-					},{
 						title: '服务商联系人',
-						dataIndex: 'activityFlag3',
-						key: 'activityFlag3'
+						dataIndex: 'sellerName',
+						key: 'sellerName',
+						render:(text)=>{
+							return text?text:'佚名'
+						}
 					},
 					{
 						title: '服务商联系方式',
-						dataIndex: 'activityFlag41',
-						key: 'activityFlag41'
+						dataIndex: 'sellerMobile',
+						key: 'sellerMobile',
+						render:(text)=>{
+							return text&&text.length>1?text:'暂无'
+						}
 					},
 				],
 				dataSource: []
@@ -170,47 +170,13 @@ const Order = Form.create()(
 		componentWillMount() {
 			this.loadData();
 		},
-		detailes(recard) {
-			this.setState({
-				loading: true
-			});
-			$.ajax({
-				method: 'get',
-				dataType: 'json',
-				crossDomain: false,
-				url: globalConfig.context + '/api/user/jtBusiness/project/detail',
-				data: {
-					id: recard.id
-				},
-				success: function(data) {
-					let thisData = data.data;
-					if (!thisData) {
-						if (data.error && data.error.length) {
-							message.warning(data.error[0].message);
-						}
-						thisData = {};
-					}
-					this.setState({
-						id: thisData.id,
-						data: thisData,
-						createTime: thisData.createTime ? new Date(thisData.createTime).toLocaleString() : ''
-					});
-				}.bind(this)
-			}).always(
-				function() {
-					this.setState({
-						loading: false
-					});
-				}.bind(this)
-			);
-		},
+		
 		//项目列表整行点击
 		tableRowClick(record, index) {
 			this.state.RowData = record;
 			this.setState({
 				editvisible: true
 			});
-			this.detailes(record);
 		},
 		edithandleCancel(e) {
 			this.setState({
@@ -247,7 +213,7 @@ const Order = Form.create()(
 				}
 			};
 			const { RangePicker } = DatePicker;
-			const theData = this.state.data || {};
+			const theData = this.state.RowData || {};
 			return (
 				<div className="user-content">
 					<div className="content-title">
@@ -262,20 +228,8 @@ const Order = Form.create()(
 								this.setState({ numberSearch: e.target.value });
 							}}
 						/>
-						<Select
-							placeholder="订单类型"
-							style={{ width: '200px', marginRight: '10px' }}
-							value={this.state.typeSearch}
-							onChange={(e) => {
-								this.setState({ typeSearch: e });
-							}}
-						>
-							{orderType.map(function(item) {
-								return <Select.Option key={item.value}>{item.key}</Select.Option>;
-							})}
-						</Select>
 						<Input
-							placeholder="公司名称"
+							placeholder="卖方名称"
 							style={{ width: '150px', marginRight: '10px', marginBottom: '10px' }}
 							value={this.state.companyNameSearch}
 							onChange={(e) => {
@@ -296,7 +250,7 @@ const Order = Form.create()(
 							onChange={(e) => {
 								this.setState({ employerNameSearch: e.target.value });
 							}}
-							placeholder="客户名称"
+							placeholder="买方名称"
 						/>
 						<Button type="primary" onClick={this.search} style={{ marginRight: '10px' }}>
 							搜索