浏览代码

邀请注册记录增加注册状态标识

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@9186 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq 8 年之前
父节点
当前提交
f30a6cb8d4

+ 30 - 10
src/main/java/com/uas/platform/b2b/controller/InvitationRecordController.java

@@ -1,6 +1,17 @@
 package com.uas.platform.b2b.controller;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.InvitationRecord;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.InvitationRecordService;
@@ -10,14 +21,6 @@ import com.uas.search.b2b.model.SPage;
 import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.model.Sort.Type;
 import com.uas.search.b2b.util.SearchConstants;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.ArrayList;
-import java.util.List;
 
 @RestController
 @RequestMapping("/invitationrecord")
@@ -53,7 +56,7 @@ public class InvitationRecordController {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("in_date", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		return searchService.getInvitationByKeyword(keyword, pageParams);
+		return invitationRecordService.getRecords(pageParams, keyword);
 	}
 
 	/**
@@ -68,6 +71,23 @@ public class InvitationRecordController {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("in_date", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		return searchService.getInvitationByKeyword(keyword, pageParams);
+		return invitationRecordService.getRecords(pageParams, keyword);
+	}
+
+	/**
+	 * 通过名称查询企业信息
+	 * 
+	 * @param name
+	 * @return
+	 */
+	@RequestMapping(value = "/enterpriseList/{name}", method = RequestMethod.GET)
+	private List<Enterprise> getEnterpriseListByName(@PathVariable String name) {
+		return invitationRecordService.findByName(name);
+	}
+
+	@RequestMapping(value = "/setenterprise/{uu}", method = RequestMethod.POST)
+	private ModelMap setenterprise(@PathVariable Long uu) {
+		return null;
+
 	}
 }

+ 42 - 0
src/main/java/com/uas/platform/b2b/model/InvitationRecord.java

@@ -80,6 +80,24 @@ public class InvitationRecord implements Serializable {
 	@Column(name = "in_count")
 	private Integer count;
 
+	/**
+	 * 是否已激活
+	 */
+	@Column(name = "in_active")
+	private Short active;
+
+	/**
+	 * 相同名称企业的数量
+	 */
+	@Column(name = "in_samecount")
+	private Integer samecount;
+
+	/**
+	 * 企业uu(如果有相同名称的设置方便查询)
+	 */
+	@Column(name = "in_venduu")
+	private Long venduu;
+
 	public Long getId() {
 		return id;
 	}
@@ -152,4 +170,28 @@ public class InvitationRecord implements Serializable {
 		this.vendusername = vendusername;
 	}
 
+	public Short getActive() {
+		return active;
+	}
+
+	public void setActive(Short active) {
+		this.active = active;
+	}
+
+	public Integer getSamecount() {
+		return samecount;
+	}
+
+	public void setSamecount(Integer samecount) {
+		this.samecount = samecount;
+	}
+
+	public Long getVenduu() {
+		return venduu;
+	}
+
+	public void setVenduu(Long venduu) {
+		this.venduu = venduu;
+	}
+
 }

+ 4 - 13
src/main/java/com/uas/platform/b2b/service/impl/BaseInfoServiceImpl.java

@@ -186,7 +186,8 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 							product.setMessage("success");
 						} else if (components.size() > 1) {
 							for (Component cmp : components) {// 器件有多个,先匹配品牌
-								if (cmp.getBrand().getNameEn().equals(product.getBrand())) {// 先匹配英文文
+								if (cmp.getBrand().getNameEn().equals(product.getBrand())
+										&& cmp.getKind().getNameCn().equals(product.getTitle())) {// 先匹配英文文
 									product.setPbranden(cmp.getBrand().getNameEn());
 									product.setPbrand(cmp.getBrand().getNameCn());
 									product.setCmpUuId(cmp.getUuid());
@@ -196,18 +197,8 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 									product.setStandard(Constant.YES);
 									product.setMessage("success");
 								} else if (!cmp.getBrand().getNameEn().equals(product.getBrand())
-										&& cmp.getBrand().getNameCn().equals(product.getBrand())) {// 在匹配中文
-									product.setPbranden(cmp.getBrand().getNameEn());
-									product.setPbrand(cmp.getBrand().getNameCn());
-									product.setCmpUuId(cmp.getUuid());
-									product.setPcmpcode(cmp.getCode());
-									product.setKind(cmp.getKind().getNameCn());
-									product.setKinden(cmp.getKind().getNameEn());
-									product.setStandard(Constant.YES);
-									product.setMessage("success");
-								}else if(!cmp.getBrand().getNameEn().equals(product.getBrand())
-										&& !cmp.getBrand().getNameCn().equals(product.getBrand())
-										&& cmp.getKind().getNameCn().equals(product.getTitle())) {// 在匹配类目
+										&& cmp.getBrand().getNameCn().equals(product.getBrand())
+										&& cmp.getKind().getNameCn().equals(product.getTitle())) {// 再匹配中文
 									product.setPbranden(cmp.getBrand().getNameEn());
 									product.setPbrand(cmp.getBrand().getNameCn());
 									product.setCmpUuId(cmp.getUuid());

+ 47 - 0
src/main/java/com/uas/platform/b2b/service/impl/InvitationRecordServiceImpl.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.service.impl;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -8,14 +9,21 @@ import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
+import org.springframework.util.CollectionUtils;
 
 import com.uas.message.mail.service.MailService;
 import com.uas.message.sms.service.SmsService;
+import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.InvitationRecordDao;
+import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.InvitationRecord;
+import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.InvitationRecordService;
 import com.uas.platform.b2b.support.MessageConf;
 import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.core.model.Constant;
+import com.uas.search.b2b.model.PageParams;
+import com.uas.search.b2b.model.SPage;
 
 @Service
 public class InvitationRecordServiceImpl implements InvitationRecordService {
@@ -32,6 +40,12 @@ public class InvitationRecordServiceImpl implements InvitationRecordService {
 	@Autowired
 	private SmsService smsService;
 
+	@Autowired
+	private SearchService searchService;
+
+	@Autowired
+	private EnterpriseDao enterpriseDao;
+
 	@Override
 	public ModelMap invite(InvitationRecord record) {
 		ModelMap map = new ModelMap();
@@ -94,4 +108,37 @@ public class InvitationRecordServiceImpl implements InvitationRecordService {
 		return invitationRecordDao.findByUseruu(SystemSession.getUser().getUserUU());
 	}
 
+	@Override
+	public SPage<InvitationRecord> getRecords(PageParams params, String keyword) {
+		SPage<InvitationRecord> invitatrecords = searchService.getInvitationByKeyword(keyword, params);
+		List<InvitationRecord> records = invitatrecords.getContent();
+		List<InvitationRecord> newRecords = new ArrayList<InvitationRecord>();
+		for (InvitationRecord record : records) {
+			List<Enterprise> enters = enterpriseDao.findByEnName(record.getVendname());
+			System.out.println(enters.size());
+			if (!CollectionUtils.isEmpty(enters)) {
+				if (enters.size() == 1) {
+					record.setActive(Constant.YES);
+					record.setSamecount(enters.size());
+					record.setVenduu(enters.get(0).getUu());
+				} else {
+					record.setActive(Constant.NO);
+					record.setSamecount(enters.size());
+				}
+			} else {
+				record.setActive(Constant.NO);
+				record.setSamecount(enters.size());
+			}
+			record = invitationRecordDao.save(record);
+			newRecords.add(record);
+		}
+		invitatrecords.setContent(newRecords);
+		return invitatrecords;
+	}
+
+	@Override
+	public List<Enterprise> findByName(String name) {
+		return enterpriseDao.findByEnName(name);
+	}
+
 }

+ 4 - 13
src/main/java/com/uas/platform/b2b/service/impl/PurcProductServiceImpl.java

@@ -123,7 +123,8 @@ public class PurcProductServiceImpl implements PurcProductService {
 							product.setMessage("success");
 						} else if (components.size() > 1) {
 							for (Component cmp : components) {// 器件有多个,先匹配品牌
-								if (cmp.getBrand().getNameEn().equals(product.getBrand())) {// 先匹配英文文
+								if (cmp.getBrand().getNameEn().equals(product.getBrand())
+										&& cmp.getKind().getNameCn().equals(product.getTitle())) {// 先匹配英文文
 									product.setPbranden(cmp.getBrand().getNameEn());
 									product.setPbrand(cmp.getBrand().getNameCn());
 									product.setCmpUuId(cmp.getUuid());
@@ -133,18 +134,8 @@ public class PurcProductServiceImpl implements PurcProductService {
 									product.setStandard(Constant.YES);
 									product.setMessage("success");
 								} else if (!cmp.getBrand().getNameEn().equals(product.getBrand())
-										&& cmp.getBrand().getNameCn().equals(product.getBrand())) {// 在匹配中文
-									product.setPbranden(cmp.getBrand().getNameEn());
-									product.setPbrand(cmp.getBrand().getNameCn());
-									product.setCmpUuId(cmp.getUuid());
-									product.setPcmpcode(cmp.getCode());
-									product.setKind(cmp.getKind().getNameCn());
-									product.setKinden(cmp.getKind().getNameEn());
-									product.setStandard(Constant.YES);
-									product.setMessage("success");
-								}else if(!cmp.getBrand().getNameEn().equals(product.getBrand())
-										&& !cmp.getBrand().getNameCn().equals(product.getBrand())
-										&& cmp.getKind().getNameCn().equals(product.getTitle())) {// 在匹配类目
+										&& cmp.getBrand().getNameCn().equals(product.getBrand())
+										&& cmp.getKind().getNameCn().equals(product.getTitle())) {// 再匹配中文
 									product.setPbranden(cmp.getBrand().getNameEn());
 									product.setPbrand(cmp.getBrand().getNameCn());
 									product.setCmpUuId(cmp.getUuid());

+ 30 - 4
src/main/webapp/resources/js/index/app.js

@@ -1098,7 +1098,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 	/**
 	 * 邀请记录(个人)
 	 */
-	app.controller('InvitationCtrl', ['$scope', 'toaster', 'InvitationRecord', 'BaseService', 'ngTableParams', function($scope, toaster, InvitationRecord, BaseService, ngTableParams) {
+	app.controller('InvitationCtrl', ['$scope', 'toaster', 'InvitationRecord', 'BaseService', 'ngTableParams', '$modal', function($scope, toaster, InvitationRecord, BaseService, ngTableParams, $modal) {
 		BaseService.scrollBackToTop();
 		$scope.status = "invitation";
 		var getService = function() {
@@ -1136,10 +1136,19 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
   			$scope.tableParams.reload();
   			$scope.tip = keyword;
 		}
+		
+		$scope.search = function(name) {
+			$modal.open({
+				templateUrl: 'static/tpl/index/baseInfo/modal/fuzzysearch_enterprise_modal.html',
+				controller: 'FuzzySearchCtrl',
+				resolve: {name: function() {return name}}
+			}).result.then(function(data){
+			});			
+		}
 	}]);
 	
 	/**
-	 * 邀请记录(个人)
+	 * 邀请记录(企业
 	 */
 	app.controller('InvitationByEnCtrl', ['$scope', 'toaster', 'InvitationRecord', 'BaseService', 'ngTableParams', function($scope, toaster, InvitationRecord, BaseService, ngTableParams) {
 		BaseService.scrollBackToTop();
@@ -1181,6 +1190,20 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		}
 	}]);
 	
+	/**
+	 * 模糊查询相似的企业名称 
+	 */
+	app.controller('FuzzySearchCtrl', ['$scope', 'name', 'InvitationRecord', 'toaster', 'BaseService', function($scope, name, InvitationRecord, toaster, BaseService) {
+		$scope.name = name;
+		if($scope.name != null) {
+			InvitationRecord.enterpriseList({name: $scope.name}, {}, function(data) {
+				$scope.enterprises = data;
+			}, function(response) {
+				toaster.pop('error', '提示', response.data);
+			});
+		}
+	}]);
+	
 	app.controller('AuthCtrl', ['$scope', '$window', 'AuthenticationService', 'toaster', 'BaseService', '$modal', function($scope, $window, AuthenticationService, toaster, BaseService, $modal) {
 		$scope.isAuthed = AuthenticationService.isAuthed();		//AuthenticationService模块在common/下
 		
@@ -15769,8 +15792,11 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		$scope.updateAll = function() {
 			angular.forEach($scope.tableParams.data, function(product) {
 				if(product.checked) {
-					ids.push(product.matchresults[0].id);
-					console.log(ids);
+					angular.forEach(product.matchresults, function(item) {
+						if(item.checked) {
+							ids.push(item.id);
+						}
+					});
 					Products.updateall( {}, ids, function(data) {
 						if(data.success) {
 							toaster.pop('success', '提示', data.success);

+ 5 - 0
src/main/webapp/resources/js/index/services/BaseInfo.js

@@ -369,6 +369,11 @@ define(['ngResource'], function() {
 			getRecordsByEn: {
 				url: 'invitationrecord/recordsByEn',
 				method: 'GET',
+			},
+			enterpriseList: {
+				url: 'invitationrecord/enterpriseList/:name',
+				method: 'GET',
+				isArray: true
 			}
 		})
 	}]);

+ 7 - 0
src/main/webapp/resources/tpl/index/baseInfo/invitation.html

@@ -140,6 +140,13 @@
 							<div ng-if="::record.venduseremail != null">邮箱:<span ng-bind="::record.venduseremail"></span></div>
 							<div>邀请时间:<span ng-bind="::record.date| date: 'yyyy-MM-dd'"></span></div>
 							<div>次数:<span ng-bind="::record.count"></span></div>
+							<div>注册状态:
+								<span ng-if="record.active == 1">已注册</span>
+								<span ng-if="record.active == 0">未注册</span>
+							</div>
+							<!-- <div ng-if="record.active == 0 && record.samecount > 1">
+								提示:当前企业名称匹配到多个企业,<a ng-click="search(record.vendname)">点击查看</a>
+							</div> -->
 						</td>
 						<td width="400" class="text-center all-btn">
 							

+ 328 - 0
src/main/webapp/resources/tpl/index/baseInfo/modal/fuzzysearch_enterprise_modal.html

@@ -0,0 +1,328 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Insert title here</title>
+</head>
+<body>
+<style>
+.condition .more.open {
+	margin-top: 10px;
+	height: 36px;
+	opacity: 1;
+}
+
+.condition .more .form-group {
+	margin-bottom: 10px;
+}
+
+.enterprise-table .header>th {
+	height: 38px;
+	text-align: center;
+	background: #f5f5f5;
+	benterprise-top: 1px solid #e8e8e8;
+	benterprise-bottom: 1px solid #e8e8e8;
+}
+
+.enterprise-table .sep-row {
+	height: 10px;
+}
+
+.enterprise-table .selector {
+	vertical-align: middle;
+	margin: 0 0 2px 0;
+}
+
+.toolbar label {
+	margin-right: 10px;
+	margin-bottom: 0;
+}
+
+.toolbar .select_all {
+	margin: 0 6px 0 10px;
+	line-height: 20px;
+}
+
+.toolbar .btn {
+	-moz-benterprise-radius: 2px;
+	margin-right: 5px;
+	benterprise: 1px solid #dcdcdc;
+	benterprise-radius: 2px;
+	-webkit-benterprise-radius: 2px;
+}
+
+.enterprise-table .enterprise-hd {
+	background: #f5f5f5;
+	height: 40px;
+	line-height: 40px;
+}
+
+.enterprise-table .enterprise-hd td.first {
+	padding-left: 20px;
+}
+
+.enterprise-table .enterprise-hd .enterprise-main span {
+	margin-right: 8px;
+}
+
+.enterprise-table .enterprise-hd .enterprise-code {
+	font-style: normal;
+	font-family: verdana;
+}
+
+.enterprise-table .enterprise-hd .enterprise-sum {
+	padding: 0 5px;
+}
+
+.enterprise-table>tbody {
+	benterprise: 1px solid transparent;
+}
+
+.enterprise-table>tbody:hover {
+	benterprise-color: #56a022;
+	benterprise-width: 2px;
+}
+
+.enterprise-table .operates {
+	display: none;
+}
+
+.enterprise-table .operates i {
+	padding: 0 2px;
+}
+
+.enterprise-table>tbody:hover .operates {
+	display: block;
+}
+.enterprise-table>tbody:hover .operates-status {
+	display: none;
+}
+
+
+.enterprise-table .enterprise-bd {
+	benterprise-bottom: 1px solid #e6e6e6;
+}
+
+.enterprise-table .enterprise-bd>td {
+	padding: 10px 5px;
+	vertical-align: top;
+	position: relative;
+}
+
+.enterprise-table .enterprise-bd .product {
+	padding-left: 20px;
+}
+
+.enterprise-table .enterprise-bd .enterprise-number {
+	position: absolute;
+	top: -1px;
+	left: -1px;
+	width: 20px;
+	height: 20px;
+	line-height: 20px;
+	text-align: center;
+	background: #f5f5f5;
+	font-weight: 500;
+	benterprise: solid 1px #d5d5d5;
+	benterprise-radius: 0 0 10px 0;
+}
+
+.enterprise-table .enterprise-bd .enterprise-number.key {
+	background: #56a022;
+	color: #ffffff;
+}
+
+.unPrinted {
+	color: #56a022;
+}
+.view-slide-in{
+	/*margin-top: 20px;*/
+}
+.info-container .info:hover {
+	color: #CC3333;
+}
+.enterprise-hd .btn{
+	border-radius: 0;
+}
+/*	增加样式*/
+.view-slide-in .block{
+	background: #f5f5f5;
+}
+.view-slide-in .group-container{
+	background: #fff;
+}
+.view-slide-in .group-container .btn-group{
+	width: 160px;
+	border: none;
+	height: 45px;
+}
+.view-slide-in .group-container .btn-group .btn-info{
+	color: #d32526;
+	background: #fff;
+	border: none;
+}
+.view-slide-in .group-container .btn-group .btn{
+	border: none;
+	font-size: 16px;
+	font-family: "Microsoft YaHei", "微软雅黑";
+}
+.view-slide-in .group-container .btn-group .btn em{
+	color: #d32526;
+	font-style: inherit;
+}
+.view-slide-in .group-container .btn-group .btn:hover{
+	background: #fff;
+	color: #d32526;
+}
+.view-slide-in .group-container{
+	padding: 0;
+}
+.view-slide-in .search-bg{
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+#topSearch{
+	font-size: 18px;
+}
+.view-slide-in #topSearch .search-bg i{
+	color: #999;
+	margin-left: 10px;
+}
+.form-group-sm .form-control-feedback{
+	width: 85px;
+	height: 36px;
+	line-height: 36px;
+	color: #fff;
+	background: #327ebe;
+	text-align: center;
+	font-size: 14px;
+	cursor: pointer;
+}
+#topSearch .input-sm, .form-group-sm .form-control{
+	height: 36px;
+	line-height: 36px;
+	border: #327ebe 1px solid;
+	border-radius: 0px;
+	font-size: 14px;
+}
+.enterprise-table .company-list{
+	margin-bottom: 10px;
+}
+.enterprise-table .company-list,.enterprise-table .enterprise-hd{
+	background: #fff;
+	font-size: 16px;
+	height: 55px;
+	line-height: 55px;
+	border-bottom: #ddd 1px solid;
+}
+.enterprise-table .company-list,.enterprise-table .enterprise-bd{
+	border-bottom: #f5f5f5 20px solid;
+}
+.enterprise-table .enterprise-hd span:first-child{
+	margin-left: 20px;
+}
+.enterprise-table .product{
+	line-height: 25px;
+	font-size: 14px;
+}
+.enterprise-table .product span{
+	margin-right: 10px;
+}
+.grey01{
+	color: #969595;
+	font-size: 14px;
+	}
+.enterprise-table .btn{
+	width: 90px;
+	height: 30px;
+	color: #fff;
+	border-radius: 4px;
+	padding: 0;
+	line-height: 30px;
+}
+.enterprise-table .btn01{
+	color: #327ebe;
+	background: #fff;
+	border: none;
+	font-size: 16px;
+	}
+.search-bg .input-group-addon{
+	width: 85px;
+	height: 36px;
+	display: inline-block;
+	background: #327ebe;
+	font-size: 16px;
+	text-align: center;
+	line-height: 36px;
+	color: #fff;
+	padding: 0;
+	border: none;
+	border-radius: 0;
+	position: absolute;
+	top: 0;
+	right: 0;
+}
+.search-bg .form-group{
+	position: relative;
+}
+.enterprise-table em {
+	font-family: "Microsoft YaHei", "微软雅黑";
+	font-style: normal;
+}
+.invite-btn:hover{
+	border: #d32526 2px solid;
+}
+.invite-right{
+	padding-right: 0;
+}
+.invite-right p{
+	font-size: 14px;
+	color: #666;
+}
+.invite-right p a{
+	text-decoration: underline;
+}
+.invite-right .invite-text{
+	color: #666;
+	margin: 0 8px;
+	font-style: italic;
+}
+</style>
+<div class="block" style="margin-left: -240px; width: 1170px;">
+<table class="enterprise-table block">
+	<tbody ng-repeat="enterprise in enterprises" class="company-list">
+		<tr class="enterprise-hd" ng-dblclick="enterprise.$collapsed=!enterprise.$collapsed">
+			<td colspan="4"><span ng-bind-html="::enterprise.enName" class="text-center"></span><span ng-if="::enterprise.shortName != null">(<em ng-bind="::enterprise.enShortname"></em>)</span><img src="static/img/logo/youruanrenzheng.png" id="logo" ng-if="enterprise.status == 313"></td>
+		</tr>
+		<tr class="enterprise-bd" ng-if="!enterprise.$collapsed ">
+			<td class="product" colspan="4">
+				<div class="">营业执照:<span ng-bind="::enterprise.businessCode" ></span></div>
+				<div class="" ng-if="::enterprise.industry != null">企业类型:<span class="text-muted" ng-bind="::enterprise.industry"></span></div>
+				<div class="" ng-if="::enterprise.address != null">企业地址:<span class="text-muted" ng-bind="::enterprise.address"></span></div>
+				<div class="">
+					<span  ng-if="::enterprise.adminName != null">管理员:<em ng-bind-html="::enterprise.adminName| getkey:keyword"></em></span>
+					<span ng-if="::enterprise.adminTel != null">电话:{{::enterprise.adminTel}}</span>
+					<span ng-if="::enterprise.adminEmail != null">邮箱:{{::enterprise.adminEmail}}</span>
+				</div>
+			</td>
+			<td width="100" class="text-center">
+				<a class="btn btn-primary" ng-click="addPartner(enterprise.name,enterprise.businessCode)" ng-if="enterprise.requestStatus==null||enterprise.requestStatus==310">立即添加</a>
+				<span class="btn label-info btn-primary" ng-if="enterprise.requestStatus==311 && enterprise.method==0">已收到申请<br><a ng-click="view(enterprise.name)">立即查看</a></span>
+				<span class="btn01 btn label-info btn-primary" ng-if="enterprise.requestStatus==311 && enterprise.method==1">已发出申请<br><a ng-click="view(enterprise.name)">立即查看</a></span>
+				<span class="btn label-info" ng-if="enterprise.requestStatus==313">已添加</span>
+			</td>
+		</tr>
+	</tbody>
+	<tbody ng-if="tableParams.total() == 0" class="no-record-tab">
+		<tr>
+			<td class="text-center" colspan="7">
+				<br>
+				<div class="text-muted"><h3><img src="static/img/icon/no-record.png" />暂未搜到与({{tip}})相关的企业信息<a ng-click="invite(tip)" class="text-inverse">立即邀请</a>注册优软云</h3></div>
+				<br>
+			</td>
+		</tr>
+	</tbody>
+</table>
+</div>
+</body>
+</html>