出库记录

src/app/share/outgoing-record-detail/outgoing-record-detail.component.html

@@ -0,0 +1,189 @@
+<div class="detail" *ngIf="!maskFlag">
+  <div class="title">
+    查看详情<i class="icon_transport transport-guanbi" (click)="close()"></i>
+  </div>
+  <div class="box">
+    <div class="tab display_flex">
+      <div
+        [ngClass]="{ item: true, flex_1: true, checked: tabType == 1 }"
+        (click)="checkTab(1)"
+      >
+        详情信息
+      </div>
+      <div
+        [ngClass]="{ item: true, flex_1: true, checked: tabType == 4 }"
+        (click)="checkTab(4)"
+      >
+        医废信息
+      </div>
+    </div>
+
+    <!-- 详情信息 -->
+    <overlay-scrollbars
+      #osComponentRef3
+      style="flex: 1"
+      *ngIf="tabType == 1"
+    >
+      <div class="content orders">
+        <div class="top">
+          <div class="info" nz-row>
+            <div nz-col nzSpan="8">
+              批次号：{{ orderInfo.batchNo }}
+            </div>
+            <div nz-col nzSpan="8">
+              凭证编号：{{ orderInfo.credentialsNumber }}
+            </div>
+            <div nz-col nzSpan="8">
+              出库时间：{{ orderInfo.outTime | date: "yyyy-MM-dd HH:mm:ss" }}
+            </div>
+          </div>
+          <div class="info" nz-row>
+            <div nz-col nzSpan="16">
+              医废类型：{{ orderInfo.clinicalWasteTypeNames }}
+            </div>
+            <div nz-col nzSpan="8">
+              操作人：{{ orderInfo.operator ? orderInfo.operator.name : '' }}
+            </div>
+          </div>
+          <div class="info" nz-row>
+            <div nz-col nzSpan="6">
+              总重量：{{ orderInfo.totalWeight }}kg
+            </div>
+            <div nz-col nzSpan="6">
+              总袋数：{{ orderInfo.totalBags }}袋
+            </div>
+            <div nz-col nzSpan="6">
+              总箱数：{{ orderInfo.totalBox }}箱
+            </div>
+            <div nz-col nzSpan="6">
+              总桶数：{{ orderInfo.totalBucket }}桶
+            </div>
+          </div>
+        </div>
+        <div class="top">
+          <div class="info" nz-row>
+            <div nz-col nzSpan="8">
+              运输单位：{{ orderInfo.transportCompany ? orderInfo.transportCompany.name : '' }}
+            </div>
+            <div nz-col nzSpan="8">
+              司机姓名：{{ orderInfo.driver ? orderInfo.driver.name : '' }}
+            </div>
+            <div nz-col nzSpan="8">
+              司机联系方式：{{ orderInfo.driver ? orderInfo.driver.mphone : '' }}
+            </div>
+          </div>
+          <div class="info" nz-row>
+            <div nz-col nzSpan="8">
+              车牌号码：{{ orderInfo.carNo }}
+            </div>
+            <div nz-col nzSpan="8">
+              营运证件号：{{ orderInfo.transportCompany ? orderInfo.transportCompany.businessCode : '' }}
+            </div>
+          </div>
+          <div class="info" nz-row>
+            <div nz-col nzSpan="24">
+              运输单位地址：{{ orderInfo.transportCompany ? orderInfo.transportCompany.address : '' }}
+            </div>
+          </div>
+        </div>
+        <div class="top">
+          <div class="info" nz-row>
+            <div nz-col nzSpan="8">
+              接收单位：{{ orderInfo.receptionCompany ? orderInfo.receptionCompany.name : '' }}
+            </div>
+            <div nz-col nzSpan="8">
+              危险物经营许可证编号：{{ orderInfo.receptionCompany ? orderInfo.receptionCompany.businessCode : '' }}
+            </div>
+            <div nz-col nzSpan="8">
+              联系人：{{ orderInfo.receptionCompany ? orderInfo.receptionCompany.contacts : '' }}
+            </div>
+          </div>
+          <div class="info" nz-row>
+            <div nz-col nzSpan="8">
+              联系电话：{{ orderInfo.receptionCompany ? orderInfo.receptionCompany.mphone : '' }}
+            </div>
+            <div nz-col nzSpan="16">
+              接收单位地址：{{ orderInfo.receptionCompany ? orderInfo.receptionCompany.address : '' }}
+            </div>
+          </div>
+        </div>
+      </div>
+    </overlay-scrollbars>
+    <!-- 医废信息 -->
+    <overlay-scrollbars
+      #osComponentRef2
+      style="flex:1;"
+      *ngIf="tabType == 4"
+    >
+      <div class="content jifen">
+        <div class="table">
+          <nz-table
+            class="integralTable"
+            [nzData]="[1, 2]"
+            nzSize="middle"
+            [nzShowPagination]="null" [nzLoading]="hsLoading"
+          >
+            <thead>
+              <tr class="thead">
+                <th nzWidth="14%">医废类型</th>
+                <th nzWidth="14%">序号</th>
+                <th nzWidth="14%">重量（KG）</th>
+                <th nzWidth="14%">科室名称</th>
+                <th nzWidth="14%">收取人</th>
+                <th nzWidth="14%">收取时间</th>
+                <th nzWidth="16%">备注</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let item of list; let i = index">
+                <td>{{ item.clinicalWasteType ? item.clinicalWasteType.typeName : "" }}</td>
+                <td>{{ item.clinicalWasteSn }}</td>
+                <td>{{ item.weight }}</td>
+                <td>{{ item.dept ? item.dept.dept : "" }}</td>
+                <td>{{ item.receivor ? item.receivor.name : "" }}</td>
+                <td>{{ item.receiveTime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
+                <td>{{ item.remark }}</td>
+              </tr>
+            </tbody>
+          </nz-table>
+          <div class="pagination">
+            <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+            <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="total"
+              [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList()"
+              (nzPageSizeChange)="getList()" [nzShowTotal]="totalTemplate">
+            </nz-pagination>
+          </div>
+        </div>
+      </div>
+    </overlay-scrollbars>
+  </div>
+  <div class="btns">
+    <button class="btn cancel" nz-button nzType="default" (click)="close()">
+      关闭
+    </button>
+  </div>
+</div>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal
+  *ngIf="promptModalShow"
+  [content]="promptContent"
+  [success]="ifSuccess"
+  [show]="promptModalShow"
+  [info]="promptInfo"
+  (closeModel)="close()"
+>
+  <!-- 2.父组件调用子组件时绑定到这个事件属性，并在事件发生时作出回应。(closeModel)="close()" -->
+</app-prompt-modal>
+
+<!-- 业务数据查看 -->
+<app-businessData-detail-modal
+  *ngIf="businessDataModalShow"
+  [show]="businessDataModalShow"
+  [type]="businessDataModalType"
+  [orderId]="orderId"
+  (closeModelHs)="closeModelBlood($event)"
+></app-businessData-detail-modal>
+
+<!-- 遮罩 -->
+<app-mask *ngIf="maskFlag"></app-mask>
+<app-image-viewer [imageUrl]="imgs" hidden *ngIf="isPreview" [isPreviewNow]="true"></app-image-viewer>

src/app/share/outgoing-record-detail/outgoing-record-detail.component.less

@@ -0,0 +1,540 @@
+@import "../../../../src/theme.less";
+:host {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  left: 0;
+  top: 0;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.detail {
+  display: flex;
+  flex-direction: column;
+  width: 1200px;
+  // min-height: 580px;
+  border-radius: 5px;
+  background: #fff;
+  color: #333;
+  font-size: 14px;
+  padding: 12px 20px;
+  position: relative;
+  padding-bottom: 70px;
+
+  .pagination{
+    margin: 8px;
+    text-align: right;
+  }
+
+  .title {
+    font-size: 18px;
+    text-align: center;
+    line-height: 24px;
+    margin: 0;
+    margin-bottom: 12px;
+    position: relative;
+
+    i {
+      position: absolute;
+      right: 0;
+      top: 0;
+      font-size: 20px;
+      color: #666;
+      cursor: pointer;
+      padding: 0 5px;
+    }
+  }
+
+  & > .box {
+    width: 1160px;
+    border: 1px solid #e5e9ed;
+    border-radius: 5px;
+    flex: 1;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+
+    .tab {
+      width: 100%;
+      height: 60px;
+      border-bottom: 1px solid #e5e9ed;
+
+      .item {
+        text-align: center;
+        line-height: 60px;
+        height: 100%;
+        border-right: 1px solid #e5e9ed;
+
+        &:nth-last-child(1) {
+          border: none;
+        }
+
+        &.checked {
+          background: #f9fafb;
+        }
+      }
+    }
+
+    .content {
+      width: 100%;
+      // min-height: 453px;
+      display: flex;
+      flex-direction: column;
+
+      &.orders {
+        background: #f9fafb;
+      }
+
+      & > .top {
+        padding: 10px 32px;
+        border-bottom: 1px solid #e5e9ed;
+        overflow: hidden;
+        background: #fff;
+
+        .num {
+          font-size: 16px;
+          overflow: hidden;
+          margin-bottom: 6px;
+
+          .left {
+            float: left;
+            font-weight: 600;
+          }
+
+          .right {
+            float: right;
+          }
+        }
+
+        .info {
+          color: #666;
+
+          & > div {
+            margin: 4px 0;
+          }
+
+          .jiaji {
+            margin: 0;
+            margin-top: 8px;
+          }
+        }
+      }
+
+      & > .center {
+        padding: 27px 0 17px 0;
+        border-bottom: 1px solid #e5e9ed;
+        font-size: 12px;
+        background: #fff;
+
+        .box {
+          display: flex;
+          justify-content: center;
+
+          .steps {
+            &:nth-last-child(1) {
+              .line {
+                display: none !important;
+              }
+            }
+
+            .step {
+              .info {
+                width: 90px;
+                text-align: center;
+                display: inline-block;
+                vertical-align: top;
+
+                i {
+                  color: #e5e9ed;
+
+                  &.green {
+                    color: @primary-color;
+                  }
+                }
+              }
+
+              p {
+                margin: 0;
+              }
+
+              .line {
+                display: inline-block;
+                width: 60px;
+                height: 2px;
+                background: #e5e9ed;
+              }
+            }
+          }
+        }
+      }
+
+      & > .bottom {
+        flex: 1;
+        padding: 25px 32px;
+        background: #f9fafb;
+
+        .amplification {
+          display: flex;
+          justify-content: flex-end;
+          margin-bottom: 8px;
+        }
+
+        .urgent {
+          input {
+            width: 600px;
+          }
+
+          .candelBtn {
+            margin-left: 20px;
+          }
+        }
+
+        .table {
+          width: 100%;
+          height: 100%;
+          min-height: 160px;
+          background: #fff;
+          border-radius: 5px;
+
+          .thead {
+            background-image: repeating-linear-gradient(
+              to right,
+              @bg-start,
+              @bg-end 100%
+            ) !important;
+
+            th {
+              color: #fff !important;
+              text-align: center;
+              font-size: 12px;
+              border: none;
+            }
+          }
+
+          .detailDrugTable {
+            .thead {
+              background-image: repeating-linear-gradient(
+                to right,
+                @bg-start,
+                @bg-end 50%
+              ) !important;
+            }
+          }
+
+          .ant-table-tbody {
+            tr {
+              text-align: center;
+              font-size: 12px;
+              border: none;
+
+              td {
+                border: none;
+                position: relative;
+              }
+            }
+
+            tr:nth-child(2n) {
+              background: #f9fafb;
+            }
+          }
+        }
+
+        .info {
+          width: 100%;
+          height: 100%;
+          background: #fff;
+          border-radius: 5px;
+          border: 1px solid #e5e9ed;
+          padding: 24px 28px 14px 28px;
+          margin-bottom: 8px;
+
+          .top {
+            .left {
+              border-right: 1px dashed #e5e9ed;
+
+              p {
+                padding: 0 70px 0 102px;
+                overflow: hidden;
+
+                & > span:nth-child(1) {
+                  float: left;
+                }
+
+                & > span:nth-child(2) {
+                  float: right;
+                  color: #666;
+                  text-align: right;
+                  max-width: 175px;
+                }
+              }
+            }
+
+            .right {
+              p {
+                padding: 0 102px 0 70px;
+                overflow: hidden;
+
+                span:nth-child(1) {
+                  float: left;
+                }
+
+                span:nth-child(2) {
+                  float: right;
+                  color: #666;
+                  text-align: right;
+                }
+              }
+            }
+          }
+
+          .wait {
+            text-align: center;
+            margin-top: 7px;
+
+            i {
+              font-size: 24px;
+              color: #62c26d;
+            }
+
+            span {
+              color: #62c26d;
+            }
+          }
+        }
+      }
+
+      &.pingjia {
+        .msg {
+          width: 100%;
+          height: 50px;
+          line-height: 50px;
+          padding-left: 32px;
+          border-bottom: 1px solid #e5e9ed;
+
+          div {
+            display: inline-block;
+            margin-right: 100px;
+          }
+        }
+
+        .con {
+          padding: 16px 32px;
+          min-height: 360px;
+        }
+      }
+
+      & > .form {
+        .ant-form-item {
+          padding: 0 32px 13px 32px;
+          margin-bottom: 0;
+          border-bottom: 1px solid #e5e9ed;
+
+          &:nth-last-child(1) {
+            border: none;
+          }
+        }
+
+        .ant-form-item-label {
+          line-height: 34px;
+          text-align: left;
+        }
+      }
+
+      & > .mediation {
+        padding: 16px 32px;
+
+        .item {
+          border-bottom: 1px solid #e5e9ed;
+          padding-top: 10px;
+
+          .label {
+            line-height: 28px;
+            margin-top: 10px;
+          }
+
+          .info {
+            line-height: 28px;
+            color: #999;
+            padding-bottom: 20px;
+          }
+        }
+      }
+
+      &.jifen {
+        padding: 32px;
+
+        & > .table {
+          width: 100%;
+          height: 100%;
+          min-height: 160px;
+          padding: 6px;
+          background: #fff;
+          border: 1px solid #e5e9ed;
+          border-radius: 5px;
+          overflow: hidden;
+
+          .thead {
+            background-image: repeating-linear-gradient(
+              to right,
+              @bg-start,
+              @bg-end 100%
+            ) !important;
+
+            th {
+              color: #fff !important;
+              text-align: center;
+              font-size: 12px;
+              border: none;
+              background: transparent;
+            }
+          }
+
+          .ant-table-tbody {
+            tr {
+              text-align: center;
+              font-size: 12px;
+              border: none;
+
+              td {
+                border: none;
+              }
+            }
+
+            tr:nth-child(2n) {
+              background: #f9fafb;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  .btns {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 100%;
+    position: absolute;
+    left: 0;
+    bottom: 20px;
+
+    .btn {
+      margin: 9px;
+      margin-bottom: 0;
+    }
+  }
+
+  .ant-table {
+    border: none !important;
+  }
+}
+
+// 撤回工单
+.recallOrder {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  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: #ff3b53;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 18px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+
+      .conditions {
+        padding: 16px 20px;
+
+        div {
+          text-align: left;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+}
+
+.txtC {
+  text-align: center;
+}
+.ji {
+  position: absolute;
+  right: 0px;
+  top: -3px;
+  width: 30px;
+}

src/app/share/outgoing-record-detail/outgoing-record-detail.component.ts

@@ -0,0 +1,236 @@
+import { Component, OnInit, OnDestroy, ViewChild } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+import {
+  FormBuilder,
+  Validators,
+  FormGroup,
+} from "@angular/forms";
+import { MainService } from "../../services/main.service";
+import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
+import { NzMessageService } from "ng-zorro-antd";
+import { ToolService } from 'src/app/services/tool.service';
+@Component({
+  selector: "app-outgoing-record-detail",
+  templateUrl: "./outgoing-record-detail.component.html",
+  styleUrls: ["./outgoing-record-detail.component.less"],
+})
+export class OutgoingRecordDetailComponent implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef2", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef2: OverlayScrollbarsComponent;
+  constructor(
+    private message: NzMessageService,
+    private fb: FormBuilder,
+    private route: ActivatedRoute,
+    private mainService: MainService,
+    private tool: ToolService,
+  ) {}
+  maskFlag: any = false;
+  id: number; //工单id
+  orderInfo: any; //工单详情信息
+  endDepts = ""; //工单详情目标科室
+  showCoop: boolean = true; //是否展示详情页操作按钮
+
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //是否展示提示框
+
+  urgentLoading: boolean = false; //确认加急按钮loading状态
+  recLoading: boolean = false; //撤回并删除按钮loading状态
+  btnLoading: boolean = false; //确认按钮loading状态
+  amplificationShow = true;
+
+  hosId;
+
+  ngOnInit() {
+    this.hosId = this.tool.getCurrentHospital().id;
+    this.tabType = this.route.snapshot.params.type || 1;
+    this.getInfo();
+    this.initForm();
+  }
+  ngOnDestroy() {}
+
+  // 放大
+  amplification(){
+    this.amplificationShow = !this.amplificationShow;
+  }
+
+  // 获取工单详情
+  hsLoading:boolean = false;
+  getInfo() {
+    this.id = +this.route.snapshot.paramMap.get("id");
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService
+      .getFetchData("simple/data", "clinicalWasteOut", this.id)
+      .subscribe((data) => {
+        this.orderInfo = data.data || {};
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        this.getList();
+      });
+  }
+  // 预览图片
+  imgs = [];
+  isPreview = false;
+  previewImageHandler(data) {
+    this.isPreview = false;
+    this.mainService.getPreviewImage(data.bindType,data.bindId).subscribe((result:any)=>{
+      if (result.status == 200) {
+        this.imgs = result.data.map((v) => location.origin + '/file' + v.relativeFilePath);
+        this.isPreview = true;
+      } else {
+        this.imgs = [];
+      }
+    })
+  }
+  // 获取历史记录
+  pageIndex: number = 1;//表格当前页码
+  pageSize: number = 3;//表格每页展示条数
+  total: number = 0;//表格总数据量
+  list: any = [];
+  getList() {
+    let postData = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      clinicalWaste: {
+        outId: this.id,
+        hosId: this.hosId,
+      }
+    }
+    this.hsLoading = true;
+    this.mainService.getFetchDataList('simple/data','clinicalWaste', postData).subscribe(res => {
+      if (res.status == 200) {
+        this.hsLoading = false;
+        this.list = res.list || [];
+        this.total = res.totalNum || 0;
+      }
+    });
+  }
+  // 切换tab栏
+  tabType: number = 1; //tab栏
+  checkTab(type) {
+    this.tabType = type;
+  }
+
+  // 关闭弹框
+  close() {
+    history.go(-1);
+  }
+
+  // 查看业务数据
+  businessDataModalShow = false; //业务数据弹窗开关
+  businessDataModalType = ''; //业务数据类型
+  orderId = ""; //查看业务数据携带
+  viewDetail(data, type) {
+    this.orderId = data.id;
+    this.businessDataModalType = type;
+    this.businessDataModalShow = true;
+  }
+  // 关闭业务数据弹窗
+  closeModelBlood(e) {
+    this.businessDataModalShow = JSON.parse(e).show;
+  }
+
+  // 获取工单历史记录
+  logList = []; //工单历史记录
+  getLog() {
+    return this.mainService.getWorkOrderLog(this.id);
+  }
+
+  // 初始化新增form表单
+  validateForm: FormGroup; //新增/编辑表单
+  initForm() {
+    this.validateForm = this.fb.group({
+      reason: [null, [Validators.required]],
+      process: [null, [Validators.required]],
+      handleType: [null, [Validators.required]],
+      improve: [null, [Validators.required]],
+    });
+  }
+
+  // 新增表单提交
+  submitForm(): void {
+    var that = this;
+    for (const i in that.validateForm.controls) {
+      that.validateForm.controls[i].markAsDirty();
+      that.validateForm.controls[i].updateValueAndValidity();
+    }
+    if (that.validateForm.invalid) return;
+    that.btnLoading = true;
+    let postData = {
+      badEvaluationHandle: {
+        id: that.id,
+        reasonAndEventProcess: that.validateForm.value.reason,
+        mediationProcess: that.validateForm.value.process,
+        handleType: { id: that.validateForm.value.handleType },
+        advice: that.validateForm.value.improve,
+        handleStatus: { key: "bad_evaluation_handle_status", value: "2" },
+      },
+    };
+
+    that.mainService
+      .postCustom("adviceCollection", "updData/badEvaluationHandle", postData)
+      .subscribe((data) => {
+        that.btnLoading = false;
+        if (data.status == 200) {
+          that.showPromptModal("调解", true, "");
+          that.getInfo();
+          // that.initForm();
+        } else {
+          that.showPromptModal("调解", false, data.msg);
+        }
+      });
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+  }
+
+  // 格式化时分秒
+  // （时间小于一分钟则显示秒，时间大于一分钟则显示分钟数，如超出一小时则显示小时和分钟。）time单位:秒
+  formatTime(time) {
+    let timeStr = "";
+    if (time >= 0 && time < 60) {
+      // 秒
+      timeStr = time + "秒";
+    } else if (time >= 60 && time < 3600) {
+      // 分钟
+      timeStr = Math.floor(time / 60) + "分钟";
+    } else if (time >= 3600) {
+      // 时 + 分
+      let h = "";
+      let m = "";
+      h = Math.floor(time / 3600) + "小时";
+      m = time % 3600 >= 60 ? Math.floor((time % 3600) / 60) + "分钟" : "";
+      timeStr = h + m;
+    }
+    return timeStr;
+  }
+
+  // 计算历史记录耗时
+  filterTime(step) {
+    // step = [{ difTime: 2 }, { difTime: 6 }]
+    let num = 0;
+    step.forEach((e) => {
+      num += e.difTime;
+    });
+    return this.formatTime(num / 1000);
+  }
+}

src/app/share/share.module.ts

@@ -41,6 +41,7 @@ import { DetailOrdinaryComponent } from './detail-ordinary/detail-ordinary.compo
 import { BloodHistoryPromptModalComponent } from './blood-history-prompt-modal/blood-history-prompt-modal.component';
 import { MedicalWasteHistoryPromptModalComponent } from './medical-waste-history-prompt-modal/medical-waste-history-prompt-modal.component';
 import { MedicalWasteLogPromptModalComponent } from './medical-waste-log-prompt-modal/medical-waste-log-prompt-modal.component';
+import { OutgoingRecordDetailComponent } from './outgoing-record-detail/outgoing-record-detail.component';
 
 @NgModule({
   declarations: [
@@ -61,6 +62,7 @@ import { MedicalWasteLogPromptModalComponent } from './medical-waste-log-prompt-
     BxPromptModalComponent,
     AppraiseDetailComponent,
     OrderDetailComponent,
+    OutgoingRecordDetailComponent,
     DateTransformPipe,
     DialogDeleteComponent,
     DialogSurgeryComponent,
@@ -111,6 +113,7 @@ import { MedicalWasteLogPromptModalComponent } from './medical-waste-log-prompt-
     BxPromptModalComponent,
     AppraiseDetailComponent,
     OrderDetailComponent,
+    OutgoingRecordDetailComponent,
     CommonModule,
     NgZorroAntdModule,
     FormsModule,

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

@@ -448,6 +448,11 @@ const routes: Routes = [
         path: "storageRecord",
         loadChildren: () => import("../medical-waste-storage-record/medical-waste-storage-record.module").then((m) => m.MedicalWasteStorageRecordModule),
       },
+      // 出库记录
+      {
+        path: "outgoingRecord",
+        loadChildren: () => import("../medical-waste-outgoing-record/medical-waste-outgoing-record.module").then((m) => m.MedicalWasteOutgoingRecordModule),
+      },
     ],
   },
 ];

src/app/views/medical-waste-information/medical-waste-information.component.html

@@ -57,7 +57,7 @@
         </div>
         <div class="list-template__searchItem">
           <span class="label">收取时间：</span>
-          <nz-range-picker [(ngModel)]="searchCriteria.dateRange"></nz-range-picker>
+          <nz-range-picker nzShowTime [(ngModel)]="searchCriteria.dateRange"></nz-range-picker>
         </div>
       </div>
       <div nz-col nzXl="8" class="list-template__btns">

src/app/views/medical-waste-outgoing-record/medical-waste-outgoing-record-routing.module.ts

@@ -0,0 +1,25 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { MedicalWasteOutgoingRecordComponent } from './medical-waste-outgoing-record.component';
+import { OutgoingRecordDetailComponent } from 'src/app/share/outgoing-record-detail/outgoing-record-detail.component';
+
+
+const routes: Routes = [
+  {
+    path: "",
+    component: MedicalWasteOutgoingRecordComponent,
+    children: [
+      {
+        // 查看详情
+        path: 'outgoingRecordDetail/:id',
+        component: OutgoingRecordDetailComponent,
+      }
+    ]
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class MedicalWasteOutgoingRecordRoutingModule { }

src/app/views/medical-waste-outgoing-record/medical-waste-outgoing-record.component.html

@@ -0,0 +1,106 @@
+<div class="list-template">
+  <div class="list-template__content">
+    <div class="list-template__top" nz-row>
+      <div nz-col nzXl='16' class="list-template__searchBox">
+        <div class="list-template__searchItem">
+          <span class="label">出库时间：</span>
+          <nz-range-picker nzShowTime [(ngModel)]="searchCriteria.dateRange"></nz-range-picker>
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">操作人：</span>
+          <input nz-input class="formItem" placeholder="请输入操作人" [(ngModel)]="searchCriteria.name" />
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">批次号：</span>
+          <input nz-input class="formItem" placeholder="请输入批次号" [(ngModel)]="searchCriteria.batchNo" />
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">凭证编号：</span>
+          <input nz-input class="formItem" placeholder="请输入凭证编号" [(ngModel)]="searchCriteria.credentialsNumber" />
+        </div>
+      </div>
+      <div nz-col nzXl="8" class="list-template__btns">
+        <button nz-button class="btn default" (click)='reset()'>重置</button>
+        <button nz-button class="btn default ml8" (click)='getList(1)'>搜索</button>
+      </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="11%">批次号</th>
+            <th nzWidth="11%">凭证编号</th>
+            <th nzWidth="11%">总重量（KG）</th>
+            <th nzWidth="11%">总袋数</th>
+            <th nzWidth="11%">操作人</th>
+            <th nzWidth="11%">出库时间</th>
+            <th nzWidth="11%">运输单位</th>
+            <th nzWidth="11%">接收单位</th>
+            <th nzWidth="12%">操作</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of listOfData;let i = index">
+            <td>{{ data.batchNo }}</td>
+            <td>{{ data.credentialsNumber }}</td>
+            <td>{{ data.totalWeight }}</td>
+            <td>{{ data.totalBags }}</td>
+            <td>{{ data.operator ? data.operator.name: '' }}</td>
+            <td>{{ data.outTime | date:"yyyy-MM-dd HH:mm:ss" }}</td>
+            <td>{{ data.transportCompany ? data.transportCompany.name : '' }}</td>
+            <td>{{ data.receptionCompany ? data.receptionCompany.name : '' }}</td>
+            <td>
+              <div class="coop">
+                <span *ngIf="coopBtns.look" (click)="detail($event,data.id)">查看详情</span>
+                <!-- <span *ngIf="coopBtns.print" (click)="showModal(data)">打印</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>
+</div>
+<!-- 矫正重量模态框 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="modal">
+  <div class="modalBody">
+    <div class="title">矫正重量<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    </div>
+    <overlay-scrollbars #osComponentRef1 class="content">
+      <div style="height: 50px;line-height: 50px;">原重量：{{coopData.weight}}kg</div>
+      <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="weight">矫正重量</nz-form-label>
+          <nz-form-control nzErrorTip="请填写矫正重量!">
+            <nz-input-number nz-input formControlName="weight" nzPlaceHolder="请填写矫正重量" [nzMin]="0" [nzStep]="0.01" [nzPrecision]="2"></nz-input-number>
+            <span class="red">（kg）</span>
+          </nz-form-control>
+        </nz-form-item>
+      </form>
+    </overlay-scrollbars>
+    <div class="display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>
+<!-- 删除模态框 -->
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading" (confirmDelEvent)="confirmDel()" [content]="content"></app-dialog-delete>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow" [info]="promptInfo"></app-prompt-modal>
+<!-- 查看 -->
+<app-medical-waste-log-prompt-modal
+  *ngIf="historyPromptModalShow"
+  [show]="historyPromptModalShow"
+  [id]="id"
+  (closeModelHs)="closeModelHistory($event)"
+></app-medical-waste-log-prompt-modal>
+
+<!-- 查看详情 -->
+<router-outlet></router-outlet>

src/app/views/medical-waste-outgoing-record/medical-waste-outgoing-record.component.less

@@ -0,0 +1,121 @@
+@import "../../../../src/theme.less";
+.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: 100%;
+      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: 19px 14px 0 14px;
+        max-height: 500px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 8px;
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button:nth-child(1) {
+        margin-right: 20px;
+      }
+    }
+  }
+}

src/app/views/medical-waste-outgoing-record/medical-waste-outgoing-record.component.ts

@@ -0,0 +1,112 @@
+import { Component, OnInit, ViewChild } from "@angular/core";
+import { MainService } from "src/app/services/main.service";
+import { ToolService } from "src/app/services/tool.service";
+import { format } from 'date-fns';
+import { ActivatedRoute, Router } from '@angular/router';
+import { FormGroup, Validators, FormBuilder } from '@angular/forms';
+import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
+
+@Component({
+  selector: "app-medical-waste-outgoing-record",
+  templateUrl: "./medical-waste-outgoing-record.component.html",
+  styleUrls: ["./medical-waste-outgoing-record.component.less"],
+})
+export class MedicalWasteOutgoingRecordComponent implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private route: ActivatedRoute,
+    private fb: FormBuilder,
+    private router: Router,
+  ) {}
+
+  searchCriteria = {
+    //搜索条件
+    name: "",
+    credentialsNumber: "",
+    batchNo: "",
+    dateRange: [],
+  };
+  hosId;
+  listOfData: any[] = []; //表格数据
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 10; //表格每页展示条数
+  listLength: number = 10; //表格总数据量
+
+  // 初始化增删改按钮
+  coopBtns: any = {};
+  ngOnInit() {
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+    this.getHospital();
+  }
+
+  // 查看
+  detail(e, id) {
+    e.stopPropagation();
+    this.router.navigateByUrl("/main/outgoingRecord/outgoingRecordDetail/" + id);
+  }
+
+  // 重置
+  reset() {
+    this.searchCriteria = {
+      //搜索条件
+      name: "",
+      credentialsNumber: "",
+      batchNo: "",
+      dateRange: [],
+    };
+    this.getList(1);
+  }
+
+  // 获取所有院区
+  getHospital() {
+    this.hosId = this.tool.getCurrentHospital().id;
+    this.getList(1);
+  }
+
+  // 表格数据
+  loading1 = false;
+  getList(type) {
+    if (type == 1) {
+      this.pageIndex = 1;
+    }
+    let postData: any = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      clinicalWasteOut: {
+        hosId: this.hosId,
+      },
+    };
+    if (this.searchCriteria.dateRange.length) {
+      postData.clinicalWasteOut.startTime =
+        format(this.searchCriteria.dateRange[0], "yyyy-MM-dd HH:mm:ss");
+      postData.clinicalWasteOut.endTime =
+        format(this.searchCriteria.dateRange[1], "yyyy-MM-dd HH:mm:ss");
+    }
+    if (this.searchCriteria.name) {
+      postData.clinicalWasteOut.name = this.searchCriteria.name;
+    }
+    if (this.searchCriteria.credentialsNumber) {
+      postData.clinicalWasteOut.credentialsNumber = this.searchCriteria.credentialsNumber;
+    }
+    if (this.searchCriteria.batchNo) {
+      postData.clinicalWasteOut.batchNo = this.searchCriteria.batchNo;
+    }
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("simple/data", "clinicalWasteOut", postData)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data["status"] == 200) {
+          this.listOfData = data["list"];
+          this.listLength = data["totalNum"];
+        }
+      });
+  }
+}
+

src/app/views/medical-waste-outgoing-record/medical-waste-outgoing-record.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { MedicalWasteOutgoingRecordRoutingModule } from './medical-waste-outgoing-record-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { MedicalWasteOutgoingRecordComponent } from './medical-waste-outgoing-record.component';
+
+
+@NgModule({
+  declarations: [MedicalWasteOutgoingRecordComponent],
+  imports: [
+    CommonModule,
+    MedicalWasteOutgoingRecordRoutingModule,
+    ShareModule,
+  ]
+})
+export class MedicalWasteOutgoingRecordModule { }

src/app/views/unit-management/unit-management.component.ts

@@ -268,7 +268,7 @@ export class UnitManagementComponent implements OnInit {
             that.listLength--;
             that.pageIndex = Math.ceil(that.listLength / that.pageSize) || 1;
           }
-          that.showPromptModal("删除", true, "已删除序号规则，请重新配置序号");
+          that.showPromptModal("删除", true, "");
         } else {
           that.showPromptModal("删除", false, data["msg"]);
         }