dengzhiguo 6 years ago
parent
commit
988047c539

BIN
image/erweima.jpg


+ 15 - 1
js/component/login/login.less

@@ -27,8 +27,22 @@
                     height: 60px;
                 }
             }
+            .erweima{
+                width: 80px;
+                padding-top: 80px;
+                float: right;
+                border-right: 1px solid #eee;
+                position: relative;
+                overflow: hidden;
+                img {
+                    position: absolute;
+                    top: 0;
+                    left: 0;
+                    height: 80px;
+                }
+            }
             .logo-text {
-                width: 700px;
+                width: 660px;
                 float: left;
                 line-height: 60px;
                 font-size: 24px;

+ 6 - 0
js/component/login/loginTop.jsx

@@ -1,19 +1,25 @@
 import React from 'react';
 import './login.less';
 import logo from '../../../image/logo.png';
+import erweima from '../../../image/erweima.jpg';
 
 const LoginTop = React.createClass({
     render() {
         return (
             <div className="login-header">
                 <div className="login-logo">
+                	<div className="erweima">
+                        <img src={erweima} alt="" />
+                    </div>
                     <div className="logo">
                         <img src={logo} alt="" />
                     </div>
+                    
                     <div className="logo-text">
                         <span>科技交易认知计算平台</span>
                         <span className="back"><a href={globalConfig.context + "/portal/index.html"}>返回首页</a></span>
                     </div>
+                    
                 </div>
             </div>
         )

+ 22 - 5
js/component/manageCenter/customer/NEW/signCustomer/followDetail.jsx

@@ -65,12 +65,26 @@ const FollowDetail = React.createClass({
 	                             onChange={(e) => { record.remarks = e.target.value; this.setState({ data: this.state.data }); }}
 	                             />
 					}
+				}, {
+					title: '操作',
+					width:120,
+					dataIndex: 'rrr',
+					key: 'rrr',
+					render: (text, record, index) => {
+						console.log(record);
+						return <div>
+                          	<Popconfirm title="再次签单?" onConfirm={(e)=>{this.intentionDelet(record,index)}} okText="再次签单" cancelText="取消">
+							    <Button style={{marginRight:'10px',color:'#ffffff',background:'#58a3ff',border:'none'}}>签单</Button>
+							</Popconfirm>
+                        </div>
+					}
 				}
 			],
 		}
 	},
 	//拜访意向服务列表单个删除
 	intentionDelet(e, index) {
+		console.log(e);
 		if(e.id) {
 			this.setState({
 				loading:true,
@@ -80,20 +94,21 @@ const FollowDetail = React.createClass({
 				method: "get",
 				dataType: "json",
 				crossDomain: false,
-				url: globalConfig.context + "/api/admin/customer/deleteFollowOneBusiness",
+				url: globalConfig.context + "/api/admin/customer/againProjectTask",
 				data: {
-					ufbId: e.id
+					uid: e.uid,
+					projectId:e.businessName,
 				}
 			}).done(function(data) {
 				if(!data.error.length) {
-					message.success('删除成功');
+					message.success('签单成功');
 					this.setState({
 						loading: false,
 					});
 				} else {
 					message.warning(data.error[0].message);
 				};
-				this.deletelist(this.props.followData.id)
+				//this.deletelist(this.props.followData.id)
 			}.bind(this));
 		} 
 	},
@@ -189,7 +204,9 @@ const FollowDetail = React.createClass({
 								businessProjectName:thisdata.businessProjectName,
 								followSituation: thisdata.followSituation==null?undefined : String(thisdata.followSituation),
 								customerStatus: thisdata.customerStatus==null?undefined : String(thisdata.customerStatus),
-								remarks: thisdata.remarks
+								remarks: thisdata.remarks,
+								uid:thisdata.uid
+								
 							});
 						}
 					};

+ 1 - 0
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManageDetaile.jsx

@@ -291,6 +291,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
     },
     //查看详情
     loaduser(record){
+		console.log(record);
     	if(record){
     	$.ajax({
             method: "get",

+ 1 - 23
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManageNew.jsx

@@ -395,28 +395,7 @@ const ProjectOrderNew=Form.create()(React.createClass({
 				});
 			}.bind(this));
 	},
-	 //项目任务旧数据处理
-	 handles(){
-    	this.setState({
-			loading: true
-		});
-		$.ajax({
-			method: "get",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context + "/api/admin/order/addContractTaskLog",
-			data: {
-				
-			},
-			success: function(data) {
-				
-			}.bind(this),
-			}).always(function() {
-				this.setState({
-					loading: false
-				});
-			}.bind(this));
-    },
+	
     componentWillMount() {
         let data=localStorage.getItem('newData');
     	if(data!='{}'&&data){
@@ -548,7 +527,6 @@ const ProjectOrderNew=Form.create()(React.createClass({
                 <div className="content-title">
                 	<span style={{fontSize:'16px'}}>{this.props.queryProject?'项目查询':'项目管理'}</span>	
 	                <div className="user-search">
-						<Button type="primary" onClick={this.handles} style={{marginLeft:'10px',float:'right'}}>项目任务数据处理</Button>
 	                    <Input placeholder="客户名称" style={{width:'150px'}}
 	                        value={this.state.buyerNameSearch}
 	                        onChange={(e) => { this.setState({ buyerNameSearch: e.target.value }); }} />

+ 24 - 1
js/component/manageCenter/set/userManagementS/jurisdiction.jsx

@@ -144,6 +144,28 @@ const Jurisdiction = Form.create()(React.createClass({
 			addnextVisible: true
 		})
 	},
+	//项目任务旧数据处理
+	 handles(){
+    	this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + "/api/admin/order/addContractTaskLog",
+			data: {
+				
+			},
+			success: function(data) {
+				
+			}.bind(this),
+			}).always(function() {
+				this.setState({
+					loading: false
+				});
+			}.bind(this));
+    },
 	//新建二级接口保存
 	nextSubmit(e) {
 		e.preventDefault();
@@ -184,7 +206,8 @@ const Jurisdiction = Form.create()(React.createClass({
 		return(
 			<div className="user-content" >
                 <div className="content-title">
-	                <div className="user-search">
+                	<div className="user-search">
+	                	<Button type="primary" onClick={this.handles} style={{marginLeft:'10px',float:'right'}}>项目任务数据处理</Button>
 	                    <Button type="primary" className="addButton" onClick={this.addClick} style={{marginBottom:'15px'}}>新增权限<Icon type="user"/></Button>
 	                </div>
 	                <div className="patent-table">