被服洗涤

src/app/services/main.service.ts

@@ -761,4 +761,10 @@ export class MainService {
       headers: this.headers,
     });
   }
+  // transflow
+  transflow(data, type): any {
+    return this.http.post(host.host + "/transflow/" + type, data, {
+      headers: this.headers,
+    });
+  }
 }

src/app/share/businessData-detail-modal/businessData-detail-modal.component.html

@@ -124,6 +124,35 @@
         </tbody>
       </nz-table>
 
+      <!-- 被服洗涤批次管理-查看视图-查看异常 -->
+      <nz-table *ngIf="type === 'washingException'" class="hospitalTable" [nzData]="washingExceptionList" nzSize="middle" [nzShowPagination]="false"
+        [nzLoading]="hsLoading" [nzScroll]="{ y: '500px' }">
+        <thead>
+          <tr class="thead">
+            <th nzWidth="5%">序号</th>
+            <th nzWidth="13%">关联科室</th>
+            <th nzWidth="11%">被服种类</th>
+            <th nzWidth="5%">调整数量</th>
+            <th nzWidth="20%">调整原因</th>
+            <th nzWidth="20%">备注</th>
+            <th nzWidth="15%">时间</th>
+            <th nzWidth="11%">操作人</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of washingExceptionList;let i = index;">
+            <td>{{i+1}}</td>
+            <td>{{ data.clothesDeptDTO?.dept }}</td>
+            <td>{{ data.clothesType?.name }}</td>
+            <td>{{ data.changeNum }}</td>
+            <td>{{ data.clothesExceptionRe?.name }}</td>
+            <td>{{ data.remarks }}</td>
+            <td>{{ data.changeTime | date:"yyyy-MM-dd HH:mm:ss" }}</td>
+            <td>{{ data.changerDTO?.name }}</td>
+          </tr>
+        </tbody>
+      </nz-table>
+
       <div class="pagination" *ngIf="type !== 'blood'">
         <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
         <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="total"

src/app/share/businessData-detail-modal/businessData-detail-modal.component.ts

@@ -12,6 +12,7 @@ export class BusinessDataDetailModalComponent implements OnInit {
   hosId;
   hsLoading = false;
   bloodList: any = [];// 血制品列表
+  washingExceptionList: any = [];// 被服洗涤异常列表
   specimenList: any = [];// 标本列表
   inspectionRateStatisticsList: any = [];// 科室检查率统计列表
   pageIndex: number = 1;//表格当前页码
@@ -45,6 +46,9 @@ export class BusinessDataDetailModalComponent implements OnInit {
       case 'deptInspectionRateStatistics':
           this.getDeptInspectionRateStatistics(1);
           break;
+      case 'washingException':
+          this.getWashingException(1);
+          break;
     }
   }
   // 关闭弹窗
@@ -84,6 +88,9 @@ export class BusinessDataDetailModalComponent implements OnInit {
       case 'deptInspectionRateStatistics':
         this.getDeptInspectionRateStatistics();
         break;
+      case 'washingException':
+        this.getWashingException();
+        break;
     }
   }
 
@@ -154,6 +161,27 @@ export class BusinessDataDetailModalComponent implements OnInit {
     })
   }
 
+  // 获取被服洗涤异常列表
+  getWashingException(idx?) {
+    if (idx) {
+      this.pageIndex = 1;
+    }
+    let postData = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      clothesException: {
+        hosId: this.hosId,
+        id: this.orderId,
+      }
+    }
+    this.hsLoading = true;
+    this.mainService.getFetchDataList('simple/data','clothesException',postData).subscribe(data => {
+      this.hsLoading = false;
+      this.washingExceptionList = data.list || [];
+      this.total = data.totalNum || 0;
+    })
+  }
+
   // 获取科室检查率统计-详情列表
   getDeptInspectionRateStatistics(idx?) {
     if (idx) {

src/app/views/washing-batch-view/washing-batch-view.component.html

@@ -29,9 +29,10 @@
       </div>
       <div class="display_flex align-items_center">
         <button nzType="primary" nz-button (click)="getList()">搜索</button>
+        <button nzType="primary" nz-button (click)="reset()">重置</button>
         <button nzType="primary" nz-button>打印功能</button>
-        <button nzType="primary" nz-button>查看异常</button>
-        <button nzType="primary" nz-button (click)="showDelModal()">批量送回</button>
+        <button nzType="primary" nz-button (click)="viewDetail()">查看异常</button>
+        <button nzType="primary" nz-button (click)="showDelModal()" [disabled]="checkedDepIds.length === 0">批量送回</button>
       </div>
     </div>
     <div class="list">
@@ -39,15 +40,23 @@
         [nzLoading]="loading" [nzScroll]="{ x: '100%', y: scrollY + 'px' }">
         <thead>
           <tr class="thead">
+            <!-- 多选框 -->
             <th nzLeft="0px" nzAlign="center" nzWidth="40px" nzShowCheckbox [(nzChecked)]="isAllDisplayDataChecked"
               (nzCheckedChange)="checkAll($event)"></th>
-            <th [nzLeft]="first ? '40px' : null" [nzRight]="last ? '0px' : (index == rows.length - 2 ? '100px' : null)" nzAlign="center" [nzWidth]="first ? '140px' : (last ? '100px' : (index == rows.length - 3 ? null : '65px'))" *ngFor="let row of rows;let first = first;let last = last;let index = index;">{{ row }}</th>
+            <!-- 固定列-first -->
+            <th nzLeft="40px" nzAlign="center" nzWidth="140px">{{ row }}</th>
+            <!-- 动态列 -->
+            <th nzAlign="center" nzWidth="65px" *ngFor="let row of rows[1]">{{ row }}</th>
+            <!-- 固定列-last -->
+            <th [nzRight]="last ? '0px' : (first ? null : '100px')" nzAlign="center" [nzWidth]="(last ? '100px' : (first ? null : '65px'))" *ngFor="let row of rows[2];let first = first;let last = last;">{{ row }}</th>
           </tr>
         </thead>
         <tbody>
-          <tr *ngFor="let data of listOfData;let index=index;" (click)="selectedListData(data)">
-            <td nzLeft="0px" nzAlign="center" nzShowCheckbox [(nzChecked)]="mapOfCheckedId[data[0]]" (nzCheckedChange)="refreshStatus()"></td>
-            <td [nzLeft]="index == 1 ? '40px' : null" [nzRight]="last ? '0px' : (index == data.length - 2 ? '100px' : null)" nzAlign="center" *ngFor="let row of data;let first = first;let last = last;let index = index;" [hidden]="first">{{ row }}</td>
+          <tr *ngFor="let data of listOfData" (click)="selectedListData(data)">
+            <td nzLeft="0px" nzAlign="center" nzShowCheckbox [nzDisabled]="data[0][1] == 5" [(nzChecked)]="mapOfCheckedId[data[0][0]]" (nzCheckedChange)="refreshStatus()"></td>
+            <td nzLeft="40px" nzAlign="center"><span>{{ data[0][data[0].length - 1] }}</span></td>
+            <td nzAlign="center" *ngFor="let row of data[1];let index = index;"><span (click)="clickNum($event, row)" class="table_hover" [ngClass]="{ red: row.exception == 1 }">{{ row.sendBackNum }}</span></td>
+            <td [nzRight]="last ? '0px' : (first ? null : '100px')" nzAlign="center" *ngFor="let row of data[2];let first = first;let last = last;"><span>{{ row }}</span></td>
           </tr>
         </tbody>
       </nz-table>
@@ -58,10 +67,61 @@
     </div>
   </div>
 </div>
-<!-- 模态框 -->
+<!-- 批量送回模态框 -->
 <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="loading3"
 (confirmDelEvent)="confirmDel()" [content]="content"></app-dialog-delete>
 
+<!-- 修改数量模态框 -->
+<div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="washingModal">
+  <div class="modalBody">
+    <div class="title">提示<i class="icon_transport transport-guanbi" (click)="hideWashingModal()"></i>
+    </div>
+    <div class="content">
+      <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="confirmWashing()">
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="sendBackNum">调整数量</nz-form-label>
+          <nz-form-control nzErrorTip="请输入调整数量!">
+            <nz-input-group>
+              <nz-input-number formControlName="sendBackNum" placeholder="请输入调整数量" [nzStep]="1" [nzPrecision]="0"></nz-input-number>
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="clothesExceptionResId">调整原因</nz-form-label>
+          <nz-form-control nzErrorTip="请选择调整原因!">
+            <nz-select formControlName="clothesExceptionResId" nzPlaceHolder="请选择调整原因">
+              <nz-option *ngFor="let option of dictionaryList" [nzLabel]="option.name" [nzValue]="option.id">
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="remarks">备注</nz-form-label>
+          <nz-form-control nzErrorTip="请输入备注!">
+            <nz-input-group>
+              <input nz-input formControlName="remarks" placeholder="请输入备注" />
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+
+      </form>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nzType="primary" [nzLoading]="btnLoading" nz-button (click)="confirmWashing()">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideWashingModal()">取消</button>
+    </div>
+  </div>
+</div>
+
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
   [info]="promptInfo"></app-prompt-modal>
+
+<!-- 异常查看 -->
+<app-businessData-detail-modal
+  *ngIf="washingExceptionModalShow"
+  [show]="washingExceptionModalShow"
+  type="washingException"
+  [orderId]="route.snapshot.paramMap.get('id')"
+  (closeModelHs)="closeModelWashingException($event)"
+></app-businessData-detail-modal>

src/app/views/washing-batch-view/washing-batch-view.component.less

@@ -98,6 +98,10 @@
             font-size: 22px;
           }
         }
+        .table_hover:hover{
+          text-decoration: underline;
+          cursor: pointer;
+        }
       }
       .bottom{
         height: 90px;
@@ -113,4 +117,131 @@
       }
     }
   }
+  .save {
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.4);
+    z-index: 99;
+
+    .modalBody {
+      width: 350px;
+      height: 220px;
+      background: #fff;
+      border-radius: 5px;
+      padding: 10px 20px;
+      color: #333;
+
+      .title {
+        width: 100%;
+        text-align: center;
+        font-size: 18px;
+        position: relative;
+
+        i {
+          position: absolute;
+          right: 0;
+          top: 0;
+          font-size: 20px;
+          color: #666;
+          cursor: pointer;
+          padding: 0 5px;
+        }
+      }
+
+      .content {
+        width: 310px;
+        height: 117px;
+        background: #f9fafb;
+        border: 1px solid #e5e9ed;
+        border-radius: 5px;
+        overflow: hidden;
+        margin-top: 12px;
+
+        div {
+          text-align: center;
+          margin: 0;
+
+          &.icon {
+            margin-top: 17px;
+
+            i {
+              color: #34b349;
+              font-size: 30px !important;
+
+              &.transport-wenhao {
+                color: #f5a523;
+              }
+
+              &.transport-shibai {
+                color: #ff3a52;
+              }
+            }
+          }
+
+          &.defeat {
+            color: #333;
+            font-size: 18px;
+          }
+
+          &:nth-child(3) {
+            font-size: 14px;
+            color: #666;
+          }
+        }
+      }
+
+      button {
+        margin-top: 10px;
+
+        &.btn {
+          margin-left: 8px;
+        }
+      }
+    }
+
+    // 新增
+    &.add {
+      .modalBody {
+        width: 480px;
+        height: auto;
+
+        .content {
+          width: 100%;
+          height: auto;
+          padding: 18px 14px 0 14px;
+
+          .addForm {
+            .ant-form-item {
+              margin-bottom: 15px;
+
+              .ant-form-item-label {
+                line-height: 0;
+                text-align: left;
+              }
+            }
+          }
+
+          .editForm {
+            .ant-form-item {
+              margin-bottom: 15px;
+
+              .ant-form-item-label {
+                line-height: 0;
+                text-align: left;
+              }
+            }
+          }
+        }
+
+        button {
+          &:nth-child(1) {
+            margin-right: 20px;
+          }
+        }
+      }
+    }
+  }
 }

src/app/views/washing-batch-view/washing-batch-view.component.ts

@@ -2,6 +2,7 @@ import { Component, OnInit, AfterViewInit, HostListener } from "@angular/core";
 import { ToolService } from 'src/app/services/tool.service';
 import { MainService } from 'src/app/services/main.service';
 import { ActivatedRoute } from '@angular/router';
+import { FormGroup, Validators, FormBuilder } from '@angular/forms';
 
 @Component({
   selector: "app-washing-batch-view",
@@ -12,13 +13,15 @@ export class WashingBatchViewComponent implements OnInit, AfterViewInit {
   constructor(
     public tool: ToolService,
     private mainService: MainService,
-    private route: ActivatedRoute,
+    public route: ActivatedRoute,
+    private fb: FormBuilder,
   ){}
 
   ngOnInit() {
     this.hosId = this.tool.getCurrentHospital().id;
     this.getParentList();
     this.getChildList();
+    this.getDictionaryList();
     this.getList();
   }
 
@@ -43,24 +46,40 @@ export class WashingBatchViewComponent implements OnInit, AfterViewInit {
   hosId:any;
   searchDto:any = {
     parent: null,
+    child: null,
   }
   parentList: Array<any> = []; //父级分类数据字典信息
   childList: Array<any> = []; //分类数据字典信息
   rows:any[] = [];
   totalData:any = {};
 
+  // 查看业务数据
+  washingExceptionModalShow = false; //业务数据弹窗开关
+  viewDetail() {
+    this.washingExceptionModalShow = true;
+  }
+  // 关闭业务数据弹窗
+  closeModelWashingException(e) {
+    this.washingExceptionModalShow = JSON.parse(e).show;
+  }
+
   // 全选
   checkAll(value: boolean): void {
     this.listOfData.forEach((item) => {
-      this.mapOfCheckedId[item[0]] = value;
+      if (item[0][1] != 5) {
+        this.mapOfCheckedId[item[0][0]] = value;
+      }
     });
     this.refreshStatus();
   }
 
   // 单选
   refreshStatus(): void {
-    this.isAllDisplayDataChecked = this.listOfData.every(
-      (item) => this.mapOfCheckedId[item[0]]
+    let listOfData = this.listOfData.filter(
+      (item) => item[0][1] != 5
+    );
+    this.isAllDisplayDataChecked = listOfData.every(
+      (item) => this.mapOfCheckedId[item[0][0]]
     );
     let arr = [];
     for (var k in this.mapOfCheckedId) {
@@ -73,7 +92,10 @@ export class WashingBatchViewComponent implements OnInit, AfterViewInit {
 
   // 整行操作
   selectedListData(data) {
-    this.mapOfCheckedId[data[0]] = !this.mapOfCheckedId[data[0]];
+    if (data[0][1] == 5) {
+      return;
+    }
+    this.mapOfCheckedId[data[0][0]] = !this.mapOfCheckedId[data[0][0]];
     this.refreshStatus();
   }
 
@@ -98,6 +120,14 @@ export class WashingBatchViewComponent implements OnInit, AfterViewInit {
       });
   }
 
+  reset(){
+    this.searchDto = {
+      parent: null,
+      child: null,
+    }
+    this.getList();
+  }
+
   // 获取分类
   getChildList() {
     let postData = {
@@ -136,10 +166,49 @@ export class WashingBatchViewComponent implements OnInit, AfterViewInit {
       hosId: this.hosId,
       batchId: this.route.snapshot.paramMap.get("id"),
       deptIds: this.checkedDepIds.toString(),
+      type: 'clothingSend',
+      orderId: 0,
     };
-    this.mainService.clothesWashing(postData, 'batchBack').subscribe((data) => {
+    this.mainService.transflow(postData, 'createRemandOrder').subscribe((data) => {
       this.loading3 = false;
       this.delModal = false;
+      if (data.data && data.data.state == 200) {
+        this.showPromptModal("操作", true, "");
+      } else {
+        this.showPromptModal("操作", false, data.data && data.data.msg);
+      }
+    });
+  }
+
+  //修改数量
+  btnLoading = false;
+  washingModal: boolean = false; //模态框
+  washingCoopData:any = {};
+  showWashingModal(row) {
+    this.washingCoopData = row;
+    this.washingModal = true;
+    this.initForm();
+  }
+  hideWashingModal() {
+    this.washingModal = false;
+  }
+  confirmWashing() {
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty();
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateForm.invalid) return;
+    this.btnLoading = true;
+    let postData: any = {
+      hosId: this.hosId,
+      id: this.washingCoopData.id,
+      sendBackNum: this.validateForm.value.sendBackNum,
+      clothesExceptionResId: this.validateForm.value.clothesExceptionResId,
+      remarks: this.validateForm.value.remarks,
+    };
+    this.mainService.simplePost("addData", "clothesWashing", postData).subscribe((data) => {
+      this.btnLoading = false;
+      this.washingModal = false;
       if (data.status == 200) {
         this.showPromptModal("操作", true, "");
       } else {
@@ -148,6 +217,16 @@ export class WashingBatchViewComponent implements OnInit, AfterViewInit {
     });
   }
 
+  // 初始化form表单
+  validateForm: FormGroup;
+  initForm() {
+    this.validateForm = this.fb.group({
+      sendBackNum: [0, [Validators.required]],
+      clothesExceptionResId: [null, [Validators.required]],
+      remarks: [null, [Validators.required]],
+    });
+  }
+
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
   promptContent: string; //操作提示框提示信息
   ifSuccess: boolean; //操作成功/失败
@@ -164,13 +243,27 @@ export class WashingBatchViewComponent implements OnInit, AfterViewInit {
     this.getList();
   }
 
+  // 点击数字
+  clickNum(e, row){
+    e.stopPropagation();
+    this.showWashingModal(row)
+  }
+
+  dictionaryList: Array<any> = []; //数据字典信息
+  // 数据字典列表
+  getDictionaryList() {
+    this.mainService.getDictionary("list", "clothes_exception").subscribe((data:any) => {
+      this.dictionaryList = data || [];
+    })
+  }
+
   // 表格数据
   getList() {
     let postData: any = {
       hosId: this.hosId,
       batchId: this.route.snapshot.paramMap.get("id"),
-      clothesTypeParent: undefined,
-      clothesType: undefined,
+      clothesTypeParent: this.searchDto.parent,
+      clothesType: this.searchDto.child,
     };
     this.loading = true;
     this.mainService
@@ -179,15 +272,12 @@ export class WashingBatchViewComponent implements OnInit, AfterViewInit {
         this.loading = false;
         if(result.status == 200){
           let rows = result.head || [];
-          this.rows = ['', ...rows.map(v => v.name), '','件数', '费用/元'];
+          this.rows = [['id', 'clothesState', ''], rows.map(v => v.name), ['','件数', '费用/元']];
           let listOfData_res = result.data || [];
           this.listOfData = listOfData_res.map(v => ([
-            v.id,
-            v.dept,
-            ...v.clothesWashingDTOS.map(vv => vv.sendBackNum),
-            '',
-            v.nums,
-            v.price,
+            [v.id, v.clothesState.value, v.dept],
+            v.clothesWashingDTOS,
+            ['', v.nums, v.price]
           ]))
           this.totalData = result.totalData || {};
         }

src/app/views/washing-batch/washing-batch.component.ts

@@ -100,32 +100,21 @@ export class WashingBatchComponent implements OnInit {
     this.tipsMsg1 = tipsMsg1;
     this.tipsMsg2 = tipsMsg2;
   }
-  // 隐藏删除框
+  // 隐藏弹窗
   hideDelModal() {
     this.delModal = false;
   }
-  // 确认删除
+  // 确认弹窗
   confirmDel() {
     this.btnLoading = true;
     if (this.confirmDelType === "recount") {
-      //删除
+      //重新统计
       this.washingBatchService
-        .simplePost("rmvData", "clothesBatch", [this.coopId.id])
+        .simplePost("addData", "clothesBatch", {id: this.coopId.id, hosId: this.currentHospital.id})
         .subscribe((data) => {
           this.btnLoading = false;
           this.delModal = false;
           if (data.status == 200) {
-            if (
-              this.listOfData.length == 1 &&
-              this.pageIndex == Math.ceil(this.listLength / this.pageSize)
-            ) {
-              this.listLength--;
-              if (this.listLength === 0) {
-                this.pageIndex = 1;
-              } else {
-                this.pageIndex = Math.ceil(this.listLength / this.pageSize);
-              }
-            }
             this.showPromptModal(this.tipsMsg2, true, "");
           } else {
             this.showPromptModal(this.tipsMsg2, false, data.msg);