Merge remote-tracking branch 'origin/feature-material-wangcz' into feature-material-wangcz

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

@@ -1133,28 +1133,25 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 			$modalInstance.close($scope.pic);
 		}
 	}]);
-
   // 上传规格书
   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 && 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' // 编辑还是查看
+    $scope.IsLookOrUpdate = ChooseItem.standard === 1 ? 'look' : 'update' // 编辑还是查看
     $scope.brandcode = ChooseItem.pbranden || ChooseItem.pbrand || ($scope.IsLookOrUpdate === 'update' ? '' : '-') // 品牌
     $scope.BrandList = [] // 品牌数组
-	  $scope.kind = ChooseItem.kind || ChooseItem.kinden || '-' // 类目
+    $scope.kind = ChooseItem.kind || ChooseItem.kinden || '-' // 类目
     $scope.spec = ChooseItem.spec || '' // 规格
     $scope.cmpcode = ChooseItem.pcmpcode || ($scope.IsLookOrUpdate === 'update' ? '' : '-') // 型号
     $scope.CodeList = [] // 型号数组
-	  $scope.RegulChange = (ChooseItem.standard === 1 && $scope.Ischange) ? false : true // 规格书是否可以编辑
-	  // $scope.RegulpicUrl = ChooseItem.Regulpic
-	  $scope.ChooseItem = ChooseItem
-	  // console.log(ChooseItem.productAttachSubmit.uploadAttach)
+    $scope.RegulChange = (ChooseItem.standard === 1 && $scope.Ischange) ? false : true // 规格书是否可以编辑
+    $scope.ChooseItem = ChooseItem
     $scope.cancel = function () {
       $modalInstance.close();
     };
-		// 确定
+    // 确定
     $scope.confirm = function() {
       if (!$scope.brandcode || $scope.brandcode === '') {
         toaster.pop('error', '品牌为必填项');
@@ -1174,7 +1171,7 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
         pcmpcode: $scope.cmpcode,
         url: ($scope.Regulpic === $scope.iniUrlImg || $scope.Regulpic === Regulpic) ? '' : $scope.Regulpic,
         spec: $scope.spec,
-	      id: ChooseItem.id
+        id: ChooseItem.id
       }
       // 返回信息
       $modalInstance.close(list);