洗涤批次

proxy.conf.json

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

src/app/services/tool.service.ts

@@ -143,6 +143,12 @@ export class ToolService {
         case "oneClickRecovery":
           coopBtns.oneClickRecovery = true; //一键恢复
           break;
+        case "view":
+            coopBtns.view = true; //查看视图
+            break;
+        case "recount":
+          coopBtns.recount = true; //重新统计
+          break;
       }
     });
     console.log(coopBtns);

src/app/views/main/main-routing.module.ts

@@ -188,6 +188,11 @@ const routes: Routes = [
         path: "workOrderLog",
         loadChildren: () => import("../work-order-log/work-order-log.module").then((m) => m.WorkOrderLogModule),
       },
+      // 洗涤批次管理
+      {
+        path: "washingBatch",
+        loadChildren: () => import("../washing-batch/washing-batch.module").then((m) => m.WashingBatchModule),
+      },
       // 统计分析-综合统计
       {
         path: "compreStatistics",

src/app/views/quilt-department-bind/quilt-department-bind.component.html

@@ -26,7 +26,7 @@
             <td>{{data.clothesTypeNames || ''}}</td>
             <td>
               <div class="coop">
-                <span *ngIf="coopBtns.del&&!data.status" (click)="showDelModal(data,'您确认要删除吗？','删除','del')">删除</span>
+                <span *ngIf="coopBtns.del" (click)="showDelModal(data,'您确认要删除吗？','删除','del')">删除</span>
                 <span *ngIf="coopBtns.edit" (click)="edit(data)">编辑</span>
               </div>
             </td>

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

@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { WashingBatchComponent } from './washing-batch.component';
+
+
+const routes: Routes = [
+  { path: '', component: WashingBatchComponent }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class WashingBatchRoutingModule { }

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

@@ -0,0 +1,72 @@
+<div class="list-template">
+  <div class="list-template__content">
+    <div class="list-template__top" nz-row>
+      <div nz-col nzXl='18' class="list-template__searchBox"></div>
+      <div nz-col nzLg="6" class="list-template__btns"></div>
+    </div>
+    <div class="list-template__bottom">
+      <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
+        [nzLoading]="loading1">
+        <thead>
+          <tr class="thead">
+            <th nzWidth="5%">序号</th>
+            <th nzWidth="13%">批次号</th>
+            <th nzWidth="13%">生成时间</th>
+            <th nzWidth="13%">科室数量</th>
+            <th nzWidth="13%">被服数量</th>
+            <th nzWidth="13%">总费用</th>
+            <th nzWidth="13%">状态</th>
+            <th nzWidth="17%">操作</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of listOfData;let index = index">
+            <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
+            <td>{{data.batchCode || ''}}</td>
+            <td>{{data.createTime | date: 'yyyy-MM-dd HH:mm' }}</td>
+            <td>{{data.deptNum || ''}}</td>
+            <td>{{data.clothesNum || ''}}</td>
+            <td>{{data.totalPrice || ''}}</td>
+            <td>{{data.batchState?.name}}</td>
+            <td>
+              <div class="coop">
+                <span *ngIf="coopBtns.view" (click)="openRecallModal(data)">查看视图</span>
+                <span *ngIf="coopBtns.recount" (click)="showDelModal(data,'您需要重新统计本批次的数据吗？','','recount')">重新统计</span>
+              </div>
+            </td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="list-template__pagination">
+        <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize"
+          (nzPageIndexChange)="getList(0)" (nzPageSizeChange)="getList(0)">
+        </nz-pagination>
+      </div>
+    </div>
+  </div>
+
+  <!-- 删除模态框 -->
+  <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+    (confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>
+</div>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>
+
+<!-- 撤回工单 -->
+<div class="recallOrder display_flex justify-content_flex-center align-items_center" *ngIf="recallOrderShow">
+  <div class="modalBody">
+    <div class="title">提示<i class="icon_transport transport-guanbi" (click)="closeRecallOrderModal()"></i></div>
+    <div class="content">
+      <div class="icon"><i class="icon_transport transport-wenhao"></i></div>
+      <div class="defeat">是否回收完毕，可将本批次设置为“洗涤中”？</div>
+    </div>
+    <div class="btns display_flex justify-content_flex-center align-items_center">
+      <button class="btn" nz-button nzType="primary" [nzLoading]='recLoading' (click)="recAndDel()">立即查看</button>
+      <button class="btn" style="width: 120px;" nz-button nzType="primary" [nzLoading]='btnLoading' (click)="confirmRec()">设置为洗涤中</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="closeRecallOrderModal()">取消</button>
+    </div>
+  </div>
+</div>
+

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

@@ -0,0 +1,258 @@
+@import "../../../../src/theme.less";
+
+:host {
+  ::ng-deep .ant-calendar-picker {
+    width: 100% !important;
+  }
+}
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 350px;
+    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;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+      padding: 16px 0;
+
+      & > div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 14px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+      .workAssignmentTips {
+        font-size: 12px;
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 16px;
+        max-height: 497px;
+        overflow-y: auto;
+
+        .addForm {
+          .workAssignmentDescribe {
+            margin-top: 8px;
+          }
+          .ant-form-item {
+            margin-bottom: 0;
+
+            .ant-form-item-label {
+              text-align: left;
+            }
+
+            .desc {
+              margin-top: 5px;
+            }
+          }
+
+          .datesControl {
+            margin-top: -16px;
+
+            .ant-form-item-label {
+              line-height: 40px;
+            }
+          }
+
+          .timer {
+            .ant-form-item-label {
+              width: 100%;
+              text-align: left;
+            }
+
+            .numInp {
+              margin-right: 5px;
+            }
+
+            .line {
+              margin-right: 5px;
+            }
+          }
+
+          .timer2 {
+            .ant-form-item-label {
+              line-height: 20px;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+// 查看视图
+.recallOrder {
+  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 {
+
+          i {
+            color: #ff3b53;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 16px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+
+      .conditions {
+        padding: 16px 20px;
+
+        div {
+          text-align: left;
+        }
+      }
+    }
+
+    .btns {
+      button {
+        margin-top: 10px;
+
+        &.btn {
+          width: 80px;
+          margin-left: 8px;
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,177 @@
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute } 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",
+  styleUrls: ["./washing-batch.component.less"],
+})
+export class WashingBatchComponent implements OnInit {
+  constructor(
+    private fb: FormBuilder,
+    private washingBatchService: WashingBatchService,
+    private route: ActivatedRoute,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) {}
+
+  userInfo: any = JSON.parse(localStorage.getItem("user")) || {}; //登录用户信息
+  listOfData: any[] = []; //表格数据
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 10; //表格每页展示条数
+  listLength: number = 10; //表格总数据量
+  tableHeight: number; //表格动态高
+  modal: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  validateForm: FormGroup; //新增/编辑表单
+  coopId: any; //当前操作列
+  currentHospital; //当前院区
+
+  btnLoading: boolean = false; //提交按钮loading状态
+
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  modelName = ""; //模态框名称
+
+
+  ngOnInit() {
+    this.currentHospital = this.tool.getCurrentHospital();
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+    this.getList(1);
+  }
+
+  // 初始化增删改按钮
+  coopBtns: any = {};
+
+  // 表格数据
+  loading1 = false;
+  getList(type) {
+    if (type == 1) {
+      this.pageIndex = 1;
+    }
+    let data = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      clothesBatch: {
+        hosId: this.currentHospital.id,
+      },
+    };
+    this.loading1 = true;
+    this.washingBatchService
+      .getFetchDataList(data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          this.listOfData = data.list;
+          this.listLength = data.totalNum;
+        }
+      });
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getList(0);
+  }
+
+  delModal: boolean = false; //删除模态框
+  tipsMsg1: string; //提示框信息
+  tipsMsg2: string; //操作后信息
+  confirmDelType: string; //确认的类型（启用/停用，删除）
+  showDelModal(
+    data,
+    tipsMsg1: string,
+    tipsMsg2: string,
+    type: string,
+  ) {
+    this.confirmDelType = type;
+    this.delModal = true;
+    this.coopId = data;
+    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])
+        .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);
+          }
+        });
+    }
+  }
+
+  // 打开查看视图
+  recallOrderShow: boolean = false;
+  coopData:any = {};
+  openRecallModal(data): void {
+    this.coopData = data;
+    this.recallOrderShow = true;
+  }
+  // 设置为洗涤中
+  confirmRec() {
+    this.btnLoading = true;
+    let postData = {
+      id: this.coopData.id,
+      stateType: "xdz",
+    };
+    this.washingBatchService
+      .simplePost("addData", 'clothesBatch', postData)
+      .subscribe((data) => {
+        this.btnLoading = false;
+        this.closeRecallOrderModal();
+        if (data.status == 200) {
+          this.showPromptModal("操作", true, "");
+        } else {
+          this.showPromptModal("操作", false, data.msg);
+        }
+      });
+  }
+  // 立即查看
+  recAndDel() {
+    alert('立即查看');
+  }
+  // 取消
+  closeRecallOrderModal() {
+    this.recallOrderShow = false;
+  }
+}
+
+

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

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { WashingBatchRoutingModule } from './washing-batch-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { WashingBatchComponent } from './washing-batch.component';
+
+
+@NgModule({
+  declarations: [
+    WashingBatchComponent,
+  ],
+  imports: [
+    CommonModule,
+    WashingBatchRoutingModule,
+    ShareModule,
+  ]
+})
+export class WashingBatchModule { }

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

@@ -0,0 +1,41 @@
+import { Injectable } from '@angular/core';
+import { MainService } from 'src/app/services/main.service';
+import { map } from 'rxjs/operators';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class WashingBatchService {
+
+  constructor(
+    private mainService: MainService,
+  ) { }
+
+  // simple增删改
+  simplePost(type, model, postData) {
+    return this.mainService.simplePost(type, model, postData);
+  }
+
+  // 查询
+  getFetchDataList(postData) {
+    return this.mainService.getFetchDataList("simple/data", "clothesBatch", postData).pipe(map((v:any) => {
+      if(Array.isArray(v.list)){
+        v.list = v.list.map(vv => ({
+          ...vv,
+          buildingListNames: vv.buildingList ? vv.buildingList.map(v => v.buildingName).toString() : '',
+          deptListNames: vv.deptList ? vv.deptList.map(v => v.dept).toString() : '',
+        }));
+      }else{
+        v.list = [];
+      }
+      return v;
+    }));;
+  }
+
+  // 字典
+  getDictionary(type) {
+    return this.mainService.getDictionary("list", type);
+  }
+}
+
+