代采企业增加付款公司信息

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

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

@@ -6844,7 +6844,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		
 		// 新增付款企业
 		$scope.savePayCompany = function(pay) {
-			pay.address = pay.province + pay.city + pay.district;
+			pay.address = pay.province + pay.city + pay.district + pay.addressdet;
 			DeputyOrder.savePaycompany( {}, pay, function(data) {
 				DeputyOrder.paycompanies({enuu: $scope.enterprise.uu}, {}, function(data) {
 					$scope.pays = data;
@@ -6950,7 +6950,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		
 		// 新增收货地址保存
 		$scope.saveShipAddress = function(ship) {
-			pay.address = pay.province + pay.city + pay.district;
+			pay.address = pay.province + pay.city + pay.district + pay.addressdet;
 			DeputyOrder.savePaycompany( {}, pay, function(data) {
 				DeputyOrder.paycompanies({enuu: $scope.enterprise.uu}, {}, function(data) {
 					$scope.pays = data;
@@ -11180,10 +11180,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 	
 	// 代采企业付款企业
 	app.controller('DbfindDeputyPayCompanyCtrl', ['$scope', 'toaster', '$upload', '$modalInstance', 'deputyuu', 'DeputyOrder', 'BaseService', 'ngTableParams', function($scope, toaster, $upload, $modalInstance, deputyuu, DeputyOrder, BaseService, ngTableParams) {
-		$scope.prod = false;
-		BaseService.scrollBackToTop();
 		DeputyOrder.paycompanies({enuu: deputyuu}, {}, function(data) {
-			$scope.paycompanys = data;
+			$scope.paycompanies = data;
 		}, function(response) {
 			toaster.pop('error', '提示', response.data);
 		});
@@ -11192,7 +11190,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
     		$modalInstance.dismiss();
   		};
   		
-  		$scope.checkVendor = function(company) { // 直接选择
+  		$scope.select = function(company) { // 直接选择
   			$modalInstance.close(company);
   		}
 	}]);

src/main/webapp/resources/tpl/index/purc/modal/payCompany.html

@@ -1,26 +1,30 @@
 <div class="modal-header">
 	<h3 class="modal-title">
-		<i class="fa fa-user fa-fw text-default"></i>客户名称
+		<i class="fa fa-user fa-fw text-default"></i>付款企业
 	</h3>
 </div>
 <div class="modal-body">
-	<div>
-		<table width="50%"
-			class="block table table-bordered table-striped table-hover">
+	<div >
+		<table width="50%" class="block table table-bordered table-striped table-hover">
 			<thead>
-				<th width="120px;" class="text-center">客户名称</th>
+				<th width="120px;" class="text-center">付款企业</th>
 			</thead>
-			<tbody>
-				<div style="overflow-y: scroll; width: 100%; max-height: 500px">
-					<tr ng-repeat="company in paycompanys">
+			<tbody >
+				<div style="overflow-y: scroll; width: 100%; max-height: 500px" ng-if="paycompanies.length != 0">
+					<tr ng-repeat="company in paycompanies">
 						<td width="80px;"><a style="text-decoration: none"
 							ng-bind="::company.enname" ng-click="select(company)"></a></td>
 					</tr>
 				</div>
+				<div ng-if="paycompanies.length == 0">
+					<tr>
+						<td class="text-center"><i class="fa fa-exclamation-circle"></i>暂无付款企业信息</td>
+					</tr>
+				</div>
 			<tbody>
 		</table>
 	</div>
 </div>
 <div class="modal-footer">
-	<button class="btn btn-default" ng-click="close(false)" type="button">取消</button>
+	<button class="btn btn-default" ng-click="cancel()" type="button">取消</button>
 </div>