企业圈全部合作伙伴搜索调整，企业圈布局调整。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@9328 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/model/InvitationRecord.java

@@ -3,13 +3,7 @@ package com.uas.platform.b2b.model;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 /**
  * 邀请合作伙伴注册
@@ -43,6 +37,13 @@ public class InvitationRecord implements Serializable {
 	 */
 	@Column(name = "in_useruu")
 	private Long useruu;
+
+	/**
+	 * 邀请人
+	 */
+	@OneToOne(cascade = { CascadeType.MERGE, CascadeType.REFRESH })
+	@JoinColumn(name = "in_useruu", insertable = false, updatable = false)
+	private User user;
 	
 	/**
 	 * 最后一次邀请时间
@@ -194,4 +195,11 @@ public class InvitationRecord implements Serializable {
 		this.venduu = venduu;
 	}
 
+	public User getUser() {
+		return user;
+	}
+
+	public void setUser(User user) {
+		this.user = user;
+	}
 }

src/main/webapp/resources/css/index.css

@@ -4115,5 +4115,5 @@ input[required]:invalid, input:focus:invalid, textarea[required]:invalid, textar
 	position: relative;
 	line-height: inherit !important;
 	position: absolute;
-	right: 177px;
+	right: 330px;
 }

src/main/webapp/resources/tpl/index/baseInfo/addPartnerAndRecord.html

@@ -32,7 +32,7 @@
                 <li style="padding-left: 0;"><a ui-sref="baseInfo.partner_searchresult" ng-class="{'active':status=='add'}" class="add-btn">+ 添加合作伙伴</a></li>
             </ul>
         </div>
-        <div class="form-input col-xs-6 myReuest search-bg">
+        <!--<div class="form-input col-xs-6 myReuest search-bg">
             <div class="row">
                 <div class="col-xs-9">
                     <div class="search">
@@ -46,6 +46,6 @@
                     <p>搜索到<em>{{tableParams.total()}}</em>条</p>
                 </div>
             </div>
-        </div>
+        </div>-->
     </div>
 </div>

src/main/webapp/resources/tpl/index/baseInfo/customersInfo.html

@@ -98,6 +98,24 @@
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
+	<div style="margin-top: -55px;">
+		<div class="col-xs-6" style="float: left;"></div>
+		<div class="form-input col-xs-6 myRequest search-bg">
+			<div class="row">
+				<div class="col-xs-9">
+					<div class="search">
+						<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+							<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称、联系人" />
+							<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
+						</div>
+					</div>
+				</div>
+				<div class="col-xs-3" style="padding-left: 0;">
+					<p>搜索到<em>{{customerParams.total()}}</em>条</p>
+				</div>
+			</div>
+		</div>
+	</div>
 <div class="pane base-info" id="customer-tab">
 	<!--<form class="form-horizontal">
 		<div class="myReuest form-group" style="background: #f5f5f5;">

src/main/webapp/resources/tpl/index/baseInfo/invitation.html

@@ -122,9 +122,27 @@
 				</div>
 			</div>
 		</div>-->
+</div>
+	<div style="margin-top: -55px;">
+		<div class="col-xs-6" style="float: left;"></div>
+		<div class="form-input col-xs-6 myRequest search-bg">
+			<div class="row">
+				<div class="col-xs-9">
+					<div class="search">
+						<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+							<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称、邀请人进行搜索" />
+							<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
+						</div>
+					</div>
+				</div>
+				<div class="col-xs-3" style="padding-left: 0;">
+					<p>搜索到<em>{{tableParams.total()}}</em>条</p>
+				</div>
+			</div>
+		</div>
 	</div>
 </div>
-<div class="filter-list col-xs-12">
+<div class="filter-list col-xs-12" style="margin-top: 10px;">
 	<div class="input-select col-xs-2" style="margin-left: 13px;">
 		<input name="self" type="radio" ng-click="setActive('invitation')" ng-checked="active == 'invitation'"/>
 		<span class="f14">只看自己</span>
@@ -141,14 +159,15 @@
 			ng-table="tableParams">
 			<tbody ng-repeat="record in $data">
 					<tr class="customer-hd">
-						<td colspan="4" class="text-left"><span ng-bind="::record.vendname"></span></td>
+						<td colspan="3" class="text-left"><span ng-bind="::record.vendname"></span></td>
+						<td><div style="font-size: 14px;" ng-show="active == 'invitationTeam'" ><span class="text-muted"style="font-size: 14px;" >邀请人：</span>{{::record.user.userName}}</div></td>
 						<td class="text-center"><span ng-bind="::record.date| date: 'yyyy-MM-dd'" class="text-muted" style="margin-left: 0;"></span></td>
 					</tr>
 					<tr class="customer-bd">
 						<td  class="first" colspan="4">
 							<div class="col-md-2"><span class="text-muted">联系人：</span><span ng-bind="::record.vendusername"></span></div>
 							<div ng-if="::record.vendusertel != null"  class="col-md-3"><span class="text-muted">电话：</span><span ng-bind="::record.vendusertel"></span></div>
-							<div ng-if="::record.venduseremail != null"  class="col-md-3"><span class="text-muted">邮箱：</span><span ng-bind="::record.venduseremail"></span></div>
+							<div ng-if="::record.venduseremail != null"  class="col-md-4"><span class="text-muted">邮箱：</span><span ng-bind="::record.venduseremail"></span></div>
 							<div class="text-icon" ng-if="record.active == 1">已注册</div>
 							<div class="text-icon" ng-if="record.active == 0" style="border: #327ebe 1px solid; color: #327ebe;">未注册</div>
 							<!--<div><span class="text-muted">次数：</span><span ng-bind="::record.count"></span></div>-->

src/main/webapp/resources/tpl/index/baseInfo/myRequest.html

@@ -338,6 +338,24 @@
 			</div>&ndash;&gt;
 		</div>
 </div>-->
+	<div style="margin-top: -55px;">
+		<div class="col-xs-6" style="float: left;"></div>
+		<div class="form-input col-xs-6 myRequest search-bg">
+			<div class="row">
+				<div class="col-xs-9">
+					<div class="search">
+						<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+							<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称、申请人或审核人" />
+							<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
+						</div>
+					</div>
+				</div>
+				<div class="col-xs-3" style="padding-left: 0;">
+					<p>搜索到<em>{{tableParams.total()}}</em>条</p>
+				</div>
+			</div>
+		</div>
+	</div>
 <table class="order-table block" ng-table="tableParams">
 	<tbody ng-repeat="request in $data" class="company-list">
 		<tr class="order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">

src/main/webapp/resources/tpl/index/baseInfo/newPartner.html

@@ -340,6 +340,24 @@
             </div>&ndash;&gt;
         </div>
     </div>-->
+    <div style="margin-top: -55px;">
+        <div class="col-xs-6" style="float: left;"></div>
+        <div class="form-input col-xs-6 myRequest search-bg">
+            <div class="row">
+                <div class="col-xs-9">
+                    <div class="search">
+                        <div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+                            <input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称、营业执照号、申请人或审核人" />
+                            <a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-3" style="padding-left: 0;">
+                    <p>搜索到<em>{{tableParams.total()}}</em>条</p>
+                </div>
+            </div>
+        </div>
+    </div>
     <table class="order-table block" ng-table="tableParams">
         <tbody ng-repeat="request in $data | orderBy :'method'" class="company-list">
         <tr class="order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">

src/main/webapp/resources/tpl/index/baseInfo/searchresult.html

@@ -296,6 +296,24 @@
 	<i></i>
 </div>
 <div ng-include src="'static/tpl/index/baseInfo/addPartnerAndRecord.html'"></div>
+	<div style="margin-top: -55px;">
+		<div class="col-xs-6" style="float: left;"></div>
+		<div class="form-input col-xs-6 myRequest search-bg">
+			<div class="row">
+				<div class="col-xs-9">
+					<div class="search">
+						<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+							<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch(keyword)" placeholder="输入企业名称、简称、营业执照号" />
+							<a class="btn input-group-addon" ng-click="onSearch(keyword)">搜索</a>
+						</div>
+					</div>
+				</div>
+				<div class="col-xs-3" style="padding-left: 0;">
+					<p>搜索到<em>{{tableParams.total()}}</em>条</p>
+				</div>
+			</div>
+		</div>
+	</div>
 <!--<div class="myReuest search-bg condition block" style="margin-bottom: 0;">
 		<div class="row">
 			<div class="col-xs-5">

src/main/webapp/resources/tpl/index/baseInfo/vendorAndCustomer.html

@@ -24,7 +24,7 @@
 				<li><a ui-sref="baseInfo.customerInfo" ng-class="{'active':status=='customer'}" >客户</a></li>
 			</ul>
 		</div>
-		<div class="form-input col-xs-6 myReuest search-bg">
+		<!--<div class="form-input col-xs-6 myReuest search-bg">
 			<div class="row">
 				<div class="col-xs-9">
 					<div class="search">
@@ -38,6 +38,6 @@
 					<p>搜索到<em>{{tableParams.total()}}</em>条</p>
 				</div>
 			</div>
-		</div>
+		</div>-->
 	</div>
 </div>

src/main/webapp/resources/tpl/index/baseInfo/vendorsInfo.html

@@ -130,6 +130,24 @@
 		</div>-->
 	</div>
 </div>
+	<div style="margin-top: -55px;">
+		<div class="col-xs-6" style="float: left;"></div>
+		<div class="form-input col-xs-6 myRequest search-bg">
+			<div class="row">
+				<div class="col-xs-9">
+					<div class="search">
+						<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+							<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称、联系人" />
+							<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
+						</div>
+					</div>
+				</div>
+				<div class="col-xs-3" style="padding-left: 0;">
+					<p>搜索到<em>{{customerParams.total()}}</em>条</p>
+				</div>
+			</div>
+		</div>
+	</div>
 <div class="wrap" id="customer-tab">
 	<div class="content">
 		<!--供应商列表-->

src/main/webapp/resources/tpl/index/purc/vendor.html

@@ -95,7 +95,7 @@
 				<div class="col-xs-6">
 					<div class="search">
 						<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
-							<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch(keyword)" placeholder="输入企业名称、简称或申请人搜索"  style="width: 100%"/>
+							<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch(keyword)" placeholder="输入企业名称、营业执照号、申请人或审核人"  style="width: 100%"/>
 							<a class="btn input-group-addon" ng-click="onSearch(keyword)">搜索</a>
 						</div>
 					</div>

src/main/webapp/resources/tpl/index/sale/order.html

@@ -430,6 +430,7 @@
 					ng-bind="::item.product.spec"></div>
 				<div class="text-muted text-bold" ng-if="item.vendspec"><span ng-bind="::item.vendspec"></span></div>
 				<div class="text-bold text-inverse" ng-if="item.factory">送货工厂：<span ng-bind="::item.factory"></span></div>
+				<div class="text-bold text-inverse" ng-if="item.remark">备注：<span ng-bind="::item.remark"></span></div>
 			</td>
 			<td class="text-center">
 				<div class="text-num" ng-bind="::item.price | number:6"></div>

src/main/webapp/resources/tpl/index/sale/order_detail.html

@@ -117,6 +117,7 @@
 							<div class="text-muted" ng-bind="::item.product.spec"></div>
 							<div class="text-muted text-bold" ng-if="item.vendspec"><span ng-bind="::item.vendspec"></span></div>
 							<div class="text-bold text-inverse" ng-if="item.factory">送货工厂：<span ng-bind="::item.factory"></span></div>
+							<div class="text-bold text-inverse" ng-if="item.remark">备注：<span ng-bind="::item.remark"></span></div>
 						</td>
 						<td class="text-center" width="80">
 							<div class="text-num" ng-bind="::item.price | number:6"></div>