dengzhiguo 6 years ago
parent
commit
6911ba8a2b

+ 26 - 0
js/component/dataDic.js

@@ -1792,6 +1792,16 @@ module.exports = {
 	        key: "APP"
 	    }
     ],
+    //是否锁定
+    isLock:[
+	    {
+	        value: "0",
+	        key: "正常"
+	    }, {
+	        value: "2",
+	        key: "锁定"
+	    }
+    ],
      //是否置顶
     stick:[
 	    {
@@ -2081,6 +2091,22 @@ module.exports = {
 	        key: "材料已完成"
 	    }
     ],
+     //公示状态	
+    publishStatus:[
+    	{
+	        value: "0",
+	        key: "已公示"
+	    },{
+	        value: "1",
+	        key: "未公示"
+	    }, {
+	        value: "2",
+	        key: "待公示"
+	    },{
+	        value: "3",
+	        key: "抽查中"
+	    }
+    ],
      //变更状态	
     changeState:[
     	{

+ 51 - 31
js/component/manageCenter/servicesManage/projectOrder/myTask/projectManage.jsx

@@ -6,8 +6,8 @@ import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message,
 import MySettlementDetaile from "./projectManageDetaile.jsx";
 import moment from 'moment';
 import '../userMangagement.less';
-import {projectState,taskStatus} from '../../../../dataDic.js';
-import {getProjectState,getOrderState,getOrderType,getPaymentState,getTaskStatus} from '../../../../tools.js';
+import {projectState,taskStatus,publishStatus} from '../../../../dataDic.js';
+import {getProjectState,getOrderState,getOrderType,getPaymentState,getTaskStatus,getPublishStatus} from '../../../../tools.js';
 const MyTask=Form.create()(React.createClass({
 	loadData(pageNo) {
         this.setState({
@@ -28,7 +28,8 @@ const MyTask=Form.create()(React.createClass({
                 projectNo:this.state.orderNoSearch,//订单编号
                 deletedSign:this.state.deleteSignSearch,//锁定激活
                 categoryId:this.state.categoryIdSearch,
-                taskReceiverName:this.state.salesmanNameSearch
+                taskReceiverName:this.state.salesmanNameSearch,
+                publishStatus:this.state.publishStatus,//公示状态
             },
             success: function (data) {
                 let theArr = [];
@@ -51,6 +52,7 @@ const MyTask=Form.create()(React.createClass({
 	                         taskStatus:thisdata.taskStatus,
 	                         taskReceiverName:thisdata.taskReceiverName,
 	                         projectNo:thisdata.projectNo,
+	                         publishStatus:thisdata.publishStatus,//公示状态
                         });
                     };
                     this.state.pagination.current = data.data.pageNo;
@@ -175,6 +177,13 @@ const MyTask=Form.create()(React.createClass({
                     	return text==2?'锁定':'未锁定'
                     }
                 },{
+                    title: '公示状态',
+                    dataIndex: 'publishStatus',
+                    key: 'publishStatus',
+                    render:(text)=>{
+                    	{return getPublishStatus(text) }
+                    }
+                },{
                     title: '任务创建时间',
                     dataIndex: 'taskDistributionTimes',
                     key: 'taskDistributionTimes',
@@ -461,6 +470,10 @@ const MyTask=Form.create()(React.createClass({
     		distributionList:[]
     	})
     },
+    closeShow(s){
+    	this.state.showDesc=s;
+    	this.loadData();
+    },
     reset() {
     	this.state.buyerNameSearch='';
     	this.state.releaseDate[0] = undefined;
@@ -471,6 +484,7 @@ const MyTask=Form.create()(React.createClass({
 		this.state.orderNoSearch='';
 		this.state.deleteSignSearch=undefined;
 		this.state.categoryIdSearch=undefined;
+		this.state.publishStatus=undefined;
         this.loadData();       
     },
     render() {
@@ -505,40 +519,45 @@ const MyTask=Form.create()(React.createClass({
 	                    <Input placeholder="客户名称" style={{width:'150px'}}
 	                        value={this.state.buyerNameSearch}
 	                        onChange={(e) => { this.setState({ buyerNameSearch: e.target.value }); }} />
+	                    <Input placeholder="项目编号" style={{width:'150px'}}
+	                        value={this.state.orderNoSearch}
+	                        onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} />
+	                    <Select placeholder="任务状态"
+                            style={{ width: 150 ,marginRight:'10px'}}
+                            value={this.state.orderStatusSearch}
+                            onChange={(e) => { this.setState({ orderStatusSearch: e }) }}>
+                            {
+                                taskStatus.map(function (item) {
+                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                })
+                            }
+                        </Select>
+                        <Select placeholder="公示状态"
+                            style={{ width: 150 ,marginRight:'10px'}}
+                            value={this.state.publishStatus}
+                            onChange={(e) => { this.setState({ publishStatus: e }) }}>
+                            {
+                                publishStatus.map(function (item) {
+                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                })
+                            }
+                        </Select>
+                        <Select placeholder="业务类别"
+                            style={{ width: 150 ,marginRight:'10px',marginBottom:'10px'}}
+                            value={this.state.categoryIdSearch}
+                            onChange={(e) => { this.setState({ categoryIdSearch: e }) }}>
+                            {
+                                businessArr.map(function (item) {
+                                        return <Select.Option key={item.id} >{item.name}</Select.Option>
+                                })
+                            }
+                        </Select>
 	                    <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 }); }} /> 
 	                    <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索</Button>
 	                    <Button onClick={this.reset}>重置</Button>
-	                    <span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>    
-	                </div>
-	                <div className='clearfix' style={{marginTop:'5px'}}>
-	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}> 
-	                        <Select placeholder="任务状态"
-	                            style={{ width: 150 ,marginRight:'10px'}}
-	                            value={this.state.orderStatusSearch}
-	                            onChange={(e) => { this.setState({ orderStatusSearch: e }) }}>
-	                            {
-                                    taskStatus.map(function (item) {
-                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-                                    })
-                                }
-	                        </Select>
-	                        <Select placeholder="业务类别"
-	                            style={{ width: 150 ,marginRight:'10px',marginBottom:'10px'}}
-	                            value={this.state.categoryIdSearch}
-	                            onChange={(e) => { this.setState({ categoryIdSearch: e }) }}>
-	                            {
-                                    businessArr.map(function (item) {
-                                            return <Select.Option key={item.id} >{item.name}</Select.Option>
-                                    })
-                                }
-	                        </Select>
-	                        <Input placeholder="项目编号" style={{width:'150px'}}
-		                        value={this.state.orderNoSearch}
-		                        onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} />
-	                    </div>
 	                </div>
 	                <div className="patent-table">
 	                    <Spin spinning={this.state.loading}>
@@ -553,6 +572,7 @@ const MyTask=Form.create()(React.createClass({
 	                <MySettlementDetaile
 	                    datauser={this.state.datauser}
 	                    showDesc={this.state.showDesc}
+	                    closeShow={this.closeShow}
 	                     />
 	            </div >
 			        <Modal maskClosable={false} visible={this.state.distributionVisible}

+ 257 - 94
js/component/manageCenter/servicesManage/projectOrder/myTask/projectManageDetaile.jsx

@@ -3,15 +3,51 @@ import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import '../userMangagement.less';
-import {orderType} from '../../../../dataDic.js';
-import {getOrderType,getProjectState,getTaskStatus,getOrderChannel,getOrderState,getPaymentState,getApprovedState} from '../../../../tools.js';
+import {orderType,publishStatus} from '../../../../dataDic.js';
+import {getOrderType,getProjectState,getTaskStatus,getPublishStatus,getOrderChannel,getOrderState,getPaymentState,getApprovedState} from '../../../../tools.js';
 
 const MySettlementDetaile = Form.create()(React.createClass({
 	getInitialState() {
 		return {
 			loading: false,
 			visible: false,
+			
             //派单
+            contractList:[
+            	{
+                    title: '姓名',
+                    dataIndex: 'name',
+                    key: 'name'
+                }, {
+                    title: '部门',
+                    dataIndex: 'depatrment',
+                    key: 'depatrment'
+                },{
+                    title: '联系方式',
+                    dataIndex: 'mobile',
+                    key: 'mobile'
+                },{
+                    title: '是否为主要联系人',
+                    dataIndex: 'major',
+                    key: 'major',
+                    render:(text) => {
+                    	return text?'是':"否"
+                    }
+                }, {
+                    title: '职务',
+                    dataIndex: 'position',
+                    key: 'position'
+                },{
+                    title: '微信',
+                    dataIndex: 'wechat',
+                    key: 'wechat'
+                },{
+                    title: 'QQ',
+                    dataIndex: 'qq',
+                    key: 'qq'
+                },
+                
+            ],
 		};
 	},
 	//查看基本详情基本信息
@@ -35,7 +71,10 @@ const MySettlementDetaile = Form.create()(React.createClass({
 	                };
 	                this.setState({
 	                	orderNo:thisData.orderNo,
-						orderList:thisData
+						orderList:thisData,
+						uid:thisData.uid,
+						taskId:thisData.taskId,
+						publishStatus:thisData.publishStatus,
 	                });                  
 	            }.bind(this),
 	       }).always(function () {
@@ -86,6 +125,70 @@ const MySettlementDetaile = Form.create()(React.createClass({
             });
         }.bind(this));  
 	},
+	//点击查看联系人
+	seeContract(){
+		this.contract();
+		this.setState({
+			seeState:false,
+			orderVisible:true
+		})
+	},
+	orderCancel(){
+		this.setState({
+			orderVisible:false
+		})
+	},
+	//查看联系人
+	contract(){
+    	$.ajax({
+            method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/customer/findAllContacts',
+            data: {
+              uid: this.state.uid
+            },
+            success: function (data) {
+                let thisData = data.data;   
+                if (!thisData) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                    thisData = {};
+                };
+                this.setState({
+					contractArr:thisData,
+                });                  
+            }.bind(this),
+       }).always(function () {
+            this.setState({            	
+                loading: false
+            });
+        }.bind(this));  
+    },
+    //修改公示状态
+	changePublishStatus(){
+    	$.ajax({
+            method: "post",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/techproject/updatePublishStatus',
+            data: {
+              taskId:this.state.taskId,
+              publishStatus:this.state.publishStatus,
+            },
+            success: function (data) {
+                let thisData = data.data;   
+                if (!thisData) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                    thisData = {};
+                }
+                message.success('修改成功');
+            }.bind(this),
+       })
+    },
 	componentWillMount() {
 		
 	},
@@ -99,6 +202,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 		this.setState({
 			visible:false
 		})
+		this.props.closeShow(false)
 	},
 	render() {
 		const FormItem = Form.Item
@@ -119,10 +223,17 @@ const MySettlementDetaile = Form.create()(React.createClass({
 		            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}} >
 		                <Spin spinning={this.state.loading}>
 		                    <div className="clearfix">
-		                   			 <FormItem className="half-item"
+		                   			<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="客户名称" >
 			                    			<span>{orderDetaiel.buyerName}</span>
+			                    			{orderDetaiel.buyerName&&<Button  onClick={this.seeContract} style={{float:'right',fontSize:'12px'}}>查看联系人</Button>}
+			                    	</FormItem>
+			                    	
+			                    	<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="营销员名称" >
+			                    			<span>{orderDetaiel.salesmanName}</span>
 			                    	</FormItem>
 			                    	<FormItem className="half-item"
 				                            {...formItemLayout}
@@ -130,6 +241,12 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			                    			<span>{orderDetaiel.orderNo}</span>
 				                        {/*<Button style={{float:'right'}} onClick={this.seeOrder}>查看订单</Button>*/}
 			                    	</FormItem>
+			                    	<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="合同编号" >
+			                    			<span>{orderDetaiel.contractNo}</span>
+				                        {/*<Button style={{float:'right'}} onClick={this.seeOrder}>查看订单</Button>*/}
+			                    	</FormItem>
 		                        	<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="项目编号" >
@@ -156,6 +273,23 @@ const MySettlementDetaile = Form.create()(React.createClass({
 				                            label="是否锁定" >
 					                    	<span>{orderDetaiel.deletedSign==2?'锁定':'未锁定'}</span>
 			                    	</FormItem>
+			                    	<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="公示状态" >
+					                    	{orderDetaiel.taskStatus==3?<span><Select placeholder="请选择公示状态"
+						                            style={{ width:'150px'}}
+						                            value={getPublishStatus(this.state.publishStatus)}
+						                            onChange={(e)=>{this.setState({publishStatus:e})}}>
+						                            {
+					                                    publishStatus.map(function (item) {
+					                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+					                                    })
+					                                }
+						                        </Select>
+						                        <Button  onClick={this.changePublishStatus} style={{marginLeft:'10px',fontSize:'12px'}}>修改公示状态</Button></span>:<span>{getPublishStatus(orderDetaiel.publishStatus)}</span>
+					                    		
+					                    	}
+			                    	</FormItem>
 			                    	<div className='clearfix'>
 								        <FormItem className="half-item"
 				                            {...formItemLayout}
@@ -180,107 +314,136 @@ const MySettlementDetaile = Form.create()(React.createClass({
 						                    	<span>{orderDetaiel.taskReceiverName}</span>
 				                    	</FormItem>
 							        </div>
+							        <div className='clearfix'>
+								        <FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单留言" >
+					                    	<span>{orderDetaiel.orderRemarks}</span>
+				                    	</FormItem>
+							        </div>
 		                        </div>
 		                </Spin>
 		            </Form >
 		        </Modal>
 		        <Modal maskClosable={false} visible={this.state.seeOrderVisible}
-                        onOk={this.seeOrderCancel} onCancel={this.seeOrderCancel}
-                        width='1000px'
-                        title= '查看订单'                 
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal" id="demand-form">
-			                <Spin spinning={this.state.loading}>
-		                        <div className="clearfix">
-	                        	  	<div className="clearfix">
-			                       		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单编号" >
-				                            <span>{seeOrderDetaiel.orderNo}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="下单时间" >  
-				                            <span>{seeOrderDetaiel.createTime}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="客户名称" >  
-				                            <span>{seeOrderDetaiel.buyerName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单类型" >  
-				                            <span>{getOrderType(seeOrderDetaiel.orderType)}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单渠道" >  
-				                            <span>{getOrderChannel(seeOrderDetaiel.orderChannel)}</span>
-			                    		</FormItem>
+                    onOk={this.seeOrderCancel} onCancel={this.seeOrderCancel}
+                    width='1000px'
+                    title= '查看订单'                 
+                    footer=''
+                    className="admin-desc-content">
+		            <Form layout="horizontal" id="demand-form">
+		                <Spin spinning={this.state.loading}>
+	                        <div className="clearfix">
+                        	  	<div className="clearfix">
+		                       		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="订单编号" >
+			                            <span>{seeOrderDetaiel.orderNo}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="下单时间" >  
+			                            <span>{seeOrderDetaiel.createTime}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="客户名称" >  
+			                            <span>{seeOrderDetaiel.buyerName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="订单类型" >  
+			                            <span>{getOrderType(seeOrderDetaiel.orderType)}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="订单渠道" >  
+			                            <span>{getOrderChannel(seeOrderDetaiel.orderChannel)}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="订单状态" >  
+			                            <span>{getOrderState(seeOrderDetaiel.orderStatus)}</span>
+		                    		</FormItem>
+				                    <div className='clearfix'>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="订单状态" >  
-				                            <span>{getOrderState(seeOrderDetaiel.orderStatus)}</span>
+				                            label="特批立项" >   
+				                            <span>{getApprovedState(seeOrderDetaiel.approval)}</span>
 			                    		</FormItem>
-					                    <div className='clearfix'>
-				                    		<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="特批立项" >   
-					                            <span>{getApprovedState(seeOrderDetaiel.approval)}</span>
-				                    		</FormItem>
-					                        <div className='clearfix'>
-									        	<FormItem
-										            labelCol={{ span: 4 }}
-										            wrapperCol={{ span: 16 }}
-										            label="订单留言" >
-									        		<span>{seeOrderDetaiel.orderRemarks}</span>
-										        </FormItem>
-									        </div>
+				                        <div className='clearfix'>
+								        	<FormItem
+									            labelCol={{ span: 4 }}
+									            wrapperCol={{ span: 16 }}
+									            label="订单留言" >
+								        		<span>{seeOrderDetaiel.orderRemarks}</span>
+									        </FormItem>
 								        </div>
-			                        </div>
-			                        <div className='clearfix'>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单负责人" >  
-				                            <span>{seeOrderDetaiel.salesmanName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="意向时间" >  
-				                            <span>{seeOrderDetaiel.createTime}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="签单时间" >  
-				                            <span>{seeOrderDetaiel.signTime}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="财务负责人" >  
-				                            <span>{seeOrderDetaiel.financeName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="项目负责人" >  
-				                            <span>{seeOrderDetaiel.technicianName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="立项时间" >  
-				                            <span>{seeOrderDetaiel.setUpTime}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="项目状态" >  
-				                            <span>{getProjectState(seeOrderDetaiel.projectStage)}</span>
-						                </FormItem>
-		                    		</div>
+							        </div>
 		                        </div>
+		                        <div className='clearfix'>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="订单负责人" >  
+			                            <span>{seeOrderDetaiel.salesmanName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="意向时间" >  
+			                            <span>{seeOrderDetaiel.createTime}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="签单时间" >  
+			                            <span>{seeOrderDetaiel.signTime}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="财务负责人" >  
+			                            <span>{seeOrderDetaiel.financeName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="项目负责人" >  
+			                            <span>{seeOrderDetaiel.technicianName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="立项时间" >  
+			                            <span>{seeOrderDetaiel.setUpTime}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="项目状态" >  
+			                            <span>{getProjectState(seeOrderDetaiel.projectStage)}</span>
+					                </FormItem>
+	                    		</div>
+	                        </div>
+		                </Spin>
+		            </Form >
+		        </Modal>
+			    <Modal maskClosable={false} visible={this.state.orderVisible}
+                        onOk={this.orderCancel} onCancel={this.orderCancel}
+                        width='800px'
+                        title={this.state.seeState?'查看订单':'查看联系人'}                     
+                        footer=''
+                        className="admin-desc-content">
+			            <Form layout="horizontal"  id="demand-form" style={{paddingBottom:'40px'}} >
+			                <Spin spinning={this.state.loading}>
+			                	 <div className="patent-table" style={{marginTop:'10px'}}>
+				                    <Spin spinning={this.state.loading}>
+				                        {this.state.seeState?
+				                        	<div className="clearfix">
+				                        	</div>:
+				                             <Table columns={this.state.contractList}
+				                            dataSource={this.state.contractArr}
+				                            pagination={false}
+				                             />}
+				                    </Spin>
+				                </div>
 			                </Spin>
-			            </Form >
-			        </Modal>
+			            </Form>
+			    </Modal>
     	    </div>
 		)
 	}

+ 3 - 8
js/component/manageCenter/servicesManage/projectOrder/orderOrder/projectOrder.jsx

@@ -316,13 +316,7 @@ const ProjectOrder=Form.create()(React.createClass({
 	                        <Select.Option value='2'>特批通过</Select.Option>
 	                        <Select.Option value='3'>特批驳回</Select.Option>
                   		</Select>
-	                    <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索</Button>
-	                    <Button onClick={this.reset}>重置</Button>
-	                    <span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>    
-	                </div>
-	                <div className='clearfix' style={{marginTop:'5px'}}>
-	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}> 
-	                    <Select placeholder="订单部门"
+                  		<Select placeholder="订单部门"
 	                            style={{ width: 150 ,marginRight:'10px',marginBottom:'10px'}}
 	                            value={this.state.departmenttSearch}
 	                            onChange={(e) => { this.setState({ departmenttSearch: e }) }}>
@@ -338,7 +332,8 @@ const ProjectOrder=Form.create()(React.createClass({
 	                        <Input placeholder="财务负责人" style={{width:'150px'}}
 		                        value={this.state.financeNameSearch}
 		                        onChange={(e) => { this.setState({ financeNameSearch: e.target.value }); }} />
-	                    </div>
+	                    <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索</Button>
+	                    <Button onClick={this.reset}>重置</Button>
 	                </div>
 	                <div className="patent-table">
 	                    <Spin spinning={this.state.loading}>

+ 27 - 34
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManage.jsx

@@ -133,15 +133,6 @@ const ProjectOrder=Form.create()(React.createClass({
                     	return text&&text.length>=6?text.substr(0,5)+'...':text
                     }
                 },{
-                    title: '客户类型',
-                    dataIndex: 'buyerProvince',
-                    key: 'buyerProvince',
-                    render:(text)=>{return text?'单位客户':'个人客户'}
-                },{
-                    title: '业务品类',
-                    dataIndex: 'projectType',
-                    key: 'projectType',
-                },{
                     title: '项目状态',
                     dataIndex: 'projectStatus',
                     key: 'projectStatus',
@@ -538,10 +529,8 @@ const ProjectOrder=Form.create()(React.createClass({
 	                    <Input placeholder="客户名称" style={{width:'150px'}}
 	                        value={this.state.buyerNameSearch}
 	                        onChange={(e) => { this.setState({ buyerNameSearch: e.target.value }); }} />
-	                    <Input placeholder="项目负责人" style={{width:'150px',marginRight:'10px'}}
-		                        value={this.state.principalNameSearch}
-		                        onChange={(e) => { this.setState({ principalNameSearch: e.target.value }); }} /> 
-	                    <Select placeholder="分派情况" style={{width:'150px',marginLeft:'10px'}}
+	                     
+	                    <Select placeholder="分派情况" style={{width:'150px'}}
 	                            value={this.state.distributeSearch}
 	                            onChange={(e) => { this.setState({ distributeSearch: e }) }}>
 	                            {
@@ -550,11 +539,22 @@ const ProjectOrder=Form.create()(React.createClass({
 	                                })
 	                            }
 	                    </Select>
-	                    <span style={{fontSize:'14px',marginRight:'5px'}}>立项时间:</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 }); }} /> 
+	                    <Input placeholder="订单编号" style={{width:'150px',marginRight:'10px'}}
+	                        value={this.state.orderNoSearch}
+	                        onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} />
+	                    <Input placeholder="项目编号" style={{width:'150px',marginRight:'10px'}}
+	                        value={this.state.serialNumberSearch}
+	                        onChange={(e) => { this.setState({ serialNumberSearch: e.target.value }); }} />    
+                        <Select placeholder="选择部门" style={{width:'150px'}}
+                            value={this.state.departmentt}
+                            onChange={(e) => { this.setState({ departmentt: e }) }}>
+                            {
+                                departmentArr.map(function (item) {
+                                        return <Select.Option key={item.id} >{item.name}</Select.Option>
+                                })
+                            }
+                        </Select>
+                        
 	                    <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索</Button>
 	                    <Button onClick={this.reset}>重置</Button>
 	                    <span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>    
@@ -562,24 +562,17 @@ const ProjectOrder=Form.create()(React.createClass({
 	                </div>
 	                <div className='clearfix' style={{marginTop:'5px'}}>
 	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}> 
-	                        <Input placeholder="订单编号" style={{width:'150px',marginRight:'10px'}}
-		                        value={this.state.orderNoSearch}
-		                        onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} />
-		                    <Input placeholder="项目编号" style={{width:'150px',marginRight:'10px'}}
-		                        value={this.state.serialNumberSearch}
-		                        onChange={(e) => { this.setState({ serialNumberSearch: e.target.value }); }} />    
-	                        <Select placeholder="选择部门" style={{width:'150px'}}
-	                            value={this.state.departmentt}
-	                            onChange={(e) => { this.setState({ departmentt: e }) }}>
-	                            {
-	                                departmentArr.map(function (item) {
-	                                        return <Select.Option key={item.id} >{item.name}</Select.Option>
-	                                })
-	                            }
-	                        </Select>
-	                        <Input placeholder="订单负责人" style={{width:'150px',margin:'10px'}}
+	                  		<Input placeholder="项目负责人" style={{width:'150px'}}
+		                        value={this.state.principalNameSearch}
+		                        onChange={(e) => { this.setState({ principalNameSearch: e.target.value }); }} />
+		                    <Input placeholder="订单负责人" style={{width:'150px',margin:'10px'}}
 		                        value={this.state.salesmanNameSearch}
 		                        onChange={(e) => { this.setState({ salesmanNameSearch: e.target.value }); }} />
+	                        <span style={{fontSize:'14px',marginRight:'5px'}}>立项时间:</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 }); }} /> 
 	                        <span style={{fontSize:'14px',marginRight:'5px'}}>订单时间:</span>
 	                        <RangePicker
 		                        value={[this.state.releaseDateOrder[0] ? moment(this.state.releaseDateOrder[0]) : null,

+ 45 - 34
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManageDetaile.jsx

@@ -4,7 +4,7 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import '../userMangagement.less';
 import {orderType} from '../../../../dataDic.js';
-import {getOrderType,getProjectState,getTaskStatus,getOrderChannel,getOrderState,getPaymentState ,getChangeState,getApprovedState} from '../../../../tools.js';
+import {getOrderType,getProjectState,getTaskStatus,getOrderChannel,getOrderState,getPaymentState ,getChangeState,getApprovedState,getPublishStatus} from '../../../../tools.js';
 import moment from 'moment';
 
 const MySettlementDetaile = Form.create()(React.createClass({
@@ -38,6 +38,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
                              taskStatus:thisdata.taskStatus, 
                              deleteSign:thisdata.deleteSign, 
                              taskComment:thisdata.taskComment, 
+                             publishStatus:thisdata.publishStatus, 
                         });
                     };
                    }
@@ -84,6 +85,13 @@ const MySettlementDetaile = Form.create()(React.createClass({
                     dataIndex: 'taskStatus',
                     key: 'taskStatus',
                     render:(text)=>{return getTaskStatus(text)}
+                },{
+                    title: '公示状态',
+                    dataIndex: 'publishStatus',
+                    key: 'publishStatus',
+                    render:(text)=>{
+                    	{return getPublishStatus(text) }
+                    }
                 }, {
                     title: '是否锁定',
                     dataIndex: 'deleteSign',
@@ -1116,30 +1124,10 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			                            label="项目编号" >  
 			                            <span>{orderDetaiel.serialNumber}</span>
 		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="合同编号" >  
-			                            <span>{orderDetaiel.contractNo}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="客户名称" >  
-			                            <span>{orderDetaiel.buyerName}</span>
-			                            {orderDetaiel.buyerName&&<Button  onClick={this.seeContract} style={{float:'right',fontSize:'12px'}}>查看联系人</Button>}
-		                    		</FormItem>
+		                    		
 		                    		{orderDetaiel.orderNo&&<div>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="客户省份" >  
-				                            <span>{orderDetaiel.buyerProvince}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="下单时间" >  
-				                            <span>{orderArr.createTime}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
 				                            label="订单类型" >  
 				                            <span>{getOrderType(orderArr.orderType)}</span>
 			                    		</FormItem>
@@ -1186,6 +1174,32 @@ const MySettlementDetaile = Form.create()(React.createClass({
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
+					                            label="合同编号" >  
+					                            <span>{orderDetaiel.contractNo}</span>
+				                    		</FormItem>
+				                    		<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="客户名称" >  
+					                            <span>{orderDetaiel.buyerName}</span>
+					                            {orderDetaiel.buyerName&&<Button  onClick={this.seeContract} style={{float:'right',fontSize:'12px'}}>查看联系人</Button>}
+				                    		</FormItem>
+				                    		<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="客户省份" >  
+					                            <span>{orderDetaiel.buyerProvince}</span>
+				                    		</FormItem>
+				                    		<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="下单时间" >  
+					                            <span>{orderArr.createTime}</span>
+				                    		</FormItem>
+				                    		<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="营销员" >  
+					                            <span>{orderArr.salesmanName}</span>
+				                    		</FormItem>
+				                    		<FormItem className="half-item"
+					                            {...formItemLayout}
 					                            label="特批立项" >   
 					                            <span>{getApprovedState(orderArr.approval)}</span>
 				                    		</FormItem>
@@ -1259,18 +1273,15 @@ const MySettlementDetaile = Form.create()(React.createClass({
 										    />:
 			                            <span>{orderDetaiel.completeDate}</span>}
 		                    		</FormItem>
-		                    	</div>
-		                    	<div className='clearfix'>
-							        	<FormItem
-								            labelCol={{ span: 4 }}
-								            wrapperCol={{ span: 16 }}
-								            label="结项说明" >
-							        		{!this.props.queryProject&&orderDetaiel.projectStatus==3?<Input type="textarea" placeholder="请输入立项说明" rows={4}  value={this.state.completeComment} 
-													onChange={(e)=>{this.setState({completeComment:e.target.value})}}/>:
-													<span>{orderDetaiel.completeComment}</span>
-											}
-								        </FormItem>
-							        </div>
+		                    		<FormItem className="half-item"
+							            {...formItemLayout}
+							            label="结项说明" >
+						        		{!this.props.queryProject&&orderDetaiel.projectStatus==3?<Input type="textarea" placeholder="请输入立项说明" rows={4}  value={this.state.completeComment} 
+												onChange={(e)=>{this.setState({completeComment:e.target.value})}}/>:
+												<span>{orderDetaiel.completeComment}</span>
+										}
+								    </FormItem>
+							    </div>
 		                    	<div className='clearfix'>
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}

+ 70 - 35
js/component/manageCenter/servicesManage/projectOrder/taskManagement/projectManage.jsx

@@ -6,8 +6,8 @@ import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message,
 import MySettlementDetaile from "./projectManageDetaile.jsx";
 import moment from 'moment';
 import '../userMangagement.less';
-import {projectState,taskStatus} from '../../../../dataDic.js';
-import {getProjectState,getOrderState,getOrderType,getPaymentState,getTaskStatus} from '../../../../tools.js';
+import {projectState,taskStatus,isLock,publishStatus} from '../../../../dataDic.js';
+import {getProjectState,getOrderState,getOrderType,getPaymentState,getTaskStatus,getPublishStatus} from '../../../../tools.js';
 
 const TaskManagement=Form.create()(React.createClass({
 	loadData(pageNo) {
@@ -29,7 +29,9 @@ const TaskManagement=Form.create()(React.createClass({
                 projectNo:this.state.orderNoSearch,//订单编号
                 deleteSign:this.state.deleteSignSearch,//锁定激活
                 categoryId:this.state.categoryIdSearch,
-                taskReceiverName:this.state.salesmanNameSearch
+                deletedSign:this.state.deletedSign,
+                taskReceiverName:this.state.salesmanNameSearch,
+                publishStatus:this.state.publishStatus,//公示状态
             },
             success: function (data) {
                 let theArr = [];
@@ -52,6 +54,7 @@ const TaskManagement=Form.create()(React.createClass({
 	                         taskStatus:thisdata.taskStatus,
 	                         taskReceiverName:thisdata.taskReceiverName,
 	                         projectNo:thisdata.projectNo,
+	                         publishStatus:thisdata.publishStatus,//公示状态
                         });
                     };
                     this.state.pagination.current = data.data.pageNo;
@@ -168,6 +171,13 @@ const TaskManagement=Form.create()(React.createClass({
                     key: 'taskStatus',
                     render:(text)=>{return getTaskStatus(text) }
                 },{
+                    title: '公示状态',
+                    dataIndex: 'publishStatus',
+                    key: 'publishStatus',
+                    render:(text)=>{
+                    	{return getPublishStatus(text) }
+                    }
+                },{
                     title: '是否锁定',
                     dataIndex: 'deleteSign',
                     key: 'deleteSign',
@@ -390,6 +400,11 @@ const TaskManagement=Form.create()(React.createClass({
 			}
 		}.bind(this));
 	},
+	//详情页面关闭时列表刷新
+	closeShow(s){
+    	this.state.showDesc=s;
+    	this.loadData();
+    },
     searchSwitch() {
 		this.setState({
 			searchMore: !this.state.searchMore
@@ -423,7 +438,9 @@ const TaskManagement=Form.create()(React.createClass({
 		this.state.salesmanNameSearch = '';
 		this.state.orderNoSearch='';
 		this.state.deleteSignSearch=undefined;
+		this.state.deletedSign=undefined;
 		this.state.categoryIdSearch=undefined;
+		this.state.publishStatus=undefined;
         this.loadData();       
     },
     render() {
@@ -455,44 +472,61 @@ const TaskManagement=Form.create()(React.createClass({
                 <div className="content-title">
                 	<span style={{fontSize:'16px'}}>项目任务管理</span>	
 	                <div className="user-search">
-	                    <Input placeholder="客户名称" style={{width:'150px'}}
+	                    <Input placeholder="客户名称" style={{width:'150px',marginRight:'10px'}}
 	                        value={this.state.buyerNameSearch}
 	                        onChange={(e) => { this.setState({ buyerNameSearch: e.target.value }); }} />
+	                    <Input placeholder="项目编号" style={{width:'150px',marginRight:'10px'}}
+	                        value={this.state.orderNoSearch}
+	                        onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} />
+	                    <Select placeholder="任务状态"
+                            style={{ width: 150 ,marginRight:'10px'}}
+                            value={this.state.orderStatusSearch}
+                            onChange={(e) => { this.setState({ orderStatusSearch: e }) }}>
+                            {
+                                taskStatus.map(function (item) {
+                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                })
+                            }
+                        </Select>
+                        <Select placeholder="公示状态"
+                            style={{ width: 150 ,marginRight:'10px'}}
+                            value={this.state.publishStatus}
+                            onChange={(e) => { this.setState({ publishStatus: e }) }}>
+                            {
+                                publishStatus.map(function (item) {
+                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                })
+                            }
+                        </Select>
+                        <Select placeholder="业务类别"
+                            style={{ width: 150 ,marginRight:'10px'}}
+                            value={this.state.categoryIdSearch}
+                            onChange={(e) => { this.setState({ categoryIdSearch: e }) }}>
+                            {
+                                businessArr.map(function (item) {
+                                        return <Select.Option key={item.id} >{item.name}</Select.Option>
+                                })
+                            }
+                        </Select>
+                        <Select placeholder="是否锁定"
+                            style={{ width: 150,marginRight:'10px' }}
+                            value={this.state.deletedSign}
+                            onChange={(e) => { this.setState({ deletedSign: e }) }}>
+                            {
+                                isLock.map(function (item) {
+                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                })
+                            }
+                        </Select>
+                       
 	                    <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 }); }} /> 
+	                        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 }); }} /> 
 	                    <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索</Button>
 	                    <Button onClick={this.reset}>重置</Button>
-	                    <span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>    
-	                </div>
-	                <div className='clearfix' style={{marginTop:'5px'}}>
-	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}> 
-	                        <Select placeholder="任务状态"
-	                            style={{ width: 150 ,marginRight:'10px'}}
-	                            value={this.state.orderStatusSearch}
-	                            onChange={(e) => { this.setState({ orderStatusSearch: e }) }}>
-	                            {
-                                    taskStatus.map(function (item) {
-                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-                                    })
-                                }
-	                        </Select>
-	                        <Select placeholder="业务类别"
-	                            style={{ width: 150 }}
-	                            value={this.state.categoryIdSearch}
-	                            onChange={(e) => { this.setState({ categoryIdSearch: e }) }}>
-	                            {
-                                    businessArr.map(function (item) {
-                                            return <Select.Option key={item.id} >{item.name}</Select.Option>
-                                    })
-                                }
-	                        </Select>
-	                        <Input placeholder="项目编号" style={{width:'150px',margin:'10px'}}
-		                        value={this.state.orderNoSearch}
-		                        onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} />
-	                    </div>
 	                </div>
+	                
 	                <div className="patent-table">
 	                    <Spin spinning={this.state.loading}>
 	                        <Table columns={this.state.columns}
@@ -506,6 +540,7 @@ const TaskManagement=Form.create()(React.createClass({
 	                <MySettlementDetaile
 	                    datauser={this.state.datauser}
 	                    showDesc={this.state.showDesc}
+	                    closeShow={this.closeShow}
 	                     />
 	            </div >
 			        <Modal maskClosable={false} visible={this.state.distributionVisible}

+ 45 - 2
js/component/manageCenter/servicesManage/projectOrder/taskManagement/projectManageDetaile.jsx

@@ -3,8 +3,8 @@ import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import '../userMangagement.less';
-import {orderType} from '../../../../dataDic.js';
-import {getOrderType,getProjectState,getTaskStatus} from '../../../../tools.js';
+import {orderType,publishStatus } from '../../../../dataDic.js';
+import {getOrderType,getProjectState,getTaskStatus,getPublishStatus} from '../../../../tools.js';
 
 const MySettlementDetaile = Form.create()(React.createClass({
 	getInitialState() {
@@ -35,6 +35,8 @@ const MySettlementDetaile = Form.create()(React.createClass({
 	                };
 	                this.setState({
 						orderList:thisData,
+						taskId:thisData.taskId,
+						publishStatus:thisData.publishStatus,
 	                });                  
 	            }.bind(this),
 	       }).always(function () {
@@ -44,6 +46,29 @@ const MySettlementDetaile = Form.create()(React.createClass({
 	        }.bind(this));  
 	    }
     },
+    //修改公示状态
+	changePublishStatus(){
+    	$.ajax({
+            method: "post",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/techproject/updatePublishStatus',
+            data: {
+              taskId:this.state.taskId,
+              publishStatus:this.state.publishStatus,
+            },
+            success: function (data) {
+                let thisData = data.data;   
+                if (!thisData) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                    thisData = {};
+                }
+                message.success('修改成功');
+            }.bind(this),
+       })
+    },
 	componentWillMount() {
 		
 	},
@@ -57,6 +82,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 		this.setState({
 			visible:false
 		})
+		this.props.closeShow(false)
 	},
 	render() {
 		const FormItem = Form.Item
@@ -108,6 +134,23 @@ const MySettlementDetaile = Form.create()(React.createClass({
 					                    	<span>{orderDetaiel.deletedSign==2?'锁定':'未锁定'}</span>
 			                    	</FormItem>
 			                    	<div className='clearfix'>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="公示状态" >
+					                    	{orderDetaiel.taskStatus==3?<span><Select placeholder="请选择公示状态"
+						                            style={{ width:'150px'}}
+						                            value={getPublishStatus(this.state.publishStatus)}
+						                            onChange={(e)=>{this.setState({publishStatus:e})}}>
+						                            {
+					                                    publishStatus.map(function (item) {
+					                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+					                                    })
+					                                }
+						                        </Select>
+						                        <Button  onClick={this.changePublishStatus} style={{marginLeft:'10px',fontSize:'12px'}}>修改公示状态</Button></span>:<span>{getPublishStatus(orderDetaiel.publishStatus)}</span>
+					                    		
+					                    	}
+			                    		</FormItem>
 								        <FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="任务说明" >

+ 14 - 0
js/component/tools.js

@@ -70,6 +70,7 @@ import {
     client,
     stick,
     taskStatus,
+    publishStatus,
     changeState,
     distributeState
 } from './dataDic.js';
@@ -1316,6 +1317,19 @@ module.exports = {
             return theType;
         }
 	},
+	//公示状态
+	getPublishStatus:function(e){
+   		if (e||e==0) {
+   			let str=e.toString()
+            let theType = '';
+            publishStatus.map(function (item) {
+                if (item.value == str) {
+                    theType = item.key;
+                };
+            });
+            return theType;
+        }
+	},
 	//变更状态
 	getChangeState:function(e){
    		if (e||e==0) {

+ 4 - 0
webpack.config.js

@@ -304,7 +304,11 @@ module.exports = (function () {
         },
         module: require('./webpack/module.config.js')(theme),
         resolve: {
+        	alias:{
+            	'@':__dirname+'/js/component',
+           },
             extensions: ['.js', '.jsx']
+           
         },
         plugins: plugins,
         devServer: {