大输液和统计分析优化

src/app/views/dept-statistics/dept-statistics.component.html

@@ -28,11 +28,11 @@
           <tr class="thead">
             <th nzWidth="5%">序号</th>
             <th nzWidth="10%" nzShowSort nzSortKey="bid" [(nzSort)]="sortCurrent.bid" (nzSortChange)="sort('bid',$event)">科室名称</th>
-            <th nzWidth="10%" nzShowSort nzSortKey="total" [(nzSort)]="sortCurrent.total" (nzSortChange)="sort('total',$event)">工单总量</th>
+            <th nzShowSort nzSortKey="total" [(nzSort)]="sortCurrent.total" (nzSortChange)="sort('total',$event)">工单总量</th>
             <th *ngFor="let item of listOfHeads; let index=index;" (nzSortChange)="sort(item.dataSort,$event)"
             	nzShowSort [(nzSort)]="item.sortName"
             	>{{item.name}}</th>
-            <th nzWidth="10%" nzShowSort nzSortKey="other" [(nzSort)]="sortCurrent.other" (nzSortChange)="sort('other',$event)">其他数量</th>
+            <th nzShowSort nzSortKey="other" [(nzSort)]="sortCurrent.other" (nzSortChange)="sort('other',$event)">其他数量</th>
           </tr>
         </thead>
         <tbody>
@@ -44,7 +44,7 @@
       </nz-table>
       <div class="list-template__pagination">
         <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
-          (nzPageIndexChange)="getList()" (nzPageSizeChange)="getList()">
+          (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue,'forbid')" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue,'forbid')">
         </nz-pagination>
       </div>
     </div>

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

@@ -220,7 +220,3 @@
  <!-- 模态框 -->
 <app-dialog-delete [delModal]="printModal" (hideDelModalEvent)="hidePrintModal()" [btnLoading]="btnLoading"
   (confirmDelEvent)="confirmPrintDel()" [content]="'您确认发药并打印吗？打印同时会更新云库存并建立配送工单？'"></app-dialog-delete>
-		
-<!-- 遮罩 -->
-<app-mask *ngIf="maskFlag"></app-mask>
-<app-excel-import [isShow]="isShow" (hideFormHand)="hideExcelImport($event)" *ngIf="isShow" (submitFormHand)="submitExcelImport($event)"></app-excel-import>

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

@@ -37,8 +37,8 @@
 						<td>{{ data.addSub||'0' }}</td>
             <td>
               <div class="coop">
-                <span (click)="itemClick($event, data.id, 'add')">增加</span>
-								<span (click)="itemClick($event, data.id, 'del')">减少</span>
+                <span (click)="itemClick($event, data, 'add')">增发</span>
+								<!-- <span (click)="itemClick($event, data, 'del')">减少</span> -->
 								<span (click)="grantClick($event, data)">{{data.giveOutType.value=='2'?'单发':'箱发'}}</span>
 							</div>
             </td>
@@ -89,13 +89,13 @@
   <!-- 增加/减少 -->
   <div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="modal">
     <div class="modalBody">
-      <div class="title">{{add ? '增加' : '减少'}}<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+      <div class="title">增发<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
       </div>
       <overlay-scrollbars #osComponentRef1 class="content">
        <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
        	<nz-form-item *ngIf="add">
-       	  <nz-form-label nzRequired nzFor="addNum">增加数量</nz-form-label>
-       	  <nz-form-control nzErrorTip="请选择增加数量!">
+       	  <nz-form-label nzRequired nzFor="addNum">增发数量<span class="color-stylr"> (支持负数)</span></nz-form-label>
+       	  <nz-form-control nzErrorTip="请选择增发数量!">
        	    <nz-input-group>
        				<nz-input-number
 								nz-input
@@ -104,12 +104,13 @@
        					[nzPrecision]="0"
        					[nzMax]="999999"
        					[nzStep]="1"
-       					[nzPlaceHolder]="'请填写增加数量'"
+       					[nzPlaceHolder]="'请填写增发数量'"
        				 ></nz-input-number>
        			</nz-input-group>
        	  </nz-form-control>
        	</nz-form-item>
-				<nz-form-item *ngIf="!add">
+				<div 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="请选择减少数量!">
 				    <nz-input-group>
@@ -124,7 +125,7 @@
 							 ></nz-input-number>
 						</nz-input-group>
 				  </nz-form-control>
-				</nz-form-item>
+				</nz-form-item> -->
        </form>
       </overlay-scrollbars>
       <div class="display_flex justify-content_flex-center">

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

@@ -332,6 +332,9 @@ h3{
 				}
 				
         .addForm {
+					.color-stylr{
+						color:red;
+					}
           .ant-form-item {
             margin-bottom: 14px;
 
@@ -403,4 +406,10 @@ h3{
 	border-radius: 50%;
 	background: red;
 	display: inline-block;
+}
+.red{
+	color: red;
+}
+.green{
+	color: #34b349;
 }

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

@@ -354,9 +354,12 @@ export class DispensingDetailComponent implements OnInit {
 	}
 	
 	// 增加/减少
-	itemClick(e, id, type){
+	rowData = null;
+	itemClick(e, data, type){
+		this.isRight = null;
 		e.stopPropagation();
-		this.rowId = id
+		this.rowId = data.id
+		this.rowData = data
 		if(type=='add'){
 			this.add = true
 		}else{
@@ -367,6 +370,7 @@ export class DispensingDetailComponent implements OnInit {
 	}
 	
 	// 表单提交
+	isRight = null;
 	submitForm(): void {
 	  var that = this;
 		for (const i in that.validateForm.controls) {
@@ -375,12 +379,22 @@ export class DispensingDetailComponent implements OnInit {
 		}
 		if (that.validateForm.invalid) return;
 	  let data = {
-			addSub:this.add?this.validateForm.value.addNum:this.validateForm.value.delNum,
+			addSub:this.validateForm.value.addNum,
 			id:this.rowId,
 			hosId:this.hosId,
 			deptId:this.deptId,
-			upType:that.add ? 'add' : 'sub'
 	  };
+		if(this.rowData.giveOutType.value==2){
+			let num1 = Number(this.rowData.expendCount) + Number(this.rowData.formerInventory) + Number(data.addSub)
+			let num2 = num1 / this.rowData.drugsInfoDTO.packingSpecs
+			if(num2 % 1 === 0){
+				this.isRight = true
+			}else{
+				this.isRight = false
+				this.message.error('数量错误，请重新填写！')
+				return
+			}
+		}
 		that.btnLoading = true;
 	  that.mainService
 	    .simplePost("addData", "drugsConfigure", data)

src/app/views/medical-waste-department-statistics/medical-waste-department-statistics.component.html

@@ -71,7 +71,7 @@
 		    <span class="rate"></span>
 		  </div>
 		  <div>
-		    <span>科室名称</span>
+		    <span>科室数</span>
 		    <span>{{summary[0] || 0}}</span>
 		  </div>
 		  <div>

src/app/views/medical-waste-personnel-statistics/medical-waste-personnel-statistics.component.ts

@@ -240,7 +240,12 @@ export class MedicalWastePersonnelStatisticsComponent implements OnInit {
 	
   // 表格数据
   loading1 = false;
-	summary = {};
+	summary = {
+		personalNum:null,
+		totalTrip:null,
+		totalOrder:null,
+		totalWeight:null,
+	};
   getList(num?: number, field?: string, sort?: string) {
     this.pageIndex = num;
     let postData: any = {

src/app/views/office-detail/office-detail.component.ts

@@ -24,7 +24,7 @@ export class OfficeDetailComponent implements OnInit {
     this.getDetail();
   }
   hideModal() {
-    this.router.navigateByUrl("/main/dispensingBatch");
+    this.router.navigateByUrl("/main/officeManagement");
   }
 
   // 获取详情

src/app/views/order-statistics/order-statistics.component.html

@@ -47,11 +47,11 @@
           <tr class="thead">
             <th nzWidth="5%">序号</th>
             <th nzWidth="10%" nzShowSort nzSortKey="date" [(nzSort)]="sortCurrent.date" (nzSortChange)="sort('date',$event)">时间</th>
-            <th nzWidth="10%" nzShowSort nzSortKey="total" [(nzSort)]="sortCurrent.total" (nzSortChange)="sort('total',$event)">工单总量</th>
+            <th nzShowSort nzSortKey="total" [(nzSort)]="sortCurrent.total" (nzSortChange)="sort('total',$event)">工单总量</th>
 						<th *ngFor="let item of listOfHeads; let index=index;" (nzSortChange)="sort(item.dataSort,$event)"
 							nzShowSort [(nzSort)]="item.sortName"
 							>{{item.name}}</th>
-            <th nzWidth="10%" nzShowSort nzSortKey="other" [(nzSort)]="sortCurrent.other" (nzSortChange)="sort('other',$event)">其他数量</th>
+            <th nzShowSort nzSortKey="other" [(nzSort)]="sortCurrent.other" (nzSortChange)="sort('other',$event)">其他数量</th>
           </tr>
         </thead>
         <tbody>
@@ -63,7 +63,7 @@
       </nz-table>
       <div class="list-template__pagination">
         <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
-          (nzPageIndexChange)="getList()" (nzPageSizeChange)="getList()">
+          (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue,'forbid')" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue,'forbid')">
         </nz-pagination>
       </div>
     </div>

src/app/views/quilt-washing-department-statistics/quilt-washing-department-statistics.component.ts

@@ -275,7 +275,14 @@ export class QuiltWashingDepartmentStatisticsComponent implements OnInit {
 	
   // 表格数据
   loading1 = false;
-	summary = {};
+	summary = {
+		deptNum:null,
+		clothesTypeTotalNum:null,
+		getOrderTotal:null,
+		sendOrderTotal:null,
+		sendClothesTotalNum:null,
+		totalPrice:null,
+	};
   getList(num?: number, field?: string, sort?: string) {
     this.mapOfCheckedId = {};
     this.checkedDepIds = [];

src/app/views/quilt-washing-hospital-statistics/quilt-washing-hospital-statistics.component.ts

@@ -168,7 +168,14 @@ export class QuiltWashingHospitalStatisticsComponent implements OnInit {
   }
   // 表格数据
   loading1 = false;
-	summary = {};
+	summary = {
+		deptNum:null,
+		clothesTypeTotalNum:null,
+		getOrderTotal:null,
+		sendOrderTotal:null,
+		sendClothesTotalNum:null,
+		totalPrice:null,
+	};
   getList(num?: number, field?: string, sort?: string) {
     this.pageIndex = num;
     let postData: any = {

src/app/views/quilt-washing-personnel-statistics/quilt-washing-personnel-statistics.component.html

@@ -89,7 +89,7 @@
 		  </div>
 		  <div>
 		    <span>送回工单数</span>
-		    <span>{{summary.sendorderTotal || 0}}</span>
+		    <span>{{summary.sendOrderTotal || 0}}</span>
 		  </div>
 		</div>
     <div class="list-template__bottom">

src/app/views/quilt-washing-personnel-statistics/quilt-washing-personnel-statistics.component.ts

@@ -235,7 +235,15 @@ export class QuiltWashingPersonnelStatisticsComponent implements OnInit {
 	}
   // 表格数据
   loading1 = false;
-	summary = {};
+	summary = {
+		personTotal:null,
+		tripTotal:null,
+		orderTotal:null,
+		getTripTotal:null,
+		getOrderTotal:null,
+		sendTripTotal:null,
+		sendOrderTotal:null,
+	};
   getList(num?: number, field?: string, sort?: string) {
     this.pageIndex = num;
     let postData: any = {