dengzhiguo 6 years ago
parent
commit
e4779ecd1b

+ 2 - 309
js/component/manageCenter/order/orderNew/addService.jsx

@@ -225,57 +225,7 @@ const NewService = Form.create()(React.createClass({
 							}
                 },
 			],
-			flowList:[
-				{
-                    title: '平台流水号',
-                    dataIndex: 'billNo',
-                    key: 'billNo',
-                }, {
-                    title: '平台流水时间',
-                    dataIndex: 'createTime',
-                    key: 'createTime'
-                }, {
-                    title: '流水金额(万元)',
-                    dataIndex: 'transactionAmount',
-                    key: 'transactionAmount'
-                },{
-                    title: '付款人名称',
-                    dataIndex: 'payerName',
-                    key: 'payerName'
-                }, {
-                    title: '收款人名称',
-                    dataIndex: 'payeeName',
-                    key: 'payeeName'
-                },
-                {
-                    title: '流水科目',
-                    dataIndex: 'transactionSubject',
-                    key: 'transactionSubject',
-                    render:(text)=>{return getTransactionProject(text) }
-                }, {
-                    title: '流水渠道',
-                    dataIndex: 'transactionChannel',
-                    key: 'transactionChannel',
-                    render:(text)=>{return getTransactionChannel(text) }
-                },{
-                    title: '财务流水号',
-                    dataIndex: 'financialPayNo',
-                    key: 'financialPayNo',
-                }, {
-                    title: '财务流水时间',
-                    dataIndex: 'financialPayTime',
-                    key: 'financialPayTime',
-                }, {
-                    title: '流水确认',
-                    dataIndex: 'confirmSign',
-                    key: 'confirmSign',
-                    render:(text)=>{return text?'已确认':'待确认' }
-                },{
-                    title: '确认时间',
-                    dataIndex: 'confirmTime',
-                    key: 'confirmTime',
-                }
-			],
+			
 			contactList:[],
 			loading:false,
 			ContactsLists: [{
@@ -319,7 +269,7 @@ const NewService = Form.create()(React.createClass({
 									    <Button style={{marginRight:'10px',color:'#ffffff',background:'#f00',border:'none'}}>删除</Button>
 									</Popconfirm>
 									:''}
-								{record.id?'': <Button  type="primary" htmlType="submit" onClick={this.contactSave}>保存</Button>}
+								{record.id?'': <Button  type="primary"  onClick={this.contactSave}>保存</Button>}
 								
                             </div>
 					}
@@ -590,7 +540,6 @@ const NewService = Form.create()(React.createClass({
 	
 	//删除收款节点
 	confirmDelet(index) {
-		console.log(index);
 		this.state.contactList.splice(index,1);
 		this.setState({
 			contactList: this.state.contactList
@@ -1806,262 +1755,6 @@ const NewService = Form.create()(React.createClass({
 			                </Spin>
 			            </Form >
 			        </Modal>
-			        <Modal maskClosable={false} visible={this.state.signBillVisible}
-                        onOk={this.signBillOk} onCancel={this.signBillOk}
-                        width='800px'
-                        title='签单信息'                    
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal" onSubmit={this.signOk} id="demand-form">
-			                <Spin spinning={this.state.loading}>
-			                        <div className="clearfix">
-					                    <FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="订单编号" > 
-					                            <span>{this.state.orderNo}</span>
-					                    </FormItem>
-					                    <FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="客户名称" >   
-				                                   <span>{this.state.buyerName}</span>
-					                    </FormItem>
-					                    <FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="实签款项(万元)" >   
-				                                    <Input placeholder="请输入实签款项" value={this.state.signTotalAmount} style={{width:'200px'}}
-				                                    onChange={(e)=>{this.setState({signTotalAmount:e.target.value})}} />
-				                                    <span className="mandatory">*</span>
-					                    </FormItem>
-					                    <FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="实签首款(万元)" >   
-				                                    <Input placeholder="请输入实签首款" value={this.state.signFirstPayment} style={{width:'200px'}}
-				                                    onChange={(e)=>{this.setState({signFirstPayment:e.target.value})}} />
-				                                    <span className="mandatory">*</span>
-					                    </FormItem>
-					                    <FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="特批立项" >  
-					                            <Select placeholder="选择特批立项类型"
-						                            style={{ width:'200px'}}
-						                            value={this.state.approval}
-						                            onChange={(e) => { this.setState({ approval: e }) }}>
-						                            <Select.Option value='0'>不申请特批</Select.Option>
-						                            <Select.Option value='1'>申请特批</Select.Option>
-						                        </Select>
-					                    		<span className="mandatory">*</span>
-						                </FormItem>
-						                <FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="合同编号" >                             
-				                                    <Input placeholder="请输入合同编号"  value={this.state.contractNo}
-				                                    	onChange={(e)=>{this.setState({contractNo:e.target.value})}} style={{width:'200px'}} />
-					                    		<span className="mandatory">*</span>
-					                    </FormItem>
-						                <div className='clearfix'>
-								        	<FormItem
-									            labelCol={{ span: 4 }}
-									            wrapperCol={{ span: 16 }}
-									            label="签单备注" >
-									                <Input type="textarea" placeholder="请输入签单备注" rows={4}  value={this.state.orderRemarks} 
-										    				onChange={(e)=>{this.setState({orderRemarks:e.target.value})}}/>			                      
-									        </FormItem>
-								        </div>
-								        <div className='clearfix'>
-								            <FormItem
-								                labelCol={{ span: 4 }}
-								                wrapperCol={{ span: 18 }}
-								                label="合同扫描件" >
-								                <PicturesWall
-								                	listType="picture-card"
-								                    fileList={this.getOrgCodeUrl}
-								                    pictureUrl={this.state.orgCodeUrl} />
-								                    <p>图片建议:要清晰。</p>
-								            </FormItem>
-								        </div>
-				                    </div>
-			                    <FormItem wrapperCol={{ span: 12, offset: 4 }} className="half-middle">
-			                        <Button className="submitSave" type="primary" htmlType="submit">确定签单</Button>  
-			                        <Button className="submitSave" type="ghost" onClick={this.signBillOk}>返回</Button>
-			                    </FormItem> 
-			                </Spin>
-			            </Form >
-			        </Modal>
-			        <Modal maskClosable={false} visible={this.state.signVisible}
-                        onOk={this.signBittOk} onCancel={this.signBittOk}
-                        width='600px'
-                        title='签单信息'                    
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal" onSubmit={this.signSub} id="demand-form">
-			                <Spin spinning={this.state.loading}>
-			                        <div className="clearfix">
-					                    <FormItem 
-					                            {...formItemLayout}
-					                            label="特批立项" >  
-					                            <Select placeholder="选择特批立项类型"
-						                            style={{ width:'200px'}}
-						                            value={this.state.approval}
-						                            onChange={(e) => { this.setState({ approval: e }) }}>
-						                            <Select.Option value='0'>不申请特批</Select.Option>
-						                            <Select.Option value='1'>申请特批</Select.Option>
-						                        </Select>
-					                    		<span className="mandatory">*</span>
-						                </FormItem>
-				                    </div>
-				                    <div className="clearfix">
-				                    	<FormItem 
-				                            {...formItemLayout}
-				                            label="签单时间" >   
-				                            <DatePicker
-				                              style={{marginTop:"2px"}}
-										      showTime
-										      format="YYYY-MM-DD"
-										      placeholder="选择签单时间"
-										      value={this.state.entryTime}
-										      onChange={(e,time)=>{this.selTime(e,time)}}
-										    />
-										    <span className="mandatory">*</span>
-			                    		</FormItem>
-			                    	</div>	
-			                    <FormItem wrapperCol={{ span: 12, offset: 4 }} className="half-middle">
-			                        <Button className="submitSave" type="primary" htmlType="submit">确定签单</Button>  
-			                        <Button className="submitSave" type="ghost" onClick={this.signBittOk}>返回</Button>
-			                    </FormItem> 
-			                </Spin>
-			            </Form >
-			        </Modal>
-			        <Modal maskClosable={false} visible={this.state.lookVisible}
-                        onOk={this.lookCancel} onCancel={this.lookCancel}
-                        width='1300px'
-                        title= '查看流水'                    
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal" id="demand-form">
-			                <Spin spinning={this.state.loading}>
-		                        <div className="clearfix">
-                        	   			<Table columns={this.state.flowList}
-					                           dataSource={this.state.lookflowList}
-					                           pagination={false}
-			                             />
-		                        </div>
-			                </Spin>
-			            </Form >
-			        </Modal>
-			        <Modal maskClosable={false} visible={this.state.addChangeState}
-                        onOk={this.addChangeCancel} onCancel={this.addChangeCancel}
-                        width='800px'
-                        title= {this.state.stateAdd?'添加变更':'查看变更记录'}                    
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal" id="demand-form">
-			                <Spin spinning={this.state.loading}>
-		                        <div className="clearfix">
-                        	   		{this.state.stateAdd?<div className="clearfix">
-						                <FormItem
-									            labelCol={{ span: 4 }}
-									            wrapperCol={{ span: 16 }}
-									            label="变更说明" >
-								                <Input type="textarea" placeholder="请输入变更说明" rows={4}  value={this.state.changeRemarks} 
-									    				onChange={(e)=>{this.setState({changeRemarks:e.target.value})}}/>			                      
-									    </FormItem>
-									    <div className="clearfix">
-									    	<Button type="primary" onClick={this.subChangeState} style={{margin:"10px 50px 10px 128px"}}>保存</Button>
-									    	<Button onClick={this.addChangeCancel}>取消</Button>
-									   </div>
-				                    </div>:
-				                    <div>
-				                    	{
-				                    	changeHtml.length?changeHtml.map(function(item,index){
-				                    			return (<div className="changeBorder" key={index}>
-													    <FormItem className="half-item"
-													            {...formItemLayout}
-													            label="变更发起人" >                             
-													               <span>{item.creater}</span>
-													    </FormItem>
-													    <FormItem className="half-item"
-													            {...formItemLayout}
-													            label="变更申请时间" >                             
-													               <span>{item.createTime}</span>
-													    </FormItem>
-													    <div className='clearfix'>
-													    	<FormItem className="half-item"
-													            {...formItemLayout}
-													            label="变更状态" >                             
-													                <span>{getChangeState(item.changeStatus)}</span>
-													   		</FormItem>
-													   		<FormItem className="half-item"
-													            {...formItemLayout}
-													            label="变更操作" >                             
-													            <Button onClick={(e)=>{this.modifyChange(item)}}>修改</Button>
-													   			{/*<Button type="danger" onClick={(e)=>{this.modifyDelete(item)}}>删除</Button>*/}
-													   		</FormItem>
-													    </div>
-													    <div className='clearfix changeRemark'>
-													    	<FormItem
-													            labelCol={{ span: 4 }}
-													            wrapperCol={{ span: 16 }}
-													            label="变更说明" >
-													    		<p>{item.changeComment}</p>
-													        </FormItem>
-													    </div>
-													</div>)
-				                    		},this):<p style={{textAlign:"center"}}>暂无变更记录</p>}
-								    </div>
-                        	   		}
-		                        </div>
-			                </Spin>
-			            </Form >
-			        </Modal>
-			        <Modal maskClosable={false} visible={this.state.modifyChangeState} 
-                        onOk={this.modifyChangeCancel} onCancel={this.modifyChangeCancel}
-                        width='600px'
-                        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>{this.state.changePromoter}</span>
-									    </FormItem>
-									    <FormItem className="half-item"
-									            {...formItemLayout}
-									            label="变更申请时间" >                             
-									               <span>{this.state.changeTime}</span>
-									    </FormItem>
-									    <div className='clearfix'>
-									    	<FormItem 
-					                             labelCol={{ span: 4 }}
-										         wrapperCol={{ span: 16 }}
-					                             label="变更状态" >  
-												<Radio.Group onChange={(e)=>{this.setState({changeState:e.target.value})}} value={this.state.changeState}>
-											        <Radio value={1}>变更中</Radio>
-											        <Radio value={2}>变更完成</Radio>
-											    </Radio.Group>    
-						                	</FormItem>
-									    </div>
-									    <div className='clearfix'>
-									    	<FormItem
-									            labelCol={{ span: 4 }}
-									            wrapperCol={{ span: 16 }}
-									            label="变更说明" >
-								                <Input type="textarea" placeholder="请输入变更说明" rows={4}  value={this.state.changeRemarks} 
-									    				onChange={(e)=>{this.setState({changeRemarks:e.target.value})}}/>			                      
-									   		</FormItem>
-									    </div>
-									    <div className="clearfix">
-									    	<Button type="primary" onClick={this.changeModify} style={{margin:"10px 95px"}}>保存</Button>
-									    	<Button onClick={this.modifyChangeCancel}>取消</Button>
-									    </div>
-									</div>
-		                        </div>
-			                </Spin>
-			            </Form >
-			        </Modal>
     	    </div>
 		)
 	}

+ 30 - 5
js/component/manageCenter/order/orderNew/examine.jsx

@@ -89,7 +89,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 				pageNo: pageNo || 1,
 				pageSize: this.state.pagination.pageSize,
 				specially: 1,//审核列表
-				name: this.state.name,//名称
+				name: this.state.customerName,//名称
 				orderNo: this.state.orderNo,//订单编号
 				starTime: this.state.releaseDate[0],//开始时间
 				endTime: this.state.releaseDate[1],//结束时间
@@ -119,11 +119,9 @@ const IntentionCustomer = Form.create()(React.createClass({
 	                         createDate:thisdata.createDate,//下单时间
 						});
 					};
-					this.state.pagination.current = data.data.pageNo;
 				    this.state.pagination.total = data.data.totalCount;
 				};
 				if(data.data&&data.data.list&&!data.data.list.length){
-					this.state.pagination.current=0
 					this.state.pagination.total=0
 				}
 				this.setState({
@@ -393,7 +391,6 @@ const IntentionCustomer = Form.create()(React.createClass({
 				};
 				this.setState({
                     dataSourceX: theArr,
-                    pagination: false,
                 });
 			}.bind(this),
 		}).always(function() {
@@ -464,6 +461,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 						visible:false,
 					});
 					this.loadData();
+					this.resets();
 				};
 				
 			}.bind(this),
@@ -473,7 +471,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 			});
 		}.bind(this));
 	},
-	//审核通过
+	//审核通过
 	examOks(){
 		$.ajax({
 			method: "post",
@@ -497,6 +495,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 						noVisible:false
 					});
 					this.loadData();
+					this.resets();
 				};
 				
 			}.bind(this),
@@ -525,6 +524,30 @@ const IntentionCustomer = Form.create()(React.createClass({
     	})
         this.loadData();
     },
+    //重置
+    reset() {
+    	this.setState({
+    		signBillVisible:false
+    	})
+    	this.state.orderNo='';
+    	this.state.customerName='';
+    	this.state.releaseDate[0] = undefined;
+		this.state.releaseDate[1] = undefined;
+		this.state.projectProgress = undefined;
+		this.state.settlementState = undefined;
+		this.state.orderStatusSearch = undefined;
+		this.state.orderChannelSearch = undefined;
+		this.state.approval= undefined;
+		this.state.formalOrder=true;
+		this.state.intentOrder=true;
+        this.loadData();       
+    },
+    resets(){
+    	this.state.orderNo='';
+    	this.state.customerName='';
+    	this.state.releaseDate[0] = undefined;
+		this.state.releaseDate[1] = undefined;
+    },
 	getOrgCodeUrl(e) {
         this.setState({ orgCodeUrl: e });
     },
@@ -533,11 +556,13 @@ const IntentionCustomer = Form.create()(React.createClass({
 		this.setState({
 			visible:false
 		})
+		this.resets();
 	},
 	visitOk(e){
 		this.setState({
 			visible:false
 		})
+		this.resets();
 	},
 	render() {
 		const formItemLayout = {

+ 393 - 101
js/component/manageCenter/order/orderNew/reject.jsx

@@ -4,7 +4,7 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import Jquery from 'jquery/dist/jquery.js';
 import moment from 'moment';
-import {boutique ,tepi} from '@/dataDic.js';
+import {boutique ,tepi,jiedian} from '@/dataDic.js';
 import { getLiquidationStatus,getApprovedState,getProcessStatus,splitUrl,getjiedian,getboutique} from '@/tools.js';
 import './customer.less';
 const TabPane = Tabs.TabPane;
@@ -123,11 +123,9 @@ const IntentionCustomer = Form.create()(React.createClass({
 	                         backId:thisdata.backId,//驳回编号
 						});
 					};
-					this.state.pagination.current = data.data.pageNo;
 				    this.state.pagination.total = data.data.totalCount;
 				};
 				if(data.data&&data.data.list&&!data.data.list.length){
-					this.state.pagination.current=0
 					this.state.pagination.total=0
 				}
 				this.setState({
@@ -149,6 +147,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 			releaseDate: [],
 			selectedRowKeys: [],
 			orgCodeUrl:[],
+			customerArr:[],
 			pagination: {
 				defaultCurrent: 1,
 				defaultPageSize: 10,
@@ -234,6 +233,17 @@ const IntentionCustomer = Form.create()(React.createClass({
 					render:(text)=>{
 						return (text&&text.length>8?text.substr(0,8)+'…':text)
 					}
+                }, {
+                    title: '操作',
+                    dataIndex: 'ABC',
+                    key: 'ABC',
+                    render: (text, record, index) => {
+						return <div>
+									{this.state.processStatus==0?<Popconfirm title="是否删除?" onConfirm={(e)=>{this.delectRow(record)}} okText="是" cancelText="否">
+										    <Button onClick={(e) =>{ e.stopPropagation()}} type="danger">删除</Button>                 
+										</Popconfirm>:""}
+								</div>
+							}
                 }
 			],
 			dataSourceX: [],
@@ -241,22 +251,77 @@ const IntentionCustomer = Form.create()(React.createClass({
 					title: '催款科目',
 					dataIndex: 'dunSubject',
 					key: 'dunSubject',
-					render: text=>{return getjiedian(text)}
+					render: (text, record, index) => {
+						return <Select placeholder="请选择催款科目"  value={record.dunSubject}  style={{width:'150px'}}
+						    		onChange={(e) => { record.dunSubject = e; this.setState({ contactList: this.state.contactList }); }}> 
+                                 {
+                                    jiedian.map(function (item) {
+                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                    })
+                                }
+                            </Select>  
+				                               
+					}
 				},{
 					title: '金额(万)',
 					dataIndex: 'money',
 					key: 'money',
+					render: (text, record, index) => {
+						return <Input value={record.money} placeholder="请输入金额(必填项)" key={record.id} required="required"
+	                  onChange={(e) => { record.money = e.target.value; this.setState({ contactList: this.state.contactList }); }} style={{width:'120px'}}/>
+					}
 				}, {
 					title: '催款状态',
 					dataIndex: 'dunStatus',
 					key: 'dunStatus',
-					render: (text) => {
+					render: (text, record, index) => {
 						return text?'已完成':'催款中'
 					}
 				},
+				{
+					title: '操作',
+					dataIndex: 'dels',
+					key: 'dels',
+					render: (text, record, index) => {
+						return <div>
+		                        {this.state.processStatus==0?<Popconfirm title="是否删除?" onConfirm={(e)=>{this.confirmDelet(record.key)}} okText="删除" cancelText="不删除">
+									    <Button style={{marginRight:'10px',color:'#ffffff',background:'#f00',border:'none'}}>删除</Button>
+									</Popconfirm>
+									:''}
+								{record.id?'': <Button  type="primary"  onClick={this.contactSave}>保存</Button>}
+								
+                            </div>
+					}
+				}
 			],
-		}
+		};
 	},
+	//删除
+    delectRow(record) {
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "post",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/newOrder/deleteOrderTask",
+            data: {
+            	id:record.id
+            }
+        }).done(function (data) {
+            if (!data.error.length) {
+                message.success('删除成功!');
+                this.setState({
+                    loading: false,
+                });
+                this.xiangmu(this.state.orderNo)
+            	this.loadData();
+            } else {
+                message.warning(data.error[0].message);
+            };
+        }.bind(this));
+    },
 	//页面加载函数
 	componentWillMount() {
 		this.loadData();
@@ -310,6 +375,8 @@ const IntentionCustomer = Form.create()(React.createClass({
 				} else {
 					let thisdata=data.data;
 					this.setState({
+						 id:thisdata.id,
+						 kehuId:thisdata.buyerId,
 						 orderNo: thisdata.orderNo,//订单编号
 						 contractNo: thisdata.contractNo,//合同编号
 						 userName:thisdata.userName,//客户名称
@@ -379,7 +446,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 				};
 				this.setState({
                     dataSourceX: theArr,
-                    pagination: false,
+                     paginations: false,
                 });
 			}.bind(this),
 		}).always(function() {
@@ -414,6 +481,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 	                		id:thisData.id,//节点Id
 	                		money:thisData.money,//催款金额
 	                		dunStatus:thisData.dunStatus,//催款状态
+	                		orderNo:thisData.orderNo,
 	                	})
                 	}
                 	this.setState({
@@ -428,8 +496,63 @@ const IntentionCustomer = Form.create()(React.createClass({
 			});
 		}.bind(this));
 	},
-	//审核通过
+	//催款节点保存
+	contactSave(e) {
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			url: globalConfig.context + '/api/admin/newOrder/createOrderDun',
+			method: 'post',
+			data: {
+				orderNo: this.state.orderNo,
+				orderDun: JSON.stringify(this.state.contactList)
+			}
+		}).done(function(data) {
+			this.setState({
+				loading: false
+			});
+			if(!data.error.length) {
+				message.success('保存成功!');
+				this.jiedian(this.state.orderNo);
+			} else {
+				message.warning(data.error[0].message);
+			}
+		}.bind(this));
+	},
+	//点击新增催款节点
+	addcontact(record) {
+		this.state.contactList.push({
+			key:this.state.contactList.length,
+			money: '',
+			dunSubject:undefined,
+			orderNo: this.state.orderNo,
+			dunTarget:this.state.kehuId,
+		});
+		this.setState({
+			contactList: this.state.contactList
+		})
+	},	
+	//删除收款节点
+	confirmDelet(index) {
+		this.state.contactList.splice(index,1);
+		this.setState({
+			contactList: this.state.contactList
+		})
+		this.contactSave();
+	},
+	//重新提交
 	examOk(){
+		let theorgCodeUrl = [];
+        if (this.state.orgCodeUrl.length) {
+            let picArr = [];
+            this.state.orgCodeUrl.map(function (item) {
+				if ( item.response && item.response.data && item.response.data.length ){
+					picArr.push(item.response.data);
+				}
+            });
+            theorgCodeUrl = picArr.join(",");
+        };
 		if(!this.state.contacts){
         	message.warning('企业负责人不能为空');
         	this.refs.signFirstPayment.focus()
@@ -464,7 +587,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 				orderNo: this.state.orderNo,//订单编号
 				totalAmount: this.state.totalAmount,//总金额
 				firstAmount: this.state.firstAmount,//首付
-				isSubmit: this.state.isSubmit,//保存草稿还是提交
+				isSubmit: 1,//保存草稿还是提交
 				signDate: this.state.signDate,//签单日期
 				contacts: this.state.contacts,//企业负责人
 				contactMobile: this.state.contactMobile,//负责人联系方式
@@ -485,6 +608,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 					this.setState({
 						visible:false,
 					});
+					this.resets();
 					this.loadData();
 				};
 				
@@ -495,62 +619,93 @@ const IntentionCustomer = Form.create()(React.createClass({
 			});
 		}.bind(this));
 	},
-	//审核通过
-	examOks(){
-		
+	//新建项目明细保存
+	nextSubmit(e) {
+		e.preventDefault();
+		if(this.state.gid==undefined||!this.state.gid){
+			message.warning('服务名称不匹配!');
+			return false;
+		};
+		if(!this.state.commodityPrice){
+			message.warning('请输入金额!');
+			this.refs.commodityPrice.focus();
+			return false;
+		};
+		if(!this.state.commodityQuantity){
+			message.warning('请输入商品数量!');
+			this.refs.commodityQuantity.focus();
+			return false;
+		};
+		if(!this.state.main){
+			message.warning('请选择是否为主要项目!');
+			this.refs.commodityQuantity.focus();
+			return false;
+		};
+		this.setState({
+			loading: true
+		});
+		let api=this.state.addState?'/api/admin/newOrder/addOrderTask':'/api/bianji';
 		$.ajax({
-			method: "post",
+			method: "POST",
 			dataType: "json",
 			crossDomain: false,
-			url: globalConfig.context +"/api/admin/newOrder/updateServiceOrderNew",
+			url: globalConfig.context +api ,
 			data: {
-				orderNo: this.state.orderNo,//订单编号
-				totalAmount: this.state.totalAmount,//总金额
-				firstAmount: this.state.firstAmount,//首付
-				signDate: this.state.signDate,//签单日期
-				contacts: this.state.contacts,//企业负责人
-				contactMobile: this.state.contactMobile,//负责人联系方式
-				legalPerson: this.state.legalPerson,//企业法人
-				legalPersonTel: this.state.legalPersonTel,//企业法人联系电话
-				approval: this.state.approval,//特批状态
-				contractNo: this.state.contractNo,//合同编号
-				orderRemarks: this.state.orderRemarks,//订单备注
-				contractPictureUrl:theorgCodeUrl.length?theorgCodeUrl:'',
-					
-			},
-			success: function(data) {
-				if(data.error.length || data.data.list == "") {
-					if(data.error && data.error.length) {
-						message.warning(data.error[0].message);
-					};
-				} else {
-					message.success("重新提交成功~");
-					this.setState({
-						visible:false,
-						noVisible:false
-					});
-					this.loadData();
-				};
-				
-			}.bind(this),
-		}).always(function() {
+				commodityId:this.state.gid,//商品ID
+				orderNo:this.state.orderNo,//订单编号
+				commodityName:this.state.commodityName,//商品名称
+				commodityQuantity:this.state.commodityQuantity,//商品数量
+				commodityPrice:this.state.commodityPrice,//签单总价
+				taskComment:this.state.taskComment,//服务说明
+				main:this.state.main,//是否为主要项目
+			}
+		}).done(function(data) {
 			this.setState({
 				loading: false
 			});
+			if(!data.error.length) {
+				message.success('保存成功!');
+				this.nextCancel()
+				 this.xiangmu(this.state.orderNo)
+			} else {
+				message.warning(data.error[0].message);
+			}
 		}.bind(this));
 	},
-	//点击拒绝
-	examNo(){
+	//点击签单
+	handleCancels(e) {
+		this.setState({
+			isSubmit:1
+		})
+	},
+	//点击签单
+	handleCancelq(e) {
 		this.setState({
-			noVisible:true
+			isSubmit:0
 		})
 	},
-	//关闭输入理由框
-	noCancel(){
+	resets(){
+    	this.state.orderNo='';
+    	this.state.customerName='';
+    	this.state.releaseDate[0] = undefined;
+		this.state.releaseDate[1] = undefined;
+    },
+    //点击添加项目明细
+	addDetailed(){
 		this.setState({
-			noVisible:false
+			gid:'',
+			customerArr:[],
+			commodityName:'',
+			commodityQuantity:'',
+			commodityId:'',
+			taskComment:'',
+			main:undefined,
+			commodityPrice:'',
+			addState:1,
+			addnextVisible: true
 		})
 	},
+	
 	//搜索
 	search() {
     	this.setState({
@@ -566,11 +721,87 @@ const IntentionCustomer = Form.create()(React.createClass({
 		this.setState({
 			visible:false
 		})
+		this.resets();
 	},
 	visitOk(e){
 		this.setState({
 			visible:false
 		})
+		this.resets();
+	},
+	//客户
+	selectAutoCUT(value){
+		let autoIds;
+		let fwList=this.state.customerArr;
+		fwList.map(function(item){
+			if(value==item.name){
+				autoIds=item.id
+			}
+		})
+		this.setState({
+			customerName:value,
+			autoId:autoIds
+		})
+		
+	},
+	//加载(自动补全)
+	supervisor(e,state){ //客户名称与服务名称自动补全
+		let api=state?'/api/admin/customer/getCustomerByName':'/api/admin/order/getBusinessProjectByName';
+		$.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + api,
+            data:state?{
+            	name:e,
+            	type:this.state.customType
+            }:{
+            	businessName:e
+            },
+            success: function (data) {                	  
+				    let thedata=data.data;
+				    if (!thedata) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };	
+                    thedata = {}; 
+                    }; 
+					this.setState({
+						states:state,
+						customerArr:thedata,	
+                    });
+				}.bind(this),
+			}).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));  
+	},
+	//上级主管输入框失去焦点是判断客户是否存在
+	selectAuto(value){
+		let kid=[];
+		let fwList=this.state.customerArr;
+		fwList.map(function(item){
+			if(value==item.bname){
+				kid=item
+			}
+		})
+		this.setState({
+			commodityName:value,
+			gid:kid.id,
+			//commodityPrice:kid.price==0?kid.price.toString():kid.price,
+			commodityFirstPayment:kid.firstPayment==0?kid.firstPayment.toString():kid.firstPayment
+		})
+	},
+	//服务值改变时请求客户名称
+	httpChange(e){
+		this.state.gid='';
+		if(e.length>=1){
+			this.supervisor(e,false); 
+		}	
+		this.setState({
+			commodityName:e
+		})
 	},
 	render() {
 		const formItemLayout = {
@@ -595,6 +826,12 @@ const IntentionCustomer = Form.create()(React.createClass({
 				})
 			},
 		};
+		const dataSources=this.state.customerArr || [];
+		const options = this.state.states?dataSources.map((group,index) =>
+				      <Select.Option key={group.id} value={group.name}>{group.name}</Select.Option>
+				     ):dataSources.map((group,index) =>
+				      <Select.Option key={index} value={group.bname}>{group.bname}</Select.Option>
+				     )
 		const hasSelected = this.state.selectedRowKeys.length > 0;
 		return(
 			<div className="user-content">
@@ -717,19 +954,15 @@ const IntentionCustomer = Form.create()(React.createClass({
 			                                }
 				                     </Select>
 		                    		</FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="合同签订时间" >   
-			                            <DatePicker
-			                              style={{marginTop:"2px",width: '240px',height:"32px" }}
-									      showTime
-									      format="YYYY-MM-DD"
-									      placeholder="合同签订时间"
-									      value={this.state.signDate}
-									      onChange={(e,time)=>{this.selTime(e,time)}}
-									    />
-									    <span className="mandatory">*</span>
-		                    		</FormItem>
+				                    <FormItem className="half-item" {...formItemLayout} label="合同签订时间">
+                                        <DatePicker 
+                                        	style={{marginTop:"2px",width: '240px',height:"32px" }}
+                                            showTime
+                                            format="YYYY-MM-DD"
+                                            onOk={(e)=>{}}
+                                            value={this.state.signDate ? moment(this.state.signDate) : null}
+                                            onChange={(data, dataString) => { this.setState({ signDate: dataString }); }} />
+                                    </FormItem>
 				                    <div className='clearfix'>
 							            <FormItem
 							                labelCol={{ span: 4 }}
@@ -806,28 +1039,92 @@ const IntentionCustomer = Form.create()(React.createClass({
 					                    <Spin spinning={this.state.loading}>
 					                        <Table columns={this.state.columnsX}
 					                            dataSource={this.state.dataSourceX}
-					                            pagination={this.state.pagination}
+					                            pagination={this.state.paginations}
 					                            onRowClick={this.tableRowClickX} 
 					                            />
 					                    </Spin>
 						            </div>
 					                <div className='addSave' style={{marginTop:'15px'}}>
-					                   <Button className="cancel" type="primary" onClick={this.examOk} style={{marginLeft:"200px"}} htmlType="submit">通过</Button>
-					                   <Button className="cancel" type="primary" onClick={this.examNo} style={{marginLeft:"50px"}} htmlType="submit">拒绝</Button>
+					                   <Button className="cancel" type="primary" onClick={this.examOk} style={{marginLeft:"200px"}} htmlType="submit">重新提交</Button>
 		                               <Button className="cancel" type="ghost" onClick={this.visitCancel} style={{marginLeft:"50px"}}>取消</Button>
 	                            	</div>
 				                </div>
 				            </Spin>
 				        </Form>
 			        </Modal>
-			        <Modal maskClosable={false} visible={this.state.addnextVisible}
+			         <Modal maskClosable={false} visible={this.state.addnextVisible}
                         onOk={this.nextCancel} onCancel={this.nextCancel}
                         width='800px'
-                        title={'项目任务详情'}                     
+                        title={this.state.addState?'添加项目任务':'项目任务详情'}                     
                         footer=''
                         className="admin-desc-content">
-			            <Form layout="horizontal"  id="demand-form">
+			            <Form layout="horizontal" onSubmit={this.nextSubmit} id="demand-form">
 			                <Spin spinning={this.state.loading}>
+			                        {this.state.addState?<div className="clearfix">
+				                    	<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="服务名称" >   
+			                                    <AutoComplete
+										        className="certain-category-search"
+										        dropdownClassName="certain-category-search-dropdown"
+										        dropdownMatchSelectWidth={false}
+										        dropdownStyle={{ width: 200 }}
+										        style={{ width: '200px' }}
+										        dataSource={options}
+										        placeholder="输入服务名称"
+										        value={this.state.commodityName}
+										        onChange={this.httpChange}
+										        filterOption={true}
+										        onSelect={this.selectAuto}
+										      >
+										        <Input/>
+										      </AutoComplete> 
+										      <span className="mandatory">*</span>
+					                    </FormItem>
+					                     
+					                    <FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="服务数量" >   
+				                                    <Input placeholder="请输入服务数量" value={this.state.commodityQuantity} style={{width:'200px'}}
+				                                    onChange={(e)=>{this.setState({commodityQuantity:e.target.value})}} ref="commodityQuantity"/>
+				                                <span className="mandatory">*</span>    
+					                    </FormItem>
+					                    <FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="实签价格(万元)" >   
+				                                    <Input placeholder="请输入实签价格" value={this.state.commodityPrice} style={{width:'200px'}}
+				                                    onChange={(e)=>{this.setState({commodityPrice:e.target.value})}} ref="commodityPrice"/>
+				                                <span className="mandatory">*</span>    
+					                    </FormItem>
+					                    <FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="主要业务" >  
+				                            <Select placeholder="选择是否为主要业务"
+					                            style={{ width:'200px'}}
+					                            value={this.state.main}
+					                            onChange={(e)=>{this.setState({main:e})}}>
+					                            {
+				                                    boutique.map(function (item) {
+				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
+				                                    })
+				                                }
+					                    	 </Select>
+					                    	 <span className="mandatory">*</span>   
+			                    		</FormItem>
+					                    <div className='clearfix'>
+						                    <FormItem 
+						                            labelCol={{ span: 4 }}
+										            wrapperCol={{ span: 16 }}
+						                            label="服务说明" >   
+					                                    <Input type='textarea' placeholder="请输入服务说明" value={this.state.taskComment} 
+					                                    onChange={(e)=>{this.setState({taskComment:e.target.value})}} />
+						                    </FormItem>
+					                    </div>
+					                    <FormItem wrapperCol={{ span: 12, offset: 4 }} className="half-middle">
+					                        <Button className="submitSave" type="primary" htmlType="submit">保存</Button>  
+					                        <Button className="submitSave" type="ghost" onClick={this.nextCancel}>取消</Button>
+					                    </FormItem> 
+				                    </div>:
 				                    <div className='clearfix'>
 				                    	<FormItem className="half-item"
 					                            {...formItemLayout}
@@ -837,51 +1134,46 @@ const IntentionCustomer = Form.create()(React.createClass({
 				                    	<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="项目数量" >
-				                    			<span>{this.state.commodityQuantity}</span>
+				                    			<Input placeholder="请输入数量" value={this.state.commodityQuantity} style={{width:'200px'}}
+				                                    onChange={(e)=>{this.setState({commodityQuantity:e.target.value})}} />
+				                                <span className="mandatory">*</span>  
 				                    	</FormItem>
 				                    	<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="金额(万元)" >
-				                    			<span>{this.state.commodityPrice}</span>
+				                    			<Input placeholder="请输入签单金额" value={this.state.commodityPrice} style={{width:'200px'}}
+				                                    onChange={(e)=>{this.setState({commodityPrice:e.target.value})}} />
+				                                <span className="mandatory">*</span>      
 				                    	</FormItem>
 					                    <FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="主要项目" >  
-				                            <span>{getboutique(this.state.main)}</span>
+				                            <Select placeholder="选择是否为主要业务"
+					                            style={{ width:'200px'}}
+					                            value={this.state.main}
+					                            onChange={(e)=>{this.setState({main:e})}}>
+					                            {
+				                                    boutique.map(function (item) {
+				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
+				                                    })
+				                                }
+					                     	</Select>
+					                     	<span className="mandatory">*</span>   
 			                    		</FormItem>
 					                    <div className='clearfix'>
 					                    	<FormItem 
-					                            labelCol={{ span: 4 }}
-									            wrapperCol={{ span: 16 }}
-					                            label="服务说明" >
-				                    			<span>{this.state.taskComment}</span>
+						                            labelCol={{ span: 4 }}
+										            wrapperCol={{ span: 16 }}
+						                            label="服务说明" >
+					                    			 <Input type='textarea' placeholder="请输入服务说明" value={this.state.taskComment} 
+					                                    onChange={(e)=>{this.setState({taskComment:e.target.value})}} />
 					                    	</FormItem>
 				                    	</div>
-				                    </div>	
-			                </Spin>
-			            </Form >
-			        </Modal>
-			         <Modal maskClosable={false} visible={this.state.noVisible}
-                        onOk={this.noCancel} onCancel={this.noCancel}
-                        width='400px'
-                        title={'拒绝理由'}                     
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal"  id="demand-form">
-			                <Spin spinning={this.state.loading}>
-				                    <div className='clearfix'>
-				                    	<FormItem
-								            labelCol={{ span: 4 }}
-								            wrapperCol={{ span: 16 }}
-								            label="拒绝理由" >
-								                <Input type="textarea" placeholder="请输入拒绝理由" rows={4}  value={this.state.reason} 
-									    				onChange={(e)=>{this.setState({reason:e.target.value})}}/>	
-								        </FormItem>
-				                    </div>	
-				                     <div className='clearfix'>
-						                   <Button className="cancel" type="primary" onClick={this.examOks} style={{marginLeft:"50px"}} htmlType="submit">重新提交</Button>
-			                               <Button className="cancel" type="ghost" onClick={this.noCancel} style={{marginLeft:"50px"}}>取消</Button>
-	                            	</div>
+				                    	<FormItem wrapperCol={{ span: 12, offset: 4 }} className="half-middle">
+					                        <Button className="submitSave" type="primary" onClick={this.tabRowSave}>保存</Button>  
+					                        <Button className="submitSave" type="ghost" onClick={this.nextCancel}>取消</Button>
+					                    </FormItem>
+				                    </div>}
 			                </Spin>
 			            </Form >
 			        </Modal>