品牌映射bug处理

src/main/webapp/resources/js/admin/controllers/product/brandMapCtrl.js

@@ -146,6 +146,19 @@ define(['app/app'], function(app) {
 
 		$scope.cancelAdd = function () {
 			$scope.brandMap = {};
+			$scope.typeInStore = 'ALL';
+			if ($scope.storeInfo){
+				$scope.storeInfo = null;
+			}
+			if ($scope.brandInfo){
+				$scope.brandInfo = null;
+			}
+			if ($scope.ensureBrand){
+				$scope.ensureBrand = null;
+			}
+			$scope.wordInStore = '';
+			$scope.wordInBrand = '';
+			$scope.initialInBrand = '';
 			$scope.addFrame = false;
 		};
 
@@ -218,7 +231,12 @@ define(['app/app'], function(app) {
 		};
 
 		$scope.cancelFitBrand = function () {
-			$scope.brandInfo = null;
+			if ($scope.ensureBrand){
+				$scope.brandInfo = $scope.ensureBrand;
+			}else{
+				$scope.brandInfo = null;
+			}
+			$scope.wordInBrand = '';
 			$scope.showBrand = false;
 		};
 
@@ -227,10 +245,11 @@ define(['app/app'], function(app) {
 				toaster.pop("info", "请选择对应标准库的品牌");
 				return ;
 			}
-			$scope.brandMap.brandid = $scope.brandInfo.id;
-			$scope.brandMap.uuid = $scope.brandInfo.uuid;
-			$scope.brandMap.nameStandardEn = $scope.brandInfo.nameEn;
-			$scope.brandMap.nameStandardCn = $scope.brandInfo.nameCn;
+			$scope.ensureBrand = $scope.brandInfo;
+			$scope.brandMap.brandid = $scope.ensureBrand.id;
+			$scope.brandMap.uuid = $scope.ensureBrand.uuid;
+			$scope.brandMap.nameStandardEn = $scope.ensureBrand.nameEn;
+			$scope.brandMap.nameStandardCn = $scope.ensureBrand.nameCn;
 			$scope.showBrand = false;
 		};