Sfoglia il codice sorgente

代采订单bug处理

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@9476 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq 8 anni fa
parent
commit
870c54ecdf

+ 6 - 16
src/main/webapp/resources/js/index/app.js

@@ -12744,13 +12744,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		// 代采企业列表
 		DeputyOrder.deputyEnterprise({}, function(data) {
 			$scope.deputyEnterprises = data;
+			$scope.deOrder.deputyname = $scope.deputyEnterprises[0].deputyenname;
 			$scope.deOrder.deputyuu = $scope.deputyEnterprises[0].deputyenuu;
-			// 费率
-			DeputyOrder.vendorRate( {enuu: $scope.deOrder.deputyuu}, {}, function(data) {
-				$scope.rate = data;
-			}, function(response){
-				
-			});
 		});
 		
 		// 更新名称时后台更改uu号
@@ -12758,8 +12753,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			DeputyOrder.deputyEnterprise({}, function(data) {
 				$scope.deputyEn = data;
 				angular.forEach($scope.deputyEn, function(en) {
-					if(deputyname == en.deputyname) {
-						$scope.deputyuu = en.deputyuu;
+					if(deputyname == en.deputyenname) {
+						$scope.deputyuu = en.deputyenuu;
 					}
 				});
 			});
@@ -13220,13 +13215,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		// 代采企业列表
 		DeputyOrder.deputyEnterprise({}, function(data) {
 			$scope.deputyEnterprises = data;
+			$scope.deOrder.deputyname = $scope.deputyEnterprises[0].deputyenname;
 			$scope.deOrder.deputyuu = $scope.deputyEnterprises[0].deputyenuu;
-			// 费率
-			DeputyOrder.vendorRate( {enuu: $scope.deOrder.deputyuu}, {}, function(data) {
-				$scope.rate = data;
-			}, function(response){
-				
-			});
 		});
 		
 		// 更新代采企业时更新费率
@@ -13234,8 +13224,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			DeputyOrder.deputyEnterprise({}, function(data) {
 				$scope.deputyEn = data;
 				angular.forEach($scope.deputyEn, function(en) {
-					if(deputyname == en.deputyname) {
-						$scope.deputyuu = en.deputyuu;
+					if(deputyname == en.deputyenname) {
+						$scope.deputyuu = en.deputyenuu;
 					}
 				});
 			});

+ 1 - 1
src/main/webapp/resources/tpl/index/purc/deputyOrder_new.html

@@ -296,7 +296,7 @@
                                 <em><b>*</b>代采企业:</em>
                                <span>
                                		<select name="" class="select" ng-model="deOrder.deputyname" style="width: 200px" ng-change="change(deOrder.deputyname)"
-                               			ng-options="deputyEn.deputyname as deputyEn.deputyenname for deputyEn in deputyEnterprises">
+                               			ng-options="deputyEn.deputyenname as deputyEn.deputyenname for deputyEn in deputyEnterprises">
                                		<option value="">请选择代采企业</option>
                                		</select>
                                </span>