熏蒸修改

src/main/resources/static/app/intelligent/fumigation/controller/fumHomeWorkCtrl.js

@@ -222,7 +222,7 @@ angular.module('app.intelligent')
     // 气体检测信息添加
     $scope.addRow = function() {
         var params = [];
-        params.houseId = $scope.fumigation.houseId;
+        params.houseId = $rootScope.storehouseObj[parseInt($scope.fumigation.houseId)].storehouseCode;
         var uibModalInstance = $uibModal.open({
             size:'lg',
             templateUrl: 'app/intelligent/fumigation/views/homework/dcsqtinfo-list-modal.html',
@@ -465,6 +465,12 @@ angular.module('app.intelligent')
         return this.optional(element)||(checkNumber.test(value));
     },"请输入正确的数字类型，最多两位小数！");
 
+    // 自定义验证，验证熏蒸次数
+    $.validator.addMethod("validFrequency",function(value,element, params) {
+        var checkNumber = /^\+?[1-9]\d*$/;
+        return this.optional(element)||(checkNumber.test(value));
+    },"请输入大于0的整数！");
+
     // 自定义验证
     $.validator.addMethod("setState",function(value,element, params) {
         if(value == "无" || value == "暂无" || value == "空"){

src/main/resources/static/app/intelligent/fumigation/controller/fumigationPlanCtrl.js

@@ -225,6 +225,12 @@ angular.module('app.intelligent')
     var validator = $("#fumigationPlan-form").validate();
 
     // 自定义验证，验证数字
+    $.validator.addMethod("validNumbers",function(value,element, params) {
+        var checkNumber = /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,3})?$/;
+        return this.optional(element)||(checkNumber.test(value));
+    },"请输入大于0的数字，最多三位小数！");
+
+    // 自定义验证，验证数字
     $.validator.addMethod("validNumber",function(value,element, params) {
         var checkNumber = /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/;
         return this.optional(element)||(checkNumber.test(value));

src/main/resources/static/app/intelligent/fumigation/controller/pesticideListModalCtrl.js

@@ -43,7 +43,7 @@ function($scope, $uibModalInstance, $filter, $http, $uibModal, $rootScope, gasDe
     $scope.searchCondition = {};
     var orgId = $rootScope.depotInfo.orgId;
     $scope.storehouseObj = $rootScope.storehouseObj;
-    // $scope.searchCondition.vCfCode = items.houseId;
+    $scope.searchCondition.vCfCode = items.houseId;
 
     // 获取列表数据
     $scope.loadData = function() {

src/main/resources/static/app/intelligent/fumigation/controller/pesticidePlanCtrl.js

@@ -250,6 +250,12 @@ angular.module('app.intelligent')
         return this.optional(element)||(checkNumber.test(value));
     },"请输入正确的数字类型，最多两位小数！");
 
+    // 自定义验证，验证熏蒸次数
+    $.validator.addMethod("validFrequency",function(value,element, params) {
+        var checkNumber = /^\+?[1-9]\d*$/;
+        return this.optional(element)||(checkNumber.test(value));
+    },"请输入大于0的整数！");
+
     //根据仓房号赋值仓型和仓房尺寸
     $scope.storeData = function (houseId) {
         // 获取仓房信息.仓房id.

src/main/resources/static/app/intelligent/fumigation/views/homework/fumHomeWorkAfter-edit.html

@@ -237,7 +237,7 @@
                                                     <section>
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationAfter.czsjzyrs"
-                                                                   ng-readonly="isNotEdit" name="czsjzyrs" validNumber="true">
+                                                                   ng-readonly="isNotEdit" name="czsjzyrs" validFrequency="true">
                                                         </label>
                                                     </section>
                                                 </th>
@@ -283,7 +283,7 @@
                                                     <section>
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationAfter.czclzyrs"
-                                                                   ng-readonly="isNotEdit" name="czclzyrs" validNumber="true">
+                                                                   ng-readonly="isNotEdit" name="czclzyrs" validFrequency="true">
                                                         </label>
                                                     </section>
                                                 </th>
@@ -422,7 +422,7 @@
                                                     <section>
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationAfter.xzhckmd" ng-readonly="isNotEdit"
-                                                                   name="xzhckmd" validNumber="true">
+                                                                   name="xzhckmd" validFrequency="true">
                                                         </label>
                                                     </section>
                                                 </th>

src/main/resources/static/app/intelligent/fumigation/views/homework/fumHomeWorkProcess-edit.html

@@ -315,7 +315,7 @@
                                                     <section>
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationProcess.totalSupplementDrugTimes" ng-readonly="isNotEdit"
-                                                                   name="totalSupplementDrugTimes" validNumber="true">
+                                                                   name="totalSupplementDrugTimes" validFrequency="true">
                                                         </label>
                                                     </section>
                                                 </th>
@@ -622,7 +622,7 @@
                                                     <section>
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationProcess.mbndwcts" ng-readonly="isNotEdit"
-                                                                   name="mbndwcts" placeholder="" validNumber="true">
+                                                                   name="mbndwcts" placeholder="" validFrequency="true">
                                                         </label>
                                                     </section>
                                                 </th>
@@ -657,7 +657,7 @@
                                                     <section>
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationProcess.mbsj" ng-readonly="isNotEdit"
-                                                                   name="mbsj" validNumber="true">
+                                                                   name="mbsj" validFrequency="true">
                                                         </label>
                                                     </section>
                                                 </th>
@@ -762,7 +762,7 @@
                                                     <section>
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationProcess.sqcsts"
-                                                                   ng-readonly="isNotEdit" name="sqcsts" validNumber="true">
+                                                                   ng-readonly="isNotEdit" name="sqcsts" validFrequency="true">
                                                         </label>
                                                     </section>
                                                 </th>

src/main/resources/static/app/intelligent/fumigation/views/plan/fumigationPlan-edit.html

@@ -176,7 +176,7 @@
 												<section>
 													<label class="input">
 														<input class="form-control" type="text" ng-model="fumigation.grainCount"
-															   name="grainCount" validNumber="true">
+															   name="grainCount" validNumbers="true">
 													</label>
 												</section>
 											</th>

src/main/resources/static/app/intelligent/fumigation/views/plan/pesticidePlan-edit.html

@@ -257,7 +257,7 @@
 													<section>
 														<label class="input">
 															<input class="form-control" type="text" ng-model="pesticide.plannDrugCount"
-																   name="plannDrugCount" placeholder="" required>
+																   name="plannDrugCount" validNumber="true" required>
 														</label>
 													</section>
 												</th>
@@ -270,7 +270,7 @@
 													<section>
 														<label class="input">
 															<input class="form-control" type="text" ng-model="pesticide.lddwyyl"
-																   name="lddwyyl" placeholder="">
+																   name="lddwyyl" validNumber="true">
 														</label>
 													</section>
 												</th>
@@ -281,7 +281,7 @@
 													<section>
 														<label class="input">
 															<input class="form-control" type="text" ng-model="pesticide.kjdwyyl"
-																   name="kjdwyyl" placeholder="">
+																   name="kjdwyyl" validNumber="true">
 														</label>
 													</section>
 												</th>
@@ -307,7 +307,7 @@
 													<section>
 														<label class="input">
 															<input class="form-control" type="text" ng-model="pesticide.settingConcentration"
-																   name="settingConcentration" placeholder="" validNumber="true" >
+																   name="settingConcentration" validNumber="true" >
 														</label>
 													</section>
 												</th>
@@ -328,7 +328,7 @@
 												<th>
 													<section>
 														<label class="select">
-															<select ng-model="pesticide.syff" required name="syff"
+															<select ng-model="pesticide.syff" name="syff"
 																	class="form-control">
 																<option value="">--请选择--</option>
 																<option value="0">潮解法</option>