大输液优化

src/app/views/dispensing-batch/dispensing-batch.component.html

@@ -199,7 +199,7 @@
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">
 					<span *ngIf="data.drugsInfoDTO.drugName!='合计'">
-						{{ data.cartonNum }}
+						{{ data.giveOutType.value==1 ? data.actualCount :data.cartonNum }}
 						{{data.giveOutType && data.giveOutType.value==1?
 						data.drugsInfoDTO.unit:'箱'}}
 					</span>

src/app/views/dispensing-detail/dispensing-detail.component.html

@@ -100,7 +100,7 @@
        				<nz-input-number
 								nz-input
        					formControlName="addNum"
-       					[nzMin]="0"
+       					[nzMin]="-999999"
        					[nzPrecision]="0"
        					[nzMax]="999999"
        					[nzStep]="1"
@@ -109,7 +109,7 @@
        			</nz-input-group>
        	  </nz-form-control>
        	</nz-form-item>
-				<div style="text-align: left;" [ngClass]="{'red': isRight == false, 'green': isRight == true}">(消耗数+原库存数 + 增发数量) / 包装规格 = 1 (计算后数量必须是整数) </div>
+				<div *ngIf="rowData.giveOutType.value=='2'" style="text-align: left;" [ngClass]="{'red': isRight == false, 'green': isRight == true}">(消耗数+原库存数 + 增发数量) / 包装规格 = 1 (计算后数量必须是整数) </div>
 		<!-- 		<nz-form-item *ngIf="!add">
 				  <nz-form-label nzRequired nzFor="delNum">减少数量</nz-form-label>
 				  <nz-form-control nzErrorTip="请选择减少数量!">