Browse Source

修改品牌不能输入中文的问题

shenjj 7 years ago
parent
commit
e145cc8312

+ 0 - 5
src/main/webapp/resources/js/admin/controllers/AuditRegulpicListCtrl.js

@@ -208,11 +208,6 @@ define([ 'app/app' ], function(app) {
         $scope.BrandList = []
         return false
       }
-      if ((/[^\x00-\xff]/g).test(name)) {
-        $scope.keyword = ''
-        $scope.BrandList = []
-        return false
-      }
       $scope.BrandList = getSimilarBrands(name).$$state
     }
     /**

+ 1 - 6
src/main/webapp/resources/js/vendor/app.js

@@ -1140,7 +1140,7 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
   // 上传规格书
   app.controller('editRegulationCtrl', ['$scope', 'Regulpic', '$modalInstance','showAction', 'Search', 'ChooseItem', 'toaster', function ($scope, Regulpic, $modalInstance, showAction, Search, ChooseItem, toaster) {
     $scope.iniUrlImg = 'static/img/vendor/images/upload_file_icon.png'
-    $scope.Regulpic = ChooseItem.productAttachSubmit.uploadAttach || ChooseItem.attach || 'static/img/vendor/images/upload_file_icon.png'; // 图片
+    $scope.Regulpic =  (ChooseItem.productAttachSubmit && ChooseItem.productAttachSubmit.uploadAttach) || ChooseItem.attach || 'static/img/vendor/images/upload_file_icon.png'; // 图片
     $scope.Ischange = (ChooseItem.productAttachSubmit && ChooseItem.productAttachSubmit.uploadAttach || ChooseItem.attach) ? true : false
     $scope.showAction = showAction || false  // 个人产品库和企业产品 还是在售产品
 	  $scope.IsLookOrUpdate = ChooseItem.standard === 1 ? 'look' : 'update' // 编辑还是查看
@@ -1205,11 +1205,6 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
         $scope.BrandList = []
         return false
       }
-      if ((/[^\x00-\xff]/g).test(name)) {
-        $scope.brandcode = ''
-        $scope.BrandList = []
-        return false
-      }
       $scope.BrandList = getSimilarBrands(name).$$state
     }