初检详情页面化验项增加其它病粒指标项

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

@@ -724,6 +724,8 @@ angular.module('app.storage')
             inorganic = isNaN(inorganic) ? 0 : inorganic;
             var gibberella = parseFloat($scope.qualitycheckInspection.imperfectgrainsScabGibberella);//赤霉病粒
             gibberella = isNaN(gibberella) ? 0 : gibberella;
+            var qtbl = parseFloat($scope.qualitycheckInspection.imperfectgrainsScabQtbl);//其它病粒
+            qtbl = isNaN(qtbl) ? 0 : qtbl;
             var organic = parseFloat($scope.qualitycheckInspection.impurityOrganic);//有机杂质
             organic = isNaN(organic) ? 0 : organic;
             var sieveResidue = parseFloat($scope.qualitycheckInspection.sieveResidue);//筛下物%
@@ -736,13 +738,13 @@ angular.module('app.storage')
             sml = isNaN(sml) ? 0 : sml;
             var syl = parseFloat($scope.qualitycheckInspection.imperfectgrainsSproutedkernel);//生芽粒%
             syl = isNaN(syl) ? 0 : syl;
-            var bblzl = ((parseFloat(black)*100) + (parseFloat(gibberella)*100))/100;//病斑粒总量%
+            var bblzl = ((parseFloat(black)*100) + (parseFloat(gibberella)*100) + (parseFloat(qtbl)*100))/100;//病斑粒总量%
             bblzl = isNaN(bblzl) ? 0 : bblzl;
             if($scope.qualitycheck !== undefined && $scope.qualitycheck !== ""){
                 //杂质总量
                 $scope.qualitycheckInspection.impurityTotal = ((parseFloat(mineral)*100) + (parseFloat(inorganic)*100)+ (parseFloat(organic)*100)+ (parseFloat(sieveResidue)*100))/100;
                 //病斑粒总量
-                $scope.qualitycheckInspection.imperfectgrainsScabTotal = ((parseFloat(black)*100) + (parseFloat(gibberella)*100))/100;
+                $scope.qualitycheckInspection.imperfectgrainsScabTotal = ((parseFloat(black)*100) + (parseFloat(gibberella)*100) + (parseFloat(qtbl)*100))/100;
 
                 //总量
                 $scope.qualitycheckInspection.imperfectgrainsTotal = ((parseFloat(csl)*100) + (parseFloat(psl)*100)+(parseFloat(sml)*100) + (parseFloat(bblzl)*100) + (parseFloat(syl)*100))/100;

src/main/resources/static/app/storage/views/qualitycheck/qualitycheck-firstcheck-edit.html

@@ -393,7 +393,7 @@
 																<input type="text" ng-model="qualitycheck.water" name="water" ng-readonly="isNotEdit">
 															</label>
 														</td>
-														<td rowspan="8" class="text-center" style="vertical-align: middle;">不完善粒</td>
+														<td rowspan="9" class="text-center" style="vertical-align: middle;">不完善粒</td>
 														<td class="text-center" colspan="2">总量</td>
 														<td colspan="2">
 															<label class="input">
@@ -423,7 +423,7 @@
 																<input type="text" ng-model="qualitycheckInspection.impurityTotal" name="impurityTotal" ng-disabled="isShow">
 															</label>
 														</td>
-														<td rowspan="3" class="text-center" style="vertical-align: middle;">病斑粒</td>
+														<td rowspan="4" class="text-center" style="vertical-align: middle;">病斑粒</td>
 														<td>总量</td>
 														<td colspan="2">
 															<label class="input">
@@ -471,10 +471,10 @@
 																	   ng-blur="zjzl()" />
 															</label>
 														</td>
-														<td colspan="2" class="text-center">破损粒%</td>
+														<td>其它病粒%</td>
 														<td colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsDamage" name="imperfectgrainsDamage" ng-readonly="isNotEdit"  ng-blur="zjzl()">
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsScabQtbl" name="imperfectgrainsScabQtbl" ng-readonly="isNotEdit"  ng-blur="zjzl()">
 															</label>
 														</td>
 													</tr>
@@ -486,10 +486,10 @@
 																	   ng-blur="zjzl()" />
 															</label>
 														</td>
-														<td colspan="2" class="text-center">生霉粒%</td>
-														<td colspan="2" class="text-center">
+														<td colspan="2" class="text-center">破损粒%</td>
+														<td colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheck.mildewCount" name="mildewCount" ng-readonly="isNotEdit"  ng-blur="zjzl()">
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsDamage" name="imperfectgrainsDamage" ng-readonly="isNotEdit"  ng-blur="zjzl()">
 															</label>
 														</td>
 													</tr>
@@ -500,10 +500,10 @@
 																<input type="text" ng-model="qualitycheck.hardIndex" name="hardIndex" ng-readonly="isNotEdit">
 															</label>
 														</td>
-														<td colspan="2" class="text-center">生芽粒%</td>
+														<td colspan="2" class="text-center">生霉粒%</td>
 														<td colspan="2" class="text-center">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsSproutedkernel"  ng-blur="zjzl()" name="imperfectgrainsSproutedkernel" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheck.mildewCount" name="mildewCount" ng-readonly="isNotEdit"  ng-blur="zjzl()">
 															</label>
 														</td>
 													</tr>
@@ -518,6 +518,12 @@
 																<input type="text" ng-model="qualitycheckInspection.inputTwo" name="inputTwo" ng-readonly="isNotEdit">
 															</label>
 														</td>
+														<td colspan="2" class="text-center">生芽粒%</td>
+														<td colspan="2" class="text-center">
+															<label class="input">
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsSproutedkernel"  ng-blur="zjzl()" name="imperfectgrainsSproutedkernel" ng-readonly="isNotEdit">
+															</label>
+														</td>
 														<td colspan="3" class="text-center"></td>
 														<td colspan="2" class="text-center"></td>
 													</tr>