lvzhikai лет назад: 4
Родитель
Сommit
102a9ad37e

+ 1 - 1
src/main/resources/static/app/business/plan/controller/planSaveCtrl.js

@@ -200,7 +200,7 @@ angular.module('app.business').controller("planSaveCtrl", function($scope, $filt
200 200
             for (var i=0; i < data.storeWareDetailList.length; i++) {
201 201
                 $scope.addedDetail.push(data.storeWareDetailList[i]);
202 202
             }
203
-            console.log(data.storeWareDetailList);
203
+            // console.log(data.storeWareDetailList);
204 204
             $scope.processDefinitionId = data.plan.processDefinitionId;
205 205
             $scope.processInstanceId = data.plan.processInstanceId;
206 206
             $scope.plan.startTime = $filter('date')($scope.plan.startTime, "yyyy-MM-dd"); 

+ 1 - 1
src/main/resources/static/app/intelligent/index-supervise/controller/ptCtrl-index.js

@@ -218,7 +218,7 @@ angular.module('app.intelligent')
218 218
                                 "<tr><td colspan='2'>采集时间:" + (data[i].time == undefined ? '无' : data[i].time) + "</td></tr></table>" +
219 219
                                 "<div class='tit1'>" +
220 220
                                 "<a data-ui-sref='app.intelligent.grainDetection.oilTemperatureDetectionList({show: true,vCfCode:\""+vCfCode+"\"})'>查看详情></a></div></div></div></div>";
221
-                            console.log('a: ',vCfCode);
221
+                            // console.log('a: ',vCfCode);
222 222
                             arrayObj.push(pop);
223 223
                             var data_x = $("#" + i + "canvas").width();
224 224
                             var data_Y = $("#" + i + "canvas").height();

+ 5 - 5
src/main/resources/static/app/storage/controller/foodbasicinfo/foodbasicinfoCtrl.js

@@ -218,7 +218,7 @@ angular.module('app.storage')
218 218
             var warehouseId=$stateParams.warehouseId;
219 219
             qualitycheckService.getQualitycheckListByFoodbasicinfoCheck(houseId,warehouseId,foodbasicinfoId).then(function(data){
220 220
                 $scope.thirdqualitycheck = data;
221
-                console.log($scope.thirdqualitycheck);
221
+                // console.log($scope.thirdqualitycheck);
222 222
             },function(data){
223 223
             });
224 224
         }
@@ -595,7 +595,7 @@ angular.module('app.storage')
595 595
         $scope.showfoodQrCode = function (houseId,tankId,warehouseId) {
596 596
             qualitycheckService.findByStoreWarehouse(houseId,tankId,warehouseId,"0","1").then(function(data){
597 597
                 $scope.qualitycheckCode = data;
598
-                console.log($scope.qualitycheckCode);
598
+                // console.log($scope.qualitycheckCode);
599 599
             },function(data){
600 600
                 // console.log(data);
601 601
             });
@@ -726,7 +726,7 @@ angular.module('app.storage')
726 726
             qualitycheckService.findByStoreWarehouseData(houseId,warehouseId,"1",id).then(function(data){
727 727
                 $scope.foodbasicinfo = data;
728 728
                 $scope.foodbasicinfo.keepMethod = $rootScope.dicData[$scope.foodbasicinfo.keepMethod];
729
-                console.log($scope.foodbasicinfo);
729
+                // console.log($scope.foodbasicinfo);
730 730
             },function(data){
731 731
                 // console.log(data);
732 732
             });
@@ -746,14 +746,14 @@ angular.module('app.storage')
746 746
             if (houseId.length>10){
747 747
                 StorehouseService.findByStorehousebank(houseId,$rootScope.orgInfo.orgId).then(function(data){
748 748
                     $scope.storehouse = data;
749
-                    console.log($scope.storehouse);
749
+                    // console.log($scope.storehouse);
750 750
                 },function(data){
751 751
                     // console.log(data);
752 752
                 });
753 753
             }else {
754 754
                 StorehouseService.findByStorehouse(houseId,$rootScope.orgInfo.orgId).then(function(data){
755 755
                     $scope.storehouse = data;
756
-                    console.log($scope.storehouse);
756
+                    // console.log($scope.storehouse);
757 757
                 },function(data){
758 758
                     // console.log(data);
759 759
                 });

+ 5 - 2
src/main/resources/static/app/storage/controller/keeperCtrl.js

@@ -329,10 +329,13 @@ angular.module('app.storage')
329 329
         $scope.keeper = {};
330 330
         $scope.loadData = function() {
331 331
             //获取角色数据
332
-            roleService.getPageInfoIdByUserId($rootScope.userInfo.userId).then(function(data){
332
+            roleService.getPageInfo("保管员").then(function(data){
333
+                $scope.rolelist = data.list[0];
334
+                var roleId = $scope.rolelist.roleId;
335
+            // roleService.getPageInfoIdByUserId($rootScope.userInfo.userId).then(function(data){
333 336
                 // $scope.rolelist = data.list[0];
334 337
                 // var roleId = $scope.rolelist.roleId;
335
-                var roleId = data;
338
+                // var roleId = data;
336 339
                 keeperService.getKeeperListPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize,$scope.search.name,
337 340
                     $scope.search.storehouseId,$rootScope.userInfo.orgId,roleId).then(function(data){
338 341
                     $scope.pageInfo = data;