dengzhiguo 6 éve%!(EXTRA string=óta)
szülő
commit
5daee0755e

+ 3 - 1
js/component/manageCenter/order/orderNew/addService.jsx

@@ -887,6 +887,8 @@ const NewService = Form.create()(React.createClass({
 			});
 			if(!data.error.length) {
 				message.success('退单成功!');
+				this.noCancel();
+				this.handleCancel();
 			} else {
 				message.warning(data.error[0].message);
 			}
@@ -1083,7 +1085,7 @@ const NewService = Form.create()(React.createClass({
 							                            {...formItemLayout}
 							                            label="已收款项" >  
 							                            <span>{this.state.settlementAmount+'万元'}</span>
-							                            <Button type='primary' onClick={this.tuikuan} style={{float:'right',marginRight:'50px',marginBottom:'15px'}}>退单</Button>
+							                            {this.state.settlementAmount?<Button type='primary' onClick={this.tuikuan} style={{float:'right',marginRight:'50px',marginBottom:'15px'}}>退单</Button>:''}
 						                    		</FormItem>
 						                    		<FormItem className="half-item"
 							                            {...formItemLayout}

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

@@ -102,6 +102,13 @@ const MyService=Form.create()(React.createClass({
                     title: '订单编号',
                     dataIndex: 'orderNo',
                     key: 'orderNo'
+                },{
+                    title: '客户名称',
+                    dataIndex: 'userName',
+                    key: 'userName',
+                    render:(text)=>{
+                    	return (text&&text.length>9?text.substr(0,9)+'...':text)
+                    }
                 }, {
                     title: '下单时间',
                     dataIndex: 'createDate',
@@ -110,13 +117,6 @@ const MyService=Form.create()(React.createClass({
                     title: '合同签订时间',
                     dataIndex: 'signDate',
                     key: 'signDate'
-                },{
-                    title: '客户名称',
-                    dataIndex: 'userName',
-                    key: 'userName',
-                    render:(text)=>{
-                    	return (text&&text.length>9?text.substr(0,9)+'...':text)
-                    }
                 }, {
                     title: '流程状态',
                     dataIndex: 'processStatus',

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1110 - 0
js/component/manageCenter/order/orderNew/chargeback.jsx


+ 136 - 315
js/component/manageCenter/order/orderNew/press.jsx

@@ -104,6 +104,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 						let thisdata = data.data.list[i];
 						theArr.push({
 							 key: i,
+							 id:thisdata.id,//ID
 							 orderNo: thisdata.orderNo,//订单编号
 	                         totalAmount:thisdata.totalAmount,//签单金额
 	                         settlementAmount:thisdata.settlementAmount,//已收款
@@ -136,6 +137,47 @@ const IntentionCustomer = Form.create()(React.createClass({
 			});
 		}.bind(this));
 	},
+	loadDatas(dunId) {
+		this.setState({
+			loading: true,
+		});
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context +"/api/admin/newOrder/selectDunLogList",
+			data: {
+				dunId:dunId,
+			},
+			success: function(data) {
+				let theArr = [];
+				if(data.error.length || data.data == "") {
+					if(data.error && data.error.length) {
+						message.warning(data.error[0].message);
+					};
+				} else {
+					for(let i = 0; i < data.data.length; i++) {
+						let thisdata = data.data[i];
+						theArr.push({
+							 key: i,
+							 id:thisdata.id,//ID
+							 dunId: thisdata.dunId,//催款ID
+	                         dumBy:thisdata.dumBy,//催款人
+	                         dumTime:thisdata.dumDate,//催款时间
+	                         remarks:thisdata.remarks,//备注
+						});
+					};
+				};
+				this.setState({
+					dataSources: theArr,
+				});
+			}.bind(this),
+		}).always(function() {
+			this.setState({
+				loading: false
+			});
+		}.bind(this));
+	},
 	getInitialState() {
 		return {
 			page:1,
@@ -207,7 +249,7 @@ const IntentionCustomer = Form.create()(React.createClass({
                     dataIndex: 'startDate',
                     key: 'startDate'
                 }, {
-					title: '跟进操作',
+					title: '催收操作',
 					dataIndex: 'abc',
 					key: 'abc',
 					render: (text, record, index) => {
@@ -221,47 +263,21 @@ const IntentionCustomer = Form.create()(React.createClass({
 			dataSource: [],
 			columnsX: [
 				{
-                    title: '业务项目名称',
-                    dataIndex: 'commodityName',
-                    key: 'commodityName'
+                    title: '催款人',
+                    dataIndex: 'dumBy',
+                    key: 'dumBy'
                 }, {
-                    title: '项目类别',
-                    dataIndex: 'cname',
-                    key: 'cname',
+                    title: '催款时间',
+                    dataIndex: 'dumTime',
+                    key: 'dumTime',
                     
                 },{
-                    title: '项目数量',
-                    dataIndex: 'commodityQuantity',
-                    key: 'commodityQuantity'
-                }, {
-                    title: '金额(万元)',
-                    dataIndex: 'commodityPrice',
-                    key: 'commodityPrice'
-                }, {
-                    title: '负责人',
-                    dataIndex: 'contacts',
-                    key: 'contacts'
-                }, {
-                    title: '负责人电话',
-                    dataIndex: 'contactsMobile',
-                    key: 'contactsMobile'
-                }, {
-                    title: '主要项目',
-                    dataIndex: 'main',
-                    key: 'main',
-                    render:(text)=>{
-                    	return (text?'是':'否')
-                    }
-                }, {
-                    title: '项目说明',
-                    dataIndex: 'taskComment',
-                    key: 'taskComment',
-					render:(text)=>{
-						return (text&&text.length>8?text.substr(0,8)+'…':text)
-					}
+                    title: '催款情况',
+                    dataIndex: 'remarks',
+                    key: 'remarks'
                 }
 			],
-			dataSourceX: [],
+			dataSources: [],
 			
 		}
 	},
@@ -271,78 +287,33 @@ const IntentionCustomer = Form.create()(React.createClass({
 		this.loadData();
 	},
 	//进入新增拜访记录
-	visit(e) {
+	visit(record) {
 		this.setState({
 			visible:true,
+			dunId:record.id
 		})
 	},
 //	//整行点击
-//	tableRowClick(record, index) {
-//		this.setState({
-//			visible:true,
-//		});
-//		this.xiangqing(record.orderNo);
-//		this.xiangmu(record.orderNo);
-//		this.jiedian(record.orderNo);
-//	},	
+	tableRowClick(record, index) {
+		this.setState({
+			visibles:true,
+		});
+		this.loadDatas(record.id);
+	},	
 	
     
-	//项目列表
-	xiangmu(orderNos) {
-		$.ajax({
-			method: "get",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context +"/api/admin/newOrder/getOrderTask",
-			data: {
-				orderNo:orderNos
-			},
-			success: function(data) {
-				let theArr = [];
-				
-				if(data.error.length || data.data.list == "") {
-					if(data.error && data.error.length) {
-						message.warning(data.error[0].message);
-					};
-				} else {
-					for (let i = 0; i < data.data.length; i++) {
-                        let thisdata = data.data[i];
-                        theArr.push({
-                             key: i,
-                             id:thisdata.id,
-                             orderNo:thisdata.orderNo,//订单编号
-                              commodityId:thisdata.commodityId,//项目ID
-                             commodityName:thisdata.commodityName,//项目名称
-                             cname:thisdata.cname,//项目类别
-                             commodityPrice:thisdata.commodityPrice,//项目价格
-                             commodityQuantity:thisdata.commodityQuantity,//项目数量
-                             main:thisdata.main,//是否为主要任务
-                             taskComment:thisdata.taskComment,//任务说明
-                             contacts:thisdata.contacts,//联系人
-                             contactsMobile:thisdata.contactsMobile,//联系人电话
-                        });
-                    };
-				};
-				this.setState({
-                    dataSourceX: theArr,
-                });
-			}.bind(this),
-		}).always(function() {
-			this.setState({
-				loading: false
-			});
-		}.bind(this));
-	},
-	//审核通过
+	
+	//新增催款记录
 	examOk(){
 		$.ajax({
 			method: "post",
 			dataType: "json",
 			crossDomain: false,
-			url: globalConfig.context +"/api/admin/newOrder/approvalOrder",
+			url: globalConfig.context +"/api/admin/newOrder/createDunLog",
 			data: {
-				orderNo:this.state.orderNo,
-				confirm:2,
+				dunId:this.state.dunId,
+				dumTime:this.state.dumTime,
+				remarks:this.state.remarks,
 			},
 			success: function(data) {
 				if(data.error.length || data.data.list == "") {
@@ -350,7 +321,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 						message.warning(data.error[0].message);
 					};
 				} else {
-					message.success("该特批订单已通过审核~");
+					message.success("新增催款记录成功~");
 					this.setState({
 						visible:false,
 					});
@@ -413,6 +384,29 @@ const IntentionCustomer = Form.create()(React.createClass({
 		})
 		this.resets();
 	},
+	//关闭详情
+	visitCancels(e){
+		this.setState({
+			visibles:false
+		})
+		this.resets();
+	},
+	//导出
+    exportExec(){
+        var data = {
+            name: this.state.customerName,//订单负责人
+            orderNo: this.state.orderNo,//订单编号
+            startTime: this.state.releaseDate[0],
+            endTime: this.state.releaseDate[1],
+        }
+        window.location.href=(globalConfig.context+'/api/admin/newOrder/exportOrderDunData?'+$.param(data));
+    },
+	visitOks(e){
+		this.setState({
+			visibles:false
+		})
+		this.resets();
+	},
 	render() {
 		const formItemLayout = {
 			labelCol: { span: 8 },
@@ -442,7 +436,8 @@ const IntentionCustomer = Form.create()(React.createClass({
 				<div className="content-title">                  
                     <span>催款节点统计</span>
                 </div>
-               	<div className="user-search">                    
+               	<div className="user-search">             
+               		<Button type="primary" onClick={this.exportExec} style={{float:'right'}}>导出催款列表</Button>
                    <Input placeholder="客户名称" style={{width:'150px',marginBottom:'10px'}}
 	                        value={this.state.customerName}
 	                        onChange={(e) => { this.setState({ customerName: e.target.value }); }} />
@@ -469,8 +464,8 @@ const IntentionCustomer = Form.create()(React.createClass({
                		<Modal	
 				      className="customeDetails"
 				      footer=''
-			          title="订单详情"
-			          width='900px'
+			          title="新增催款记录"
+			          width='500px'
 			          visible={this.state.visible}
 			          onOk={this.visitOk}
 					  onCancel={this.visitCancel}							          							          
@@ -478,229 +473,55 @@ const IntentionCustomer = Form.create()(React.createClass({
 				        <Form layout="horizontal" onSubmit={this.handleSubmit} id="demand-form" style={{paddingBottom:'40px'}} >
 				            <Spin spinning={this.state.loading}>
 				                <div className="clearfix">
-				                	<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="订单编号" >
-			                            <span>{this.state.orderNo}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="合同编号" >  
-			                            <span>{this.state.contractNo}</span>
-				                    </FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="客户名称" >  
-			                            <span>{this.state.userName}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="合同签订时间" >   
-			                            <span>{this.state.signDate}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="流程状态" >  
-			                            <span>{getProcessStatus(this.state.processStatus)}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="结算状态" >  
-			                            <span>{getLiquidationStatus(this.state.liquidationStatus)}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="企业联系人" >                             
-		                                <span>{this.state.contacts}</span>
-				                    </FormItem>
-				                     <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="联系人电话" >                             
-		                                <span>{this.state.contactMobile}</span>
-				                    </FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="企业法人" >                             
-		                                <span>{this.state.legalPerson}</span>
-		                            </FormItem>
-				                     <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="法人电话" >  
-			                             <span>{this.state.legalPersonTel}</span>
-				                    </FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="签单金额(万元)" >                             
-		                                 <span>{this.state.firstAmount}</span>
-				                    </FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="首付金额(万元)" >                             
-		                                <span>{this.state.totalAmount}</span>
-				                    </FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="特批立项" >  
-			                            <span>{getApprovedState(this.state.approval)}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="已收款项(万元)" >  
-			                            <span>{this.state.settlementAmount}</span>
-		                    		</FormItem>
-				                    <div className='clearfix'>
-							        	<FormItem
-								            labelCol={{ span: 4 }}
-								            wrapperCol={{ span: 16 }}
-								            label="订单留言" >
-							        	 <span>{this.state.orderRemarks}</span>
-								        </FormItem>
-							        </div>
-				                    <div className='clearfix'>
-							            <FormItem
-							                labelCol={{ span: 4 }}
-							                wrapperCol={{ span: 18 }}
-							                label={
-							                	<span>
-													<strong style={{ color: '#f00' }}>*</strong>合同扫描件
-												</span> 
-							                }
-							                >
-							            	
-							                <PicturesWall
-							                    fileList={this.getOrgCodeUrl}
-							                    pictureUrl={this.state.orgCodeUrl} />
-							                    <p>图片建议:要清晰。</p>
-							            </FormItem>
-							        </div>
-							        <div className='clearfix'>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单负责人" >  
-				                            <span>{this.state.salesmanName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单负责人电话" >  
-                            				<span>{this.state.salesmanMobile}</span>
-			                    		</FormItem>
-			                    	</div>
-			                    	<div className='clearfix'>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="财务负责人" >  
-				                            <span>{this.state.financeName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="财务负责人电话" >  
-                            				<span>{this.state.financeMobile}</span>
-			                    		</FormItem>
-			                    	</div>
-			                    	<div>
-								                	<span style={{marginLeft:'50px',fontSize:'20px'}}>催款节点</span>
-								                	{this.state.processStatus==0?<Button type='primary' onClick={this.addcontact} style={{float:'right',marginRight:'50px',marginBottom:'15px'}}>添加催款节点</Button>:""}
-								                </div>
-								                <div className="clearfix">
-								    			  <Spin spinning={this.state.loading}>
-								    			        <Form layout="horizontal" id="demand-form"  >
-													      	<Table 
-											            	 pagination={false}
-											            	 columns={this.state.ContactsLists} 
-											            	 dataSource={this.state.contactList}
-											            	 />
-									            	        <Col span={24} offset={9} style={{marginTop:'15px'}}>
-												                 
-												            </Col>
-										            	</Form> 
-												   </Spin> 
-												</div>
-									            <div>
-								                	<span style={{marginLeft:'50px',fontSize:'20px'}}>项目业务</span>
-								                	{this.state.processStatus==0?<Button type='primary' onClick={this.addDetailed} style={{float:'right',marginRight:'50px',marginBottom:'15px'}}>添加项目明细</Button>:""}
-								                </div>
-								                <div className="patent-table">
-								                    <Spin spinning={this.state.loading}>
-								                        <Table columns={this.state.columnsX}
-								                            dataSource={this.state.dataSourceX}
-								                            pagination={this.state.paginations}
-								                            onRowClick={this.tableRowClickX} 
-								                            />
-								                    </Spin>
-									            </div>
-					                <div 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="ghost" onClick={this.visitCancel} style={{marginLeft:"50px"}}>取消</Button>
-	                            	</div>
-				                </div>
-				            </Spin>
-				        </Form>
-			        </Modal>
-			        <Modal maskClosable={false} visible={this.state.addnextVisible}
-                        onOk={this.nextCancel} onCancel={this.nextCancel}
-                        width='800px'
-                        title={'项目任务详情'}                     
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal"  id="demand-form">
-			                <Spin spinning={this.state.loading}>
-				                    <div className='clearfix'>
-				                    	<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="项目名称" >
-				                    			<span>{this.state.commodityName}</span>
-				                    	</FormItem>
-				                    	<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="项目数量" >
-				                    			<span>{this.state.commodityQuantity}</span>
-				                    	</FormItem>
-				                    	<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="金额(万元)" >
-				                    			<span>{this.state.commodityPrice}</span>
-				                    	</FormItem>
-					                    <FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="主要项目" >  
-				                            <span>{getboutique(this.state.main)}</span>
-			                    		</FormItem>
-					                    <div className='clearfix'>
-					                    	<FormItem 
-					                            labelCol={{ span: 4 }}
-									            wrapperCol={{ span: 16 }}
-					                            label="服务说明" >
-				                    			<span>{this.state.taskComment}</span>
-					                    	</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'>
+				                	<div className='clearfix'>
+				                    	<FormItem className="half-item" {...formItemLayout} label="催款时间">
+	                                        <DatePicker 
+	                                            style={{marginTop:"2px",width: '240px',height:"32px" }}
+	                                            showTime
+	                                            format="YYYY-MM-DD"
+	                                            onOk={(e)=>{}}
+	                                            value={this.state.dumTime ? moment(this.state.dumTime) : null}
+	                                            onChange={(data, dataString) => { this.setState({ dumTime: dataString }); }} />
+	                                    </FormItem>
+				                	 </div>
+				                	<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})}}/>	
+								            label="催款情况" >
+								                <Input type="textarea" placeholder="请输入催款情况" rows={4}  value={this.state.remarks} 
+									    				onChange={(e)=>{this.setState({remarks:e.target.value})}}/>	
 								        </FormItem>
 				                    </div>	
 				                     <div className='clearfix'>
-						                   <Button className="cancel" type="primary" onClick={this.examOks} style={{marginLeft:"50px"}} htmlType="submit">确定</Button>
+						                   <Button className="cancel" type="primary" onClick={this.examOk} style={{marginLeft:"50px"}} htmlType="submit">添加</Button>
 			                               <Button className="cancel" type="ghost" onClick={this.noCancel} style={{marginLeft:"50px"}}>取消</Button>
 	                            	</div>
-			                </Spin>
-			            </Form >
+				                </div>
+				            </Spin>
+				        </Form>
+			        </Modal>
+			        <Modal	
+				      className="customeDetails"
+				      footer=''
+			          title="催款记录查看"
+			          width='500px'
+			          visible={this.state.visibles}
+			          onOk={this.visitOks}
+					  onCancel={this.visitCancels}							          							          
+			        >	
+			        	<div className="user-content">
+					        <div className="patent-table">
+			                    <Spin spinning={this.state.loading}>
+			                        <Table columns={this.state.columnsX}
+			                            dataSource={this.state.dataSources}    
+			                            rowSelection={rowSelection}
+			                            pagination={this.state.paginations} 
+			                            onRowClick={this.tableRowClick}
+			                           />
+			                    </Spin>
+		               		 </div>
+		                </div>
 			        </Modal>
                	</div>  
             </div>

+ 33 - 0
js/component/manageCenter/order/orderNew/reject.jsx

@@ -619,6 +619,38 @@ const IntentionCustomer = Form.create()(React.createClass({
 			});
 		}.bind(this));
 	},
+	//重新提交
+	examOks(){
+		
+		$.ajax({
+			method: "post",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context +"/api/admin/newOrder/deleteOrderNew",
+			data: {
+				orderNo: this.state.orderNo,//订单编号
+			},
+			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,
+					});
+					this.resets();
+					this.loadData();
+				};
+				
+			}.bind(this),
+		}).always(function() {
+			this.setState({
+				loading: false
+			});
+		}.bind(this));
+	},
 	//新建项目明细保存
 	nextSubmit(e) {
 		e.preventDefault();
@@ -1046,6 +1078,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 						            </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.examOks} style={{marginLeft:"50px"}} htmlType="submit">订单作废</Button>
 		                               <Button className="cancel" type="ghost" onClick={this.visitCancel} style={{marginLeft:"50px"}}>取消</Button>
 	                            	</div>
 				                </div>