Просмотр исходного кода

修改冲突的controller名称

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7820 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
dongbw 9 лет назад
Родитель
Сommit
d24ff86a48
1 измененных файлов с 3 добавлено и 3 удалено
  1. 3 3
      src/main/webapp/resources/js/index/app.js

+ 3 - 3
src/main/webapp/resources/js/index/app.js

@@ -10263,7 +10263,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
                 animation: true,
                 animation: true,
                 size: 'lg',
                 size: 'lg',
                 templateUrl: 'static/tpl/index/purc/modal/product_kindChoose_modal.html',
                 templateUrl: 'static/tpl/index/purc/modal/product_kindChoose_modal.html',
-                controller: 'KindChooseCtrl',
+                controller: 'ProdKindChooseCtrl',
                 resolve: {
                 resolve: {
                     actives: function() {
                     actives: function() {
                         return $scope.actives;
                         return $scope.actives;
@@ -10675,8 +10675,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
     }]);
     }]);
 
 
 
 
-    //类目选择模态框
-    app.controller('KindChooseCtrl', ['$scope', 'KindAPI', 'actives', 'toaster', '$modalInstance', function($scope, KindAPI, actives, toaster, $modalInstance) {
+    //类目选择模态框(招标产品明细)
+    app.controller('ProdKindChooseCtrl', ['$scope', 'KindAPI', 'actives', 'toaster', '$modalInstance', function($scope, KindAPI, actives, toaster, $modalInstance) {
         $scope.actives = actives;
         $scope.actives = actives;
         $scope.kinds = [[], [], [], []];
         $scope.kinds = [[], [], [], []];
         // 获取子类目
         // 获取子类目