Merge remote-tracking branch 'origin/release-201814-wangcz' into release-201814-wangcz

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

@@ -709,7 +709,7 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 						$state.go('vendor_store_maintain');
 					}
 				}
-                是否pcb
+                // 是否pcb
                 StoreInfo.isPcb({enuu: $rootScope.userInfo.enterprise.uu}, function (res) {
                     $rootScope.isPcbStore = res.data == 1;
                 }, function (error) {

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_upload_ctrl.js

@@ -72,18 +72,21 @@ define([ 'app/app' ], function(app) {
 		//选择相应的销售类型
 		$scope.sellType = function(type) {
             if (type == 'self') {
-                $scope.batch.selfSellEabled && ($scope.batch.sellType = type);
+                $scope.batch.selfSellEabled && ($scope.batch.sellType = 'self');
             } else if (type == 'UAS') {
-                !$rootScope.isPcbStore && ($scope.batch.sellType = type && $scope.setShowSelfSellRemindBox(true));
+                if (!$rootScope.isPcbStore) {
+                    $scope.batch.sellType = 'UAS';
+                    $scope.setShowSelfSellRemindBox(true);
+                }
             }
-			// if($scope.batch.selfSellEabled) {
-			// 	$scope.batch.sellType = type;
-			// 	if (type == 'UAS') {
-			// 		$scope.setShowSelfSellRemindBox(true);
-			// 	}
-			// }else {
-			// 	$scope.batch.sellType = 'UAS';
-			// }
+            // if($scope.batch.selfSellEabled) {
+				// $scope.batch.sellType = type;
+				// if (type == 'UAS') {
+            //         $scope.setShowSelfSellRemindBox(true);
+				// }
+            // } else {
+				// $scope.batch.sellType = 'UAS';
+            // }
 
         };