fix: 日常检查

src/main/resources/static/app/storage/controller/dailyListCtrl.js

@@ -214,6 +214,10 @@ angular.module('app.storage')
             $scope.dailycheck.rchygiene = "正常";
             $scope.dailycheck.rccorridor = "正常";
             $scope.dailycheck.ratfinchCheck = "0";//鼠雀检查
+            $scope.dailycheck.sfjl = 0;//是否结露
+            $scope.dailycheck.lsmbqk = 0;//粮食霉变情况
+            $scope.dailycheck.cfywxl = 0;//仓房有无渗漏
+            $scope.dailycheck.sffc = 0;//是否返潮:
         }
 
 
@@ -260,4 +264,50 @@ angular.module('app.storage')
             return currentdate;
         }
 
-    })
+    })
+	.directive('onlynumber', function($parse) {
+		return {  
+			link: function (scope, element, attrs, ctrl) {  
+				//控制输入框只能输入数字和小数点  
+				function limit(){  
+					var limitV=element[0].value;  
+					limitV=limitV.replace(/[^0-9.]/g,"");
+					//处理0开头的整数
+					if ((/^0+[0-9]+$/).test(limitV)) {
+						limitV=limitV.replace(/\b(0+)/gi,"");
+					}
+					//限定小数点后的位数
+					var digits =  attrs['digits']?Number(attrs['digits']):2;
+					if (limitV*Math.pow(10,digits)%1!=0) {
+						var index = limitV.indexOf('.');
+						var last = index+digits+1;
+						limitV = (""+limitV).substring(0,last);
+					}
+					element[0].value=limitV;  
+					$parse(attrs['ngModel']).assign(scope, limitV);
+					// format();
+				}  
+			
+				//对输入数字的整数部分插入千位分隔符  
+				function format(){  
+					var formatV=element[0].value;  
+					var array=new Array();  
+					array=formatV.split(".");  
+					var re=/(-?\d+)(\d{3})/;  
+					while(re.test(array[0])){  
+						array[0]=array[0].replace(re,"$1,$2")  
+					}  
+					var returnV=array[0];  
+					for(var i=1;i<array.length;i++){  
+						returnV+="."+array[i];  
+					}  
+					element[0].value=returnV;  
+					$parse(attrs['ngModel']).assign(scope, formatV);
+				}  
+			
+				scope.$watch(attrs.ngModel,function(){
+					limit();
+				})
+			}  
+		};
+  	})

src/main/resources/static/app/storage/views/safeproduce/safeproduce-dailyList-add.html

@@ -77,7 +77,60 @@
 
 											</label>
 										</section>
-
+										<section class="col col-3">
+											<label>保管员:<span style="color: red;">*</span></label>
+											<label class="input" style="padding-top:5px;">
+												<input type="text" ng-model="dailycheck.bgy" name="bgy" ng-readonly="isNotEdit"
+													   placeholder="保管员" required>
+											</label>
+										</section>
+										<section class="col col-3">
+											<label>参与人员:<span style="color: red;">*</span></label>
+											<label class="input" style="padding-top:5px;">
+												<input type="text" ng-model="dailycheck.cyry" name="cyry" ng-readonly="isNotEdit"
+													   placeholder="参与人员" required>
+											</label>
+										</section>
+									</div>
+									<div class="row">
+										<section class="col col-3">
+											<label>天气情况:</label>
+											<label class="input" style="padding-top:5px;">
+												<input type="text" ng-model="dailycheck.tqqk" name="tqqk" ng-readonly="isNotEdit" placeholder="天气情况" maxlength="30">
+											</label>
+										</section>
+										<section class="col col-3">
+											<label>粮温℃:</label>
+											<label class="input" style="padding-top:5px;">
+												<input type="text" ng-model="dailycheck.lw" name="lw" ng-readonly="isNotEdit" placeholder="粮温℃" onlynumber digits="1">
+											</label>
+										</section>
+										<section class="col col-3">
+											<label>仓温℃:</label>
+											<label class="input" style="padding-top:5px;">
+												<input type="text" ng-model="dailycheck.cw" name="cw" ng-readonly="isNotEdit" placeholder="仓温℃" onlynumber digits="1">
+											</label>
+										</section>
+										<section class="col col-3">
+											<label>气温℃:</label>
+											<label class="input" style="padding-top:5px;">
+												<input type="text" ng-model="dailycheck.qw" name="qw" ng-readonly="isNotEdit" placeholder="气温℃" onlynumber digits="1">
+											</label>
+										</section>
+									</div>
+									<div class="row">
+										<section class="col col-3">
+											<label>仓内湿%:</label>
+											<label class="input" style="padding-top:5px;">
+												<input type="text" ng-model="dailycheck.cns" name="cns" ng-readonly="isNotEdit" placeholder="仓内湿%" onlynumber digits="1">
+											</label>
+										</section>
+										<section class="col col-3">
+											<label>仓外湿%:</label>
+											<label class="input" style="padding-top:5px;">
+												<input type="text" ng-model="dailycheck.cws" name="cws" ng-readonly="isNotEdit" placeholder="仓外湿%" onlynumber digits="1">
+											</label>
+										</section>
 									</div>
 								</fieldset>
 								<header>虫害检查</header>
@@ -135,14 +188,28 @@
 											</label>
 										</section>
 										<section class="col col-3">
-											<span>其它检查:</span>
-											<label class="input" style="padding-top: 8px;">
-												<input type="text" ng-model="dailycheck.otherCheck" name="otherCheck" ng-disabled="isNotEdit"
-													   placeholder="其它检查">
-
+											<label class="select">
+												<label class="label" >是结露:</label>
+												<label class="select">
+													<select 
+														name="sfjl"
+														ng-model="dailycheck.sfjl"
+														ng-disabled="isNotEdit"
+														ng-options="x.value as x.label for x  in [{value:0,label:'无'},{value:1,label:'有'}]"
+													>
+														<option value="">--请选择--</option>
+													</select> <i></i> </label>
+											</label>
+										</section>
+										<section class="col col-3">
+											<label class="select">
+												<label class="label" >粮食霉变情况:</label>
+												<label class="select">
+													<select name="lsmbqk" ng-model="dailycheck.lsmbqk"  ng-disabled="isNotEdit" ng-options="x.value as x.label for x  in [{value:0,label:'无'},{value:1,label:'有'}]">
+														<option value="">--请选择--</option>
+													</select> <i></i> </label>
 											</label>
 										</section>
-
 									</div>
 									<div class="row">
 										<section class="col col-3">
@@ -166,6 +233,15 @@
 													   placeholder="灯">
 											</label>
 										</section>
+										<section class="col col-3">
+											<label class="select">
+												<label class="label" >仓房有无渗漏:</label>
+												<label class="select">
+													<select name="cfywxl" ng-model="dailycheck.cfywxl"  ng-disabled="isNotEdit" ng-options="x.value as x.label for x  in [{value:0,label:'无'},{value:1,label:'有'}]">
+														<option value="">--请选择--</option>
+													</select> <i></i> </label>
+											</label>
+										</section>
 									</div>
 									<div class="row">
 										<section class="col col-3">
@@ -182,7 +258,22 @@
 													   placeholder="查粮走道">
 											</label>
 										</section>
-
+										<section class="col col-3">
+											<label class="select">
+												<label class="label" >是否返潮:</label>
+												<label class="select">
+													<select name="sffc" ng-model="dailycheck.sffc"  ng-disabled="isNotEdit" ng-options="x.value as x.label for x  in [{value:0,label:'无'},{value:1,label:'有'}]">
+														<option value="">--请选择--</option>
+													</select> <i></i> </label>
+											</label>
+										</section>
+										<section class="col col-3">
+											<span>其它检查:</span>
+											<label class="input" style="padding-top: 8px;">
+												<input type="text" ng-model="dailycheck.otherCheck" name="otherCheck" ng-disabled="isNotEdit"
+													   placeholder="其它检查">
+											</label>
+										</section>
 									</div>
 									<div class="row">
 										<section class="col col-10" style="width:100%">