Browse Source

客户资料列表、导航栏

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@715 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
suntg 11 years ago
parent
commit
4d9f6d678d

+ 10 - 1
src/main/webapp/resources/tpl/index/account/index.html

@@ -35,7 +35,7 @@
 			</ul>
 			<ul class="list-unstyled f14 detail">
 				<li><a href="#" class="text-light"><i
-						class="fa fa-tty fa-fw icon-left"></i>自助服务</a></li>
+						class="fa fa-star fa-fw icon-left"></i>新手入门</a></li>
 				<li><a href="#" class="text-light"><i
 						class="fa fa-hand-o-right fa-fw icon-left"></i>投诉举报</a></li>
 				<li><a href="#" class="text-light"><i
@@ -43,5 +43,14 @@
 			</ul>
 		</div>
 	</div>
+	<div class="pane service">
+		<div class="pane-header">
+			扫描下载移动客户端<a class="pull-right text-muted"><i
+				class="fa fa-mobile fa-lg"></i></a>
+		</div>
+		<div class="pane-body text-center">
+			<img src="static/img/mobile/code.gif" width="120px" height="120px">
+		</div>
+	</div>
 </div>
 <!-- 动态信息 End -->

+ 21 - 13
src/main/webapp/resources/tpl/index/home/left.html

@@ -5,31 +5,39 @@
 			<img src="static/img/all/user_empty.png">
 		</div>
 		<div class="user-name">
-			应鹏<br>
-			<div class="work_user-username-info">
-				<a target="_blank" class="work_user-username-info-label"
+			{{userInfo.userName}}<br>
+			<div class="work_user-username-info dropdown"">
+				<a target="_blank" class="work_user-username-info-label dropdown-toggle"
 					href="#app/accountmanagement">账户信息 <span
 					class="work_user-arrow"></span></a>
+				<br>
+				<div class="dropdown-menu" style="padding: 15px; width: 180px;">
+					<div class="pull-right"><a href="#/account/user"><i class="fa fa-pencil-square-o fa-lg"></i></a></div>
+					<div>UU:{{::userInfo.userUU}}</div>
+					<div>姓名:{{::userInfo.userName}}</div>
+					<div>手机:{{::userInfo.userTel}}</div>
+					<div>角色:{{::userInfo.roles[0].desc}}</div>
+				</div>
 			</div>
 		</div>
-		<ul class="user-lv list-unstyled">
+		<!-- <ul class="user-lv list-unstyled">
 			<li>采购等级: <i class="fa fa-star-o"></i>
 			</li>
 			<li>销售等级: <i class="fa fa-star-o"></i>
 			</li>
-		</ul>
+		</ul> -->
 	</div>
-	<ul class="user-count list-unstyled">
+	<ul class="user-count list-unstyled" ng-controller="VendCountCtrl">
 		<li>
-			<div class="count">20</div>
+			<div class="count">{{::count.customer}}</div>
 			<div class="title">
-				<a href="#">客户</a>
+				<a href="#/sale/customer">客户</a>
 			</div>
 		</li>
 		<li>
-			<div class="count">20</div>
+			<div class="count">{{::count.vendor}}</div>
 			<div class="title">
-				<a href="#">供应商</a>
+				<span>供应商</span>
 			</div>
 		</li>
 	</ul>
@@ -41,9 +49,9 @@
 		常用操作<i></i>
 	</div>
 	<ul class="list-unstyled">
-		<li><a href="#">销售中的产品</a></li>
-		<li><a href="#">已买到的产品</a></li>
-		<li><a href="#">已卖出的产品</a></li>
+		<li><a href="#/sale/order">客户采购订单</a></li>
+		<li><a href="#/sale/notice">客户送货提醒</a></li>
+		<li><a href="#/sale/accept">客户验收单</a></li>
 	</ul>
 </div>
 <div class="use">

+ 13 - 4
src/main/webapp/resources/tpl/index/home/right.html

@@ -28,7 +28,7 @@
 					</ul>
 				</li>
 			</ul>
-			<ul class="list-unstyled list-inline">
+			<!-- <ul class="list-unstyled list-inline">
 				<li class="icon">委外</li>
 				<li class="start">
 					<ul class="list-unstyled">
@@ -47,7 +47,7 @@
 						<li><a href="#">退货中(0)</a></li>
 					</ul>
 				</li>
-			</ul>
+			</ul> -->
 		</div>
 	</div>
 	<!-- 待处理统计 End -->
@@ -72,7 +72,7 @@
 <div class="feed-wrap">
 	<div class="pane notice" ng-controller="NoticeCtrl">
 		<div class="pane-header">
-			公告<span class="pull-right f12 text-muted">1-9 星期五</span>
+			公告<span class="pull-right f12 text-muted">{{dateTime | date: 'yyyy-MM-dd'}} {{["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"][dateTime.getDay()]}}</span>
 		</div>
 		<div class="pane-body">
 			<ul class="list-unstyled detail">
@@ -99,7 +99,7 @@
 			</ul>
 			<ul class="list-unstyled f14 detail">
 				<li><a href="#" class="text-light"><i
-						class="fa fa-tty fa-fw icon-left"></i>自助服务</a></li>
+						class="fa fa-star fa-fw icon-left"></i>新手入门</a></li>
 				<li><a href="#" class="text-light"><i
 						class="fa fa-hand-o-right fa-fw icon-left"></i>投诉举报</a></li>
 				<li><a href="#" class="text-light"><i
@@ -107,5 +107,14 @@
 			</ul>
 		</div>
 	</div>
+	<div class="pane service">
+		<div class="pane-header">
+			扫描下载移动客户端<a class="pull-right text-muted"><i
+				class="fa fa-mobile fa-lg"></i></a>
+		</div>
+		<div class="pane-body text-center">
+			<img src="static/img/mobile/code.gif" width="120px" height="120px">
+		</div>
+	</div>
 </div>
 <!-- 动态信息 End -->

+ 36 - 0
src/main/webapp/resources/tpl/index/sale/customer.html

@@ -0,0 +1,36 @@
+<div class="loading in" ng-class="{'in': loading}">
+	<i></i>
+</div>
+<div class="pane base-info" style="max-height: 500px;overflow: auto;">
+	<div class="pane-header">
+		客户资料 (共{{::totalCount}}个)
+		<div class="pull-right">
+			<a href="vendor/customer/xls" target="_self" class="text-simple"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+		</div>
+	</div>
+	<div class="pane-body">
+		<table class="block table table-default table-striped"
+			ng-table="customerParams">
+			<thead>
+				<tr class="header">
+					<th width="80">UU</th>
+					<th width="200">客户名称</th>
+					<th width="250">地址</th>
+					<th width="80">客户联系人</th>
+					<th width="120">联系人电话</th>
+					<th width="80">我方联系人</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr ng-repeat="customer in $data">
+					<td class="text-center" ng-bind="::customer.myEnterprise.uu"></td>
+					<td class="text-center" ng-bind="::customer.myEnterprise.enName"></td>
+					<td class="text-center" ng-bind="::customer.myEnterprise.enAddress"></td>
+					<td class="text-center" ng-bind="::customer.myUser.userName"></td>
+					<td ng-bind="::customer.myUser.userTel"></td>
+					<td class="text-center" ng-bind="::customer.vendorUser.userName"></td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
+</div>

+ 15 - 16
src/main/webapp/resources/tpl/index/sale/left.html

@@ -9,11 +9,10 @@
 		<i></i>客户管理
 	</div>
 	<ul class="list-unstyled">
-		<li><a href="#">客户资料管理</a></li>
-		<li><a href="#">客户分配管理</a></li>
+		<li ng-class="{'active': active=='customer'}"><a ui-sref="sale.customer">客户资料管理</a></li>
 	</ul>
 </div>
-<div class="left-nav">
+<!-- <div class="left-nav">
 	<div class="nav-label">
 		<i></i>产品管理
 	</div>
@@ -22,6 +21,17 @@
 		<li><a href="#">销售中的产品</a></li>
 		<li><a href="#">客户物料对照关系</a></li>
 	</ul>
+</div> -->
+<div class="left-nav">
+	<div class="nav-label">
+		<i></i>销售管理
+	</div>
+	<ul class="list-unstyled">
+		<li ng-class="{'active': active=='order'}"><a ui-sref="sale.order">客户采购订单</a></li>
+		<li ng-class="{'active': active=='change'}"><a ui-sref="sale.change">客户采购变更单</a></li>
+		<li ng-class="{'active': active=='forecast'}"><a ui-sref="sale.forecast">客户采购预测单</a></li>
+		<li ng-class="{'active': active=='notice'}"><a ui-sref="sale.notice">发货提醒</a></li>
+	</ul>
 </div>
 <div class="left-nav">
 	<div class="nav-label">
@@ -41,17 +51,6 @@
 		<li ng-class="{'active': active=='quotation'}"><a ui-sref="sale.quotation">主动报价</a></li>
 	</ul>
 </div>
-<div class="left-nav">
-	<div class="nav-label">
-		<i></i>销售管理
-	</div>
-	<ul class="list-unstyled">
-		<li ng-class="{'active': active=='order'}"><a ui-sref="sale.order">客户采购订单</a></li>
-		<li ng-class="{'active': active=='change'}"><a ui-sref="sale.change">客户采购变更单</a></li>
-		<li ng-class="{'active': active=='forecast'}"><a ui-sref="sale.forecast">客户采购预测单</a></li>
-		<li ng-class="{'active': active=='notice'}"><a ui-sref="sale.notice">发货提醒</a></li>
-	</ul>
-</div>
 <div class="left-nav">
 	<div class="nav-label">
 		<i></i>出货管理
@@ -62,14 +61,14 @@
 		<li ng-class="{'active': active=='returns'}"><a ui-sref="sale.returns">客户退货单</a></li>
 	</ul>
 </div>
-<div class="left-nav">
+<!-- <div class="left-nav">
 	<div class="nav-label">
 		<i></i>委托加工管理
 	</div>
 	<ul class="list-unstyled">
 		<li><a href="#">受委托加工订单管理</a></li>
 	</ul>
-</div>
+</div> -->
 <div class="left-nav">
 	<div class="nav-label">
 		<i></i>增值服务