dengzhiguo 6 years ago
parent
commit
2813eac162

+ 3 - 6
js/component/manageCenter/financialManage/distribute/paiDan.jsx

@@ -242,16 +242,13 @@ const PaiDan = React.createClass({
                     <Input placeholder="订单编号"
                         value={this.state.orderNoSearch}
                         onChange={(e) => { this.setState({ orderNoSearch: 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>
+                    <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>
+                    <Button type="primary" onClick={this.search} style={{ marginLeft:10}}>搜索</Button>
+                    <Button onClick={this.reset}>重置</Button>
                 </div>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>

+ 14 - 11
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -92,7 +92,8 @@ const ShouKuang = React.createClass({
                             companyName:thisdata.companyName,
                             buyerId:thisdata.buyerId,
                             buyerName:thisdata.buyerName,
-                            contractNo:thisdata.contractNo
+                            contractNo:thisdata.contractNo,
+                            createTime:thisdata.createTime,
                         });
                     };
                 }
@@ -144,11 +145,16 @@ const ShouKuang = React.createClass({
                     key: 'orderNo',
                 },
                 {
-                    title: '单日期',
+                    title: '单日期',
                     dataIndex: 'signTime',
                     key: 'signTime',
                 },
                 {
+                    title: '下单日期',
+                    dataIndex: 'createTime',
+                    key: 'createTime',
+                },
+                {
                     title: '已收款(万元)',
                     dataIndex: 'actuallyTotalAmount',
                     key: 'actuallyTotalAmount',
@@ -324,16 +330,13 @@ const ShouKuang = React.createClass({
                             })
                         }
                     </Select>
-                    <Button type="primary" onClick={this.search}>搜索</Button>
+                    <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 }); }} />
+                    <Button type="primary" onClick={this.search} style={{ marginLeft:10}}>搜索</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}>

+ 6 - 9
js/component/manageCenter/financialManage/distribute/tuiDan.jsx

@@ -317,16 +317,13 @@ const TuiDan = React.createClass({
                         <Option value="1">审核通过</Option>
                         <Option value="2">审核拒绝</Option>
                     </Select>   
-                    <Button type="primary" onClick={this.search}>搜索</Button>
+                    <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 }); }} />
+                    <Button type="primary" onClick={this.search} style={{ marginLeft:10}}>搜索</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}>

+ 6 - 9
js/component/manageCenter/financialManage/flowWater/myWater.jsx

@@ -250,16 +250,13 @@ const MyWater = React.createClass({
                             })
                         }
                     </Select>
-                    <Button type="primary" onClick={this.search}>搜索</Button>
+                    <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 }); }} />
+                    <Button type="primary" onClick={this.search} style={{ marginLeft:10}}>搜索</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}>

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

@@ -653,7 +653,7 @@ const IntentionCustomer = Form.create()(React.createClass({
                             })
                         }
                		 </Select>
-                    <span style={{marginRight:"10px"}}>合同签订时间 :</span>
+                    <span style={{marginRight:"10px"}}>下单时间 :</span>
                     <RangePicker
 	                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
 	                        this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}

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

@@ -449,7 +449,7 @@ const MyService=Form.create()(React.createClass({
 	                    <Input placeholder="订单编号" style={{width:'150px'}}
 	                        value={this.state.orderNo}
 	                        onChange={(e) => { this.setState({ orderNo: e.target.value }); }} />
-	                    <span style={{marginRight:"10px"}}>合同签订时间 :</span>
+	                    <span style={{marginRight:"10px"}}>下单时间 :</span>
 	                    <RangePicker
 		                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
 		                        this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}

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

@@ -606,7 +606,7 @@ const IntentionCustomer = Form.create()(React.createClass({
                     <Input placeholder="订单编号" style={{width:'150px'}}
                         value={this.state.orderNo}
                         onChange={(e) => { this.setState({ orderNo: e.target.value }); }} />
-                    <span style={{marginRight:"10px"}}>合同签订时间 :</span>
+                    <span style={{marginRight:"10px"}}>下单时间 :</span>
                     <RangePicker
 	                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
 	                        this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}

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

@@ -600,7 +600,7 @@ const IntentionCustomer = Form.create()(React.createClass({
                     <Input placeholder="订单编号" style={{width:'150px'}}
                         value={this.state.orderNo}
                         onChange={(e) => { this.setState({ orderNo: e.target.value }); }} />
-                    <span style={{marginRight:"10px"}}>合同签订时间 :</span>
+                    <span style={{marginRight:"10px"}}>下单时间 :</span>
                     <RangePicker
 	                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
 	                        this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}

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

@@ -597,7 +597,7 @@ const IntentionCustomer = Form.create()(React.createClass({
                     <Input placeholder="订单编号" style={{width:'150px'}}
                         value={this.state.orderNo}
                         onChange={(e) => { this.setState({ orderNo: e.target.value }); }} />
-                    <span style={{marginRight:"10px"}}>合同签订时间 :</span>
+                    <span style={{marginRight:"10px"}}>下单时间 :</span>
                     <RangePicker
 	                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
 	                        this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}

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

@@ -523,7 +523,7 @@ const IntentionCustomer = Form.create()(React.createClass({
                             })
                         }
                		 </Select>  
-                    <span style={{marginRight:"10px"}}>合同签订时间 :</span>
+                    <span style={{marginRight:"10px"}}>下单时间 :</span>
                     <RangePicker
 	                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
 	                        this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}

+ 6 - 3
js/component/manageCenter/order/orderNew/reject.jsx

@@ -170,8 +170,11 @@ const IntentionCustomer = Form.create()(React.createClass({
                     title: '驳回日期',
                     dataIndex: 'backDate',
                     key: 'backDate'
-                },
-				{
+                },{
+                    title: '下单时间',
+                    dataIndex: 'createDate',
+                    key: 'createDate'
+                },{
                     title: '订单编号',
                     dataIndex: 'orderNo',
                     key: 'orderNo'
@@ -872,7 +875,7 @@ const IntentionCustomer = Form.create()(React.createClass({
                     <Input placeholder="订单编号" style={{width:'150px'}}
                         value={this.state.orderNo}
                         onChange={(e) => { this.setState({ orderNo: e.target.value }); }} />
-                    <span style={{marginRight:"10px"}}>合同签订时间 :</span>
+                    <span style={{marginRight:"10px"}}>下单时间 :</span>
                     <RangePicker
 	                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
 	                        this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}

+ 6 - 0
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -317,6 +317,7 @@ const PaiDan = React.createClass({
 						 orderNo: thisdata.orderNo,//订单编号
 						 contractNo: thisdata.contractNo,//合同编号
 						 userName:thisdata.userName,//客户名称
+						 depName:thisdata.depName,//订单部门
 						 signDate:thisdata.signDate,//签单时间
 						 processStatus:thisdata.processStatus,//流程状态
 	                     liquidationStatus:thisdata.liquidationStatus,//结算状态
@@ -721,6 +722,11 @@ const PaiDan = React.createClass({
 				                            label="订单负责人电话" >  
                             				<span>{this.state.salesmanMobile}</span>
 			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单部门" >  
+				                            <span>{this.state.depName}</span>
+			                    		</FormItem>
 			                    	</div>
 			                    	<div className='clearfix'>
 			                    		<FormItem className="half-item"

+ 6 - 0
js/component/manageCenter/project/project/projectQuery.jsx

@@ -261,6 +261,7 @@ const PaiDan = React.createClass({
 	                     salesmanMobile:thisdata.salesmanMobile,//营销员电话
 	                     financeName:thisdata.financeName,//财务名称
 	                     financeMobile:thisdata.financeMobile,//财务电话
+	                     depName:thisdata.depName,//订单部门
 					})
 				};
 				
@@ -626,6 +627,11 @@ const PaiDan = React.createClass({
 				                            label="订单负责人电话" >  
                             				<span>{this.state.salesmanMobile}</span>
 			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单部门" >  
+				                            <span>{this.state.depName}</span>
+			                    		</FormItem>
 			                    	</div>
 			                    	<div className='clearfix'>
 			                    		<FormItem className="half-item"

+ 1 - 0
js/component/manageCenter/project/task/myTask.jsx

@@ -405,6 +405,7 @@ const Task = React.createClass({
 	                     salesmanMobile:thisdata.salesmanMobile,//营销员电话
 	                     financeName:thisdata.financeName,//财务名称
 	                     financeMobile:thisdata.financeMobile,//财务电话
+	                     depName:thisdata.depName,//订单部门
 					})
 				};
 				

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

@@ -262,6 +262,7 @@ const Task = React.createClass({
 	                     salesmanMobile:thisdata.salesmanMobile,//营销员电话
 	                     financeName:thisdata.financeName,//财务名称
 	                     financeMobile:thisdata.financeMobile,//财务电话
+	                     depName:thisdata.depName,//订单部门
 					})
 				};
 				
@@ -593,6 +594,11 @@ const Task = React.createClass({
 				                            label="订单负责人电话" >  
                             				<span>{this.state.salesmanMobile}</span>
 			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单部门" >  
+				                            <span>{this.state.depName}</span>
+			                    		</FormItem>
 			                    	</div>
 			                    	<div className='clearfix'>
 			                    		<FormItem className="half-item"

+ 6 - 0
js/component/manageCenter/project/task/taskQuery.jsx

@@ -263,6 +263,7 @@ const Task = React.createClass({
 	                     salesmanMobile:thisdata.salesmanMobile,//营销员电话
 	                     financeName:thisdata.financeName,//财务名称
 	                     financeMobile:thisdata.financeMobile,//财务电话
+	                     depName:thisdata.depName,//订单部门
 					})
 				};
 				
@@ -593,6 +594,11 @@ const Task = React.createClass({
 				                            label="订单负责人电话" >  
                             				<span>{this.state.salesmanMobile}</span>
 			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单部门" >  
+				                            <span>{this.state.depName}</span>
+			                    		</FormItem>
 			                    	</div>
 			                    	<div className='clearfix'>
 			                    		<FormItem className="half-item"

+ 9 - 10
js/component/manageCenter/publicComponent/assign.jsx

@@ -74,7 +74,7 @@ const Assign=React.createClass({
                     title: '部门机构',
                     dataIndex: 'departmentName',
                     key: 'departmentName',
-                    width:100,
+                    width:150,
                     render:text=>{
                         return text&&text.length>12?<span title={text}>{text.substr(0,12)+'...'}</span>:text
                     }
@@ -83,9 +83,6 @@ const Assign=React.createClass({
                     dataIndex: 'position',
                     key: 'position',
                     width:100,
-                    render:text=>{
-                        return getPost(text)
-                    }
                 },{
                     title: '联系手机',
                     dataIndex: 'contactMobile',
@@ -131,7 +128,7 @@ const Assign=React.createClass({
         this.setState({
             loading:true
         });
-        let api = nub?'/api/admin/frequentContactsList':'/api/admin/superviser/adminList';
+        let api = !nub?'/api/admin/frequentContactsList':'/api/admin/superviser/adminList';
         $.ajax({
             method: "get",
             dataType: "json",
@@ -153,6 +150,7 @@ const Assign=React.createClass({
                 } else {
                     for (let i = 0; i < data.data.list.length; i++) {
                         let thisdata = data.data.list[i];
+                        console.log(thisdata.roles[0]);
                         theArr.push({
                              key: i,
                              id: thisdata.id,
@@ -161,7 +159,7 @@ const Assign=React.createClass({
 	                         name:thisdata.name,
 	                         departmentName:thisdata.departmentName,
 	                         departmentId:thisdata.departmentId,
-	                         position:thisdata.position,
+	                         position:thisdata.roles[0],
 	                         contactMobile:thisdata.contactMobile,
                         });
                     };
@@ -181,6 +179,7 @@ const Assign=React.createClass({
     	this.setState({
             loading: true
         });
+        console.log(this.state.contact);
         $.ajax({
             method: "post",
             dataType: "json",
@@ -188,11 +187,11 @@ const Assign=React.createClass({
             url: globalConfig.context +this.props.selApi,
             data: this.props.fenpaiData==8?{
             	taskId:this.props.data.id,//任务ID
-            	taskReceiverId:!this.state.contact?record.id:record.contactId,//分配人物ID
+            	taskReceiverId:this.state.contact?record.id:record.contactId,//分配人物ID
             	specially:this.props.specially//是否是咨询师管理员
             }:{
             	orderNo:this.state.orderNo,
-                financeId: !this.state.contact?record.id:record.contactId,    //分配人物id
+                financeId: this.state.contact?record.id:record.contactId,    //分配人物id
                 approval:this.props.data.approval   //是否特批
             }
         }).done(function (data) {
@@ -251,8 +250,8 @@ const Assign=React.createClass({
 			                	<div>
                                     <span style={{marginRight:5}}>常用联系人:</span>
                                     <Radio.Group onChange={(e)=>{this.setState({contact:e.target.value})}} value={this.state.contact}>
-                                        <Radio value={0}>否</Radio>
-                                        <Radio value={1}>是</Radio>
+                                        <Radio value={1}>否</Radio>
+                                        <Radio value={0}>是</Radio>
                                     </Radio.Group>
 			                		<Select placeholder="部门"
 				                            style={{ width: 150 ,marginRight:'10px',marginLeft:'10px'}}