|
|
@@ -804,6 +804,7 @@ angular.module('app.storage')
|
|
804
|
804
|
$("#printing").printArea();
|
|
805
|
805
|
}
|
|
806
|
806
|
|
|
|
807
|
+ //四舍五入保留两位小数
|
|
807
|
808
|
$scope.getMath = function(v) {
|
|
808
|
809
|
if (isNaN(v) || v == "") {
|
|
809
|
810
|
v = 0.00;
|
|
|
@@ -819,6 +820,7 @@ angular.module('app.storage')
|
|
819
|
820
|
}
|
|
820
|
821
|
return v;
|
|
821
|
822
|
}
|
|
|
823
|
+ //四舍五入保留一位小数
|
|
822
|
824
|
$scope.getMath1 = function(v) {
|
|
823
|
825
|
if (isNaN(v) || v == "") {
|
|
824
|
826
|
v = 0.0;
|
|
|
@@ -1021,7 +1023,7 @@ angular.module('app.storage')
|
|
1021
|
1023
|
}
|
|
1022
|
1024
|
var bblzl = ((parseFloat(black)*100) + (parseFloat(gibberella)*100) + (parseFloat(qtbl)*100))/100;
|
|
1023
|
1025
|
//$scope.qualitycheckInspection.imperfectgrainsScabTotal = $scope.getMath($scope.qualitycheckInspection.imperfectgrainsScabTotal);
|
|
1024
|
|
- bblzl = $scope.checkJqos(bblzl,1);
|
|
|
1026
|
+ //bblzl = $scope.checkJqos(bblzl,1);
|
|
1025
|
1027
|
$scope.qualitycheckInspection.imperfectgrainsScabTotal = isNaN(bblzl) ? '0.0' : $scope.getMath1(bblzl);
|
|
1026
|
1028
|
//不完善粒总量
|
|
1027
|
1029
|
if(csl == null || csl == undefined){
|