dengzhiguo 6 年 前
コミット
d6743c5b0d

+ 37 - 33
js/component/manageCenter/order/orderNew/addService.jsx

@@ -298,16 +298,6 @@ const NewService = Form.create()(React.createClass({
             theorgCodeUrl = picArr.join(",");
         };
         if(this.props.userDetaile){
-	        if(!this.state.contacts){
-	        	message.warning('企业负责人不能为空');
-	        	this.refs.signFirstPayment.focus()
-	        	return false;
-	        };
-	        if(!this.state.contactMobile){
-	        	message.warning('企业负责人电话不能为空');
-	        	this.refs.signFirstPayment.focus()
-	        	return false;
-	        };
 	        if(!this.state.totalAmount){
 	        	message.warning('签单金额不能为空');
 	        	this.refs.signFirstPayment.focus()
@@ -830,7 +820,7 @@ const NewService = Form.create()(React.createClass({
 			if(!data.error.length) {
 				message.success('保存成功!');
 				this.nextCancel()
-				this.loaduser(this.props.datauser);
+				//this.loaduser(this.props.datauser);
 				this.loadData();
 			} else {
 				message.warning(data.error[0].message);
@@ -1104,13 +1094,11 @@ const NewService = Form.create()(React.createClass({
 								                            {...formItemLayout}
 								                            label="企业联系人" >                             
 							                                    <Input placeholder="请输入联系人" ref='signTotalAmount' value={this.state.contacts} onChange={(e)=>{this.setState({contacts:e.target.value})}} style={{width:'240px'}} />
-									                   			<span className="mandatory">*</span>
 									                    </FormItem>
 									                     <FormItem className="half-item"
 								                            {...formItemLayout}
 								                            label="联系人电话" >                             
 							                                    <Input placeholder="请输入联系人电话" ref='signTotalAmount' value={this.state.contactMobile} onChange={(e)=>{this.setState({contactMobile:e.target.value})}} style={{width:'240px'}} />
-									                   			<span className="mandatory">*</span>
 									                    </FormItem>
 									                    <FormItem className="half-item"
 								                            {...formItemLayout}
@@ -1202,25 +1190,41 @@ const NewService = Form.create()(React.createClass({
 								                            <span>{this.state.signDate}</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'>
+							                    	{this.state.processStatus==0?
+											            <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>:
+											            <FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 18 }} label="合同扫描件">
+								                            <Upload className="demandDetailShow-upload"
+								                                listType="picture-card"
+								                                fileList={this.state.orgCodeUrl}                               
+								                                onPreview={(file) => {
+								                                    this.setState({
+								                                        previewImage: file.url || file.thumbUrl,
+								                                        previewVisible: true,
+								                                    });
+								                                }} >
+								                            </Upload>
+								                            <Modal maskClosable={false} footer={null}
+								                                visible={this.state.previewVisible}
+								                                onCancel={() => { this.setState({ previewVisible: false }) }}>
+								                                <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
+								                            </Modal>
+								                        </FormItem>}
+												    </div>
 												        <div className='clearfix'>
 												        {this.state.processStatus==0?
 												        	<FormItem
@@ -1432,7 +1436,7 @@ const NewService = Form.create()(React.createClass({
 			        <Modal maskClosable={false} visible={this.state.lookVisible}
                         onOk={this.noCancel} onCancel={this.noCancel}
                         width='800px'
-                        title={'项目任务详情'}                     
+                        title={'退单申请'}                     
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal"  id="demand-form">

+ 41 - 19
js/component/manageCenter/order/orderNew/chargeback.jsx

@@ -193,14 +193,17 @@ const IntentionCustomer = Form.create()(React.createClass({
                 },{
                     title: '退单原因',
                     dataIndex: 'reason',
-                    key: 'reason'
+                    key: 'reason',
+                    render:(text)=>{
+                    	return (text&&text.length>18?text.substr(0,18)+'...':text)
+                    }
                 }, {
 					title: '操作',
 					dataIndex: 'abc',
 					key: 'abc',
 					render: (text, record, index) => {
 						return <div>
-                            <Button onClick={(e) =>{ e.stopPropagation(), this.visit(record)}} type="primary">{this.state.refundStatus==2?'修改退申请':'查看退款申请'}</Button>
+                            <Button onClick={(e) =>{ e.stopPropagation(), this.visit(record)}} type="primary">{this.state.refundStatus==2?'修改退申请':'查看退款申请'}</Button>
                         </div>
 					}
 				}
@@ -713,21 +716,23 @@ const IntentionCustomer = Form.create()(React.createClass({
 								        </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>
+							            <FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 18 }} label="合同扫描件">
+				                            <Upload className="demandDetailShow-upload"
+				                                listType="picture-card"
+				                                fileList={this.state.orgCodeUrl}                               
+				                                onPreview={(file) => {
+				                                    this.setState({
+				                                        previewImage: file.url || file.thumbUrl,
+				                                        previewVisible: true,
+				                                    });
+				                                }} >
+				                            </Upload>
+				                            <Modal maskClosable={false} footer={null}
+				                                visible={this.state.previewVisible}
+				                                onCancel={() => { this.setState({ previewVisible: false }) }}>
+				                                <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
+				                            </Modal>
+				                        </FormItem>
 							        </div>
 							        <div className='clearfix'>
 			                    		<FormItem className="half-item"
@@ -826,14 +831,31 @@ const IntentionCustomer = Form.create()(React.createClass({
 				                    			<span>{getLiquidationStatus(this.state.liquidationStatus)}</span>
 				                    	</FormItem>
 				                    	<div className='clearfix'>
-				                			<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 16 }} label="终止合同">
+				                			{this.state.refundStatus==2?<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 16 }} label="终止合同">
 										        <Picture
 									              fileList={(e)=>{this.setState({contractUrl:e})}}
 									              pictureUrl={this.state.contractUrl}
 									              visible={this.props.visible}
 									              data={{'sign':'order_refund_file',url:'/api/admin/newOrder/uploadRefundOrderFile',number:8}}
 									           />
-										    </FormItem>
+										    </FormItem>:
+										    <FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 18 }} label="合同扫描件">
+					                            <Upload className="demandDetailShow-upload"
+					                                listType="picture-card"
+					                                fileList={this.state.orgCodeUrl}                               
+					                                onPreview={(file) => {
+					                                    this.setState({
+					                                        previewImage: file.url || file.thumbUrl,
+					                                        previewVisible: true,
+					                                    });
+					                                }} >
+					                            </Upload>
+					                            <Modal maskClosable={false} footer={null}
+					                                visible={this.state.previewVisible}
+					                                onCancel={() => { this.setState({ previewVisible: false }) }}>
+					                                <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
+					                            </Modal>
+					                        </FormItem>}
 										</div>
 										<div className='clearfix'>
 				                			<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 16 }} label="退单申请表">

+ 23 - 18
js/component/manageCenter/order/orderNew/examine.jsx

@@ -120,6 +120,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 						});
 					};
 				    this.state.pagination.total = data.data.totalCount;
+				    this.state.pagination.current = data.data.pageNo;
 				};
 				if(data.data&&data.data.list&&!data.data.list.length){
 					this.state.pagination.total=0
@@ -492,7 +493,8 @@ const IntentionCustomer = Form.create()(React.createClass({
 					message.success("该订单已被拒绝~");
 					this.setState({
 						visible:false,
-						noVisible:false
+						noVisible:false,
+						reason:'',
 					});
 					this.reset();
 				};
@@ -513,7 +515,8 @@ const IntentionCustomer = Form.create()(React.createClass({
 	//关闭输入理由框
 	noCancel(){
 		this.setState({
-			noVisible:false
+			noVisible:false,
+			reason:'',
 		})
 	},
 	//搜索
@@ -533,7 +536,7 @@ const IntentionCustomer = Form.create()(React.createClass({
     	this.state.releaseDate[0] = undefined;
 		this.state.releaseDate[1] = undefined;
 		this.state.approval= undefined;
-        this.loadData();       
+        this.loadData(1);       
     },
     resets(){
     	this.state.orderNo='';
@@ -701,21 +704,23 @@ const IntentionCustomer = Form.create()(React.createClass({
 								        </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>
+							            <FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 18 }} label="合同扫描件">
+				                            <Upload className="demandDetailShow-upload"
+				                                listType="picture-card"
+				                                fileList={this.state.orgCodeUrl}                               
+				                                onPreview={(file) => {
+				                                    this.setState({
+				                                        previewImage: file.url || file.thumbUrl,
+				                                        previewVisible: true,
+				                                    });
+				                                }} >
+				                            </Upload>
+				                            <Modal maskClosable={false} footer={null}
+				                                visible={this.state.previewVisible}
+				                                onCancel={() => { this.setState({ previewVisible: false }) }}>
+				                                <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
+				                            </Modal>
+				                        </FormItem>
 							        </div>
 							        <div className='clearfix'>
 			                    		<FormItem className="half-item"

+ 17 - 15
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -701,21 +701,23 @@ const IntentionCustomer = Form.create()(React.createClass({
 								        </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>
+							            <FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 18 }} label="合同扫描件">
+				                            <Upload className="demandDetailShow-upload"
+				                                listType="picture-card"
+				                                fileList={this.state.orgCodeUrl}                               
+				                                onPreview={(file) => {
+				                                    this.setState({
+				                                        previewImage: file.url || file.thumbUrl,
+				                                        previewVisible: true,
+				                                    });
+				                                }} >
+				                            </Upload>
+				                            <Modal maskClosable={false} footer={null}
+				                                visible={this.state.previewVisible}
+				                                onCancel={() => { this.setState({ previewVisible: false }) }}>
+				                                <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
+				                            </Modal>
+				                        </FormItem>
 							        </div>
 							        <div className='clearfix'>
 			                    		<FormItem className="half-item"

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

@@ -61,7 +61,7 @@ const PicturesWall = React.createClass({
                     fileList={fileList}
                     onPreview={this.handlePreview}
                     onChange={this.handleChange} >
-                    {fileList.length >= 1 ? null : uploadButton}
+                    {fileList.length >= 8 ? null : uploadButton}
                 </Upload>
                 <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
                     <img alt="example" style={{ width: '100%' }} src={previewImage} />
@@ -124,6 +124,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 						});
 					};
 				    this.state.pagination.total = data.data.totalCount;
+				    this.state.pagination.current = data.data.pageNo;
 				};
 				if(data.data&&data.data.list&&!data.data.list.length){
 					this.state.pagination.total=0
@@ -188,7 +189,10 @@ const IntentionCustomer = Form.create()(React.createClass({
                 },{
                     title: '驳回原因',
                     dataIndex: 'reason',
-                    key: 'reason'
+                    key: 'reason',
+                    render:(text)=>{
+                    	return (text&&text.length>24?text.substr(0,24)+'...':text)
+                    }
                 }
 			],
 			data: [],
@@ -553,16 +557,6 @@ const IntentionCustomer = Form.create()(React.createClass({
             });
             theorgCodeUrl = picArr.join(",");
         };
-		if(!this.state.contacts){
-        	message.warning('企业负责人不能为空');
-        	this.refs.signFirstPayment.focus()
-        	return false;
-        };
-        if(!this.state.contactMobile){
-        	message.warning('企业负责人电话不能为空');
-        	this.refs.signFirstPayment.focus()
-        	return false;
-        };
         if(!this.state.totalAmount){
         	message.warning('签单金额不能为空');
         	this.refs.signFirstPayment.focus()
@@ -942,13 +936,11 @@ const IntentionCustomer = Form.create()(React.createClass({
 			                            {...formItemLayout}
 			                            label="企业联系人" >                             
 		                                 <Input placeholder="请输入联系人" ref='signTotalAmount' value={this.state.contacts} onChange={(e)=>{this.setState({contacts:e.target.value})}} style={{width:'240px'}} />
-								            <span className="mandatory">*</span>
 				                    </FormItem>
 				                     <FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="联系人电话" >                             
 		                                <Input placeholder="请输入联系人电话" ref='signTotalAmount' value={this.state.contactMobile} onChange={(e)=>{this.setState({contactMobile:e.target.value})}} style={{width:'240px'}} />
-								            <span className="mandatory">*</span>
 				                    </FormItem>
 				                    <FormItem className="half-item"
 			                            {...formItemLayout}

+ 43 - 32
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -15,21 +15,21 @@ const PaiDan = React.createClass({
             page:pageNo,
             loading: true
         });
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + "/api/admin/orderProject/orderTaskList",
-            data: {
-                pageNo: pageNo || 1,
-                pageSize: this.state.pagination.pageSize,
-                name: this.state.nameSearch,//项目名称
-                orderNo:this.state.orderNo,//订单编号
-                taskId:this.state.taskId, //任务编号
-                taskStatus:this.state.taskStatus, //任务状态
-                adminName:this.state.adminName, //任务受理人
-                specially:this.state.specially, //个人/经理
-            },
+       $.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context +"/api/admin/newOrder/orderNewList",
+			data: {
+				pageNo: pageNo || 1,
+				pageSize: this.state.pagination.pageSize,
+				specially: 4,//咨询师管理列表
+				distribution:2,//全部列表
+				name: this.state.customerName,//名称
+				orderNo: this.state.orderNo,//订单编号
+				starTime: this.state.releaseDate[0],//开始时间
+				endTime: this.state.releaseDate[1],//结束时间
+			},
             success: function (data) {
                 let theArr = [];
                 if (!data.data || !data.data.list) {
@@ -43,14 +43,15 @@ const PaiDan = React.createClass({
                             key: i,
                             id:thisdata.id,//任务ID
                             orderNo: thisdata.orderNo,//订单编号
-                            taskName:thisdata.taskName,//名称
-		                    cname:thisdata.cname,//项目品类
-		                    receiverName:thisdata.receiverName,//受理人
-                            projectStatus:thisdata.projectStatus,//项目状态
-                            taskStatus:thisdata.taskStatus,//任务状态
-                            taskDate:thisdata.taskDate,//分配时间
-                            commodityQuantity:thisdata.commodityQuantity,//数量
-                            userName:thisdata.userName,//用户名
+	                         totalAmount:thisdata.totalAmount,//签单金额
+	                         processStatus:thisdata.processStatus,//流程状态
+	                         liquidationStatus:thisdata.liquidationStatus,//结算状态
+	                         approval:thisdata.approval,//特批状态
+	                         signDate:thisdata.signDate,//签单时间
+	                         userName:thisdata.userName,//客户名称
+	                         salesmanName:thisdata.salesmanName,//营销员名称
+	                         financeName:thisdata.financeName,//财务名称
+	                         createDate:thisdata.createDate,//下单时间
                         });
                     };
                 }
@@ -97,21 +98,21 @@ const PaiDan = React.createClass({
                     title: '订单编号',
                     dataIndex: 'orderNo',
                     key: 'orderNo',
+                },
+                {
+                    title: '签单客户',
+                    dataIndex: 'userName',
+                    key: 'userName',
                 }, {
                     title: '下单时间',
-                    dataIndex: 'createTime',
-                    key: 'createTime',
+                    dataIndex: 'createDate',
+                    key: 'createDate',
                 },  {
                     title: '签单时间',
                     dataIndex: 'signDate',
                     key: 'signDate',
                 },
                 {
-                    title: '签单客户',
-                    dataIndex: 'userName',
-                    key: 'userName',
-                },
-                {
                     title: '流程状态',
                     dataIndex: 'processStatus',
                     key: 'processStatus',
@@ -119,8 +120,8 @@ const PaiDan = React.createClass({
                 },
                 {
                     title: '订单总金额(万)',
-                    dataIndex: 'signTotalAmount',
-                    key: 'signTotalAmount'
+                    dataIndex: 'totalAmount',
+                    key: 'totalAmount'
                 },
                 {
                     title: '是否特批',
@@ -134,6 +135,16 @@ const PaiDan = React.createClass({
                     key: 'salesmanName'
                 },
                 {
+                    title: '订单负责人',
+                    dataIndex: 'salesmanName',
+                    key: 'salesmanName'
+                },
+                {
+                    title: '订单负责人',
+                    dataIndex: 'salesmanName',
+                    key: 'salesmanName'
+                },
+                {
                     title: '分派状态',
                     dataIndex: 'sellerName1',
                     key: 'sellerName1'