fanxw hace 1 año
padre
commit
b0d3800fd8

+ 2 - 2
src/main/resources/static/app/app.js

@@ -435,11 +435,11 @@ angular.module('app', [
435 435
                             $rootScope.store_tank_list = data.house_and_tank_List;
436 436
                             /* 包含所有有效的仓房信息的下拉对象  */
437 437
                             $rootScope.storelist = data.houseList;
438
-                            $rootScope.storelist2 = data.houseList;
438
+                            //$rootScope.storelist2 = data.houseList;
439 439
                             $rootScope.storeAgentlist = data.houseList;
440 440
                             /* 包含所有有效的油罐信息的下拉对象  */
441 441
                             $rootScope.tanklist = data.tankList;
442
-                            $rootScope.tanklist2 = data.tankList;
442
+                            //$rootScope.tanklist2 = data.tankList;
443 443
                             $rootScope.agentYGList = data.tankList;
444 444
                             /* 按ID来封装的包含所有仓房和油罐(有仓房的详细信息,油罐只有油罐ID、油罐code和油罐name) */
445 445
                             $rootScope.storehouseObj = data.houseObj;

+ 1 - 1
src/main/resources/static/app/business/commonUtilService.js

@@ -158,7 +158,7 @@ angular.module('app.business').service("commonUtilService", function($http, $q,
158 158
         return v;
159 159
     }
160 160
     
161
-    //将v四舍五入,且保留n位小数
161
+    //将v四舍五入,且保留n位小数(这个方法有异常,不准)
162 162
     this.getMath_N = function(v, n) {
163 163
         if (isNaN(v) || v == "") {
164 164
         	if (isNaN(n) || v == "") {

+ 2 - 1
src/main/resources/static/app/business/storageSealedConfirmation/service/pageListService.js

@@ -11,7 +11,8 @@ angular.module('app.business').service("pageListService", function ($http, $root
11 11
                 auditState  : search.auditState, // 1:待提交,2:待审批,3:驳回,4:已审批,5:审批结束
12 12
                 orgId : $rootScope.userInfo.orgId,
13 13
                 houseId : search.houseId,
14
-                warehouseId : search.warehouseId
14
+                warehouseId : search.warehouseId,
15
+                applyTime : search.applyTime
15 16
             }
16 17
         }).then(function successCallback(response) {
17 18
             // 请求成功执行代码

+ 1 - 1
src/main/resources/static/app/storage/controller/qualitycheckCtrl.js

@@ -1397,7 +1397,7 @@ angular.module('app.storage')
1397 1397
         	value = value.replace(",",',');
1398 1398
         	$scope.qualitycheck.checker = value;
1399 1399
         	var checkNumber = /^[\u4e00-\u9fa5,\|?]{0,128}$/g;
1400
-            return this.optional(element)||(checkNumber.test(value));  
1400
+            return this.optional(element)||(checkNumber.test(value));
1401 1401
         },"请输入汉字,用','号分隔");
1402 1402
         
1403 1403
         //通过检验时间判断部分检验项是否要加载