Kaynağa Gözat

Merge branch 'master' of http://git.jishutao.com/jishutao/web

liting2017 6 yıl önce
ebeveyn
işleme
1608bdf764

+ 2 - 2
js/component/manageCenter/customer/customerData/myClient.jsx

@@ -2078,7 +2078,7 @@ const MyClient = Form.create()(React.createClass({
                     </span>
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>                      
-                    <Button onClick={() => { window.open(globalConfig.context + '/api/admin/customer/downloadTemplate?type=1') }}>下载批量导入模板</Button>
+                    <Button onClick={() => { window.open(globalConfig.context + '/api/admin/customer/downloadTemplate?type=1') }} style={{display:'none'}}>下载批量导入模板</Button>
                		<Upload 
                		    name="file"
                         action={globalConfig.context + "/api/admin/customer/uploadExcel"}                            
@@ -2100,7 +2100,7 @@ const MyClient = Form.create()(React.createClass({
                                 message.error(`${info.file.name} 文件上传失败。`);
                             };
                         }} >
-                        <Button>上传批量内容</Button>
+                        <Button style={{display:'none'}}> 上传批量内容</Button>
                     </Upload>   
 	               {adminData.isSuperAdmin?<Popconfirm title="是否删除?" onConfirm={this.delectRow} okText="是" cancelText="否">
 							     <Button type="danger" style={{marginLeft:'10px'}}

+ 5 - 0
js/component/manageCenter/customer/customerData/myClientDesc.jsx

@@ -99,6 +99,11 @@ const AchievementDetailForm = Form.create()(React.createClass({
         <div>
             <Form horizontal onSubmit={this.handleSubmit} id="demand-form">
                 <Spin spinning={this.state.loading}>
+                	<div className="clearfix">
+                		<FormItem className="half-item">   
+	                		 <span className="mandatory" style={{color:'red',marginLeft:'57px'}}>*请录入真实有效的客户信息</span>
+	                	 </FormItem>
+	                	</div>
                     <div className="clearfix">
                     	<FormItem className="half-item"
 	                            {...formItemLayout}

+ 2 - 2
js/component/manageCenter/customer/individualCustomer/individualCustomer.jsx

@@ -2149,7 +2149,7 @@ const IndividualCustomer = Form.create()(React.createClass({
                     </span>
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>                      
-                    <Button onClick={() => { window.open(globalConfig.context + '/api/admin/customer/downloadTemplate?type=0')}}>下载批量导入模板</Button>
+                    <Button onClick={() => { window.open(globalConfig.context + '/api/admin/customer/downloadTemplate?type=0')}} style={{display:'none'}}>下载批量导入模板</Button>
                		<Upload 
                		    name="file"
                         action={globalConfig.context + "/api/admin/customer/uploadExcel"}                            
@@ -2171,7 +2171,7 @@ const IndividualCustomer = Form.create()(React.createClass({
                                 message.error(`${info.file.name} 文件上传失败。`);
                             };
                         }} >
-                        <Button>上传批量内容</Button>
+                        <Button style={{display:'none'}}>上传批量内容</Button>
                     </Upload>                        
 					{adminData.isSuperAdmin?<Button style={{ marginRight:'10px' ,marginLeft:'10px'}} type='danger'
 	                        disabled={!hasSelected} 

+ 10 - 1
js/component/manageCenter/customer/individualCustomer/myClientDesc.jsx

@@ -96,7 +96,14 @@ const AchievementDetailForm = Form.create()(React.createClass({
         <div>
             <Form horizontal onSubmit={this.handleSubmit} id="demand-form">
                 <Spin spinning={this.state.loading}>
-                    <div className="clearfix">
+                		<div className="clearfix">
+                		<FormItem className="half-item"
+	                           
+	                             >   
+	                		 <span className="mandatory" style={{color:'red',marginLeft:'57px'}}>*请录入真实有效的客户信息</span>
+	                	 </FormItem>
+	                	</div>
+                    	<div className="clearfix">
                     	<FormItem className="half-item"
 	                            {...formItemLayout}
 	                            label="客户姓名" >   
@@ -107,6 +114,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                                     <Input placeholder="客户姓名" />
                                 )} 
 	                    </FormItem>
+	                    
 	                    </div>
 	                    <div className="clearfix">
                     	<FormItem className="half-item"
@@ -139,6 +147,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                             )}
                    		 </FormItem>
                     </div>
+                    
                     <FormItem wrapperCol={{ span: 12, offset: 4 }}>
                         <Button className="set-submit" type="primary" htmlType="submit">保存</Button>  
                         {/*<Button className="set-submit" type="primary"  onClick={(e)=>{this.addContent();this.props.closeDesc}}>去完善</Button>*/}

+ 8 - 2
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManageDetaile.jsx

@@ -300,6 +300,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
                 	signTime:thisData.signDate,
                 	completeTime:thisData.completeDate,
                 	signComment:thisData.signComment,
+                	contractNo:thisData.signComment,
                 	completeComment:thisData.completeComment,
 	                completeDate:thisData.completeDate?moment(thisData.completeDate,'YYYY-MM-DD HH:mm:ss'):undefined,
 	                signDate:thisData.signDate?moment(thisData.signDate,'YYYY-MM-DD HH:mm:ss'):undefined,
@@ -1117,6 +1118,11 @@ const MySettlementDetaile = Form.create()(React.createClass({
 		                    		</FormItem>
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
+			                            label="合同编号" >  
+			                            <span>{orderDetaiel.contractNo}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
 			                            label="客户名称" >  
 			                            <span>{orderDetaiel.buyerName}</span>
 			                            {orderDetaiel.buyerName&&<Button  onClick={this.seeContract} style={{float:'right',fontSize:'12px'}}>查看联系人</Button>}
@@ -1229,7 +1235,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			                            label="业务品类" >  
 			                            <span>{orderDetaiel.projectType}</span>
 		                    		</FormItem>
-			                        <div className='clearfix'>
+			                       {/* <div className='clearfix'>
 							        	<FormItem
 								            labelCol={{ span: 4 }}
 								            wrapperCol={{ span: 16 }}
@@ -1237,7 +1243,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 							        		{!this.props.queryProject&&orderDetaiel.projectStatus==2?<Input type="textarea" placeholder="请输入立项说明" rows={4}  value={this.state.signComment} 
 													onChange={(e)=>{this.setState({signComment:e.target.value})}}/>:<span>{orderDetaiel.signComment}</span>}		                      
 								        </FormItem>
-							        </div>
+							        </div>*/}
 		                        </div>
 		                        <div className='clearfix'>
 		                    		<FormItem className="half-item"

+ 29 - 15
js/component/manageCenter/set/organization/organization.jsx

@@ -130,6 +130,7 @@ const Organization=Form.create()(React.createClass({
                 },
                 success: function (data) {                	  
                 		let theArr = [];
+                		let theId=[];//用于保存上级组织的ID和名称
 					    let thedata=data.data;
 					    if (!thedata) {
 		                    if (data.error && data.error.length) {
@@ -138,16 +139,19 @@ const Organization=Form.create()(React.createClass({
 		                    thedata = {}; 
 		              };   
 					    var contactIds=[];
-				        //for (let item in data.data) {
-				        	for(var i=0;i<data.data.length;i++){
+				        for(var i=0;i<data.data.length;i++){
 		                    let theData = data.data[i];
 		                    theArr.push(
 		                        <Select.Option value={theData.id} key={theData.id}>{theData.name}</Select.Option>
 		                    );
+		                    theId.push(
+		                        [theData.id,theData.name]
+		                    );
 		                };
 						this.setState({	
 							SuperArr:thedata,
 		                    contactsOption: theArr, 
+		                    theId: theId, 
 		                    orderStatusOptions:data.data,
 	                    });
 	                    
@@ -165,8 +169,16 @@ const Organization=Form.create()(React.createClass({
     	//上级组织字典
         let nameText=this.state.SuperArr
         let superText=this.state.editSuperId;
-        //let superText=(this.state.editSuperId).length<=1?nameText[parseInt(this.state.editSuperId)].name:''
-    	let superOne=this.state.editDataSource[0].editSuperId;
+        let upId=this.state.theId;
+        let oldId='';
+        let superOne=this.state.editDataSource[0].editSuperId;
+    	if(superOne==superText){
+    		for(let j=0;j<upId.length;j++){
+    			if(superText==upId[j][1]){
+    				oldId=upId[j][0]
+    			}
+    		}
+    	};
     	let remarksText=(this.state.editRemarks)?this.state.editRemarks:'该组织没有职能说明,请完善!';
     	let isStatus=this.state.editStatus;
     	if(isStatus==1){
@@ -211,7 +223,7 @@ const Organization=Form.create()(React.createClass({
 			            	name:this.state.editName,//组织名称
 			            	type:this.state.editType, //组织类型
 			            	managerId:this.state.theTypes?this.state.theTypes:this.state.managerIdOrganizationId,//负责人ID
-			                superId:this.state.editSuperId,//上级组织
+			                superId:oldId,//上级组织
 			                status:this.state.editStatus,//组织状态
 			                remarks:remarksText,//组织职能说明
 			                id:this.state.editId,//组织ID
@@ -233,6 +245,7 @@ const Organization=Form.create()(React.createClass({
     	}else{
     		if(!(superOne==superText)){
 		    		if(confirm('上级组织已修改,是否保存?')){
+		    		console.log(this.state.editSuperId);
 			        $.ajax({
 			            method: "post",
 			            dataType: "json",
@@ -262,7 +275,8 @@ const Organization=Form.create()(React.createClass({
 			        return false
 		        	}
 		    	}else {
-		        	$.ajax({
+		    		console.log(this.state.editSuperId);
+		    		$.ajax({
 			            method: "post",
 			            dataType: "json",
 			            crossDomain: false,
@@ -271,7 +285,7 @@ const Organization=Form.create()(React.createClass({
 			            	name:this.state.editName,//组织名称
 			            	type:this.state.editType, //组织类型
 			            	managerId:this.state.theTypes?this.state.theTypes:this.state.managerIdOrganizationId,//负责人ID
-			                superId:this.state.editSuperId,//上级组织
+			                superId:oldId,//上级组织
 			                status:this.state.editStatus,//组织状态
 			                remarks:remarksText,//组织职能说明
 			                id:this.state.editId,//组织ID
@@ -346,9 +360,9 @@ const Organization=Form.create()(React.createClass({
                 });
             }.bind(this),
         }).always(function (data) {
-        	if (data.error.length) {
-        		message.warn(data.error[0].message);
-        	};
+//      	if (data.error.length) {
+//      		message.warn(data.error[0].message);
+//      	};
             this.setState({
                 loading: false
             });
@@ -390,10 +404,10 @@ const Organization=Form.create()(React.createClass({
     //新增一个部门,保存
     addhandleSubmit(e){
     	e.preventDefault();	
-    	if(!this.state.theTypes){
-    		message.warning('请输入负责人姓名');
-    		return false;
-    	}
+//  	if(!this.state.theTypes){
+//  		message.warning('请输入负责人姓名');
+//  		return false;
+//  	}
     	if(!this.state.typeOrganization){
     		message.warning('请选择组织类型');
     		return false;
@@ -650,7 +664,7 @@ const Organization=Form.create()(React.createClass({
 											      >
 											        <Input />
 											</AutoComplete> 
-											<span className="mandatory" style={{color:'red',marginLeft:'5px'}}>*</span>
+											{/*<span className="mandatory" style={{color:'red',marginLeft:'5px'}}>*</span>*/}
 							            </FormItem>
 				                    </div>