主动报价单关联客户和客户物料查询

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

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

@@ -1552,7 +1552,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 	
 	// 查找客户
 	app.controller('DbfindCustCtrl', ['$scope', 'Customer', 'BaseService', 'ngTableParams', 'toaster', '$modalInstance', function($scope, Customer, BaseService, ngTableParams, toaster, $modalInstance){
-		$scope.customerParams = new ngTableParams({
+		$scope.tableParams = new ngTableParams({
 			page : 1, 
 			count : 10
 		}, {
@@ -1585,7 +1585,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 	
 	// 查找客户物料
 	app.controller('DbfindCustProdCtrl', ['$scope', 'Product', 'BaseService', 'ngTableParams', 'toaster', '$modalInstance', 'custUU', function($scope, Product, BaseService, ngTableParams, toaster, $modalInstance, custUU){
-		$scope.customerParams = new ngTableParams({
+		$scope.tableParams = new ngTableParams({
 			page : 1, 
 			count : 10
 		}, {
@@ -1623,7 +1623,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
   		// 搜索框回车
 		$scope.onSearch = function() {
 			$scope.tableParams.page(1);
-			$scope.customerParams.reload();
+			$scope.tableParams.reload();
 		};
 	}]);
 	

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

@@ -2,7 +2,7 @@
 	<div class="headerline">
 		<span class="content"><i class="fa fa-fw fa-edit text-primary"></i>主动报价 - 选择客户</span>
 	</div>
-	<form class="form-horizontal">
+	<!-- <form class="form-horizontal">
 		<div class="form-group">
 			<label class="col-md-2 col-sm-2 control-label">筛选：</label>
 			<div class="col-md-8 col-sm-8">
@@ -10,9 +10,9 @@
 					required placeholder="输入客户名称关键字查询" autofocus>
 			</div>
 		</div>
-	</form>
+	</form> -->
 	<table class="block table table-default table-striped table-bordered"
-		ng-table="customerParams">
+		ng-table="tableParams">
 		<thead>
 			<tr class="header">
 				<th>UU</th>

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

@@ -12,7 +12,7 @@
 		</div>
 	</form>
 	<table class="block table table-default table-striped table-bordered"
-		ng-table="customerParams">
+		ng-table="tableParams">
 		<thead>
 			<tr class="header">
 				<th width="160px">编号</th>