视图

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-    "target": "http://192.168.3.108",
+    "target": "http://192.168.4.223",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/app-routing.module.ts

@@ -62,11 +62,6 @@ const routes: Routes = [
     loadChildren: () => import('./views/specimen-view2/specimen-view2.module').then(m => m.SpecimenView2Module),
     canActivate: [SpecimenView2Guard]
   },
-  // 洗涤批次视图
-  {
-    path: 'washingBatchView',
-    loadChildren: () => import('./views/washing-batch-view/washing-batch-view.module').then(m => m.WashingBatchViewModule),
-  },
   // 全局业务查看
   {
     path: 'disinfectionSupply',
@@ -78,6 +73,11 @@ const routes: Routes = [
     path: "preview",
     loadChildren: () => import("./views/preview/preview.module").then((m) => m.PreviewModule),
   },
+  // 洗涤批次视图
+  {
+    path: 'washingBatchView',
+    loadChildren: () => import('./views/washing-batch-view/washing-batch-view.module').then(m => m.WashingBatchViewModule),
+  },
   // 管理端首页
   {
     path: '**',

src/app/services/main.service.ts

@@ -754,4 +754,11 @@ export class MainService {
       headers: this.headers,
     });
   }
+
+  // 被服洗涤-视图
+  clothesWashing(data, type): any {
+    return this.http.post(host.host + "/clothesWashing/" + type, data, {
+      headers: this.headers,
+    });
+  }
 }

src/app/views/quilt-washing-search/quilt-washing-search.component.html

@@ -47,15 +47,15 @@
         <tbody>
           <tr *ngFor="let data of listOfData;let i = index">
             <td>{{i+1}}</td>
-            <td>{{ data.relatedDept?.dept }}</td>
+            <td>{{ data.relatedDeptDTO?.dept }}</td>
             <td>{{ data.batchCode }}</td>
             <td>{{ data.clothesType?.name }}</td>
             <td>{{ data.recyclingNum }}</td>
             <td>{{ data.sendBackNum }}</td>
             <td>{{ data.exception == 1 ? '是' : '否' }}</td>
-            <td>{{ data.recyclersId?.name }}</td>
+            <td>{{ data.recyclersIdDTO?.name }}</td>
             <td>{{ data.recyclingTime | date:'yyyy-MM-dd HH:mm' }}</td>
-            <td>{{ data.sendBackId?.name }}</td>
+            <td>{{ data.sendBackIdDTO?.name }}</td>
             <td>{{ data.sendBackTime | date:'yyyy-MM-dd HH:mm' }}</td>
             <td>{{ data.clothesState?.name }}</td>
           </tr>

src/app/views/quilt-washing-send-page-control/quilt-washing-send-page-control.component.html

@@ -25,7 +25,7 @@
           </nz-select>
         </div>
         <!-- 被服洗涤科室 -->
-        <!-- <div class="display_flex align-items_center mb8">
+        <div class="display_flex align-items_center mb8">
           <nz-form-label class="label" nzRequired>被服洗涤科室</nz-form-label>
           <nz-select class="w320px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear nzPlaceHolder="请选择" (nzOnSearch)="changeDept($event)" [(ngModel)]="clothingDept">
             <ng-container *ngFor="let data of clothingDepts">
@@ -35,7 +35,7 @@
               <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
             </nz-option>
           </nz-select>
-        </div> -->
+        </div>
         <!-- 批次号生成规则 -->
         <!-- <div class="display_flex align-items_center mb8">
           <nz-form-label class="label" nzRequired>批次号生成规则</nz-form-label>

src/app/views/quilt-washing-send-page-control/quilt-washing-send-page-control.component.ts

@@ -17,7 +17,7 @@ export class QuiltWashingSendPageControlComponent implements OnInit {
   hosId = this.tool.getCurrentHospital().id; //当前院区
 
   // 积分计算方式
-  // clothingDept:any = null;
+  clothingDept:any = null;
   // 批次号生成规则
   // batchNoRule:any = null;
   // 配置
@@ -32,7 +32,7 @@ export class QuiltWashingSendPageControlComponent implements OnInit {
       fun.call(this, v[1]);
     });
     this.getTaskTypes();
-    // this.getDepts();
+    this.getDepts();
     // this.getClothingBatchnoRule();
     this.getConfig();
   }
@@ -51,9 +51,9 @@ export class QuiltWashingSendPageControlComponent implements OnInit {
     this.searchTimer(this.getTaskTypes, e);
   }
 
-  // changeDept(e) {
-  //   this.searchTimer(this.getDepts, e);
-  // }
+  changeDept(e) {
+    this.searchTimer(this.getDepts, e);
+  }
 
   //获取任务类型
   getTaskTypes(e:string = '') {
@@ -84,27 +84,27 @@ export class QuiltWashingSendPageControlComponent implements OnInit {
   }
 
   //获取科室
-  // clothingDepts:any = [];
-  // getDepts(e:string = '') {
-  //   this.isLoading = true;
-  //   let postData = {
-  //     idx: 0,
-  //     sum: 9999,
-  //     department: {
-  //       searchType: 1,// 简单查询
-  //       dept: e,
-  //       cascadeHosId: this.hosId,
-  //     }
-  //   };
-  //   this.otherPageControlService
-  //     .getDepts(postData)
-  //     .subscribe((result) => {
-  //       this.isLoading = false;
-  //       if (result.status == 200) {
-  //         this.clothingDepts = result.list || [];
-  //       }
-  //     });
-  // }
+  clothingDepts:any = [];
+  getDepts(e:string = '') {
+    this.isLoading = true;
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      department: {
+        searchType: 1,// 简单查询
+        dept: e,
+        cascadeHosId: this.hosId,
+      }
+    };
+    this.otherPageControlService
+      .getDepts(postData)
+      .subscribe((result) => {
+        this.isLoading = false;
+        if (result.status == 200) {
+          this.clothingDepts = result.list || [];
+        }
+      });
+  }
   //获取批次号生成规则
   // clothing_batchno_rule:any = [];
   // getClothingBatchnoRule() {
@@ -128,10 +128,10 @@ export class QuiltWashingSendPageControlComponent implements OnInit {
       return;
     }
 
-    // if(!this.clothingDept){
-    //   this.msg.create("warning", "请先配置被服洗涤科室！");
-    //   return;
-    // }
+    if(!this.clothingDept){
+      this.msg.create("warning", "请先配置被服洗涤科室！");
+      return;
+    }
 
     // if(!this.batchNoRule){
     //   this.msg.create("warning", "请先配置批次号生成规则！");
@@ -143,7 +143,7 @@ export class QuiltWashingSendPageControlComponent implements OnInit {
       taskType: this.clothingSendTypeId,
       clothingSendTypeId: this.clothingSendTypeId,
       hosId: this.hosId,
-      // clothingDept: this.clothingDept,
+      clothingDept: this.clothingDept,
       // batchNoRule: { id: this.batchNoRule },
     };
     this.btnLoading = true;
@@ -181,7 +181,7 @@ export class QuiltWashingSendPageControlComponent implements OnInit {
         this.loading = false;
         if (result.status == 200) {
           this.configs = result.list[0] || {};
-          // this.clothingDept = this.configs.clothingDept;
+          this.clothingDept = this.configs.clothingDept;
           // this.batchNoRule = this.configs.batchNoRule ? this.configs.batchNoRule.id : null;
           this.clothingSendTypeId = this.configs.clothingSendTypeId || null;
         }

src/app/views/washing-batch-view/washing-batch-view-routing.module.ts

@@ -4,7 +4,7 @@ import { WashingBatchViewComponent } from "./washing-batch-view.component";
 
 const routes: Routes = [
   {
-    path: "",
+    path: ":id",
     component: WashingBatchViewComponent,
   },
 ];

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

@@ -28,10 +28,10 @@
         </div>
       </div>
       <div class="display_flex align-items_center">
-        <button nzType="primary" nz-button>搜索</button>
+        <button nzType="primary" nz-button (click)="getList()">搜索</button>
         <button nzType="primary" nz-button>打印功能</button>
         <button nzType="primary" nz-button>查看异常</button>
-        <button nzType="primary" nz-button>批量送回</button>
+        <button nzType="primary" nz-button (click)="showDelModal()">批量送回</button>
       </div>
     </div>
     <div class="list">
@@ -41,20 +41,27 @@
           <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' : '65px')" *ngFor="let row of rows;let first = first;let last = last;let index = index;">{{ row }}</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>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let index=index;" (click)="selectedListData(data)">
-            <td nzLeft="0px" nzAlign="center" nzShowCheckbox [(nzChecked)]="mapOfCheckedId[data.id]" (nzCheckedChange)="refreshStatus()"></td>
-            <td [nzLeft]="first ? '40px' : null" [nzRight]="last ? '0px' : (index == rows.length - 2 ? '100px' : null)" nzAlign="center" *ngFor="let row of data;let first = first;let last = last;let index = index;">{{ row }}</td>
+            <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>
         </tbody>
       </nz-table>
     </div>
     <div class="bottom">
-      <strong>总件数：1365件</strong>
-      <strong>总费用：4089.4元</strong>
+      <strong>总件数：{{totalData.totalNum}}件</strong>
+      <strong>总费用：{{totalData.totalPrice}}元</strong>
     </div>
   </div>
 </div>
+<!-- 模态框 -->
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="loading3"
+(confirmDelEvent)="confirmDel()" [content]="content"></app-dialog-delete>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo"></app-prompt-modal>

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

@@ -1,6 +1,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';
 
 @Component({
   selector: "app-washing-batch-view",
@@ -11,12 +12,14 @@ export class WashingBatchViewComponent implements OnInit, AfterViewInit {
   constructor(
     public tool: ToolService,
     private mainService: MainService,
+    private route: ActivatedRoute,
   ){}
 
   ngOnInit() {
     this.hosId = this.tool.getCurrentHospital().id;
     this.getParentList();
     this.getChildList();
+    this.getList();
   }
 
   ngAfterViewInit(){
@@ -31,30 +34,7 @@ export class WashingBatchViewComponent implements OnInit, AfterViewInit {
     }, 500)
   }
 
-  listOfData: any[] = [
-    ['眼科康复科睡', 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18.05],
-    ['大势科室', 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18.05],
-    ['大势科室', 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18.05],
-    ['大势科室', 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18.05],
-    ['大势科室', 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18.05],
-    ['大势科室', 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18.05],
-    ['大势科室', 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18.05],
-    ['大势科室', 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18.05],
-    ['大势科室', 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18.05],
-    ['大势科室', 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18.05],
-    ['大势科室', 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18.05],
-    ['大势科室', 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18.05],
-    ['大势科室', 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18.05],
-    ['大势科室', 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18.05],
-    ['大势科室', 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18.05],
-    ['大势科室', 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18.05],
-    ['大势科室', 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18.05],
-    ['大势科室', 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18.05],
-    ['大势科室', 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18.05],
-    ['大势科室', 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18.05],
-    ['大势科室', 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18.05],
-    ['大势科室', 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18.05],
-  ]; //表格数据
+  listOfData: any[] = []; //表格数据
   loading:boolean = false;
   isAllDisplayDataChecked = false; //当前页是否全选
   mapOfCheckedId: { [key: string]: boolean } = {};
@@ -66,12 +46,13 @@ export class WashingBatchViewComponent implements OnInit, AfterViewInit {
   }
   parentList: Array<any> = []; //父级分类数据字典信息
   childList: Array<any> = []; //分类数据字典信息
-  rows:any[] = ['', '双单', '洗手衣上', '大包布', '中包布', '隔离衣', '无菌巾', '小洞巾', '大洞巾', '小毛巾', '病员服', '仪器套', '裤腿', '床套', '沙发套', '窗帘', '隔帘', '浴巾', '件数', '费用/元'];
+  rows:any[] = [];
+  totalData:any = {};
 
   // 全选
   checkAll(value: boolean): void {
     this.listOfData.forEach((item) => {
-      this.mapOfCheckedId[item.id] = value;
+      this.mapOfCheckedId[item[0]] = value;
     });
     this.refreshStatus();
   }
@@ -79,7 +60,7 @@ export class WashingBatchViewComponent implements OnInit, AfterViewInit {
   // 单选
   refreshStatus(): void {
     this.isAllDisplayDataChecked = this.listOfData.every(
-      (item) => this.mapOfCheckedId[item.id]
+      (item) => this.mapOfCheckedId[item[0]]
     );
     let arr = [];
     for (var k in this.mapOfCheckedId) {
@@ -92,7 +73,7 @@ export class WashingBatchViewComponent implements OnInit, AfterViewInit {
 
   // 整行操作
   selectedListData(data) {
-    this.mapOfCheckedId[data.id] = !this.mapOfCheckedId[data.id];
+    this.mapOfCheckedId[data[0]] = !this.mapOfCheckedId[data[0]];
     this.refreshStatus();
   }
 
@@ -137,5 +118,80 @@ export class WashingBatchViewComponent implements OnInit, AfterViewInit {
         }
       });
   }
+
+  //批量送回
+  loading3 = false;
+  delModal: boolean = false; //模态框
+  content:string = '';
+  showDelModal() {
+    this.delModal = true;
+    this.content = `您选择了${this.checkedDepIds.length}个科室批量送回被服，您确认吗？`;
+  }
+  hideDelModal() {
+    this.delModal = false;
+  }
+  confirmDel() {
+    this.loading3 = true;
+    let postData: any = {
+      hosId: this.hosId,
+      batchId: this.route.snapshot.paramMap.get("id"),
+      deptIds: this.checkedDepIds.toString(),
+    };
+    this.mainService.clothesWashing(postData, 'batchBack').subscribe((data) => {
+      this.loading3 = false;
+      this.delModal = false;
+      if (data.status == 200) {
+        this.showPromptModal("操作", true, "");
+      } else {
+        this.showPromptModal("操作", false, data.msg);
+      }
+    });
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getList();
+  }
+
+  // 表格数据
+  getList() {
+    let postData: any = {
+      hosId: this.hosId,
+      batchId: this.route.snapshot.paramMap.get("id"),
+      clothesTypeParent: undefined,
+      clothesType: undefined,
+    };
+    this.loading = true;
+    this.mainService
+      .clothesWashing(postData, 'view')
+      .subscribe((result) => {
+        this.loading = false;
+        if(result.status == 200){
+          let rows = result.head || [];
+          this.rows = ['', ...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,
+          ]))
+          this.totalData = result.totalData || {};
+        }
+      });
+  }
 }
 

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

@@ -1,12 +1,9 @@
 import { Component, OnInit } from "@angular/core";
-import { ActivatedRoute } from "@angular/router";
+import { ActivatedRoute, Router } from "@angular/router";
 import { FormBuilder, Validators, FormGroup } from "@angular/forms";
 
 import { ToolService } from "../../services/tool.service";
 import { WashingBatchService } from './washing-batch.service';
-import { Subject } from 'rxjs';
-import { debounceTime } from 'rxjs/operators';
-import { NzMessageService } from 'ng-zorro-antd/message';
 @Component({
   selector: "app-washing-batch",
   templateUrl: "./washing-batch.component.html",
@@ -14,11 +11,10 @@ import { NzMessageService } from 'ng-zorro-antd/message';
 })
 export class WashingBatchComponent implements OnInit {
   constructor(
-    private fb: FormBuilder,
     private washingBatchService: WashingBatchService,
     private route: ActivatedRoute,
     private tool: ToolService,
-    private message: NzMessageService,
+    public router: Router,
   ) {}
 
   userInfo: any = JSON.parse(localStorage.getItem("user")) || {}; //登录用户信息
@@ -166,7 +162,7 @@ export class WashingBatchComponent implements OnInit {
   }
   // 立即查看
   recAndDel() {
-    alert('立即查看');
+    this.router.navigateByUrl("/washingBatchView/" + this.coopData.id);
   }
   // 取消
   closeRecallOrderModal() {