页面UI更改

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

src/main/webapp/resources/js/index/app.js

@@ -14346,30 +14346,32 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			$scope.loading = false;
 			$scope.thisUser = data;
 		});
+		
 		$scope.customerParams = new ngTableParams({
-			page : 1,
+			page : 1, 
 			count : 10
 		}, {
-			total : 0,
+			total : 0, 
 			counts: [],
 			getData : function($defer, params) {
 				$scope.loading = true;
 				var pageParams = params.url();
 				pageParams.keyword = $scope.keyword;
-				VendorService.customer.get(BaseService.parseParams(pageParams), function(page){
+				VendorService.customer.get.call(null, BaseService.parseParams(pageParams), function(page){
 					$scope.loading = false;
 					if(page) {
 						params.total(page.totalElement);
+						$scope.total = page.totalElement;
 						$defer.resolve(page.content);
 					}
-					$scope.totalCount = page.totalElement;
+					$scope.totalCount = page.totalElements;
 				}, function(response){
 					$scope.loading = false;
 					toaster.pop('error', '数据加载失败', response.data);
 				});
 			}
 		});
-		
+
 		// 搜索框回车
   		$scope.onSearch = function(keyword) {
   			$scope.customerParams.page(1);

src/main/webapp/resources/tpl/index/home/right.html

@@ -64,7 +64,7 @@
 					<div id="operateTips" ng-controller="VendCountCtrl">
 						<a class="col-xs-4" href="#/sale/customer"> 我的客户（<span ng-class="{'text-inverse': count.customer>0}">{{count.customer || 0}}</span>）</a>
 						<a class="col-xs-4" ui-sref="sale.prodList">产品信息</a>
-						<a class="col-xs-4" style="color: #327ebe" ui-sref="sale.newProdInfo"><i class="fa fa-plus"></i> 产品导入</a>
+						<a class="col-xs-4" style="color: #327ebe" ui-sref="sale.uploadByBatch"><i class="fa fa-plus"></i> 产品导入</a>
 						<a class="col-xs-4" style="color: #327ebe" href="#/sale/quotation/new"><i class="fa fa-plus"></i> 新增主动报价单</a>
 					</div>
 				</div>
@@ -96,11 +96,12 @@
 					</ul>
 					<div id="operateTips" ng-controller="VendCountCtrl">
 						<a class="col-xs-4" ui-sref="purc.vendor">我的供应商（<span ng-class="{'text-inverse': count.vendor>0}">{{count.vendor || 0}}</span>）</a>
+						<a class="col-xs-4" href="#/purc/product"> 物料信息</a>
 						<a class="col-xs-4" style="color: #327ebe" href="#/purc/addOrder"><i class="fa fa-plus"></i> 新增采购单</a>
 						<a class="col-xs-4" style="color: #327ebe" href="#/purc/deputy/add"><i class="fa fa-plus"></i> 新增代采订单</a>
 						<a class="col-xs-4" style="color: #327ebe" href="#/purc/addTender"><i class="fa fa-plus"></i> 发布招标</a>
 						<a class="col-xs-4" style="color: #327ebe" href="#/purc/purcinquiry"><i class="fa fa-plus"></i> 发布询价</a>
-						<a class="col-xs-4" style="color: #327ebe" href="#/purc/product"><i class="fa fa-plus"></i> 物料导入</a>
+						<a class="col-xs-4" style="color: #327ebe" ui-sref="purc.uploadProduct"><i class="fa fa-plus"></i> 物料导入</a>
 					</div>
 				</div>
 			</div>

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

@@ -136,7 +136,7 @@
         <i></i>
     </div>
     <div class="pub-com_head">
-        <span>产品库</span>
+        <span>物料库</span>
         <div class="p-right">
             <a href="product/baseInfo/xls?keyword={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格">导出</a>
             <!-- <a ui-sref="sale.newProdInfo">新增</a> -->