Przeglądaj źródła

fix: 删除console、修复判断类型错误、下拉框联动参数错误

XuPengHui 3 lat temu
rodzic
commit
5263158c6a

+ 3 - 16
src/main/resources/static/app/storage/controller/safeProduceDangerHandle.js

@@ -12,16 +12,8 @@ angular
12
           .getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize)
12
           .getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize)
13
           .then(
13
           .then(
14
             function (data) {
14
             function (data) {
15
-              console.log(data);
16
               if (data) {
15
               if (data) {
17
-                $scope.pageInfo.list = data.data.list;
18
-                $scope.pageInfo.hasNextPage = data.data.hasNextPage;
19
-                $scope.pageInfo.nextPage = data.data.nextPage;
20
-                $scope.pageInfo.navigatepageNums = data.data.navigatepageNums;
21
-                $scope.pageInfo.isLastPage = data.data.isLastPage;
22
-                $scope.pageInfo.pages = Math.ceil(
23
-                  data.data.total / $scope.pageInfo.pageSize
24
-                );
16
+                $scope.pageInfo = data.data;
25
               }
17
               }
26
               if ($scope.pageInfo.pageNum <= 0) {
18
               if ($scope.pageInfo.pageNum <= 0) {
27
                 $scope.pageInfo.pageNum = 1;
19
                 $scope.pageInfo.pageNum = 1;
@@ -31,7 +23,7 @@ angular
31
               }
23
               }
32
             },
24
             },
33
             function (data) {
25
             function (data) {
34
-              console.log(222, data);
26
+              console.log(data);
35
             }
27
             }
36
           );
28
           );
37
       };
29
       };
@@ -100,7 +92,6 @@ angular
100
       $scope.insertDanger = {
92
       $scope.insertDanger = {
101
         orgName: $rootScope.depotInfo.orgName,
93
         orgName: $rootScope.depotInfo.orgName,
102
       };
94
       };
103
-      console.log($rootScope.depotInfo.orgName);
104
       $scope.storehouseList = [];
95
       $scope.storehouseList = [];
105
       // $scope.storehouseId = "";
96
       // $scope.storehouseId = "";
106
       //下面的判断用于查看页面只读状态
97
       //下面的判断用于查看页面只读状态
@@ -119,7 +110,6 @@ angular
119
         //仓房信息下拉
110
         //仓房信息下拉
120
         StorehouseService.getStorehouseList($rootScope.orgInfo.orgId).then(
111
         StorehouseService.getStorehouseList($rootScope.orgInfo.orgId).then(
121
           function (data) {
112
           function (data) {
122
-            console.log(data.houseList);
123
             if (data.houseList.length > 0) {
113
             if (data.houseList.length > 0) {
124
               $scope.storehouseList = data.houseList; //下拉列表数据
114
               $scope.storehouseList = data.houseList; //下拉列表数据
125
             }
115
             }
@@ -133,13 +123,11 @@ angular
133
       
123
       
134
 
124
 
135
       $scope.edit = function () {
125
       $scope.edit = function () {
136
-        console.log("$scope.isNotEdit", $scope.isNotEdit);
137
         // 编辑
126
         // 编辑
138
-        if ($stateParams.id !== 0) {
127
+        if ($stateParams.id != 0) {
139
           safeDangerHandleService
128
           safeDangerHandleService
140
             .queryById($stateParams.id)
129
             .queryById($stateParams.id)
141
             .then(function (data) {
130
             .then(function (data) {
142
-              console.log(148, data);
143
               $scope.insertDanger = data.data;
131
               $scope.insertDanger = data.data;
144
             });
132
             });
145
         }
133
         }
@@ -149,7 +137,6 @@ angular
149
       // 提交表单
137
       // 提交表单
150
       var validator = $("#safeDangerHandle-form").validate();
138
       var validator = $("#safeDangerHandle-form").validate();
151
       $scope.saveData = function () {
139
       $scope.saveData = function () {
152
-        console.log($stateParams.id);
153
         $scope.insertDanger.solveTime = $(
140
         $scope.insertDanger.solveTime = $(
154
           "input[name='solveTime']"
141
           "input[name='solveTime']"
155
         ).val(); // 时间控件获取值
142
         ).val(); // 时间控件获取值

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

@@ -39,7 +39,7 @@ angular
39
               }
39
               }
40
             },
40
             },
41
             function (data) {
41
             function (data) {
42
-              console.log(222, data);
42
+              console.log(data);
43
             }
43
             }
44
           );
44
           );
45
       };
45
       };
@@ -141,13 +141,11 @@ angular
141
       ];
141
       ];
142
 
142
 
143
       $scope.edit = function () {
143
       $scope.edit = function () {
144
-        console.log("$scope.isNotEdit", $scope.isNotEdit);
145
         // 编辑
144
         // 编辑
146
-        if ($stateParams.id !== 0) {
145
+        if ($stateParams.id != 0) {
147
           safeProduceRiskService
146
           safeProduceRiskService
148
             .queryById($stateParams.id)
147
             .queryById($stateParams.id)
149
             .then(function (data) {
148
             .then(function (data) {
150
-              console.log(148, data);
151
               $scope.insertRisk = data.data;
149
               $scope.insertRisk = data.data;
152
             });
150
             });
153
         }
151
         }
@@ -156,7 +154,6 @@ angular
156
       // 提交表单
154
       // 提交表单
157
       var validator = $("#safeProduceNotify-form").validate();
155
       var validator = $("#safeProduceNotify-form").validate();
158
       $scope.saveData = function () {
156
       $scope.saveData = function () {
159
-        console.log($stateParams.id);
160
         if (validator.form()) {
157
         if (validator.form()) {
161
           $scope.insertRisk.orgId = $rootScope.orgInfo.orgId;
158
           $scope.insertRisk.orgId = $rootScope.orgInfo.orgId;
162
           $scope.fxlxList.forEach(function (item, i) {
159
           $scope.fxlxList.forEach(function (item, i) {

+ 1 - 4
src/main/resources/static/app/storage/grainCard/controller/foodHandleCtr.js

@@ -34,7 +34,6 @@ angular
34
       $scope.loadData();
34
       $scope.loadData();
35
       // 货位列表
35
       // 货位列表
36
       $scope.loadWare = function (houseId) {
36
       $scope.loadWare = function (houseId) {
37
-      console.log("🚀 ~ file: foodHandleCtr.js ~ line 47 ~ houseId", houseId)
38
         warehouseService
37
         warehouseService
39
           .getStorehouse($rootScope.orgInfo.orgId, houseId, "0")
38
           .getStorehouse($rootScope.orgInfo.orgId, houseId, "0")
40
           .then(
39
           .then(
@@ -147,7 +146,6 @@ angular
147
             function (data) {
146
             function (data) {
148
               $scope.warelist = data.wareList; //下拉列表数据
147
               $scope.warelist = data.wareList; //下拉列表数据
149
               $scope.warehouseObj = data.wares; //查询数据列表货位信息转换
148
               $scope.warehouseObj = data.wares; //查询数据列表货位信息转换
150
-              console.log($scope.warelist, $scope.warehouseObj);
151
             },
149
             },
152
             function (data) {
150
             function (data) {
153
               console.log(data);
151
               console.log(data);
@@ -157,7 +155,7 @@ angular
157
       $scope.loadWare(null);
155
       $scope.loadWare(null);
158
       $scope.edit = function () {
156
       $scope.edit = function () {
159
         // 编辑
157
         // 编辑
160
-          if ($stateParams.id !== 0) {
158
+          if ($stateParams.id != 0) {
161
             foodHandleService
159
             foodHandleService
162
               .findDataById($stateParams.id)
160
               .findDataById($stateParams.id)
163
               .then(function (data) {
161
               .then(function (data) {
@@ -168,7 +166,6 @@ angular
168
                 if($scope.insertFoodHandle.isSolve == 0) {
166
                 if($scope.insertFoodHandle.isSolve == 0) {
169
                   $scope.insertFoodHandle.isSolve = "0"
167
                   $scope.insertFoodHandle.isSolve = "0"
170
                 }
168
                 }
171
-                
172
                 $scope.search.spareOne = data.data.storeHouseId;
169
                 $scope.search.spareOne = data.data.storeHouseId;
173
                 $scope.search.spareTwo = data.data.wareHouseId;
170
                 $scope.search.spareTwo = data.data.wareHouseId;
174
               });
171
               });

+ 0 - 1
src/main/resources/static/app/storage/grainCard/service/foodHandleService.js

@@ -2,7 +2,6 @@
2
 angular.module('app.storage').service("foodHandleService", function ($http, $q, APP_CONFIG, $rootScope) {
2
 angular.module('app.storage').service("foodHandleService", function ($http, $q, APP_CONFIG, $rootScope) {
3
     // 分页列表
3
     // 分页列表
4
     this.getPageInfo = function (pageInfo, search) {
4
     this.getPageInfo = function (pageInfo, search) {
5
-        console.log(search.spareTwo);
6
         var d = $q.defer();
5
         var d = $q.defer();
7
         $http({
6
         $http({
8
             method: 'GET',
7
             method: 'GET',

+ 1 - 1
src/main/resources/static/app/storage/grainCard/views/foodHandle-edit.html

@@ -43,7 +43,7 @@
43
                           name="spareOne"
43
                           name="spareOne"
44
                           ng-disabled="isNotEdit"
44
                           ng-disabled="isNotEdit"
45
                           ng-options="store.storehouseId as store.storehouseName for store in storehouseObj"
45
                           ng-options="store.storehouseId as store.storehouseName for store in storehouseObj"
46
-                          ng-change="loadWare(search.storehouseCode)"
46
+                          ng-change="loadWare(search.spareOne)"
47
                           required
47
                           required
48
                         >
48
                         >
49
                           <option value="">请选择</option></select
49
                           <option value="">请选择</option></select

+ 1 - 1
src/main/resources/static/app/storage/grainCard/views/foodHandle-list.html

@@ -25,7 +25,7 @@
25
                                             <label style="margin-left: 10px;"> 仓房名称:
25
                                             <label style="margin-left: 10px;"> 仓房名称:
26
                                                 <select ng-model="search.spareOne" class="form-control input-sm"
26
                                                 <select ng-model="search.spareOne" class="form-control input-sm"
27
                                                         ng-options="store.storehouseId as store.storehouseName for store in storehouseObj"
27
                                                         ng-options="store.storehouseId as store.storehouseName for store in storehouseObj"
28
-                                                        ng-change="loadWare(search.storehouseCode)">
28
+                                                        ng-change="loadWare(search.spareOne)">
29
                                                     <option value="">请选择</option>
29
                                                     <option value="">请选择</option>
30
                                                 </select>&emsp;
30
                                                 </select>&emsp;
31
                                             </label>
31
                                             </label>

+ 2 - 2
src/main/resources/static/app/storage/registrationTable/controller/registrationCtrl.js

@@ -168,7 +168,7 @@ angular.module('app.registrationTable').controller("registrationWheatCtrl", func
168
 				dwfzr: ""
168
 				dwfzr: ""
169
 			};
169
 			};
170
 			registrationService.exportWheat(params)
170
 			registrationService.exportWheat(params)
171
-			console.log("奥利给");
171
+			// console.log("奥利给");
172
 		}
172
 		}
173
     
173
     
174
 })
174
 })
@@ -659,7 +659,7 @@ angular.module('app.registrationTable').controller("registrationRiceCtrl", funct
659
 				dwfzr: ""
659
 				dwfzr: ""
660
 			};
660
 			};
661
 			registrationService.exportRice(params)
661
 			registrationService.exportRice(params)
662
-			console.log("奥利给");
662
+			// console.log("奥利给");
663
 		}
663
 		}
664
 })
664
 })
665
 
665
 

+ 2 - 2
src/main/resources/static/app/storage/service/safeDangerHandleService.js

@@ -39,12 +39,12 @@ angular
39
           },
39
           },
40
         }).then(
40
         }).then(
41
           function successCallback(response) {
41
           function successCallback(response) {
42
-            console.log("success", response);
42
+            // console.log("success", response);
43
             // 请求成功执行代码
43
             // 请求成功执行代码
44
             d.resolve(response.data);
44
             d.resolve(response.data);
45
           },
45
           },
46
           function errorCallback(response) {
46
           function errorCallback(response) {
47
-            console.log("error", response);
47
+            // console.log("error", response);
48
             // 请求失败执行代码
48
             // 请求失败执行代码
49
             d.reject("error");
49
             d.reject("error");
50
           }
50
           }

+ 2 - 2
src/main/resources/static/app/storage/service/safeProduceRiskService.js

@@ -41,12 +41,12 @@ angular
41
           },
41
           },
42
         }).then(
42
         }).then(
43
           function successCallback(response) {
43
           function successCallback(response) {
44
-            console.log("success", response);
44
+            // console.log("success", response);
45
             // 请求成功执行代码
45
             // 请求成功执行代码
46
             d.resolve(response.data);
46
             d.resolve(response.data);
47
           },
47
           },
48
           function errorCallback(response) {
48
           function errorCallback(response) {
49
-            console.log("error", response);
49
+            // console.log("error", response);
50
             // 请求失败执行代码
50
             // 请求失败执行代码
51
             d.reject("error");
51
             d.reject("error");
52
           }
52
           }