合并代码

src/app/app-routing.module.ts

@@ -83,6 +83,11 @@ const routes: Routes = [
     path: 'washingBatchView',
     loadChildren: () => import('./views/washing-batch-view/washing-batch-view.module').then(m => m.WashingBatchViewModule),
   },
+	{
+	  // 发药批次-配置
+	  path: 'dispensingDetail/:id',
+	  loadChildren: () => import('./views/dispensing-detail/dispensing-detail.module').then(m => m.DispensingDetailModule),
+	},
   // 洗涤批次视图
   {
     path: 'inspectionPlanConfig/:id',

src/app/services/main.service.ts

@@ -817,4 +817,21 @@ export class MainService {
 	    headers: this.headers,
 	  });
 	}
+	// 科室发药单打印
+	transfusionPrint(model, id): any {
+	  return this.http.get(host.host + `/simple/data/fetchData/${model}/${id}`);
+	}
+	// 科室发药配送建单
+	transfusionBuildOrder(data): any {
+	  return this.http.post(host.host + "/infusion/solutions/createOrTakeOrder", data, {
+	    headers: this.headers,
+	  });
+	}
+	// 发药批次-配置科室删除
+	transfusionConfigDeptDel(data): any {
+	  return this.http.post(host.host + "/infusion/solutions/remove", data, {
+	    headers: this.headers,
+	  });
+	}
+	
 }

src/app/services/tool.service.ts

@@ -158,6 +158,15 @@ export class ToolService {
         case "editNum":
           coopBtns.editNum = true; //矫正重量
           break;
+				case "establish":
+				  coopBtns.establish = true; //配送建单
+				  break;
+				case "historyRecord":
+				  coopBtns.historyRecord = true; //历史记录
+				  break;
+				case "batchPrint":
+				  coopBtns.batchPrint = true; //发药并打印
+				  break;
         case "config":
           coopBtns.config = true; //配置
           break;

src/app/views/admin-office-prescription/admin-office-prescription-routing.module.ts

@@ -0,0 +1,24 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { AdminOfficePrescriptionComponent } from './admin-office-prescription.component';
+
+
+const routes: Routes = [
+  {
+    path: '',
+    component: AdminOfficePrescriptionComponent,
+    children: [
+      {
+        // 查看详情
+        path: 'officeDetail/:id',
+        loadChildren: () => import('../office-detail/office-detail.module').then(m => m.OfficeDetailModule),
+      }
+    ]
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class AdminOfficePrescriptionRoutingModule { }

src/app/views/admin-office-prescription/admin-office-prescription.component.html

@@ -0,0 +1,222 @@
+<div class="list-template">
+  <div class="list-template__content">
+    <div class="list-template__top" nz-row>
+      <div nz-col nzLg='20' class="list-template__searchBox">
+        <div class="list-template__searchItem">
+          <span class="label">申请科室：</span>
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" (nzOnSearch)="changeInp($event)" nzServerSearch nzShowSearch nzAllowClear nzPlaceHolder="请选择申请科室" [(ngModel)]="department">
+            <ng-container *ngFor="let option of hospitals1">
+              <nz-option *ngIf="!isDeptLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isDeptLoading" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">批次号：</span>
+          <input nz-input class="formItem" [(ngModel)]="batchNumber" placeholder="请输入批次号" nzSize="default" />
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">创建时间：</span>
+          <nz-range-picker [(ngModel)]="dateRange" nzFormat="yyyy-MM-dd"
+					(ngModelChange)="changeDate($event)"></nz-range-picker>
+        </div>
+      </div>
+      <div nz-col nzLg="4" class="list-template__btns">
+        <button class="btn default" (click)='search()'>搜索</button>
+        <button class="btn default ml8" (click)='reset()'>重置</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="10%">单号|创建时间</th>
+            <th nzWidth="10%">批次号</th>
+            <th nzWidth="10%">申请科室</th>
+            <th nzWidth="7%">总件数</th>
+            <th nzWidth="7%">品类数</th>
+            <th nzWidth="7%">消耗总价</th>
+            <th nzWidth="7%">实发总价</th>
+            <th nzWidth="10%">取药药房</th>
+						<th nzWidth="7%">是否已建单</th>
+						<th nzWidth="6%">状态</th>
+            <th nzWidth="18%">操作</th>
+          </tr>
+        </thead>
+        <tbody v-if="listOfData && listOfData.length>0">
+          <tr *ngFor="let data of listOfData" (click)="selectedListData(data.id)">
+            <td>
+							<div>{{ data.packingNo}}</div>
+							<div>{{ data.createTime|date:'yyyy-MM-dd HH:mm'}}</div>
+						</td>
+            <td>{{ data.batch?data.batch.batchNo:'-' }}</td>
+            <td>{{ data.applyDeptDTO?data.applyDeptDTO.dept :'-' }}</td>
+            <td>{{ data.totalCount||'0' }}</td>
+            <td>{{data.kindCount||'0'}}</td>
+            <td>{{ data.expendPrice ||'0' }}</td>
+            <td>{{ data.actualPrice || '0'}}</td>
+            <td>{{ data.pharmacyDTO?data.pharmacyDTO.dept:'-'}}</td>
+						<td>{{ data.createOrder==1?'是':'否'}}</td>
+						<td>{{ data.orderState.name}}</td>
+            <td>
+              <div class="coop">
+                <span *ngIf="coopBtns.look" (click)="detail($event,data.id)">查看</span>
+                <span *ngIf="coopBtns.print" (click)="print($event, data, data.id)">打印</span>
+                <span *ngIf="coopBtns.establish && ( data.createOrder=='0' || data.createOrder==null)" (click)="addDateModal(data)">配送建单</span>
+              </div>
+            </td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="list-template__pagination">
+        <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
+          (nzPageIndexChange)="getList()" (nzPageSizeChange)="getList()">
+        </nz-pagination>
+      </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 class="list-template__bottom">
+          <nz-table class="list-template__nzTable" [nzData]="viewData" nzSize="middle" [nzShowPagination]="false"
+            [nzLoading]="loading1">
+            <thead>
+              <tr class="thead">
+								<th nzWidth="10%">药品标识</th>
+                <th nzWidth="10%">药品名称</th>
+                <th nzWidth="10%">规格</th>
+                <th nzWidth="10%">消耗数量</th>
+                <th nzWidth="10%">实发数量</th>
+                <th nzWidth="10%">包装规格</th>
+                <th nzWidth="10%">发药药箱</th>
+                <th nzWidth="10%">原库存数</th>
+                <th nzWidth="10%">计算后库存</th>
+        				<th nzWidth="10%">增减</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of viewData">
+								<td>{{ data.drugsInfoDTO?data.drugsInfoDTO.drugCode:'无' }}</td>
+                <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.drugName:'无' }}</td>
+                <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.specs:'无' }}</td>
+                <td>{{ data.expendCount||'0' }}</td>
+                <td>{{ data.actualCount||'0' }}</td>
+                <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.packingSpecs:'0' }}</td>
+                <td>{{ data.cartonNum || '0' }}</td>
+                <td>{{ data.formerInventory || '0' }}</td>
+                <td>{{ data.afterInventory || '0'}}</td>
+        				<td>{{ data.addSub || '0' }}</td>
+              </tr>
+            </tbody>
+          </nz-table>
+        <!--  <div class="list-template__pagination">
+            <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
+              (nzPageIndexChange)="getList()" (nzPageSizeChange)="getList()">
+            </nz-pagination>
+          </div> -->
+        </div>
+      </overlay-scrollbars>
+      <div class="display_flex justify-content_flex-center">
+        <button class="btn" nz-button nzType="primary" (click)="hideModal()">知道了</button>
+      </div>
+    </div>
+  </div>
+  <!-- 删除模态框 -->
+  <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+    (confirmDelEvent)="confirmDel()" content="您确认要删除科室吗？"></app-dialog-delete>
+
+  <!-- 启用停用模态框 -->
+  <app-dialog-delete [delModal]="delModal1" (hideDelModalEvent)="hideDelModal1()" [btnLoading]="btnLoading"
+    (confirmDelEvent)="confirmDel1()" [content]="'您确认要建立配送工单吗？'"></app-dialog-delete>
+
+  <!-- 打印 -->
+  <div id="report" style="display: none;">
+		<div class="monad" 
+				*ngIf="rowData"
+				style="padding: 10px;
+				border: 1px solid #e7e7e7;
+				border-radius: 5px;">
+			<div class="monad-title" 
+				style="text-align: center;
+				font-weight: 700;
+				font-size: 16px;
+				border-bottom: 1px solid #e7e7e7;
+				padding-bottom: 10px;">
+				大输液发药单-{{rowData.applyDeptDTO?rowData.applyDeptDTO.dept:''}}
+			</div>
+			<div class="monad-sign" style="display: flex;line-height: 40px;font-size: 14px;">
+				<div style="margin-right: 15px;">日期：{{rowData.createTime|date:'yyyy-MM-dd HH:mm'}}</div>
+				<div style="margin-right: 15px;">批次号：{{rowData.batch?rowData.batch.batchNo:'-'}}</div>
+				<div style="margin-right: 15px;">单号：{{rowData.packingNo}}</div>
+			</div>
+			<div style="border: 1px solid #e7e7e7;border-bottom: none;font-size: 14px;">
+				<div class="thead" style="display: flex;">
+					<div style="text-align: center;width: 40%;height: 40px;
+					line-height: 40px;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">药品名称</div>
+					
+					<div style="text-align: center;width: 20%;height: 40px;
+					line-height: 40px;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">规格</div>
+					
+					<div style="text-align: center;width: 10%;height: 40px;
+					line-height: 40px;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">总量</div>
+					
+					<div style="text-align: center;width: 10%;height: 40px;
+					line-height: 40px;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">箱数</div>
+					
+					<div style="text-align: center;width: 20%;height: 40px;
+					line-height: 40px;border-bottom: 1px solid #e7e7e7;">取药药房</div>
+				</div>
+				<div *ngFor="let data of codes" style="display: flex;">
+					<div style="text-align: center;width: 40%;height: 40px;
+					line-height: 40px;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.drugName }}</div>
+					
+					<div style="text-align: center;width: 20%;height: 40px;
+					line-height: 40px;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.specs }}</div>
+					
+					<div style="text-align: center;width: 10%;height: 40px;
+					line-height: 40px;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{ data.actualCount }}</div>
+					
+					<div style="text-align: center;width: 10%;height: 40px;
+					line-height: 40px;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{ data.cartonNum }}</div>
+					
+					<div style="text-align: center;width: 20%;height: 40px;
+					line-height: 40px;border-bottom: 1px solid #e7e7e7;">{{ data.deptName }}</div>
+				</div>
+			</div>
+		</div>
+  </div>
+
+</div>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo"></app-prompt-modal>
+
+<!-- 查看详情 -->
+<router-outlet></router-outlet>
+<!-- 遮罩 -->
+<app-mask *ngIf="maskFlag"></app-mask>
+<app-excel-import [isShow]="isShow" (hideFormHand)="hideExcelImport($event)" *ngIf="isShow" (submitFormHand)="submitExcelImport($event)"></app-excel-import>

src/app/views/admin-office-prescription/admin-office-prescription.component.less

@@ -0,0 +1,233 @@
+@import "../../../../src/theme.less";
+:host {
+  .add-button {
+    margin: 0 auto 16px !important;
+  }
+  .targetDept {
+    overflow: hidden;
+    // width: 90px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .dynamic {
+    margin-bottom: 16px;
+    display: flex;
+    align-items: center;
+    input {
+      width: 90%;
+    }
+    i {
+      margin-left: 8px;
+      cursor: pointer;
+      font-size: 18px;
+    }
+  }
+}
+
+.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: 80%;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 19px 14px 0 14px;
+        max-height: 500px;
+        overflow-y: auto;
+				
+				.list-template__bottom {
+				  background: #f9fafb;
+				  border: 1px solid #e5e9ed;
+				  border-radius: 8px;
+				  padding-bottom: 56px;
+				  position: relative;
+				  .list-template__nzTable {
+				    padding: 16px 16px 0;
+				
+				    .thead {
+				      background-image: linear-gradient(to right, @bg-start, @bg-end);
+				
+				      th {
+				        background: transparent;
+				        color: #fff;
+				        text-align: center;
+				      }
+				    }
+				
+				    .ant-table-body {
+				      border-bottom: 1px solid #e5e9ed;
+				    }
+				
+				    .ant-table-tbody {
+				      tr {
+				        text-align: center;
+				        color: #333;
+				
+				        td {
+				          border: none;
+				
+				          &.tab_hover:hover{
+				            text-decoration: underline;
+				            cursor: pointer;
+				          }
+				
+				          .coop {
+				            button{
+				              color: #333;
+				            }
+				            span,button {
+				              display: inline-block;
+				              padding: 0 8px;
+				              cursor: pointer;
+				              position: relative;
+				
+				              &::after {
+				                content: "|";
+				                position: absolute;
+				                top: 0;
+				                right: 0;
+				              }
+				
+				              &:hover,
+				              &:active {
+				                color: @primary-color;
+				              }
+				
+				              &:nth-last-child(1) {
+				                &::after {
+				                  content: "";
+				                }
+				              }
+				            }
+				          }
+				        }
+				      }
+				    }
+				  }
+				  .list-template__pagination {
+				    height: 56px;
+				    display: flex;
+				    align-items: center;
+				    position: absolute;
+				    right: 8px;
+				  }
+				}
+				
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+              text-align: left;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}
+

src/app/views/admin-office-prescription/admin-office-prescription.component.ts

@@ -0,0 +1,868 @@
+import { Component, OnInit, ViewChild} from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import {
+  FormBuilder,
+  Validators,
+  FormGroup,
+  FormControl,
+} from "@angular/forms";
+
+import { MainService } from "../../services/main.service";
+import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
+import { ToolService } from "../../services/tool.service";
+import { format, startOfDay, endOfDay } from "date-fns";
+import { NzMessageService } from "ng-zorro-antd";
+import { Subject } from "rxjs";
+import { debounceTime, filter } from "rxjs/operators";
+import host from "../../../assets/js/http";
+import { HttpRequest, HttpResponse, HttpClient } from '@angular/common/http';
+
+@Component({
+  selector: "app-admin-office-prescription",
+  templateUrl: "./admin-office-prescription.component.html",
+  styleUrls: ["./admin-office-prescription.component.less"],
+})
+export class AdminOfficePrescriptionComponent implements OnInit{
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  constructor(
+    private message: NzMessageService,
+    private fb: FormBuilder,
+    private route: ActivatedRoute,
+    private router: Router,
+    private mainService: MainService,
+    private tool: ToolService,
+    private http: HttpClient,
+  ) {}
+	
+  ngOnInit() {
+    this.searchParentDeptSubject.pipe(debounceTime(500)).subscribe((e) => {
+      // this.getAllParentdepart(v).subscribe((result) => {
+      //   this.isLoading = false;
+      //   if (result.status == 200) {
+      //     this.allParentdepart = result.list;
+      //   }
+      // });
+			this.isDeptLoading = true;
+			this.getDeparts(e);
+    });
+		this.hosId = this.tool.getCurrentHospital().id;
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+    this.initForm();
+    this.getAllHospital();
+    // this.getType();
+    // this.getDeptHandoverType();
+  }
+  listOfData: any[] = []; //表格数据
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  modal: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  validateForm: FormGroup; //新增/编辑表单
+  coopId: number; //表格中执行操作的id
+  department: ""; //所属科室
+	hosId: number; 
+	dateRange;//时间
+  batchNumber; //批次号
+  num; //编码
+  deptalias; //别名
+  type; //类型
+  deptHandoverType; //类型
+  pageIndex: number = 1; //页码
+  listLength: number = 10; //总条数
+  pageSize: number = 10; //每页条数
+  btnLoading: boolean = false; //确认按钮loading状态
+  printLoading: boolean = false; //批量打印按钮loading状态
+  deptPhones: any = []; //新添加的科室电话列表
+  isAddDeptsPhone = true; //添加新的科室电话是否禁用
+  deptsPhoneId = 1; //科室电话自增id
+  allParentdepart: any = []; //所有的父级科室列表
+  hospitals1: any = []; //科室列表(搜索)
+	rowData: object = {}; //打印选择列表
+  searchParentDeptSubject = new Subject();
+  // 初始化增删改按钮
+  coopBtns: any = {};
+	viewData: any = []; //科室单查看数据
+  // 模板导出
+  excelExport(){
+    this.maskFlag = this.message.loading("下载模板中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService.exportExcel("department", {}).subscribe(
+      (data) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        this.message.success('下载模板成功');
+        var file = new Blob([data], {
+          type: "application/vnd.ms-excel",
+        });
+        //trick to download store a file having its URL
+        var fileURL = URL.createObjectURL(file);
+        var a = document.createElement("a");
+        a.href = fileURL;
+        a.target = "_blank";
+        a.download = "科室导入模板.xls";
+        document.body.appendChild(a);
+        a.click();
+      },
+      (err) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        this.message.error('下载模板失败');
+      }
+    );
+  }
+
+  // 导入---start
+  // model-取消
+  isShow = false;
+  hideExcelImport() {
+    this.isShow = false;
+  }
+  // 触发
+  excelImport() {
+    this.isShow = true;
+  }
+  submitExcelImport({fileList}){
+    this.isShow = false;
+    const formData = new FormData();
+    fileList.forEach((file: any) => {
+      formData.append('file', file);
+    });
+    this.maskFlag = this.message.loading("正在导入中..", {
+      nzDuration: 0,
+    }).messageId;
+    const req = new HttpRequest('Post', host.host + '/user/data/importExcel/department', formData, {
+      reportProgress: true
+    });
+    this.http
+      .request(req)
+      .pipe(filter(e => e instanceof HttpResponse))
+      .subscribe(
+        (res:any) => {
+          if(res.body.status == 200){
+            this.message.remove(this.maskFlag);
+            this.maskFlag = false;
+            this.message.success('导入成功');
+            this.getList();
+          }else{
+            this.message.remove(this.maskFlag);
+            this.maskFlag = false;
+            this.showPromptModal("导入", false, res.body.msg);
+          }
+        },
+        () => {
+          this.message.remove(this.maskFlag);
+          this.maskFlag = false;
+          this.message.error('导入失败');
+        },
+      );
+  }
+  // 导入---end
+  //搜索父级科室
+	isDeptLoading = false;
+  changeInp(e) {
+    this.searchParentDeptSubject.next(e);
+  }
+  // 打开父级科室下拉框baba
+  isLoading = false;
+  openDeptSelect(flag) {
+    if (flag) {
+      this.isLoading = true;
+      this.getAllParentdepart().subscribe((result) => {
+        this.isLoading = false;
+        if (result.status == 200) {
+          this.allParentdepart = result.list;
+        }
+      });
+    }
+  }
+  // 配送建单
+  coopData:any = {};
+  addDateModal(data) {
+    this.coopData = data;
+    this.showDelModal1();
+  }
+  delModal1: boolean = false; //删除模态框
+
+  showDelModal1() {
+    this.delModal1 = true;
+  }
+  hideDelModal1() {
+    this.delModal1 = false;
+  }
+  // 确认配送工单
+  confirmDel1() {
+    this.btnLoading = true;
+    this.mainService
+      .transfusionBuildOrder({
+				drugsListId:this.coopData.id
+			})
+      .subscribe((data) => {
+        this.btnLoading = false;
+        this.delModal1 = false;
+        if (data.status == 200) {
+          this.showPromptModal('操作', true, "");
+        } else {
+          this.showPromptModal('操作', false, data.msg);
+        }
+      });
+  }
+  //获取所有的父级科室列表
+  getAllParentdepart(keyWord = "") {
+    let postData: any = {
+      idx: 0,
+      sum: 10,
+      department: {
+        // hospital: { id: this.add ? this.tool.getCurrentHospital().id : this.hospital },
+        keyWord: keyWord,
+      },
+    };
+    if (this.coopItem) {
+      // 过滤这个科室及其子科室
+      postData.department.filterByDeptId = this.coopItem.id;
+    }
+    return this.mainService.getFetchDataList("data", "department", postData);
+  }
+  // 新添加科室号码
+  addDeptPhone(e: MouseEvent) {
+    e.preventDefault();
+    this.deptPhones.push({ id: ++this.deptsPhoneId, phone: "" });
+    this.deptsPhoneChange();
+  }
+  // 删除新添加科室号码
+  removeDeptPhone(index: number, e: MouseEvent) {
+    e.preventDefault();
+    this.deptPhones.splice(index, 1);
+    this.deptsPhoneChange();
+  }
+  //监听科室电话输入事件
+  deptsPhoneChange(e?, phone?) {
+    if (e !== undefined && phone !== undefined) {
+      phone.phone = e;
+    }
+    // -------------判断添加按钮是否禁用 start
+    this.isAddDeptsPhone = !this.validateForm.value.officeNum;
+    if (!this.isAddDeptsPhone) {
+      //如果没禁用
+      this.isAddDeptsPhone = this.deptPhones.some((item) => item.phone === "");
+    }
+    // -------------判断添加按钮是否禁用 end
+  }
+
+  // 搜索
+  search() {
+    this.pageIndex = 1;
+    this.getList();
+  }
+  // 重置
+  reset() {
+    this.pageIndex = 1;
+    this.department = null;
+    this.batchNumber = "";
+		this.dateRange = [];
+		this.startDate = "";
+		this.endDate = "";
+    this.getList();
+  }
+  // 表格数据
+  loading1 = false;
+  getList() {
+    var that = this;
+    let data = {
+      idx: that.pageIndex - 1,
+      sum: that.pageSize,
+      drugsList: {
+        applyDept: that.department,
+				batch:{
+					batchNo:that.batchNumber
+				},
+        startTime: this.startDate,
+				endTime: this.endDate,
+				hosId: this.hosId
+      },
+    };
+		if(that.department){
+			data.drugsList.applyDept = that.department
+		}else{
+			delete data.drugsList.applyDept
+		}
+		if(that.batchNumber){
+			data.drugsList.batch.batchNo = that.batchNumber
+		}else{
+			delete data.drugsList.batch
+		}
+    this.loading1 = true;
+    that.mainService
+      .getFetchDataList("data", "drugsList", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        that.listOfData = data.list;
+        that.listLength = data.totalNum;
+      });
+  }
+	
+	// 日期选择
+	startDate: string; //发起时间开始
+	endDate: string; //发起时间结束
+	changeDate(result?): void {
+	  if (!result) {
+	    this.startDate = this.endDate = "";
+	    return;
+	  }
+	  this.startDate = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
+	  this.endDate = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
+	}
+	
+	// 获取所有科室
+  // snum = 0;
+  getDeparts(dept) {
+    var that = this;
+    let data = {
+      department: {
+        dept,
+        hospital: {
+          id: this.hosId
+        },
+      },
+      idx: 0,
+      sum: 20,
+    };
+    that.mainService
+		.getFetchDataList("data", "department", data)
+		.subscribe((data) => {
+			setTimeout(_=>{
+				this.isDeptLoading = false
+				this.hospitals1 = data.list
+			},500)
+		});
+  }
+	
+  // 获取所有院区
+  getAllHospital() {
+		this.getDeparts('')
+    this.getList();
+  }
+
+  // 切换院区选项
+  buildings: any = []; //楼栋
+  maskFlag: any = false;
+  changeHosp(obj?) {
+    let hospitalId;
+    if (obj) {
+      hospitalId = obj.hospital.id;
+    }
+    let hid;
+    if (hospitalId || hospitalId == 0) {
+      hid = hospitalId - 0;
+    } 
+		// else {
+  //     hid = this.hospital - 0;
+  //   }
+    let data = {
+      // hosId: this.add ? this.tool.getCurrentHospital().id : hid,
+    };
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService
+      .coopData("getBuildingOrFloor", "building", data)
+      .subscribe((data) => {
+        this.buildings = data.data;
+        this.floors = [];
+        // ---------
+        if (obj) {
+          //编辑
+          let arr = this.buildings.map((item) => item.id);
+          if (obj.building.id && arr.includes(obj.building.id)) {
+            //有楼栋
+            this.changeBuilding(obj.building.id, obj);
+            this.validateForm.controls.building.setValue(obj.building.id + "");
+          } else {
+            //无楼栋
+            this.floors = [];
+            this.message.remove(this.maskFlag);
+            this.maskFlag = false;
+            this.modal = true;
+            this.validateForm.controls.building.setValue(null);
+            this.validateForm.controls.officeAddress.setValue(null);
+          }
+        } else {
+          //新增
+          this.message.remove(this.maskFlag);
+          this.maskFlag = false;
+          this.modal = true;
+        }
+        // ---------
+      });
+  }
+
+  // 切换楼栋信息
+  floors: Array<any> = []; //楼层
+  floorLoading: boolean = false;
+  changeBuilding(buildingId?, obj?) {
+    var that = this;
+    that.floors = [];
+    var bid;
+    if (buildingId || buildingId == 0) {
+      bid = buildingId - 0;
+    } else if (!that.add && that.validateForm.value.building) {
+      bid = that.validateForm.value.building - 0;
+    } else {
+      return;
+    }
+    let data = {
+      buildingId: bid,
+    };
+    this.floorLoading = true;
+    that.mainService
+      .coopData("getBuildingOrFloor", "floor", data)
+      .subscribe((data) => {
+        this.floorLoading = false;
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        this.modal = true;
+        that.floors = data.data;
+        if (obj) {
+          let floorId = obj.floor.id;
+          let arr = that.floors.map((item) => item["id"]);
+          if (floorId && arr.includes(floorId)) {
+            this.validateForm.controls.floor.setValue(floorId + "");
+          } else {
+            this.validateForm.controls.floor.setValue(null);
+            this.validateForm.controls.officeAddress.setValue(null);
+          }
+        }
+      });
+  }
+
+  // 获取科室类型
+  types: Array<any> = [];
+  getType() {
+    var that = this;
+    that.mainService.getDictionary("list", "dept_type").subscribe((data) => {
+      console.log(data);
+      that.types = data;
+    });
+  }
+
+  // 获取科室汇总交接类型
+  deptHandoverTypes: Array<any> = [];
+  getDeptHandoverType() {
+    var that = this;
+    that.mainService.getDictionary("list", "dept_handover_type").subscribe((data) => {
+      console.log(data);
+      that.deptHandoverTypes = data;
+    });
+  }
+
+  // 新增弹框
+  showModal() {
+    this.initForm();
+    // this.changeHosp();
+    this.add = true;
+    this.isAddDeptsPhone = true;
+    this.deptPhones = [];
+  }
+  hideModal() {
+    this.coopItem = null;
+    this.modal = false;
+    this.initForm();
+  }
+  // 初始化新增form表单
+  initForm() {
+    this.endTime1Hourdis = () => [];
+    this.endTime1Mindis = () => [];
+    this.endTime2Hourdis = () => [];
+    this.endTime2Mindis = () => [];
+    this.startTime1Hourdis = () => [];
+    this.startTime1Mindis = () => [];
+    this.startTime2Hourdis = () => [];
+    this.startTime2Mindis = () => [];
+    this.validateForm = this.fb.group({
+      parentOfficeName: [null],
+      officeName: [null, [Validators.required]],
+      deptalias: [null],
+      officeNo: [null, [Validators.required]],
+      officeNum: [null, [Validators.required]],
+      building: [null, [Validators.required]],
+      floor: [null, [Validators.required]],
+      officeAddress: [null, [Validators.required]],
+      officeType: [null, [Validators.required]],
+      deptHandoverType: [null],
+      startTime1: [null],
+      endTime1: [null],
+      dynamicCode1: [null],
+      startTime2: [null],
+      endTime2: [null],
+      dynamicCode2: [null],
+    });
+  }
+  // 科室位置必填
+  buildValidator = (control: FormControl): { [s: string]: boolean } => {
+    if (
+      this.validateForm &&
+      this.validateForm.value &&
+      (!this.validateForm.value.building ||
+        !this.validateForm.value.floor ||
+        !this.validateForm.value.officeAddress)
+    ) {
+      return { required: true };
+    }
+  };
+  /**
+   * 生成一个从 start 到 end 的连续数组
+   * @param start
+   * @param end
+   */
+  generateArray(start, end) {
+    return Array.from(new Array(end).keys()).slice(start);
+  }
+
+  //服务时间选择
+  // 禁用的小时
+  startTime1Hourdis() {
+    return [];
+  }
+  endTime1Hourdis() {
+    return [];
+  }
+  startTime2Hourdis() {
+    return [];
+  }
+  endTime2Hourdis() {
+    return [];
+  }
+  // 禁用的分钟
+  startTime1Mindis() {
+    return [];
+  }
+  endTime1Mindis() {
+    return [];
+  }
+  startTime2Mindis() {
+    return [];
+  }
+  endTime2Mindis() {
+    return [];
+  }
+  timeChange(e: boolean, type: string, num: number) {
+    if (!e && this.validateForm.value[type + num]) {
+      let hour = new Date(this.validateForm.value[type + num]).getHours();
+      let minute = new Date(this.validateForm.value[type + num]).getMinutes();
+      if (type == "startTime" && num === 1) {
+        this.endTime1Hourdis = () => this.generateArray(0, hour);
+        this.endTime1Mindis = () => this.generateArray(0, minute + 1);
+      } else if (type == "startTime" && num === 2) {
+        this.endTime2Hourdis = () => this.generateArray(0, hour);
+        this.endTime2Mindis = () => this.generateArray(0, minute + 1);
+      } else if (type == "endTime" && num === 1) {
+        this.startTime1Hourdis = () => this.generateArray(hour + 1, 24);
+        this.startTime1Mindis = () => this.generateArray(minute, 60);
+      } else if (type == "endTime" && num === 2) {
+        this.startTime2Hourdis = () => this.generateArray(hour + 1, 24);
+        this.startTime2Mindis = () => this.generateArray(minute, 60);
+      }
+    }
+  }
+  // 表单提交
+  submitForm(): void {
+    var that = this;
+    for (const i in that.validateForm.controls) {
+      that.validateForm.controls[i].markAsDirty();
+      that.validateForm.controls[i].updateValueAndValidity();
+    }
+    console.log(that.validateForm);
+    if (that.validateForm.invalid) return;
+    let deptsPhone = this.deptPhones.map((item) => item.phone).join();
+    let data: any = {
+      department: {
+        dept: that.validateForm.value.officeName,
+        deptalias: that.validateForm.value.deptalias,
+        // hospital: { id: that.add ? that.tool.getCurrentHospital().id : that.hospital },
+        pcode: that.validateForm.value.officeNo,
+        manyPhone: deptsPhone
+          ? that.validateForm.value.officeNum + "," + deptsPhone
+          : that.validateForm.value.officeNum,
+        building: { id: that.validateForm.value.building - 0 },
+        floor: { id: that.validateForm.value.floor - 0 },
+        address: that.validateForm.value.officeAddress,
+        type: { id: that.validateForm.value.officeType },
+        deptHandoverType: { id: that.validateForm.value.deptHandoverType },
+      },
+    };
+    if (this.validateForm.value.parentOfficeName) {
+      data.department.parent = { id: this.validateForm.value.parentOfficeName };
+    }
+    if (
+      this.validateForm.value.startTime1 ||
+      this.validateForm.value.endTime1
+    ) {
+      if (
+        this.validateForm.value.startTime1 &&
+        this.validateForm.value.endTime1
+      ) {
+        data.department["startTime1"] = format(
+          this.validateForm.value.startTime1,
+          "yyyy-MM-dd HH:mm:ss"
+        );
+        data.department["endTime1"] = format(
+          this.validateForm.value.endTime1,
+          "yyyy-MM-dd HH:mm:ss"
+        );
+        data.department["dynamicCode1"] = this.validateForm.value.dynamicCode1 ? 1 : 0;
+      } else {
+        return;
+      }
+    }
+    if (
+      this.validateForm.value.startTime2 ||
+      this.validateForm.value.endTime2
+    ) {
+      if (
+        this.validateForm.value.startTime2 &&
+        this.validateForm.value.endTime2
+      ) {
+        data.department["startTime2"] = format(
+          this.validateForm.value.startTime2,
+          "yyyy-MM-dd HH:mm:ss"
+        );
+        data.department["endTime2"] = format(
+          this.validateForm.value.endTime2,
+          "yyyy-MM-dd HH:mm:ss"
+        );
+        data.department["dynamicCode2"] = this.validateForm.value.dynamicCode2 ? 1 : 0;
+      } else {
+        return;
+      }
+    }
+    if (!that.add) {
+      data.department["id"] = that.coopId;
+    }
+    that.btnLoading = true;
+    that.mainService
+      .coopData(that.add ? "addData" : "updData", "department", data)
+      .subscribe((data) => {
+        that.btnLoading = false;
+        that.hideModal();
+        that.initForm();
+        if (data.status == 200) {
+          that.showPromptModal(that.add ? "新增" : "编辑", true, "");
+        } else {
+          that.showPromptModal(that.add ? "新增" : "编辑", false, data.msg);
+        }
+      });
+  }
+
+  // 编辑
+  coopItem: any = null;
+  edit(e, data) {
+    e.stopPropagation();
+    this.add = false;
+    this.coopId = data.id;
+    this.coopItem = data;
+    this.isAddDeptsPhone = false;
+    this.deptPhones = [];
+    let phones = data.manyPhone ? data.manyPhone.split(",") : [];
+    if (phones.length === 0) {
+      this.validateForm.controls.officeNum.setValue("");
+      this.deptPhones = [];
+    } else if (phones.length === 1) {
+      this.validateForm.controls.officeNum.setValue(phones[0]);
+      this.deptPhones = [];
+    } else {
+      this.validateForm.controls.officeNum.setValue(phones[0]);
+      this.deptPhones = phones.slice(1).map((item) => {
+        return {
+          id: ++this.deptsPhoneId,
+          phone: item,
+        };
+      });
+    }
+    if (data.startTime1 && data.endTime1) {
+      this.validateForm.controls.startTime1.setValue(new Date(data.startTime1));
+      this.validateForm.controls.endTime1.setValue(new Date(data.endTime1));
+      this.validateForm.controls.dynamicCode1.setValue(data.dynamicCode1 == 1);
+    }
+    if (data.startTime2 && data.endTime2) {
+      this.validateForm.controls.startTime2.setValue(new Date(data.startTime2));
+      this.validateForm.controls.endTime2.setValue(new Date(data.endTime2));
+      this.validateForm.controls.dynamicCode2.setValue(data.dynamicCode2 == 1);
+    }
+    this.validateForm.controls.officeAddress.setValue(data.address);
+    if (data.parent) {
+      this.getAllParentdepart(data.parent.dept).subscribe((res) => {
+        if (res.status == 200) {
+          this.allParentdepart = res.list;
+          this.validateForm.controls.parentOfficeName.setValue(data.parent.id);
+        }
+      });
+    }
+    this.validateForm.controls.officeName.setValue(data.dept);
+    this.validateForm.controls.deptalias.setValue(data.deptalias);
+    this.validateForm.controls.officeNo.setValue(data.pcode);
+    this.validateForm.controls.officeType.setValue(data.type.id + "");
+    this.validateForm.controls.deptHandoverType.setValue(data.deptHandoverType ? data.deptHandoverType.id + "" : null);
+    // this.changeHosp(data);
+    this.validateForm.controls.officeAddress.setValue(data.address);
+  }
+
+  // 展示信息提示框（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();
+  }
+
+  delModal: boolean = false; //删除模态框
+  coopIds: any;
+  coopFlag: any = false;
+  /**
+   *
+   * @param e 事件对象
+   * @param flag true是批量删除，false是单个删除
+   * @param id
+   */
+  showDelModal(e, flag, id) {
+    e.stopPropagation();
+    this.delModal = true;
+    this.coopFlag = flag;
+    if (flag) {
+      this.coopIds = id;
+    } else {
+      this.coopId = id;
+    }
+  }
+  hideDelModal() {
+    this.delModal = false;
+  }
+  // 确认删除
+  confirmDel() {
+    var that = this;
+    that.btnLoading = true;
+    that.mainService
+      .coopData(
+        "rmvData",
+        "department",
+        this.coopFlag ? this.coopIds : [that.coopId]
+      )
+      .subscribe((data) => {
+        that.btnLoading = false;
+        that.delModal = false;
+        if (data.data && data.data[0]) {
+          if (!data.data[0].msg) {
+            if (
+              that.listOfData.length == 1 &&
+              that.pageIndex == Math.ceil(that.listLength / that.pageSize)
+            ) {
+              that.listLength--;
+              that.pageIndex = Math.ceil(that.listLength / that.pageSize) || 1;
+            }
+            that.showPromptModal("删除", true, "");
+          } else {
+            that.showPromptModal("删除", false, data.data[0].msg);
+          }
+        } else {
+          that.showPromptModal("删除", false, "");
+        }
+      });
+  }
+
+  // 查看
+  detail(e, id) {
+    e.stopPropagation();
+		var that = this;
+		let data = {
+			idx: 0,
+			sum: 9999,
+			drugsConfigure: {
+			  hosId: this.hosId,
+			  drugListId: id
+			}
+		};
+		this.loading1 = true;
+		that.mainService
+		  .getFetchDataList("data", "drugsConfigure", data)
+		  .subscribe((data) => {
+		    this.loading1 = false;
+				this.modal = true
+		    that.viewData = data.list;
+		    // that.listLength = data.totalNum;
+		  });
+  }
+
+  // 选中表格中科室
+  mapOfCheckedId: { [key: string]: boolean } = {};
+  checkedDepIds = []; //已选中科室id
+  refreshStatus(): void {
+    this.isAllDisplayDataChecked = this.listOfData.every(
+      (item) => this.mapOfCheckedId[item.id]
+    );
+    let arr = [];
+    for (var k in this.mapOfCheckedId) {
+      if (this.mapOfCheckedId[k]) {
+        arr.push(Number(k));
+      }
+    }
+    this.checkedDepIds = arr;
+    console.log(this.checkedDepIds);
+  }
+  //表格整行选中
+  selectedListData(id) {
+    this.mapOfCheckedId[id] = !this.mapOfCheckedId[id];
+    this.refreshStatus();
+  }
+  // 全选
+  isAllDisplayDataChecked = false; //当前页是否全选
+  checkAll(value: boolean): void {
+    this.listOfData.forEach((item) => (this.mapOfCheckedId[item.id] = value));
+    this.refreshStatus();
+  }
+
+  // 打印
+  codes = []; //二维码
+  print(e, data, id) {
+		this.rowData = data
+    e.stopPropagation();
+    let that = this;
+    that.printLoading = true;
+    that.mainService
+      .transfusionPrint("drugsList", id)
+      .subscribe((res) => {
+				let arr = res.data.drugsConfigureDTOS;
+				for(let i of arr){
+					i.deptName = res.data.pharmacyDTO?res.data.pharmacyDTO.dept:'-'
+				}
+				arr.push({
+					drugsInfoDTO:{
+						drugName:'合计',
+						specs:'',
+					},
+					actualCount:res.data.totalActual,
+					cartonNum:res.data.totalCarton,
+					deptName:''
+				})
+        that.codes = arr
+        that.printLoading = false;
+        setTimeout(() => {
+          const printContent = document.getElementById("report");
+          const WindowPrt = window.open("", "", "width=1000,height=900");
+          WindowPrt.document.write(printContent.innerHTML);
+          WindowPrt.document.close();
+          WindowPrt.focus();
+          WindowPrt.print();
+          WindowPrt.close();
+        }, 500);
+      });
+  }
+}

src/app/views/admin-office-prescription/admin-office-prescription.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { AdminOfficePrescriptionRoutingModule } from './admin-office-prescription-routing.module';
+import { AdminOfficePrescriptionComponent } from './admin-office-prescription.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    AdminOfficePrescriptionComponent,
+  ],
+  imports: [
+    CommonModule,
+    AdminOfficePrescriptionRoutingModule,
+    ShareModule
+  ]
+})
+export class AdminOfficePrescriptionModule { }

src/app/views/big-transfusion-set/big-transfusion-set-routing.module.ts

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

src/app/views/big-transfusion-set/big-transfusion-set.component.html

@@ -0,0 +1,49 @@
+<div class="TaskTypeManagement">
+  <div class="taskTypeInfo">
+    <div class="top">
+      <div class="item" (click)="tabModal('characteristics')" [ngClass]="{'items':tabModalName=='characteristics'}">
+        特性配置
+      </div>
+      <div class="item" (click)="tabModal('automaticOrderCreation')" [ngClass]="{'items':tabModalName=='automaticOrderCreation'}">
+        自动建单配置
+      </div>
+    </div>
+    <div class="list" *ngIf="!loading">
+      <!-- 特性配置 -->
+      <div *ngIf="tabModalName=='characteristics'">
+       <!-- 任务类型 -->
+       <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
+           (nzOnSearch)="changeTasktype($event)" nzPlaceHolder="请选择任务类型" [(ngModel)]="infusionSolutionsTypeId">
+           <ng-container *ngFor="let option of taskTypes1">
+             <nz-option *ngIf="!isLoading" [nzLabel]="option.taskName" [nzValue]="option.id"></nz-option>
+           </ng-container>
+           <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+             <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+           </nz-option>
+         </nz-select>
+       </div>
+      </div>
+      <!-- 自动建单配置 -->
+      <div *ngIf="tabModalName=='automaticOrderCreation'">
+        <!-- 自动建单 -->
+        <div class="display_flex align-items_center mb8">
+          <nz-form-label class="label">自动建单</nz-form-label>
+          <nz-checkbox-group [(ngModel)]="autoCreateOrders"></nz-checkbox-group>
+        </div>
+      </div>
+      <div class="bottom">
+        <button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitForm()">保存</button>
+      </div>
+    </div>
+    <div class="list" *ngIf="loading">
+      <div class="loadingFull display_flex justify-content_flex-center align-items_center">
+        <div class="loadingFullInner">
+          <img src="../../../assets/images/loading.gif" alt="">
+          <div>加载中...</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

src/app/views/big-transfusion-set/big-transfusion-set.component.less

@@ -0,0 +1,94 @@
+@import "../../../../src/theme.less";
+:host {
+  width: 100%;
+  height: 100%;
+}
+.w320px {
+  width: 250px;
+}
+
+.TaskTypeManagement {
+  height: calc(100vh - 88px);
+  background: #f9fafb;
+  overflow: hidden;
+  padding: 16px 20px;
+
+  //任务类型管理-主体
+  .taskTypeInfo {
+    height: 100%;
+    border: 1px solid #e5e9ed;
+    background: #fff;
+    color: #333;
+    position: relative;
+
+    .top {
+      height: 61px;
+      line-height: 60px;
+      display: flex;
+      align-items: center;
+      border-bottom: 1px solid #e5e9ed;
+      position: relative;
+      z-index: 2;
+
+      .items {
+        background: #f0f6ed;
+      }
+
+      & > div {
+        border-right: 1px solid #e5e9ed;
+        width: 30%;
+        text-align: center; // display: flex;
+        // align-items: center;
+        cursor: pointer;
+
+        &:hover {
+          background: #f0f6ed;
+        }
+      }
+
+      &:nth-last-child(4) {
+        border: none;
+      }
+    }
+
+    .list {
+      width: 100%;
+      padding: 16px;
+      background: #fff;
+      height: 89%;
+      overflow: auto;
+
+      nz-form-label {
+        margin-left: 0px !important;
+      }
+
+      & > div {
+        background: #f9fafb;
+        border: 1px solid #e5e9ed;
+        border-radius: 10px 10px 0px 0px;
+        padding: 24px 120px;
+
+        .label {
+          margin-left: 16px;
+          font-size: 14px;
+          color: #333;
+        }
+      }
+
+      .bottom {
+        height: 60px;
+        border-radius: 0px 0px 10px 10px;
+        padding: 10px 240px 0px 240px;
+        border-top: 0px;
+
+        button {
+          width: 80px;
+          height: 34px;
+          display: block;
+          margin: 0 auto;
+        }
+      }
+    }
+  }
+}
+

src/app/views/big-transfusion-set/big-transfusion-set.component.ts

@@ -0,0 +1,195 @@
+import { Component, OnInit } from "@angular/core";
+import { MainService } from 'src/app/services/main.service';
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from 'ng-zorro-antd';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+
+@Component({
+  selector: "app-big-transfusion-set",
+  templateUrl: "./big-transfusion-set.component.html",
+  styleUrls: ["./big-transfusion-set.component.less"],
+})
+export class BigTransfusionSetComponent implements OnInit {
+  loading:boolean = false; //页面加载的loading
+  btnLoading:boolean = false; //提交按钮的loading
+  tabModalName:string = 'characteristics'; //当前选中的tab
+  surgeryField = null; //手术关联业务
+  hosId = this.tool.getCurrentHospital().id; //当前院区
+  // 接手术关联任务类型
+  infusionSolutionsTypeId:Number;
+  taskTypes1:any[] = [];
+  taskTypeData:{id:''};
+  // 苏醒室科室
+  recoveryDeptId:any;
+  recoveryDepts:any[] = [];
+  // 自动建单
+  autoCreateOrders:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+  // 是否开通送回病房
+  autoSendWard:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+  // 是否开通送回苏醒室
+  autoSendAwakeningRoom:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+  // 是否开通关联手术清洁建单
+  autoRemandClean:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+  // 是否开启手术即将开始通知
+  surgeryBegin:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+  // 建单时间
+  autoTime:Date | null = null;
+  tasktype1Id:any;
+  tasktype2Id:any;
+  cleanTypeId:any;
+	associationTypeIds:any;
+	questionnaireManagementData:any; //调查问卷数据
+	questionnaireIds:Number; //问卷参数
+	intervalTime:string = ''; //间隔时间参数
+	taskTypeIds:any = []; //任务类型参数
+	editId:'';
+	targetData:any = [];
+	stateData:any = [];
+	// 间隔时间数据
+	timeData:any[] = [
+	  {label:'10',value: 10},
+		{label:'15',value: 15},
+		{label:'30',value: 30},
+		{label:'60',value: 60}
+	];
+  // 配置
+  configs:any = {};
+  searchTimerSubject = new Subject();
+  constructor(private mainService: MainService,private tool: ToolService,private msg: NzMessageService) {}
+
+  ngOnInit():void {
+    // todo
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1], v[2], v[3]);
+    });
+    this.getTaskTypes('', true);
+  }
+
+  // 切换tab
+  tabModal(tabModalName:string){
+    this.tabModalName = tabModalName;
+  }
+
+  // 保存
+  submitForm() {
+    if(!this.infusionSolutionsTypeId){
+      this.msg.create("warning", "请选择任务类型！");
+      return;
+    }
+    let editData = {
+			id:'',
+			taskType:this.taskTypeData.id,
+			hosId: this.hosId,
+			infusionSolutionsTypeId:this.infusionSolutionsTypeId, //任务类型参数
+			autoCreate:0
+    };
+		if(this.editId){
+			editData.id = this.editId
+		}else{
+			delete editData.id 
+		}
+		if(this.autoCreateOrders[0].checked){
+			editData.autoCreate = 1
+		}else{
+			delete editData.autoCreate
+		}
+    this.btnLoading = true;
+    this.mainService
+      .simplePost("addData", "taskTypeConfig", editData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        if (result.status == 200) {
+          this.getConfig();
+        }
+      });
+  }
+	
+  // 用户输入搜索任务类型
+  isLoading: boolean = false;
+  changeTasktype(e) {
+    this.searchTimer(this.getTaskTypes, e, false);
+  }
+
+  // 边输入边搜索节流阀
+  searchTimer(fun, e, isFirst, type?) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e, isFirst, type]);
+  }
+	
+  //获取关联任务类型
+  // 1 患者其他服务
+  // 2 其他临床服务
+  getTaskTypes(e:string = '', isFirst:boolean = false) {
+    isFirst && (this.loading = true);
+    let postData:any = {
+      idx: 0,
+      sum: 9999,
+      taskType: {
+        taskName: e,
+        simpleQuery: true,
+				associationType : {
+					key: 'association_types',
+					value: 'other'
+				},
+        hosId: {
+          id: this.hosId
+        }
+      }
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("simple/data", "taskType", postData)
+      .subscribe((result) => {
+        this.isLoading = false;
+        if (result.status == 200) {
+          this.taskTypes1 = result.list || [];
+					this.getTaskTypesId();
+        }
+      });
+  }
+	
+	// 获取任务id
+	getTaskTypesId() {
+		this.mainService.getDictionary("list", "ordinary_field").subscribe((data) => {
+			this.taskTypeData = data.find(i=>i.value=='infusionSolutions')
+			this.getConfig();
+		});
+	}
+	
+  // 获取配置
+  getConfig() {
+    this.loading = true;
+    let postData = {
+      idx: 0,
+      sum: 10,
+      taskTypeConfig: {
+				hosId:this.hosId,
+				taskType:this.taskTypeData.id
+      }
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "taskTypeConfig", postData)
+      .subscribe((result) => {
+        this.loading = false;
+        if (result.status == 200) {
+    			let data = result.list[0] || {};
+					this.editId = data.id
+					this.autoCreateOrders[0].checked = data.autoCreate == 1;
+    			this.infusionSolutionsTypeId = data.infusionSolutionsTypeId
+        }
+      });
+  }
+}
+

src/app/views/big-transfusion-set/big-transfusion-set.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { BigTransfusionSetRoutingModule } from './big-transfusion-set-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { BigTransfusionSetComponent } from './big-transfusion-set.component';
+
+
+@NgModule({
+  declarations: [BigTransfusionSetComponent],
+  imports: [
+    CommonModule,
+    BigTransfusionSetRoutingModule,
+    ShareModule
+  ]
+})
+export class BigTransfusionSetModule { }

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

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

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

@@ -0,0 +1,203 @@
+<div class="list-template">
+  <div class="list-template__content">
+    <div class="list-template__top" nz-row>
+      <div nz-col nzLg='18' class="list-template__searchBox">
+        <div class="list-template__searchItem">
+          <span class="label">批次号：</span>
+          <input nz-input class="formItem" [(ngModel)]="batchNumber" placeholder="请输入批次号" nzSize="default" />
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">创建时间：</span>
+          <nz-range-picker [(ngModel)]="dateRange" nzFormat="yyyy-MM-dd"
+					(ngModelChange)="changeDate($event)"></nz-range-picker>
+        </div>
+      </div>
+      <div nz-col nzLg="6" class="list-template__btns">
+        <button class="btn default" (click)='search()'>搜索</button>
+        <button class="btn default ml8" (click)='reset()'>重置</button>
+				<button *ngIf="coopBtns.add" class="btn default ml8" (click)='showModal()'>新增</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="13%">批次号</th>
+            <th nzWidth="13%">创建时间</th>
+            <th nzWidth="13%">发药时间区间</th>
+            <th nzWidth="7%">发药科室</th>
+            <th nzWidth="7%">科室数</th>
+            <th nzWidth="7%">发药量</th>
+            <th nzWidth="7%">箱数</th>
+            <th nzWidth="10%">药品总价</th>
+						<th nzWidth="7%">状态</th>
+            <th nzWidth="16%">操作</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of listOfData" (click)="selectedListData(data.id)">
+            <td>{{ data.batchNo || '-' }}</td>
+            <td>{{ data.createTime|date:'yyyy-MM-dd HH:mm' }}</td>
+            <td>
+							<div>{{ data.startTime|date:'yyyy-MM-dd HH:mm' }}至</div>
+							<div>{{ data.endTime|date:'yyyy-MM-dd HH:mm' }}</div>
+						</td>
+            <td>{{ data.pharmacyDTO?data.pharmacyDTO.dept:'-' }}</td>
+            <td>{{ data.deptNum || '0' }}</td>
+            <td>{{ data.drugNum || '0'}}</td>
+						<td>{{ data.cartonNum || '0' }}</td>
+						<td>{{ data.totalPrice || '0' }}</td>
+						<td>{{ data.batchState?data.batchState.name : '-' }}</td>
+            <td>
+              <div class="coop">
+								<span *ngIf="coopBtns.edit && data.batchState.name=='未发药'" (click)="edit($event,data)">编辑</span>
+								<span *ngIf="coopBtns.del && data.batchState.name=='未发药'" (click)="showDelModal($event,data.id)">删除</span>
+                <span *ngIf="coopBtns.config && data.batchState.name=='未发药'" (click)="detail($event,data)">配置</span>
+                <span *ngIf="coopBtns.print && data.batchState.name=='已发药'" (click)="print($event,data, data.id)">打印</span>
+                <span *ngIf="coopBtns.batchPrint && data.batchState.name=='未发药'" (click)="dispensingPrint($event, data, data.id)">发药并打印</span>
+              </div>
+            </td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="list-template__pagination">
+        <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
+          (nzPageIndexChange)="getList()" (nzPageSizeChange)="getList()">
+        </nz-pagination>
+      </div>
+    </div>
+  </div>
+
+  <!-- 新增/编辑模态框 -->
+  <div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="modal">
+    <div class="modalBody">
+      <div class="title">发药批次-{{add ? '新增' : '编辑'}}<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+      </div>
+      <overlay-scrollbars #osComponentRef1 class="content">
+       <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
+       	<nz-form-item>
+       	  <nz-form-label nzRequired nzFor="dispensingTime">发药时间区间</nz-form-label>
+       	  <nz-form-control nzErrorTip="请选择发药时间区间!">
+       	    <nz-input-group>
+       				<nz-range-picker formControlName="dispensingTime" 
+							[nzShowTime]="{ nzFormat: 'yyyy-MM-dd HH:mm:ss' }" nzFormat="yyyy-MM-dd HH:mm:ss"
+							(ngModelChange)="formChangeDate($event)"></nz-range-picker>
+       			</nz-input-group>
+       	  </nz-form-control>
+       	</nz-form-item>
+       	<nz-form-item>
+       	  <nz-form-label nzRequired nzFor="department">取药科室</nz-form-label>
+       	  <nz-form-control nzErrorTip="请选择取药科室!">
+       	    <nz-input-group>
+       				<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" (nzOnSearch)="changeInp($event)" nzServerSearch nzShowSearch nzPlaceHolder="请选择申请科室" formControlName="department">
+       				  <ng-container *ngFor="let option of hospitals1">
+       				    <nz-option *ngIf="!isDeptLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+       				  </ng-container>
+       				  <nz-option *ngIf="isDeptLoading" nzDisabled nzCustomContent>
+       				    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+       				  </nz-option>
+       				</nz-select>
+       			</nz-input-group>
+       	  </nz-form-control>
+       	</nz-form-item>
+       </form>
+      </overlay-scrollbars>
+      <div class="display_flex justify-content_flex-center">
+        <button class="btn" nz-button nzType="primary" (click)="submitForm()" [nzLoading]="btnLoading">{{add ? '保存并配置' : '保存'}}</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="您确认要删除发药批次吗？"></app-dialog-delete>
+
+  <!-- 编辑模态框 -->
+  <app-dialog-delete [delModal]="editModal" (hideDelModalEvent)="hideDelModal1()" [btnLoading]="saveLoading"
+    (confirmDelEvent)="confirmDel1()" [content]="'保存后会重置您的发药科室的药品信息，您确认吗？'"></app-dialog-delete>
+
+  <!-- 打印 -->
+  <div id="report" style="display: none">
+		<div class="monad" *ngFor="let item of printData"
+				style="padding: 10px;
+				border: 1px solid #e7e7e7;
+				border-radius: 5px;margin-bottom: 40px;">
+			<div class="monad-title" 
+				style="text-align: center;
+				font-weight: 700;
+				font-size: 16px;
+				border-bottom: 1px solid #e7e7e7;
+				padding-bottom: 10px;">
+				大输液发药单-{{item.applyDeptDTO.dept}}
+			</div>
+			<div class="monad-sign" style="display: flex;line-height: 40px;font-size: 14px;">
+				<div style="margin-right: 15px;">日期：{{item.createTime|date:'yyyy-MM-dd HH:mm'}}</div>
+				<div style="margin-right: 15px;">批次号：{{item.batch.batchNo}}</div>
+				<div style="margin-right: 15px;">单号：{{item.packingNo}}</div>
+			</div>
+			<div style="border: 1px solid #e7e7e7;border-bottom: none;font-size: 14px;">
+				<div class="thead" style="display: flex;">
+					<div style="text-align: center;width: 40%;height: 40px;
+					line-height: 40px;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">药品名称</div>
+					
+					<div style="text-align: center;width: 20%;height: 40px;
+					line-height: 40px;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">规格</div>
+					
+					<div style="text-align: center;width: 10%;height: 40px;
+					line-height: 40px;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">总量</div>
+					
+					<div style="text-align: center;width: 10%;height: 40px;
+					line-height: 40px;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">箱数</div>
+					
+					<div style="text-align: center;width: 20%;height: 40px;
+					line-height: 40px;border-bottom: 1px solid #e7e7e7;">取药药房</div>
+				</div>
+				<div *ngFor="let data of item.drugsConfigureDTOS" style="display: flex;">
+					<div style="text-align: center;width: 40%;height: 40px;
+					line-height: 40px;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.drugName }}</div>
+					
+					<div style="text-align: center;width: 20%;height: 40px;
+					line-height: 40px;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.specs }}</div>
+					
+					<div style="text-align: center;width: 10%;height: 40px;
+					line-height: 40px;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{ data.actualCount }}</div>
+					
+					<div style="text-align: center;width: 10%;height: 40px;
+					line-height: 40px;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{ data.cartonNum }}</div>
+					
+					<div style="text-align: center;width: 20%;height: 40px;
+					line-height: 40px;border-bottom: 1px solid #e7e7e7;">{{ data.deptName }}</div>
+				</div>
+			</div>
+		</div>
+  </div>
+
+</div>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo"></app-prompt-modal>
+
+ <!-- 模态框 -->
+<app-dialog-delete [delModal]="printModal" (hideDelModalEvent)="hidePrintModal()" [btnLoading]="btnLoading"
+  (confirmDelEvent)="confirmPrintDel()" [content]="'您确认发药并打印吗？打印同时会更新云库存并建立配送工单？'"></app-dialog-delete>
+		
+<!-- 遮罩 -->
+<app-mask *ngIf="maskFlag"></app-mask>
+<app-excel-import [isShow]="isShow" (hideFormHand)="hideExcelImport($event)" *ngIf="isShow" (submitFormHand)="submitExcelImport($event)"></app-excel-import>

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

@@ -0,0 +1,260 @@
+@import "../../../../src/theme.less";
+:host {
+  .add-button {
+    margin: 0 auto 16px !important;
+  }
+  .targetDept {
+    overflow: hidden;
+    // width: 90px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .dynamic {
+    margin-bottom: 16px;
+    display: flex;
+    align-items: center;
+    input {
+      width: 90%;
+    }
+    i {
+      margin-left: 8px;
+      cursor: pointer;
+      font-size: 18px;
+    }
+  }
+}
+
+.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: 420px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 19px 14px 0 14px;
+        max-height: 500px;
+        overflow-y: auto;
+				
+				.ant-select{
+					width: 100%;
+				}
+				.ant-calendar-picker{
+					width: 100% !important;
+				}
+				.list-template__bottom {
+				  background: #f9fafb;
+				  border: 1px solid #e5e9ed;
+				  border-radius: 8px;
+				  padding-bottom: 56px;
+				  position: relative;
+				  .list-template__nzTable {
+				    padding: 16px 16px 0;
+				
+				    .thead {
+				      background-image: linear-gradient(to right, @bg-start, @bg-end);
+				
+				      th {
+				        background: transparent;
+				        color: #fff;
+				        text-align: center;
+				      }
+				    }
+				
+				    .ant-table-body {
+				      border-bottom: 1px solid #e5e9ed;
+				    }
+				
+				    .ant-table-tbody {
+				      tr {
+				        text-align: center;
+				        color: #333;
+				
+				        td {
+				          border: none;
+				
+				          &.tab_hover:hover{
+				            text-decoration: underline;
+				            cursor: pointer;
+				          }
+				
+				          .coop {
+				            button{
+				              color: #333;
+				            }
+				            span,button {
+				              display: inline-block;
+				              padding: 0 8px;
+				              cursor: pointer;
+				              position: relative;
+				
+				              &::after {
+				                content: "|";
+				                position: absolute;
+				                top: 0;
+				                right: 0;
+				              }
+				
+				              &:hover,
+				              &:active {
+				                color: @primary-color;
+				              }
+				
+				              &:nth-last-child(1) {
+				                &::after {
+				                  content: "";
+				                }
+				              }
+				            }
+				          }
+				        }
+				      }
+				    }
+				  }
+				  .list-template__pagination {
+				    height: 56px;
+				    display: flex;
+				    align-items: center;
+				    position: absolute;
+				    right: 8px;
+				  }
+				}
+				
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+              text-align: left;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}
+
+.monad{
+	margin-top: 20px;
+	.monad-list{
+		border: 1px solid #e7e7e7;
+		border-radius: 5px;
+		margin-bottom: 40px;
+		padding: 20px;
+	}
+	.monad-title{
+		text-align: center;
+		font-weight: 700;
+		font-size: 16px;
+	}
+	.monad-sign{
+		display: flex;
+		line-height: 30px;
+		div{
+			margin-right: 15px;
+		}
+	}
+}

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

@@ -0,0 +1,770 @@
+import { Component, OnInit, ViewChild } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import {
+  FormBuilder,
+  Validators,
+  FormGroup,
+  FormControl,
+} from "@angular/forms";
+
+import { MainService } from "../../services/main.service";
+import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
+import { ToolService } from "../../services/tool.service";
+import { format, startOfDay, endOfDay, subDays} from "date-fns";
+import { NzMessageService } from "ng-zorro-antd";
+import { Subject } from "rxjs";
+import { debounceTime, filter } from "rxjs/operators";
+import host from "../../../assets/js/http";
+import { HttpRequest, HttpResponse, HttpClient } from '@angular/common/http';
+
+@Component({
+  selector: "app-dispensing-batch",
+  templateUrl: "./dispensing-batch.component.html",
+  styleUrls: ["./dispensing-batch.component.less"],
+})
+export class DispensingBatchComponent implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  constructor(
+    private message: NzMessageService,
+    private fb: FormBuilder,
+    private route: ActivatedRoute,
+    private router: Router,
+    private mainService: MainService,
+    private tool: ToolService,
+    private http: HttpClient,
+  ) {}
+
+  ngOnInit() {
+    this.searchParentDeptSubject.pipe(debounceTime(500)).subscribe((e) => {
+			this.isDeptLoading = true;
+			this.getDeparts(e);
+    });
+		this.hosId = this.tool.getCurrentHospital().id;
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+    this.initForm();
+    this.getAllHospital();
+    this.getType();
+    this.getDeptHandoverType();
+  }
+  listOfData: any[] = []; //表格数据
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  modal: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  validateForm: FormGroup; //新增/编辑表单
+  coopId: number; //表格中执行操作的id
+  department: number; //所属科室
+	hosId: number; 
+	dateRange;//时间
+  batchNumber; //批次号
+  num; //编码
+  deptalias; //别名
+  type; //类型
+  deptHandoverType; //类型
+  pageIndex: number = 1; //页码
+  listLength: number = 10; //总条数
+  pageSize: number = 10; //每页条数
+  btnLoading: boolean = false; //确认按钮loading状态
+  printLoading: boolean = false; //批量打印按钮loading状态
+  deptPhones: any = []; //新添加的科室电话列表
+  isAddDeptsPhone = true; //添加新的科室电话是否禁用
+  deptsPhoneId = 1; //科室电话自增id
+  allParentdepart: any = []; //所有的父级科室列表
+  hospitals1: any = []; //科室列表(搜索)
+	rowData: object = {}; //打印选择列表
+	editModal:boolean = false; //编辑时弹框
+  searchParentDeptSubject = new Subject();
+  // 初始化增删改按钮
+  coopBtns: any = {};
+	saveLoading:boolean = false;
+  // 模板导出
+  excelExport(){
+    this.maskFlag = this.message.loading("下载模板中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService.exportExcel("department", {}).subscribe(
+      (data) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        this.message.success('下载模板成功');
+        var file = new Blob([data], {
+          type: "application/vnd.ms-excel",
+        });
+        //trick to download store a file having its URL
+        var fileURL = URL.createObjectURL(file);
+        var a = document.createElement("a");
+        a.href = fileURL;
+        a.target = "_blank";
+        a.download = "科室导入模板.xls";
+        document.body.appendChild(a);
+        a.click();
+      },
+      (err) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        this.message.error('下载模板失败');
+      }
+    );
+  }
+
+  // 导入---start
+  // model-取消
+  isShow = false;
+  hideExcelImport() {
+    this.isShow = false;
+  }
+  // 触发
+  excelImport() {
+    this.isShow = true;
+  }
+  submitExcelImport({fileList}){
+    this.isShow = false;
+    const formData = new FormData();
+    fileList.forEach((file: any) => {
+      formData.append('file', file);
+    });
+    this.maskFlag = this.message.loading("正在导入中..", {
+      nzDuration: 0,
+    }).messageId;
+    const req = new HttpRequest('Post', host.host + '/user/data/importExcel/department', formData, {
+      reportProgress: true
+    });
+    this.http
+      .request(req)
+      .pipe(filter(e => e instanceof HttpResponse))
+      .subscribe(
+        (res:any) => {
+          if(res.body.status == 200){
+            this.message.remove(this.maskFlag);
+            this.maskFlag = false;
+            this.message.success('导入成功');
+            this.getList();
+          }else{
+            this.message.remove(this.maskFlag);
+            this.maskFlag = false;
+            this.showPromptModal("导入", false, res.body.msg);
+          }
+        },
+        () => {
+          this.message.remove(this.maskFlag);
+          this.maskFlag = false;
+          this.message.error('导入失败');
+        },
+      );
+  }
+  // 导入---end
+  //搜索父级科室
+	isDeptLoading = false;
+  changeInp(e) {
+    this.searchParentDeptSubject.next(e);
+  }
+  // 打开父级科室下拉框baba
+  isLoading = false;
+  openDeptSelect(flag) {
+    if (flag) {
+      this.isLoading = true;
+      this.getAllParentdepart().subscribe((result) => {
+        this.isLoading = false;
+        if (result.status == 200) {
+          this.allParentdepart = result.list;
+        }
+      });
+    }
+  }
+  // 配送建单
+  coopData:any = {};
+  addDateModal(data) {
+    this.coopData = data;
+    this.showDelModal1();
+  }
+
+  showDelModal1() {
+    this.editModal = true;
+  }
+  hideDelModal1() {
+    this.editModal = false;
+  }
+	
+  // 编辑保存
+  confirmDel1() {
+    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;
+    let data: any = {
+			startTime:this.formStartDate?this.formStartDate:this.loadStartTime,//发起时间开始
+			endTime:this.formEndDate?this.formEndDate:this.loadEndTime,//发起时间结束
+			hosId:this.hosId,
+			pharmacy:this.validateForm.value.department,
+			id:that.coopId
+    };
+		that.saveLoading = true;
+		that.mainService
+		  .simplePost("addData", "drugsBatch", data)
+		  .subscribe((data) => {
+		    that.saveLoading = false;
+		    that.hideModal();
+		    that.initForm();
+		    if (data.status == 200) {
+					this.editModal = false;
+		      that.showPromptModal("编辑", true, "");
+		    } else {
+		      that.showPromptModal("编辑", false, data.msg);
+		    }
+		  });
+  }
+	
+  //获取所有的父级科室列表
+  getAllParentdepart(keyWord = "") {
+    let postData: any = {
+      idx: 0,
+      sum: 10,
+      department: {
+        // hospital: { id: this.add ? this.tool.getCurrentHospital().id : this.hospital },
+        keyWord: keyWord,
+      },
+    };
+    if (this.coopItem) {
+      // 过滤这个科室及其子科室
+      postData.department.filterByDeptId = this.coopItem.id;
+    }
+    return this.mainService.getFetchDataList("data", "department", postData);
+  }
+  // 新添加科室号码
+  addDeptPhone(e: MouseEvent) {
+    e.preventDefault();
+    this.deptPhones.push({ id: ++this.deptsPhoneId, phone: "" });
+    this.deptsPhoneChange();
+  }
+  // 删除新添加科室号码
+  removeDeptPhone(index: number, e: MouseEvent) {
+    e.preventDefault();
+    this.deptPhones.splice(index, 1);
+    this.deptsPhoneChange();
+  }
+  //监听科室电话输入事件
+  deptsPhoneChange(e?, phone?) {
+    if (e !== undefined && phone !== undefined) {
+      phone.phone = e;
+    }
+    // -------------判断添加按钮是否禁用 start
+    this.isAddDeptsPhone = !this.validateForm.value.officeNum;
+    if (!this.isAddDeptsPhone) {
+      //如果没禁用
+      this.isAddDeptsPhone = this.deptPhones.some((item) => item.phone === "");
+    }
+    // -------------判断添加按钮是否禁用 end
+  }
+
+  // 搜索
+  search() {
+    this.pageIndex = 1;
+    this.getList();
+  }
+  // 重置
+  reset() {
+    this.pageIndex = 1;
+		this.batchNumber = null;
+    this.startDate = null;
+		this.endDate = null;
+		this.dateRange = [];
+    this.getList();
+  }
+  // 表格数据
+  loading1 = false;
+  getList() {
+    var that = this;
+    let data = {
+      idx: that.pageIndex - 1,
+      sum: that.pageSize,
+      drugsBatch: {
+    		batchNo:that.batchNumber,
+        startTime: this.startDate,
+    		endTime: this.endDate,
+    		hosId: this.hosId
+      },
+    };
+    if(that.batchNumber){
+    	data.drugsBatch.batchNo = that.batchNumber
+    }else{
+    	delete data.drugsBatch.batchNo
+    }
+    this.loading1 = true;
+    that.mainService
+      .getFetchDataList("data", "drugsBatch", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        that.listOfData = data.list;
+        that.listLength = data.totalNum;
+      });
+  }
+	
+	// 日期选择
+	startDate: string; //发起时间开始
+	endDate: string; //发起时间结束
+	changeDate(result?): void {
+	  if (!result) {
+	    this.startDate = this.endDate = "";
+	    return;
+	  }
+	  this.startDate = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
+	  this.endDate = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
+	}
+	
+	// 新增、编辑日期选择
+	formStartDate: string; //发起时间开始
+	formEndDate: string; //发起时间结束
+	formChangeDate(result?): void {
+		if (!result) {
+		  this.formStartDate = this.formEndDate = "";
+		  return;
+		}
+		this.formStartDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
+		this.formEndDate = format(result[1], 'yyyy-MM-dd HH:mm:ss');
+	}
+	
+	// 获取所有科室
+  getDeparts(dept) {
+    var that = this;
+    let data = {
+      department: {
+        dept,
+        hospital: {
+          id: this.hosId
+        },
+				type:{
+					id:''
+				}
+      },
+      idx: 0,
+      sum: 20,
+    };
+		that.mainService.getDictionary("list", "dept_type").subscribe((res) => {
+		  let typeData = res.find(i=>i.value=='pharmacyRoom');
+			if(typeData){
+				data.department.type.id = typeData.id
+			}
+			that.mainService
+			  .getFetchDataList("data", "department", data)
+			  .subscribe((data) => {
+					setTimeout(_=>{
+						this.hospitals1 = data.list
+						that.isDeptLoading = false;
+					},500)
+			  });
+		});
+  }
+	
+  // 获取所有院区
+  getAllHospital() {
+		this.getDeparts('')
+    this.getList();
+  }
+
+  // 切换院区选项
+  buildings: any = []; //楼栋
+  maskFlag: any = false;
+  changeHosp(obj?) {
+    let hospitalId;
+    if (obj) {
+      hospitalId = obj.hospital.id;
+    }
+    let hid;
+    if (hospitalId || hospitalId == 0) {
+      hid = hospitalId - 0;
+    } 
+		// else {
+  //     hid = this.hospital - 0;
+  //   }
+    let data = {
+      hosId: this.add ? this.tool.getCurrentHospital().id : hid,
+    };
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService
+      .coopData("getBuildingOrFloor", "building", data)
+      .subscribe((data) => {
+        this.buildings = data.data;
+        this.floors = [];
+        // ---------
+        if (obj) {
+          //编辑
+          let arr = this.buildings.map((item) => item.id);
+          if (obj.building.id && arr.includes(obj.building.id)) {
+            //有楼栋
+            this.changeBuilding(obj.building.id, obj);
+            this.validateForm.controls.building.setValue(obj.building.id + "");
+          } else {
+            //无楼栋
+            this.floors = [];
+            this.message.remove(this.maskFlag);
+            this.maskFlag = false;
+            this.modal = true;
+            this.validateForm.controls.building.setValue(null);
+            this.validateForm.controls.officeAddress.setValue(null);
+          }
+        } else {
+          //新增
+          this.message.remove(this.maskFlag);
+          this.maskFlag = false;
+          this.modal = true;
+        }
+        // ---------
+      });
+  }
+
+  // 切换楼栋信息
+  floors: Array<any> = []; //楼层
+  floorLoading: boolean = false;
+  changeBuilding(buildingId?, obj?) {
+    var that = this;
+    that.floors = [];
+    var bid;
+    if (buildingId || buildingId == 0) {
+      bid = buildingId - 0;
+    } else if (!that.add && that.validateForm.value.building) {
+      bid = that.validateForm.value.building - 0;
+    } else {
+      return;
+    }
+    let data = {
+      buildingId: bid,
+    };
+    this.floorLoading = true;
+    that.mainService
+      .coopData("getBuildingOrFloor", "floor", data)
+      .subscribe((data) => {
+        this.floorLoading = false;
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        this.modal = true;
+        that.floors = data.data;
+        if (obj) {
+          let floorId = obj.floor.id;
+          let arr = that.floors.map((item) => item["id"]);
+          if (floorId && arr.includes(floorId)) {
+            this.validateForm.controls.floor.setValue(floorId + "");
+          } else {
+            this.validateForm.controls.floor.setValue(null);
+            this.validateForm.controls.officeAddress.setValue(null);
+          }
+        }
+      });
+  }
+
+  // 获取科室类型
+  types: Array<any> = [];
+  getType() {
+    var that = this;
+    that.mainService.getDictionary("list", "dept_type").subscribe((data) => {
+      console.log(data);
+      that.types = data;
+    });
+  }
+
+  // 获取科室汇总交接类型
+  deptHandoverTypes: Array<any> = [];
+  getDeptHandoverType() {
+    var that = this;
+    that.mainService.getDictionary("list", "dept_handover_type").subscribe((data) => {
+      console.log(data);
+      that.deptHandoverTypes = data;
+    });
+  }
+
+  // 新增弹框
+  showModal() {
+    this.initForm();
+    this.add = true;
+		this.modal = true;
+    this.isAddDeptsPhone = true;
+  }
+  hideModal() {
+    this.coopItem = null;
+    this.modal = false;
+    this.initForm();
+  }
+  // 初始化新增form表单
+	loadStartTime = '';
+	loadEndTime = '';
+  initForm() {
+    this.validateForm = this.fb.group({
+      dispensingTime: [null, [Validators.required]],
+      department: [null, [Validators.required]]
+    });
+		let date = new Date();
+		this.loadStartTime = format(subDays(date, 1), "yyyy-MM-dd") +' '+'08:00:00'
+		this.loadEndTime = format(date, "yyyy-MM-dd") +' '+'08:00:00'
+		this.validateForm.controls.dispensingTime.setValue([this.loadStartTime, this.loadEndTime]);
+  }
+  // 科室位置必填
+  buildValidator = (control: FormControl): { [s: string]: boolean } => {
+    if (
+      this.validateForm &&
+      this.validateForm.value &&
+      (!this.validateForm.value.building ||
+        !this.validateForm.value.floor ||
+        !this.validateForm.value.officeAddress)
+    ) {
+      return { required: true };
+    }
+  };
+  /**
+   * 生成一个从 start 到 end 的连续数组
+   * @param start
+   * @param end
+   */
+  generateArray(start, end) {
+    return Array.from(new Array(end).keys()).slice(start);
+  }
+
+  //服务时间选择
+  // 禁用的小时
+  startTime1Hourdis() {
+    return [];
+  }
+  endTime1Hourdis() {
+    return [];
+  }
+  startTime2Hourdis() {
+    return [];
+  }
+  endTime2Hourdis() {
+    return [];
+  }
+  // 禁用的分钟
+  startTime1Mindis() {
+    return [];
+  }
+  endTime1Mindis() {
+    return [];
+  }
+  startTime2Mindis() {
+    return [];
+  }
+  endTime2Mindis() {
+    return [];
+  }
+  timeChange(e: boolean, type: string, num: number) {
+    if (!e && this.validateForm.value[type + num]) {
+      let hour = new Date(this.validateForm.value[type + num]).getHours();
+      let minute = new Date(this.validateForm.value[type + num]).getMinutes();
+      if (type == "startTime" && num === 1) {
+        this.endTime1Hourdis = () => this.generateArray(0, hour);
+        this.endTime1Mindis = () => this.generateArray(0, minute + 1);
+      } else if (type == "startTime" && num === 2) {
+        this.endTime2Hourdis = () => this.generateArray(0, hour);
+        this.endTime2Mindis = () => this.generateArray(0, minute + 1);
+      } else if (type == "endTime" && num === 1) {
+        this.startTime1Hourdis = () => this.generateArray(hour + 1, 24);
+        this.startTime1Mindis = () => this.generateArray(minute, 60);
+      } else if (type == "endTime" && num === 2) {
+        this.startTime2Hourdis = () => this.generateArray(hour + 1, 24);
+        this.startTime2Mindis = () => this.generateArray(minute, 60);
+      }
+    }
+  }
+  // 表单提交
+  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;
+    let data: any = {
+			startTime:this.formStartDate?this.formStartDate:this.loadStartTime,//发起时间开始
+			endTime:this.formEndDate?this.formEndDate:this.loadEndTime,//发起时间结束
+			hosId:this.hosId,
+			pharmacy:this.validateForm.value.department
+    };
+  
+    if (!that.add) {
+			this.editModal = true
+    }else{
+			that.btnLoading = true;
+			that.mainService
+			  .simplePost("addData", "drugsBatch", data)
+			  .subscribe((data) => {
+			    that.btnLoading = false;
+			    that.hideModal();
+			    that.initForm();
+			    if (data.status == 200) {
+			      that.showPromptModal(that.add ? "新增" : "编辑", true, "");
+			    } else {
+			      that.showPromptModal(that.add ? "新增" : "编辑", false, data.msg);
+			    }
+			  });
+		}
+  }
+
+  // 编辑
+  coopItem: any = null;
+  edit(e, data) {
+    e.stopPropagation();
+    this.add = false;
+    this.coopId = data.id;
+    this.coopItem = data;
+    this.validateForm.controls.department.setValue(data.pharmacy);
+    this.validateForm.controls.dispensingTime.setValue([data.startTime,data.endTime]);
+		this.loadStartTime = data.startTime
+		this.loadEndTime = data.endTime
+		this.modal = true
+  }
+
+  // 展示信息提示框（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();
+  }
+
+  delModal: boolean = false; //删除模态框
+  coopIds: any;
+  coopFlag: any = false;
+  /**
+   *
+   * @param e 事件对象
+   * @param id
+   */
+  showDelModal(e, id) {
+    e.stopPropagation();
+    this.delModal = true;
+    this.coopId = id;
+  }
+  hideDelModal() {
+    this.delModal = false;
+  }
+  // 确认删除
+  confirmDel() {
+    var that = this;
+    that.btnLoading = true;
+    that.mainService
+      .coopTypeConfig(
+        "rmvData",
+        "drugsBatch",
+         [that.coopId]
+      )
+      .subscribe((data) => {
+        that.btnLoading = false;
+        that.delModal = false;
+        if (data.status==200) {
+          that.showPromptModal("删除", true, "");
+        } else {
+          that.showPromptModal("删除", false, data.data[0].msg);
+        }
+      });
+  }
+
+  // 查看
+  detail(e, data) {
+    e.stopPropagation();
+		this.router.navigateByUrl(`/dispensingDetail/${data.id}`);
+  }
+
+  // 选中表格中科室
+  mapOfCheckedId: { [key: string]: boolean } = {};
+  checkedDepIds = []; //已选中科室id
+  refreshStatus(): void {
+    this.isAllDisplayDataChecked = this.listOfData.every(
+      (item) => this.mapOfCheckedId[item.id]
+    );
+    let arr = [];
+    for (var k in this.mapOfCheckedId) {
+      if (this.mapOfCheckedId[k]) {
+        arr.push(Number(k));
+      }
+    }
+    this.checkedDepIds = arr;
+    console.log(this.checkedDepIds);
+  }
+  //表格整行选中
+  selectedListData(id) {
+    this.mapOfCheckedId[id] = !this.mapOfCheckedId[id];
+    this.refreshStatus();
+  }
+  // 全选
+  isAllDisplayDataChecked = false; //当前页是否全选
+  checkAll(value: boolean): void {
+    this.listOfData.forEach((item) => (this.mapOfCheckedId[item.id] = value));
+    this.refreshStatus();
+  }
+
+	// 发药并打印
+	printData = []; 
+	print(e, data, id){
+		this.rowData = data
+		e.stopPropagation();
+		let that = this;
+		that.printLoading = true;
+		that.mainService
+		  .transfusionPrint("drugsBatch", id)
+		  .subscribe((res) => {
+				let arr = res.data.drugsListDTOS;
+				for(let i of arr){
+					for(let t of i.drugsConfigureDTOS){
+						t.deptName = i.pharmacyDTO?i.pharmacyDTO.dept:'-'
+					}
+					i.drugsConfigureDTOS.push({
+						drugsInfoDTO:{
+							drugName:'合计',
+							specs:'',
+						},
+						actualCount:i.totalActual,
+						cartonNum:i.totalCarton,
+						deptName:''
+					})
+				}
+		    that.printData = arr;
+		    that.printLoading = false;
+				that.btnLoading = false;
+				that.printModal = false;
+		    setTimeout(() => {
+		      const printContent = document.getElementById("report");
+		      const WindowPrt = window.open("", "", "width=1000,height=900");
+		      WindowPrt.document.write(printContent.innerHTML);
+		      WindowPrt.document.close();
+		      WindowPrt.focus();
+		      WindowPrt.print();
+		      WindowPrt.close();
+					setTimeout(()=>{
+						this.getList();
+					},200)
+		    }, 500);
+		  });
+	}
+	
+	printModal = false;
+	printE = '';
+	printItemData = '';
+	printItemId = '';
+	dispensingPrint(e, data, id){
+		this.printModal = true
+		this.printE = e
+		this.printItemData = data
+		this.printItemId = id
+	}
+	
+	confirmPrintDel(){
+		this.btnLoading = true;
+		this.print(this.printE, this.printItemData, this.printItemId)
+	}
+	
+	hidePrintModal(){
+		this.printModal = false
+	}
+}

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

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

src/app/views/dispensing-detail/dispensing-detail-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { DispensingDetailComponent } from './dispensing-detail.component';
+
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DispensingDetailComponent
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class DispensingDetailRoutingModule { }

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

@@ -0,0 +1,142 @@
+<div class="list-template detail-box">
+  <div class="list-template__content">
+		<div class="detail-title">
+			<h3 *ngIf="deptName">{{deptName}}-发药单</h3>
+			<button class="btn cancel right-btn" nz-button nzType="default" (click)="back()">取消</button>
+		</div>
+    <div class="list-template__bottom" style="padding: 0 !important;">
+      <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
+        [nzLoading]="loading1">
+        <thead>
+          <tr class="thead">
+						<th nzWidth="9%">药品标识</th>
+            <th nzWidth="9%">药品名称</th>
+            <th nzWidth="9%">规格</th>
+						<th nzWidth="9%">消耗数量</th>
+						<th nzWidth="9%">原库存数</th>
+						<th nzWidth="9%">包装规格</th>
+						<th nzWidth="9%">发药箱数</th>
+						<th nzWidth="9%">实发数量</th>
+            <th nzWidth="9%">计算后库存</th>
+						<th nzWidth="7%">增减</th>
+            <th nzWidth="11%">操作</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of listOfData">
+						<td>{{ data.drugsInfoDTO?data.drugsInfoDTO.drugCode:'-' }}</td>
+            <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.drugName:'-' }}</td>
+            <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.specs:'-' }}</td>
+            <td>{{ data.expendCount||'0' }}</td>
+            <td>{{ data.formerInventory || '0' }}</td>
+            <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.packingSpecs:'0' }}</td>
+						<td>{{ data.cartonNum||'0' }}</td>
+						<td>{{ data.actualCount||'0' }}</td>
+						<td>{{ data.afterInventory||'0' }}</td>
+						<td>{{ data.addSub||'0' }}</td>
+            <td>
+              <div class="coop">
+                <span (click)="itemClick($event,data.id, 'add')">增加</span>
+								<span (click)="itemClick($event,data.id, 'del')">减少</span>
+							</div>
+            </td>
+          </tr>
+        </tbody>
+      </nz-table>
+    </div>
+  </div>
+	<div class="right-content">
+		<div class="right-top">
+			<h3 class="title">快速添加发药科室</h3>
+			<div class="right-template">
+			  <span class="label">科室：</span>
+			  <nz-select class="formItem" (ngModelChange)="deptChange($event)" [nzDropdownMatchSelectWidth]="false" (nzOnSearch)="changeInp($event, 'dept')" nzServerSearch nzShowSearch nzPlaceHolder="请选择科室" [(ngModel)]="department">
+			    <ng-container *ngFor="let option of hospitals1">
+			      <nz-option *ngIf="!isDeptLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+			    </ng-container>
+			    <nz-option *ngIf="isDeptLoading" nzDisabled nzCustomContent>
+			      <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+			    </nz-option>
+			  </nz-select>
+				<span (click)='addDept()' class="icon_transport transport-tag27fuben add-class"></span>
+			</div>
+		</div>
+		<div class="right-bottom">
+			<h3 class="title">发药科室列表</h3>
+			<div class="right-template">
+			  <span class="label">楼栋：</span>
+			  <nz-select class="formItem" (ngModelChange)="buildingChange($event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+			    (nzOnSearch)="changeInp($event, 'building')" nzAllowClear nzPlaceHolder="请选择楼栋" [(ngModel)]="building">
+			    <ng-container *ngFor="let option of buildingList">
+			      <nz-option *ngIf="!isDeptLoading" [nzLabel]="option.buildingName" [nzValue]="option.id"></nz-option>
+			    </ng-container>
+			    <nz-option *ngIf="isDeptLoading" nzDisabled nzCustomContent>
+			      <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+			    </nz-option>
+			  </nz-select>
+			</div>
+			<div class="dept-box">
+				<div *ngFor="let item of deptList;let index=index;" class="dept-item" 
+					[ngClass]="{'activeClass': index == deptIndex}" (click)="deptClick($event,item,index)">
+					<div>{{item.applyDeptDTO?item.applyDeptDTO.dept:'-'}}</div>
+					<span class="icon_transport transport-lajitong" (click)="deptDel($event,item,index)"></span>
+				</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">{{add ? '增加' : '减少'}}<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+      </div>
+      <overlay-scrollbars #osComponentRef1 class="content">
+       <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
+       	<nz-form-item *ngIf="add">
+       	  <nz-form-label nzRequired nzFor="addNum">增加数量</nz-form-label>
+       	  <nz-form-control nzErrorTip="请选择增加数量!">
+       	    <nz-input-group>
+       				<nz-input-number
+								nz-input
+       					formControlName="addNum"
+       					[nzMin]="0"
+       					[nzPrecision]="0"
+       					[nzMax]="999999"
+       					[nzStep]="1"
+       					[nzPlaceHolder]="'请填写增加数量'"
+       				 ></nz-input-number>
+       			</nz-input-group>
+       	  </nz-form-control>
+       	</nz-form-item>
+				<nz-form-item *ngIf="!add">
+				  <nz-form-label nzRequired nzFor="delNum">减少数量</nz-form-label>
+				  <nz-form-control nzErrorTip="请选择减少数量!">
+				    <nz-input-group>
+							<nz-input-number
+								nz-input
+								formControlName="delNum"
+								[nzMin]="0"
+								[nzPrecision]="0"
+								[nzMax]="999999"
+								[nzStep]="1"
+								[nzPlaceHolder]="'请填写减少数量'"
+							 ></nz-input-number>
+						</nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+       </form>
+      </overlay-scrollbars>
+      <div class="display_flex justify-content_flex-center">
+        <button class="btn" nz-button nzType="primary" (click)="submitForm()" [nzLoading]="btnLoading">保存</button>
+    		<button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
+      </div>
+    </div>
+  </div>
+
+</div>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo"></app-prompt-modal>
+	
+<!-- 删除模态框 -->
+  <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+    (confirmDelEvent)="confirmDel()" content="您确认要删除发药科室吗？"></app-dialog-delete>

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

@@ -0,0 +1,385 @@
+@import "../../../../src/theme.less";
+:host {
+	width: 100%;
+	height: 100%;
+	// display: flex;
+	// text-rendering: optimizeLegibility;
+	// -webkit-font-smoothing: antialiased;
+	// -moz-osx-font-smoothing: grayscale;
+  .add-button {
+    margin: 0 auto 16px !important;
+  }
+  .targetDept {
+    overflow: hidden;
+    // width: 90px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .dynamic {
+    margin-bottom: 16px;
+    display: flex;
+    align-items: center;
+    input {
+      width: 90%;
+    }
+    i {
+      margin-left: 8px;
+      cursor: pointer;
+      font-size: 18px;
+    }
+  }
+}
+
+h3{
+	margin: 0 !important;
+}
+/* 修改垂直滚动条 */
+::-webkit-scrollbar {
+  width: 4px; /* 修改宽度 */
+}
+ 
+/* 修改滚动条轨道背景色 */
+::-webkit-scrollbar-track {
+  background-color: #f1f1f1;
+}
+ 
+/* 修改滚动条滑块颜色 */
+::-webkit-scrollbar-thumb {
+  background-color: #888;
+}
+ 
+/* 修改滚动条滑块悬停时的颜色 */
+::-webkit-scrollbar-thumb:hover {
+  background-color: #555;
+}
+
+.detail-box{
+	display: flex;
+	.list-template__content{
+		flex:3;
+		padding: 0 10px 10px 10px;
+		border-radius: 5px;
+		border: 1px solid #e5e5e5;
+		.list-template__bottom{
+			height: auto;
+			max-height: 550px;
+			overflow-y: auto;
+		}
+	}
+	.right-content{
+		flex: 1;
+		margin-left: 10px;
+		.right-top{
+			border-radius: 5px;
+			background: #f9fafb;
+			border: 1px solid #e5e5e5;
+			padding: 10px;
+			.title{
+				text-align: center;
+				margin-bottom: 10px;
+			}
+			.right-template{
+				display: flex;
+				align-items: center;
+				margin-top: 10px;
+				.label{
+					width:55px;
+				}
+				.ant-select{
+					width: 100%;
+				}
+				.add-class{
+					margin-left: 10px;
+					cursor: pointer;
+					color: #34b349;
+				}
+			}
+			
+		}
+		.right-bottom{
+			border-radius: 5px;
+			background: #f9fafb;
+			border: 1px solid #e5e5e5;
+			padding: 10px;
+			margin-top: 20px;
+			.title{
+				text-align: center;
+				margin-bottom: 10px;
+			}
+			.right-template{
+				display: flex;
+				align-items: center;
+				margin-top: 10px;
+				.label{
+					width:50px;
+				}
+				.ant-select{
+					width: 100%;
+				}
+			}
+			.dept-box{
+				margin-top: 20px;
+				height: auto;
+				max-height: 393px;
+				overflow-y: auto;
+				.dept-item{
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					cursor: pointer;
+					height: 40px;
+					padding: 0 10px;
+					box-sizing: border-box;
+					.transport-lajitong{
+						color: #49b856;
+						font-size: 18px;
+					}
+				}
+				.activeClass{
+					border: 1px solid #49b856;
+					background: #E9F7E9;
+				}
+			}
+		}
+	}
+	.detail-title{
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		position: relative;
+		height: 42px;
+		
+		.right-btn{
+			position: absolute;
+			right: 0;
+		}
+	}
+}
+
+.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: 400px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 19px 14px 0 14px;
+        max-height: 500px;
+        overflow-y: auto;
+				
+				.ant-input-number{
+					width: 100%;
+				}
+				.list-template__bottom {
+				  background: #f9fafb;
+				  border: 1px solid #e5e9ed;
+				  border-radius: 8px;
+				  position: relative;
+				  .list-template__nzTable {
+				    padding: 16px 16px 0;
+				
+				    .thead {
+				      background-image: linear-gradient(to right, @bg-start, @bg-end);
+				
+				      th {
+				        background: transparent;
+				        color: #fff;
+				        text-align: center;
+				      }
+				    }
+				
+				    .ant-table-body {
+				      border-bottom: 1px solid #e5e9ed;
+				    }
+				
+				    .ant-table-tbody {
+				      tr {
+				        text-align: center;
+				        color: #333;
+				
+				        td {
+				          border: none;
+				
+				          &.tab_hover:hover{
+				            text-decoration: underline;
+				            cursor: pointer;
+				          }
+				
+				          .coop {
+				            button{
+				              color: #333;
+				            }
+				            span,button {
+				              display: inline-block;
+				              padding: 0 8px;
+				              cursor: pointer;
+				              position: relative;
+				
+				              &::after {
+				                content: "|";
+				                position: absolute;
+				                top: 0;
+				                right: 0;
+				              }
+				
+				              &:hover,
+				              &:active {
+				                color: @primary-color;
+				              }
+				
+				              &:nth-last-child(1) {
+				                &::after {
+				                  content: "";
+				                }
+				              }
+				            }
+				          }
+				        }
+				      }
+				    }
+				  }
+				  .list-template__pagination {
+				    height: 56px;
+				    display: flex;
+				    align-items: center;
+				    position: absolute;
+				    right: 8px;
+				  }
+				}
+				
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+              text-align: left;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}
+
+.monad{
+	padding: 10px;
+	border: 1px solid #e7e7e7;
+	border-radius: 5px;
+	margin-top: 20px;
+	.monad-title{
+		text-align: center;
+		font-weight: 700;
+		font-size: 16px;
+	}
+	.monad-sign{
+		display: flex;
+		line-height: 30px;
+		div{
+			margin-right: 15px;
+		}
+	}
+}

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

@@ -0,0 +1,386 @@
+import { Component, OnInit, ViewChild } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import {
+  FormBuilder,
+  Validators,
+  FormGroup,
+  FormControl,
+} from "@angular/forms";
+
+import { MainService } from "../../services/main.service";
+import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
+import { ToolService } from "../../services/tool.service";
+import { NzMessageService } from "ng-zorro-antd";
+import { Subject } from "rxjs";
+import { debounceTime, filter } from "rxjs/operators";
+import { HttpRequest, HttpResponse, HttpClient } from '@angular/common/http';
+
+@Component({
+  selector: "app-dispensing-detail",
+  templateUrl: "./dispensing-detail.component.html",
+  styleUrls: ["./dispensing-detail.component.less"],
+})
+export class DispensingDetailComponent implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  constructor(
+    private message: NzMessageService,
+    private fb: FormBuilder,
+    private route: ActivatedRoute,
+    private router: Router,
+    private mainService: MainService,
+    private tool: ToolService,
+    private http: HttpClient,
+  ) {}
+
+  ngOnInit() {
+    this.searchParentDeptSubject.pipe(debounceTime(500)).subscribe((e) => {
+			this.isDeptLoading = true;
+			if(e[1]=='dept'){
+				this.getDeparts(e[0]);
+			}else{
+				this.getBuilding(e[0]);
+			}
+    });
+		this.detailId = this.route.snapshot.params.id;
+		this.hosId = this.tool.getCurrentHospital().id;
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+    this.getAllHospital();
+  }
+	detailId:null; //列表数据
+	deptId:null; //选中的科室id
+  listOfData: any[] = []; //表格数据
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  modal: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  validateForm: FormGroup; //新增/编辑表单
+  coopId: number; //表格中执行操作的id
+  department: number; //所属科室
+	drug: number; //药品名称
+	hosId: number; 
+	rowId:number; //清单id
+	dateRange;//时间
+  batchNumber; //批次号
+  num; //编码
+  deptalias; //别名
+  type; //类型
+  deptHandoverType; //类型
+  pageIndex: number = 1; //页码
+  listLength: number = 10; //总条数
+  pageSize: number = 10; //每页条数
+  btnLoading: boolean = false; //确认按钮loading状态
+  printLoading: boolean = false; //批量打印按钮loading状态
+  deptPhones: any = []; //新添加的科室电话列表
+  isAddDeptsPhone = true; //添加新的科室电话是否禁用
+  deptsPhoneId = 1; //科室电话自增id
+  allParentdepart: any = []; //所有的父级科室列表
+  hospitals1: any = []; //科室列表
+	buildingList: any = []; //楼栋列表
+	deptList: any = []; //楼栋科室
+	building:''; //楼栋
+	deptIndex:number; //选中index
+  searchParentDeptSubject = new Subject();
+  // 初始化增删改按钮
+  coopBtns: any = {};
+	deptName:null;
+  //搜索父级科室
+	isDeptLoading = false;
+  changeInp(e, type) {
+    this.searchParentDeptSubject.next([e, type]);
+  }
+
+  // 表格数据
+  loading1 = false;
+  getList() {
+    var that = this;
+    let data = {
+    	idx: 0,
+    	sum: 9999,
+    	drugsConfigure: {
+    	  hosId: this.hosId,
+				deptId :this.deptId?this.deptId:null,
+    	  batchId: this.detailId
+    	}
+    };
+    this.loading1 = true;
+    that.mainService
+      .getFetchDataList("data", "drugsConfigure", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        that.listOfData = data.list;
+      });
+  }
+	
+	// 发药科室列表
+	getDispensingDept(e,type){
+		var that = this;
+		let data = {
+			idx: 0,
+			sum: 9999,
+			drugsConfigure: {
+			  hosId: this.hosId,
+				deptId :e,
+				batchId:''
+			}
+		};
+		if(type=='dept'){
+			data.drugsConfigure.batchId = this.detailId
+		}else{
+			delete data.drugsConfigure.batchId
+		}
+		let deptData = this.hospitals1.find(i=>i.id==e)
+		that.mainService
+		  .getFetchDataList("data", "drugsConfigure", data)
+		  .subscribe((res) => {
+				if(res.list.length==0){
+					this.message.error(`您选择的科室“	${deptData.dept}”时间段内没有消耗药品无法添加发药单。`)
+				}
+				this.getDeptData(e,'all','load')
+		  });
+	}
+	
+	// 科室点击
+	deptClick(e,item,index){
+		e.stopPropagation();
+		this.deptId = item.applyDeptDTO.id
+		this.deptName = item.applyDeptDTO.dept
+		this.deptIndex = index
+		this.getList()
+	}
+	
+	// 科室删除
+	deptDel(e,item,index){
+		e.stopPropagation();
+		this.delModal = true;
+		this.coopId = item.applyDept;
+	}
+	
+	hideDelModal() {
+	  this.delModal = false;
+	}
+	
+	// 确认删除
+	confirmDel() {
+		var that = this;
+		let data = {
+			hosId: this.hosId,
+			deptId :this.coopId,
+			batchId: this.detailId
+		};
+		that.btnLoading = true;
+		that.mainService
+		  .transfusionConfigDeptDel(data)
+		  .subscribe((res) => {
+				that.btnLoading = false;
+				that.delModal = false;
+				this.deptId = null
+				this.deptName = null
+				this.deptIndex = null
+				this.getDeptData('','all','load')
+				if (res.status==200) {
+				  that.showPromptModal("删除", true, "");
+				} else {
+				  that.showPromptModal("删除", false, res.msg);
+				}
+		  });
+	}
+	// 选择楼栋
+	buildingChange(e){
+		this.deptId = null
+		this.deptName = null
+		this.deptIndex = null
+		this.listOfData=[]
+		this.getDeptData(e,'','')
+	}
+	
+	// 根据楼栋查询科室
+	getDeptData(e,type,initial){
+		var that = this;
+		let data = {
+		  idx: 0,
+		  sum: 99999,
+		  drugsList: {
+				hosId: this.hosId,
+				buildingId:e,
+				batch:{
+					id:this.detailId
+				}
+		  },
+		};
+		if(type=='all'){
+			delete data.drugsList.buildingId
+		}else{
+			data.drugsList.buildingId = e
+		}
+		that.mainService
+		  .getFetchDataList("data", "drugsList", data)
+		  .subscribe((res) => {
+		    that.deptList = res.list;
+				if(initial=='load'){
+					if(res.list.length>0){
+						this.deptId = res.list[0].applyDeptDTO.id
+						this.deptName = res.list[0].applyDeptDTO.dept
+						this.deptIndex = 0
+					}
+					this.getList()
+				}
+		  });
+	}
+	
+	// 选择科室
+	addDeptId=''
+	deptChange(e){
+		this.addDeptId = e
+		
+	}
+	// 添加科室
+	addDept(){
+		if(this.addDeptId){
+			this.getDispensingDept(this.addDeptId,'dept')
+		}else{
+			this.message.error('请先选择发药科室')
+		}
+	}
+	
+	// 获取楼栋
+	getBuilding(name){
+		let postData = {
+		  building: {
+		    cascadeHosId: this.hosId,
+		    buildingName: name
+		  },
+		  idx: 0,
+		  sum: 20,
+		};
+		this.mainService
+		  .getFetchDataList("data", "building", postData)
+		  .subscribe((result) => {
+				setTimeout(_=>{
+					this.isDeptLoading = false
+					this.buildingList = result.list;
+				},500)
+		  });
+	}
+	
+	// 获取所有科室
+  getDeparts(dept) {
+    var that = this;
+    let data = {
+      department: {
+        dept,
+        hospital: {
+          id: this.hosId
+        },
+      },
+      idx: 0,
+      sum: 20,
+    };
+    that.mainService
+      .getFetchDataList("data", "department", data)
+      .subscribe((data) => {
+				setTimeout(_=>{
+					that.isDeptLoading = false;
+					this.hospitals1 = data.list
+				},500)
+      });
+  }
+	
+  // 获取所有院区
+  getAllHospital() {
+		this.getDeparts('')
+		this.getBuilding('')
+		this.getDeptData('','all','load')
+  }
+	
+	// 增加/减少
+	itemClick(e, id, type){
+		e.stopPropagation();
+		this.rowId = id
+		if(type=='add'){
+			this.add = true
+		}else{
+			this.add = false
+		}
+		this.modal = true
+		this.initForm();
+	}
+	
+	// 表单提交
+	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;
+	  let data = {
+			addSub:this.add?this.validateForm.value.addNum:this.validateForm.value.delNum,
+			id:this.rowId,
+			hosId:this.hosId,
+			deptId:this.deptId,
+			upType:that.add ? 'add' : 'sub'
+	  };
+	  that.mainService
+	    .simplePost("addData", "drugsConfigure", data)
+	    .subscribe((data) => {
+	      that.btnLoading = false;
+	      that.hideModal();
+				this.getList()
+	      if (data.status == 200) {
+	        that.showPromptModal(that.add ? "增加" : "减少", true, "");
+	      } else {
+	        that.showPromptModal(that.add ? "增加" : "减少", false, data.msg);
+	      }
+	    });
+	}
+
+  // 新增弹框
+  showModal() {
+    this.add = true;
+    this.isAddDeptsPhone = true;
+    this.deptPhones = [];
+  }
+	// 返回
+	back(){
+		this.router.navigateByUrl(`/main/dispensingBatch`);
+	}
+	
+  hideModal() {
+		this.initForm();
+    this.modal = false;
+  }
+  // 初始化新增form表单
+  initForm() {
+		if(this.add){
+			this.validateForm = this.fb.group({
+			  addNum: [null, [Validators.required]]
+			});
+		}else{
+			this.validateForm = this.fb.group({
+				delNum: [null, [Validators.required]]
+			});
+		}
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+  }
+
+  delModal: boolean = false; //删除模态框
+  coopIds: any;
+  coopFlag: any = false;
+
+}

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

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { DispensingDetailRoutingModule } from './dispensing-detail-routing.module';
+import { DispensingDetailComponent } from './dispensing-detail.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    DispensingDetailComponent,
+  ],
+  imports: [
+    CommonModule,
+    DispensingDetailRoutingModule,
+    ShareModule
+  ]
+})
+export class DispensingDetailModule { }

src/app/views/drug-cloud/drug-cloud-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { DrugCloudComponent } from './drug-cloud.component';
+
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DrugCloudComponent
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class DrugCloudRoutingModule { }

src/app/views/drug-cloud/drug-cloud.component.html

@@ -0,0 +1,127 @@
+<div class="list-template">
+  <div class="list-template__content">
+    <div class="list-template__top" nz-row>
+      <div nz-col nzLg='20' class="list-template__searchBox">
+        <div class="list-template__searchItem">
+          <span class="label">科室：</span>
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" (nzOnSearch)="changeInp($event,'dept')" nzServerSearch nzShowSearch nzPlaceHolder="请选择科室" [(ngModel)]="department">
+            <ng-container *ngFor="let option of hospitals1">
+              <nz-option *ngIf="!isDeptLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isDeptLoading" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">药品：</span>
+					<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" (nzOnSearch)="changeInp($event,'drug')" nzServerSearch nzShowSearch nzPlaceHolder="请选择药品" [(ngModel)]="drug">
+					  <ng-container *ngFor="let option of drugData">
+					    <nz-option *ngIf="!isDeptLoading" [nzLabel]="option.drugName" [nzValue]="option.id"></nz-option>
+					  </ng-container>
+					  <nz-option *ngIf="isDeptLoading" nzDisabled nzCustomContent>
+					    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+					  </nz-option>
+					</nz-select>
+        </div>
+      </div>
+      <div nz-col nzLg="4" class="list-template__btns">
+        <button class="btn default" (click)='search()'>搜索</button>
+        <button class="btn default ml8" (click)='reset()'>重置</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="10%">科室名称</th>
+						<th nzWidth="10%">药品标识</th>
+            <th nzWidth="20%">药品名称</th>
+            <th nzWidth="10%">规格</th>
+            <th nzWidth="20%">库存数量（正负值）</th>
+            <th nzWidth="20%">库存价值（正负值）</th>
+            <th nzWidth="10%">操作</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of listOfData" (click)="selectedListData(data.id)">
+            <td>{{ data.departmentDTO?data.departmentDTO.dept:'-' }}</td>
+						<td>{{ data.drugsInfoDTO?data.drugsInfoDTO.drugCode:'-' }}</td>
+            <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.drugName:'-' }}</td>
+            <td>{{ data.drugsInfoDTO?data.drugsInfoDTO.specs:'0' }}</td>
+            <td>{{ data.inventoryNum || '0' }}</td>
+            <td>{{ data.inventoryPrice || '0' }}</td>
+            <td>
+              <div class="coop">
+                <span *ngIf="coopBtns.historyRecord" (click)="detail($event,data)">历史记录</span>
+              </div>
+            </td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="list-template__pagination">
+        <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
+          (nzPageIndexChange)="getList()" (nzPageSizeChange)="getList()">
+        </nz-pagination>
+      </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 class="list-template__bottom">
+          <nz-table class="list-template__nzTable" [nzData]="viewData" nzSize="middle" [nzShowPagination]="false"
+            [nzLoading]="loading1">
+            <thead>
+              <tr class="thead">
+                <th nzWidth="13%">时间</th>
+                <th nzWidth="13%">批次号</th>
+								<th nzWidth="13%">发药单号</th>
+                <th nzWidth="8%">消耗数量</th>
+								<th nzWidth="8%">原库存数</th>
+								<th nzWidth="7%">增减</th>
+                <th nzWidth="10%">包装规格</th>
+                <th nzWidth="10%">发药药箱</th>
+								<th nzWidth="8%">实发数量</th>
+                <th nzWidth="10%">计算后库存</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of viewData">
+                <td>{{ data.createTime|date:'yyyy-MM-dd HH:mm'}}</td>
+                <td>{{ data.drugsList?data.drugsList.batch.batchNo : '无' }}</td>
+                <td>{{ data.drugsList?data.drugsList.packingNo : '无' }}</td>
+								<td>{{ data.drugsConfig?data.drugsConfig.expendCount:'0' }}</td>
+								<td>{{ data.drugsConfig&&data.drugsConfig.formerInventory?data.drugsConfig.formerInventory:'0' }}</td>
+								<td>{{ data.drugsConfig&&data.drugsConfig.addSub?data.drugsConfig.addSub:'0' }}</td>
+                <td>{{ data.drugsInfo?data.drugsInfo.packingSpecs:'0' }}</td>
+                <td>{{ data.drugsConfig?data.drugsConfig.cartonNum : '0' }}</td>
+                <td>{{ data.drugsConfig?data.drugsConfig.actualCount : '0'}}</td>
+        				<td>{{ data.drugsConfig?data.drugsConfig.afterInventory : '0' }}</td>
+              </tr>
+            </tbody>
+          </nz-table>
+        <!--  <div class="list-template__pagination">
+            <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
+              (nzPageIndexChange)="getList()" (nzPageSizeChange)="getList()">
+            </nz-pagination>
+          </div> -->
+        </div>
+      </overlay-scrollbars>
+      <div class="display_flex justify-content_flex-center">
+        <button class="btn" nz-button nzType="primary" (click)="hideModal()">知道了</button>
+      </div>
+    </div>
+  </div>
+
+</div>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo"></app-prompt-modal>
+
+<app-excel-import [isShow]="isShow" (hideFormHand)="hideExcelImport($event)" *ngIf="isShow" (submitFormHand)="submitExcelImport($event)"></app-excel-import>

src/app/views/drug-cloud/drug-cloud.component.less

@@ -0,0 +1,251 @@
+@import "../../../../src/theme.less";
+:host {
+  .add-button {
+    margin: 0 auto 16px !important;
+  }
+  .targetDept {
+    overflow: hidden;
+    // width: 90px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .dynamic {
+    margin-bottom: 16px;
+    display: flex;
+    align-items: center;
+    input {
+      width: 90%;
+    }
+    i {
+      margin-left: 8px;
+      cursor: pointer;
+      font-size: 18px;
+    }
+  }
+}
+
+.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: 80%;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 19px 14px 0 14px;
+        max-height: 500px;
+        overflow-y: auto;
+				
+				.list-template__bottom {
+				  background: #f9fafb;
+				  border: 1px solid #e5e9ed;
+				  border-radius: 8px;
+				  padding-bottom: 56px;
+				  position: relative;
+				  .list-template__nzTable {
+				    padding: 16px 16px 0;
+				
+				    .thead {
+				      background-image: linear-gradient(to right, @bg-start, @bg-end);
+				
+				      th {
+				        background: transparent;
+				        color: #fff;
+				        text-align: center;
+				      }
+				    }
+				
+				    .ant-table-body {
+				      border-bottom: 1px solid #e5e9ed;
+				    }
+				
+				    .ant-table-tbody {
+				      tr {
+				        text-align: center;
+				        color: #333;
+				
+				        td {
+				          border: none;
+				
+				          &.tab_hover:hover{
+				            text-decoration: underline;
+				            cursor: pointer;
+				          }
+				
+				          .coop {
+				            button{
+				              color: #333;
+				            }
+				            span,button {
+				              display: inline-block;
+				              padding: 0 8px;
+				              cursor: pointer;
+				              position: relative;
+				
+				              &::after {
+				                content: "|";
+				                position: absolute;
+				                top: 0;
+				                right: 0;
+				              }
+				
+				              &:hover,
+				              &:active {
+				                color: @primary-color;
+				              }
+				
+				              &:nth-last-child(1) {
+				                &::after {
+				                  content: "";
+				                }
+				              }
+				            }
+				          }
+				        }
+				      }
+				    }
+				  }
+				  .list-template__pagination {
+				    height: 56px;
+				    display: flex;
+				    align-items: center;
+				    position: absolute;
+				    right: 8px;
+				  }
+				}
+				
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+              text-align: left;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}
+
+.monad{
+	padding: 10px;
+	border: 1px solid #e7e7e7;
+	border-radius: 5px;
+	margin-top: 20px;
+	.monad-title{
+		text-align: center;
+		font-weight: 700;
+		font-size: 16px;
+	}
+	.monad-sign{
+		display: flex;
+		line-height: 30px;
+		div{
+			margin-right: 15px;
+		}
+	}
+}

src/app/views/drug-cloud/drug-cloud.component.ts

@@ -0,0 +1,323 @@
+import { Component, OnInit, ViewChild } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import {
+  FormBuilder,
+  Validators,
+  FormGroup,
+  FormControl,
+} from "@angular/forms";
+
+import { MainService } from "../../services/main.service";
+import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
+import { ToolService } from "../../services/tool.service";
+import { NzMessageService } from "ng-zorro-antd";
+import { Subject } from "rxjs";
+import { debounceTime, filter } from "rxjs/operators";
+import host from "../../../assets/js/http";
+import { HttpRequest, HttpResponse, HttpClient } from '@angular/common/http';
+
+@Component({
+  selector: "app-drug-cloud",
+  templateUrl: "./drug-cloud.component.html",
+  styleUrls: ["./drug-cloud.component.less"],
+})
+export class DrugCloudComponent implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  constructor(
+    private message: NzMessageService,
+    private fb: FormBuilder,
+    private route: ActivatedRoute,
+    private router: Router,
+    private mainService: MainService,
+    private tool: ToolService,
+    private http: HttpClient,
+  ) {}
+
+  ngOnInit() {
+    this.searchParentDeptSubject.pipe(debounceTime(500)).subscribe((e) => {
+			this.isDeptLoading = true;
+			if(e[1]=='dept'){
+				this.getDeparts(e[0]);
+			}else{
+				this.getDrugInfo(e[0]);
+			}
+    });
+		this.hosId = this.tool.getCurrentHospital().id;
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+    this.initForm();
+    this.getAllHospital();
+  }
+  listOfData: any[] = []; //表格数据
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  modal: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  validateForm: FormGroup; //新增/编辑表单
+  coopId: number; //表格中执行操作的id
+  department: number; //所属科室
+	drug: number; //药品名称
+	hosId: number; 
+	dateRange;//时间
+  batchNumber; //批次号
+  num; //编码
+  deptalias; //别名
+  type; //类型
+  deptHandoverType; //类型
+  pageIndex: number = 1; //页码
+  listLength: number = 10; //总条数
+  pageSize: number = 10; //每页条数
+  btnLoading: boolean = false; //确认按钮loading状态
+  printLoading: boolean = false; //批量打印按钮loading状态
+  deptPhones: any = []; //新添加的科室电话列表
+  isAddDeptsPhone = true; //添加新的科室电话是否禁用
+  deptsPhoneId = 1; //科室电话自增id
+  allParentdepart: any = []; //所有的父级科室列表
+  hospitals1: any = []; //科室列表(搜索)
+	rowData: object = {}; //打印选择列表
+  searchParentDeptSubject = new Subject();
+  // 初始化增删改按钮
+  coopBtns: any = {};
+	drugData: any = []; //药品搜索列表
+	drugTypeData: any = {}; //药品类型
+	viewData: any = []; //历史记录
+  // 导入---start
+  // model-取消
+  isShow = false;
+  hideExcelImport() {
+    this.isShow = false;
+  }
+  // 触发
+  excelImport() {
+    this.isShow = true;
+  }
+
+  // 导入---end
+  //搜索父级科室
+	isDeptLoading = false;
+  changeInp(e,type) {
+    this.searchParentDeptSubject.next([e,type]);
+  }
+
+  // 配送建单
+  coopData:any = {};
+  addDateModal(data) {
+    this.coopData = data;
+    this.showDelModal1();
+  }
+  delModal1: boolean = false; //删除模态框
+
+  showDelModal1() {
+    this.delModal1 = true;
+  }
+  hideDelModal1() {
+    this.delModal1 = false;
+  }
+
+  // 搜索
+  search() {
+    this.pageIndex = 1;
+    this.getList();
+  }
+  // 重置
+  reset() {
+    this.pageIndex = 1;
+    this.department = null;
+    this.drug = null;
+    this.getList();
+  }
+	
+	// 获取药品类型
+	getDrugType(){
+		this.mainService.getDictionary("list", "drug_type").subscribe((data) => {
+			this.drugTypeData = data.find(i=>i.value=='infusion_solutions')
+			this.getDrugInfo('')
+		});
+	}
+	
+	// 获取药品信息
+	getDrugInfo(e) {
+	  let data = {
+	    idx: 0,
+	    sum: 20,
+	    drugsInfo: {
+				drugName: e,
+	      hosId: this.hosId || "" ,
+				drugType:{
+					id:this.drugTypeData.id
+				}
+	    },
+	  };
+	  this.mainService
+	    .getFetchDataList("data", "drugsInfo", data)
+	    .subscribe((data) => {
+				this.isDeptLoading = false;
+	      this.drugData = data.list;
+				this.getList();
+	    });
+	}
+	
+  // 表格数据
+  loading1 = false;
+  getList() {
+    var that = this;
+    let data = {
+      idx: that.pageIndex - 1,
+      sum: that.pageSize,
+      drugsCloudInventory: {
+        deptId: that.department,
+        drugId: that.drug,
+        hosId: this.hosId
+      },
+    };
+    this.loading1 = true;
+    that.mainService
+      .getFetchDataList("data", "drugsCloudInventory", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        that.listOfData = data.list;
+        that.listLength = data.totalNum;
+      });
+  }
+	
+	
+	// 获取所有科室
+  getDeparts(dept) {
+    var that = this;
+    let data = {
+      department: {
+        dept,
+        hospital: {
+          id: this.hosId
+        },
+      },
+      idx: 0,
+      sum: 20,
+    };
+    that.mainService
+      .getFetchDataList("data", "department", data)
+      .subscribe((data) => {
+				setTimeout(_=>{
+					this.isDeptLoading = false
+					this.hospitals1 = data.list
+				},500)
+      });
+  }
+	
+  // 获取所有院区
+  getAllHospital() {
+		this.getDeparts('')
+    this.getDrugType();
+  }
+
+
+  // 新增弹框
+  showModal() {
+    this.initForm();
+    // this.changeHosp();
+    this.add = true;
+    this.isAddDeptsPhone = true;
+    this.deptPhones = [];
+  }
+  hideModal() {
+    this.modal = false;
+    this.initForm();
+  }
+  // 初始化新增form表单
+  initForm() {
+    this.validateForm = this.fb.group({
+      parentOfficeName: [null],
+      officeName: [null, [Validators.required]],
+      deptalias: [null],
+      officeNo: [null, [Validators.required]],
+      officeNum: [null, [Validators.required]],
+      building: [null, [Validators.required]],
+      floor: [null, [Validators.required]],
+      officeAddress: [null, [Validators.required]],
+      officeType: [null, [Validators.required]],
+      deptHandoverType: [null],
+      startTime1: [null],
+      endTime1: [null],
+      dynamicCode1: [null],
+      startTime2: [null],
+      endTime2: [null],
+      dynamicCode2: [null],
+    });
+  }
+  // 科室位置必填
+  buildValidator = (control: FormControl): { [s: string]: boolean } => {
+    if (
+      this.validateForm &&
+      this.validateForm.value &&
+      (!this.validateForm.value.building ||
+        !this.validateForm.value.floor ||
+        !this.validateForm.value.officeAddress)
+    ) {
+      return { required: true };
+    }
+  };
+
+  // 展示信息提示框（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();
+  }
+
+  delModal: boolean = false; //删除模态框
+  coopIds: any;
+  coopFlag: any = false;
+  /**
+   *
+   * @param e 事件对象
+   * @param flag true是批量删除，false是单个删除
+   * @param id
+   */
+  showDelModal(e, flag, id) {
+    e.stopPropagation();
+    this.delModal = true;
+    this.coopFlag = flag;
+    if (flag) {
+      this.coopIds = id;
+    } else {
+      this.coopId = id;
+    }
+  }
+  hideDelModal() {
+    this.delModal = false;
+  }
+
+  // 查看
+  detail(e, item) {
+    e.stopPropagation();
+		var that = this;
+		let data = {
+			idx: 0,
+			sum: 9999,
+			drugsLog: {
+			  hosId: this.hosId,
+			  drugId: item.drugId,
+				deptId: item.deptId
+			}
+		};
+		this.loading1 = true;
+		that.mainService
+		  .getFetchDataList("data", "drugsLog", data)
+		  .subscribe((data) => {
+		    this.loading1 = false;
+				this.modal = true
+		    that.viewData = data.list;
+		  });
+  }
+
+}

src/app/views/drug-cloud/drug-cloud.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { DrugCloudRoutingModule } from './drug-cloud-routing.module';
+import { DrugCloudComponent } from './drug-cloud.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    DrugCloudComponent,
+  ],
+  imports: [
+    CommonModule,
+    DrugCloudRoutingModule,
+    ShareModule
+  ]
+})
+export class DrugCloudModule { }

src/app/views/drug-info/drug-info-routing.module.ts

@@ -0,0 +1,15 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { DrugInfoComponent } from './drug-info.component';
+
+
+const routes: Routes = [{
+  path: '',
+  component: DrugInfoComponent
+}];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class DrugInfoRoutingModule { }

src/app/views/drug-info/drug-info.component.html

@@ -0,0 +1,184 @@
+<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 class="list-template__searchItem">
+          <span class="label">药品标识</span>：
+          <input nz-input class="formItem" [(ngModel)]="drugCode" placeholder="请输入药品标识" nzSize="default" />
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">药品名称</span>：
+          <input nz-input class="formItem" [(ngModel)]="name" placeholder="请输入药品名称" nzSize="default" />
+        </div>
+      </div>
+      <div nz-col nzXl='6' class="list-template__btns">
+        <button nz-button class="btn default" (click)='search()'>搜索</button>
+        <button nz-button class="btn ml8 default" (click)='reset()'>重置</button>
+        <button nz-button *ngIf="coopBtns.add" class="btn ml8 default" (click)="showModal()">新增</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="5%">序号</th>
+            <th nzWidth="10%">药品标识</th>
+            <th nzWidth="20%">药品名称</th>
+            <th nzWidth="10%">规格</th>
+            <th nzWidth="9%">单位</th>
+            <th nzWidth="9%">单价</th>
+            <th nzWidth="9%">包装规格</th>
+            <th nzWidth="9%">低舍</th>
+						<th nzWidth="9%">高入</th>
+            <th nzWidth="10%">操作</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of listOfData;let index=index;">
+            <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
+            <td>{{ data.drugCode||'-' }}</td>
+            <td>{{ data.drugName||'-' }}</td>
+            <td>{{ data.specs||'-'}}</td>
+            <td>{{ data.unit||'-' }}</td>
+            <td>{{ data.unitPrice||'-' }}</td>
+            <td>{{ data.packingSpecs }}</td>
+						<td>{{ data.lowerRound }}</td>
+						<td>{{ data.upperRound }}</td>
+            <td>
+              <div class="coop">
+                <span *ngIf="coopBtns.edit" (click)="edit(data)">编辑</span>
+                <span *ngIf="coopBtns.del" (click)="del(data)">删除</span>
+              </div>
+            </td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="list-template__pagination">
+        <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
+          (nzPageIndexChange)="getList()" (nzPageSizeChange)="getList()">
+        </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">药品信息 - {{add?"新增":"编辑"}}<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    </div>
+    <overlay-scrollbars #osComponentRef1 class="content">
+      <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="drugCode">药品标识</nz-form-label>
+          <nz-form-control nzErrorTip="请填写药品标识!">
+            <nz-input-group>
+              <input type="text" pattern="^[^\u4e00-\u9fa5]+$" (input)="handleInput($event)"
+							nz-input formControlName="drugCode" placeholder="请填写药品标识" />
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="drugName">药品名称</nz-form-label>
+          <nz-form-control nzErrorTip="请填写药品名称!">
+            <nz-input-group>
+              <input type="drugName" nz-input formControlName="drugName" placeholder="请填写药品名称" />
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="specs">规格</nz-form-label>
+          <nz-form-control nzErrorTip="请填写规格!">
+            <nz-input-group>
+              <input type="specs" nz-input formControlName="specs" placeholder="请填写规格" />
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="unit">单位</nz-form-label>
+          <nz-form-control nzErrorTip="请填写单位!">
+            <nz-input-group>
+              <input nz-input formControlName="unit" placeholder="请填写单位" />
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="unitPrice">单价</nz-form-label>
+          <nz-form-control nzErrorTip="请填写单价!">
+           <nz-input-number
+							formControlName="unitPrice"
+            	[nzMin]="0"
+							[nzPrecision]="2"
+            	[nzMax]="999999"
+            	[nzStep]="0.1"
+            	[nzPlaceHolder]="'请填写单价(保留2位小数)'"
+            ></nz-input-number>
+          </nz-form-control>
+        </nz-form-item>
+				<nz-form-item>
+				  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="packingSpecs">包装规格</nz-form-label>
+				  <nz-form-control nzErrorTip="请填写包装规格!">
+				    <nz-input-group>
+							<nz-input-number
+								formControlName="packingSpecs"
+								[nzMin]="0"
+								[nzPrecision]="0"
+								[nzMax]="999999"
+								[nzStep]="1"
+								[nzPlaceHolder]="'请填写包装规格'"
+							 ></nz-input-number>
+						 </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				<nz-form-item>
+				  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="lowerRound">低舍</nz-form-label>
+				  <nz-form-control nzErrorTip="请填写低舍!">
+				    <nz-input-group>
+							<nz-input-number
+								(ngModelChange)="lowerChange($event)"
+								formControlName="lowerRound"
+								[nzMin]="0"
+								[nzPrecision]="0"
+								[nzMax]="999999"
+								[nzStep]="1"
+								[nzPlaceHolder]="'请填写低舍'"
+							 ></nz-input-number>
+						</nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				<nz-form-item>
+				  <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="upperRound">高入</nz-form-label>
+				  <nz-form-control nzErrorTip="请填写高入!">
+				    <nz-input-group>
+							<nz-input-number
+								formControlName="upperRound"
+								[nzDisabled]="true"
+								[nzMin]="0"
+								[nzPrecision]="0"
+								[nzMax]="999999"
+								[nzStep]="1"
+								[nzPlaceHolder]="'请填写高入'"
+							 ></nz-input-number>
+						</nz-input-group>
+				  </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()" (cancelDelEvent)="cancelDel()" content="是否删除药品信息？" confirmTxt="是" cancelTxt="否">
+</app-dialog-delete>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo"></app-prompt-modal>
+
+<!-- 查看详情 -->
+<router-outlet (deactivate)="getList()"></router-outlet>
+

src/app/views/drug-info/drug-info.component.less

@@ -0,0 +1,130 @@
+@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;
+						.ant-input-number{
+							width: 100% !important;
+						}
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+						.ant-input-number{
+							width: 100% !important;
+						}
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button:nth-child(1) {
+        margin-right: 20px;
+      }
+    }
+  }
+}

src/app/views/drug-info/drug-info.component.ts

@@ -0,0 +1,271 @@
+import { Component, OnInit, ViewChild } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { FormBuilder, Validators, FormGroup } from "@angular/forms";
+
+import { MainService } from "../../services/main.service";
+import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
+import { ToolService } from "../../services/tool.service";
+import { forkJoin, Subject } from "rxjs";
+import { debounceTime } from "rxjs/operators";
+import { NzMessageService } from "ng-zorro-antd";
+
+@Component({
+  selector: "app-drug-info",
+  templateUrl: "./drug-info.component.html",
+  styleUrls: ["./drug-info.component.less"],
+})
+export class DrugInfoComponent implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  constructor(
+    private message: NzMessageService,
+    private fb: FormBuilder,
+    private route: ActivatedRoute,
+    private router: Router,
+    private mainService: MainService,
+    private tool: ToolService
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+
+  modal: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  validateForm: FormGroup; //新增/编辑表单
+  coopId: number; //表格中执行操作的id
+  department: any; //所属科室
+  drugCode; //编号
+  name; //名称
+  userType: any; //用户类型
+  hosId: any; //院区（搜索）
+  userGroup; //所属组
+  userGroup1; //所属组(搜索)
+  userTypes: Array<any>; //所有用户类型
+  alldepart: any = []; //所有所属科室
+  alldepart1: any = []; //所有所属科室(搜索)
+  hospitals1: any = []; //院区列表(搜索)
+	drugTypeData: any = []; //药品类型
+  allUserGroup: Array<any>; //所有用户组
+  allUserGroup1: Array<any>; //用户组(搜索)
+  allUserRole: Array<any>; //所有角色
+  pageIndex: number = 1; //页码
+  listLength: number = 10; //总条数
+  pageSize: number = 10; //每页条数
+
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+
+  btnLoading: boolean = false; //提交按钮loading状态
+  wxRequired = false; //新增或编辑用户的时候，微信号是否必填
+  changeInpSubject = new Subject(); //防抖
+  changeInpHospitalSubject = new Subject(); //防抖
+  ngOnInit() {
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+		this.hosId = this.tool.getCurrentHospital().id;
+    this.initForm();
+		this.getDrugType()
+  }
+
+  // 初始化增删改按钮
+  coopBtns: any = {};
+  // 搜索
+  search() {
+    this.pageIndex = 1;
+    this.getList();
+  }
+  // 重置
+  reset() {
+    this.pageIndex = 1;
+    this.name = "";
+    this.drugCode = "";
+    this.getList();
+  }
+  // 表格数据
+  loading1 = false;
+  getList() {
+    let data = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      drugsInfo: {
+        drugName: this.name || "",
+        drugCode: this.drugCode || "",
+        hosId: this.hosId || "" ,
+				drugType:{
+					id:this.drugTypeData.id
+				}
+      },
+    };
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("data", "drugsInfo", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        this.listOfData = data.list;
+        this.listLength = data.totalNum;
+      });
+  }
+	
+	// 获取药品类型
+	getDrugType(){
+		this.mainService.getDictionary("list", "drug_type").subscribe((data) => {
+			this.drugTypeData = data.find(i=>i.value=='infusion_solutions')
+			this.getList();
+		});
+	}
+	
+	lowerChange(e){
+		this.validateForm.controls.upperRound.setValue(e+1);
+	}
+	
+	// 监听标识输入
+	handleInput(event: KeyboardEvent){
+		const input = event.target as HTMLInputElement;
+		// 如果输入的不是中文，则允许输入
+		if (!input.validity.patternMismatch) {
+			this.validateForm.value.drugCode = input.value;
+		} else {
+			// 重置输入值，不允许输入中文
+			input.value = this.validateForm.value.drugCode;
+		}
+	}
+	
+  // 新增弹框
+  showModal() {
+    this.add = true;
+		this.modal = true
+    this.initForm();
+  }
+  hideModal() {
+    this.modal = false;
+    this.initForm();
+  }
+	
+  // 初始化新增form表单
+  initForm() {
+    this.validateForm = this.fb.group({
+      drugName: [null, [Validators.required]],
+      drugCode: [null, [Validators.required]],
+      specs: [null, [Validators.required]],
+      unit: [null, [Validators.required]],
+			unitPrice:[null, [Validators.required]],
+			packingSpecs:[null, [Validators.required]],
+			lowerRound:[null, [Validators.required]],
+			upperRound:[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;
+		let form = this.validateForm.value
+		if(form.lowerRound >= form.upperRound){
+			this.message.error('低舍不能大于或者等于高入')
+			return 
+		}
+		if(form.upperRound >= form.packingSpecs){
+			this.message.error('高入不能大于或者等于包装规格')
+			return
+		}
+    let data = {
+			...this.validateForm.value,
+			id:0,
+			drugType:{
+				id:this.drugTypeData.id
+			},
+			hosId:that.hosId
+    };
+    if (!that.add) {
+      data.id = that.coopId;
+    }else{
+			delete data.id
+		}
+    that.mainService
+      .simplePost("addData", "drugsInfo", data)
+      .subscribe((data) => {
+        that.btnLoading = false;
+        that.hideModal();
+        that.initForm();
+        if (data.status == 200) {
+          that.showPromptModal(that.add ? "新增" : "编辑", true, "");
+        } else {
+          that.showPromptModal(that.add ? "新增" : "编辑", false, data.msg);
+        }
+      });
+  }
+
+  // 编辑
+  edit(data) {
+		this.add = false
+		this.coopId = data.id;
+    this.validateForm.controls.drugName.setValue(data.drugName);
+    this.validateForm.controls.drugCode.setValue(data.drugCode);
+    this.validateForm.controls.specs.setValue(data.specs);
+    this.validateForm.controls.unit.setValue(data.unit);
+    this.validateForm.controls.unitPrice.setValue(data.unitPrice);
+    this.validateForm.controls.packingSpecs.setValue(data.packingSpecs);
+    this.validateForm.controls.lowerRound.setValue(data.lowerRound);
+		this.validateForm.controls.upperRound.setValue(data.upperRound);
+		this.modal = true
+  }
+
+  // 删除
+  delModal: boolean = false; //删除模态框
+  del(data) {
+    let that = this;
+    that.coopId = data.id;
+    that.delModal = true;
+  }
+	
+	// 取消删除弹框
+	cancelDel(){
+		this.hideDelModal();
+	}
+	
+  // 确认删除
+  confirmDel() {
+    let that = this;
+    that.btnLoading = true;
+    that.mainService
+      .coopTypeConfig('rmvData', 'drugsInfo', [this.coopId])
+      .subscribe((data) => {
+        that.btnLoading = false;
+        that.hideDelModal();
+        if (data["status"] == 200) {
+          that.showPromptModal("删除", true, "");
+        } else {
+          that.showPromptModal("删除", false, data["msg"]);
+        }
+      });
+  }
+	
+	// 展示信息提示框（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();
+	}
+	
+  // 关闭删除模态框
+  hideDelModal() {
+    this.delModal = false;
+  }
+
+  // 查看
+  detail(id) {
+    this.router.navigateByUrl("/main/clinicalUsersManagement/userDetail/" + id);
+  }
+}
+

src/app/views/drug-info/drug-info.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { DrugInfoRoutingModule } from './drug-info-routing.module';
+import { DrugInfoComponent } from './drug-info.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    DrugInfoComponent
+  ],
+  imports: [
+    CommonModule,
+    DrugInfoRoutingModule,
+    ShareModule
+  ]
+})
+export class DrugInfoModule { }

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

@@ -508,6 +508,31 @@ const routes: Routes = [
         path: "medicalWasteTrendAnalysis",
         loadChildren: () => import("../medical-waste-trend-analysis/medical-waste-trend-analysis.module").then((m) => m.MedicalWasteTrendAnalysisModule),
       },
+			// 大输液配置
+			{
+			  path: "bigTransfusionSet",
+			  loadChildren: () => import("../big-transfusion-set/big-transfusion-set.module").then((m) => m.BigTransfusionSetModule),
+			},
+			// 药品信息
+			{
+			  path: "drugInfo",
+			  loadChildren: () => import("../drug-info/drug-info.module").then((m) => m.DrugInfoModule),
+			},
+			// 科室发药单
+			{
+			  path: "adminOfficePrescription",
+			  loadChildren: () => import("../admin-office-prescription/admin-office-prescription.module").then((m) => m.AdminOfficePrescriptionModule),
+			},
+			// 药品云库存
+			{
+			  path: "drugCloud",
+			  loadChildren: () => import("../drug-cloud/drug-cloud.module").then((m) => m.DrugCloudModule),
+			},
+			// 发药批次
+			{
+			  path: "dispensingBatch",
+			  loadChildren: () => import("../dispensing-batch/dispensing-batch.module").then((m) => m.DispensingBatchModule),
+			}
       // 巡检单配置
       {
         path: "inspectionConfiguration",

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

@@ -1,7 +1,7 @@
 <div class="detail" *ngIf="!maskFlag">
   <div class="modalBody">
     <div class="title">查看科室信息<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
-    <div class="content">
+		<div class="content">
       <div class="top display_flex justify-content_space-between align-items_center">
         <span>{{officeInfo['dept']?officeInfo['dept']:'无'}}<em style="font-style: normal;"
             *ngIf="officeInfo['deptalias']">（别名：{{officeInfo['deptalias']}}）</em></span>
@@ -39,7 +39,7 @@
       </div>
     </div>
     <div class="display_flex justify-content_flex-center">
-      <button class="btn know" nz-button nzType="primary" nzGhost (click)="hideModal()">知道了</button>
+      <button class="btn know" nz-button nzType="primary" nzGhost (click)="hideModal()">取消</button>
     </div>
   </div>
 </div>

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

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