fanxw лет назад: 2
Родитель
Сommit
ed193288b0
1 измененных файлов с 3 добавлено и 1 удалено
  1. 3 1
      src/main/resources/static/app/storage/controller/qualitycheckCtrl.js

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

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