药品和静配工单需要显示药包编码

src/app/services/tool.service.ts

@@ -24,43 +24,37 @@ export class ToolService {
   }
   //获取当前菜单的权限
   initCoopBtns(route) {
-    // 二级菜单
-    let secondMenus = [];
-    // 初始化增删改权限
-    let coopBtns: any = {
-      look: false,
-      add: false,
-      edit: false,
-      del: false,
-    };
+    let link = route.parent.snapshot.routeConfig.path; //当前路由
+    let secondMenus = []; // 二级菜单
+    let jurisdiction = []; //当前菜单的权限列表
+    let coopBtns: any = {}; // 初始化权限
     this.menu.forEach((e) => {
       e.childrens.forEach((el) => {
         secondMenus.push(el);
       });
     });
-    let link = route.parent.snapshot.routeConfig.path;
-    let btns = [];
     secondMenus.forEach((e) => {
       if (e.link == link) {
-        btns = e.childrens || [];
+        jurisdiction = e.childrens || []; //匹配路由后，取得对应的权限
       }
     });
-    btns.forEach((e) => {
+    jurisdiction.forEach((e) => {
       switch (e.link) {
         case "look":
-          coopBtns.look = true;
+          coopBtns.look = true; //查看
           break;
         case "add":
-          coopBtns.add = true;
+          coopBtns.add = true; //新增
           break;
         case "edit":
-          coopBtns.edit = true;
+          coopBtns.edit = true; //编辑
           break;
         case "del":
-          coopBtns.del = true;
+          coopBtns.del = true; //删除
           break;
       }
     });
+    console.log(coopBtns);
     return coopBtns;
   }
 }

src/app/share/detail-drug/detail-drug.component.html

@@ -14,6 +14,8 @@
         <div nz-col nzSpan="8">申请科室：{{orderInfo.createDeptDTO?orderInfo.createDeptDTO.dept:''}}</div>
         <div nz-col nzSpan="8">目标科室：{{(orderInfo.endDepts&&orderInfo.endDepts[0])?orderInfo.endDepts[0].dept:''}}</div>
         <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息：{{orderInfo.worker.name}}</div>
+        <div nz-col nzSpan="8" *ngIf="orderInfo.drugs">药包编码：{{orderInfo.drugs.packid}}</div>
+        <div nz-col nzSpan="8" *ngIf="orderInfo.staticDistri">药包编码：{{orderInfo.staticDistri.packid}}</div>
         <div nz-col nzSpan="24" *ngIf="orderInfo.specialCloseReason">
           特殊情况关闭原因：{{orderInfo.specialCloseReason}}
         </div>

src/app/share/order-detail/order-detail.component.html

@@ -266,7 +266,9 @@
             <div nz-col nzSpan="6" *ngIf="orderInfo.urgentDetails">加急状态：{{orderInfo.urgentDetails.checkStatus.name}}
             </div>
             <div nz-col nzSpan="6" *ngIf="orderInfo.drugs">
-              药包编码：{{orderInfo.drugs.batchNo}}</div>
+              药包编码：{{orderInfo.drugs.packid}}</div>
+            <div nz-col nzSpan="6" *ngIf="orderInfo.staticDistri">
+              药包编码：{{orderInfo.staticDistri.packid}}</div>
           </div>
           <div class="info" nz-row *ngIf="orderInfo.urgentDetails">
             <div nz-col nzSpan="24" class="jiaji">加急原因：{{orderInfo.urgentDetails.urgentReason}}</div>

src/app/views/building-floor/building-floor.component.html

@@ -6,13 +6,13 @@
       <div *ngIf="coopBtns.edit" class="edit item" (click)="showCoopModal('edit')">编辑</div>
       <div *ngIf="coopBtns.del" class="del item" (click)="showDelModal()">删除</div>
     </div>
-    <div class="groups" [ngStyle]="{display:!loading1?'block':'none'}">
+    <div class="groups" [ngStyle]="{display:!buildingsLoading?'block':'none'}">
       <overlay-scrollbars #osComponentRef1 [ngStyle]="{ height:'100%' }">
         <div [ngClass]="{'item':true,'checked':data.id==checkedBuilding.id}" *ngFor="let data of buildingList"
-          (click)="checkGroup(data)" [title]="data.buildingName">{{data.buildingName}}</div>
+          (click)="checkBuilding(data)" [title]="data.buildingName">{{data.buildingName}}</div>
       </overlay-scrollbars>
     </div>
-    <div class="groups" *ngIf="loading1">
+    <div class="groups" *ngIf="buildingsLoading">
       <div class="loadingFull display_flex justify-content_flex-center align-items_center">
         <div class="loadingFullInner">
           <img src="../../../assets/images/loading.gif" alt="">
@@ -24,18 +24,17 @@
   <div class="userInfo">
     <div class="top display_flex justify-content_flex-end align-items_center">
       <div class="display_flex align-items_center">
-        <span>已选择 {{usersArr.length}} 个楼层</span>
-        <button class="btn default" *ngIf="coopBtns.add" nzType="primary" nz-button [nzLoading]="saveLoading"
+        <span>已选择 {{selectedFloor.length}} 个楼层</span>
+        <button class="btn default" *ngIf="coopBtns.add" nzType="primary" nz-button
           (click)="showFloorModal($event,'add')">新增</button>
-        <button class="btn default" *ngIf="coopBtns.del" nzType="primary" nz-button [nzLoading]="saveLoading"
+        <button class="btn default" *ngIf="coopBtns.del" nzType="primary" nz-button
           (click)="showDelFloorModal($event)">批量删除</button>
-        <button class="btn default" *ngIf="coopBtns.add" nzType="primary" nz-button [nzLoading]="saveLoading"
-          (click)="generate()">生成楼层</button>
+        <button class="btn default" *ngIf="coopBtns.add" nzType="primary" nz-button (click)="generate()">生成楼层</button>
       </div>
     </div>
-    <div class="table" *ngIf="!loading1">
+    <div class="table" *ngIf="!buildingsLoading">
       <nz-table class="groupManagementTable" #rowSelectionTable [nzPageSize]="9999" [nzData]="allFloorList"
-        [nzShowPagination]="false" #fixedTable [nzScroll]="{ y: tableHeight+'px' }" [nzLoading]="loading2">
+        [nzShowPagination]="false" [nzScroll]="{ y: tableHeight+'px' }" [nzLoading]="floorsLoading">
         <tbody>
           <tr *ngFor="let data of rowSelectionTable.data" (click)="selectedUser(data)">
             <td style="width:5%" nzShowCheckbox [(nzDisabled)]="!coopBtns.edit" [(nzChecked)]="mapOfCheckedId[data.id]"

src/app/views/building-floor/building-floor.component.ts

@@ -1,7 +1,6 @@
 import { Component, OnInit, ViewChild } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import { FormBuilder, Validators, FormGroup } from "@angular/forms";
-import { NzMessageService } from "ng-zorro-antd/message";
 
 import { MainService } from "../../services/main.service";
 import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
@@ -15,14 +14,40 @@ import { GenerateFloorComponent } from "src/app/share/generate-floor/generate-fl
 })
 export class BuildingFloorComponent implements OnInit {
   tableHeight;
+  validateForm: FormGroup;
+  validateFloorForm: FormGroup;
+  allFloorList: any[] = []; //当前选中的楼栋包含的所有楼层
+  mapOfCheckedId: { [key: string]: boolean } = {};
+  checkedBuilding: any = {}; //选中楼栋
+  buildingList: Array<any> = []; //楼栋信息
+  hosId: any; //当前选择的院区id
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //是否展示提示框
+  btnLoading: boolean = false; //确认按钮loading状态
+  coopBtns: any = {}; // 初始化增删改按钮
+  buildingsLoading = false; //获取楼栋列表的loading
+  floorsLoading = false; //获取楼层列表的loading
+  positionY = 0; //记录Y轴滚动距离
+  selectedFloor = []; //选中的楼层
+  coopModal: boolean = false; //楼栋模态框是否展示
+  add: boolean = true; //楼栋新增的标识，true：新增；false：编辑
+  floorModal: boolean = false; //楼层模态框是否展示
+  addFloor: boolean = true; //楼层，true：新增；false：编辑
+  floorDataEdit; //正在编辑的楼层
+  delModal: boolean = false; //删除楼栋，模态框是否显示
+  delFloorModal: boolean = false; //删除楼层，模态框是否显示
+  isDelSingle: boolean = false; //是否单个删除楼层
+  generateModal: boolean = false; //生成楼层的模态框
 
   constructor(
     private fb: FormBuilder,
     private route: ActivatedRoute,
     private mainService: MainService,
-    private msg: NzMessageService,
     private tool: ToolService
   ) {}
+
   @ViewChild("osComponentRef1", {
     read: OverlayScrollbarsComponent,
     static: false,
@@ -30,67 +55,42 @@ export class BuildingFloorComponent implements OnInit {
   osComponentRef1: OverlayScrollbarsComponent;
   @ViewChild(GenerateFloorComponent, { static: false })
   generate1: GenerateFloorComponent;
+
   ngOnInit() {
     this.coopBtns = this.tool.initCoopBtns(this.route);
-    console.log(this.coopBtns);
-    this.initForm();
-    this.initFormFloor();
-    this.getHospitalList();
+    this.hosId = this.tool.getCurrentHospital().id;
     this.getBuildingList();
     this.tableHeight = document.body.clientHeight - 267;
   }
-  isAllDisplayDataChecked = false;
-  isIndeterminate = false;
-  listOfDisplayData: any[] = [];
-  allFloorList: any[] = []; //当前选中的楼栋包含的所有楼层
-  mapOfCheckedId: { [key: string]: boolean } = {};
-  checkedBuilding: any = {}; //选中楼栋
-  buildingList: Array<any> = []; //楼栋信息
-  hospitalList: Array<any> = []; //院区列表
-  hosId: any; //当前选择的院区id
-
-  promptContent: string; //操作提示框提示信息
-  ifSuccess: boolean; //操作成功/失败
-  promptInfo: string; //操作结果提示信息
-  promptModalShow: boolean; //是否展示提示框
-
-  btnLoading: boolean = false; //确认按钮loading状态
-  saveLoading: boolean = false; //批量打印按钮loading状态
 
-  // 初始化增删改按钮
-  coopBtns: any = {};
-
-  // 分组列表
-  loading1 = false;
+  // 楼栋列表
   getBuildingList() {
     let postData = {
       idx: 0,
       sum: 9999,
       building: { hosId: this.hosId },
     };
-    this.loading1 = true;
+    this.buildingsLoading = true;
     this.mainService
       .getFetchDataList("simple/data", "building", postData)
       .subscribe((result) => {
-        this.loading1 = false;
+        this.buildingsLoading = false;
         if (result.status == 200) {
           this.buildingList = result.list;
           if (Object.keys(this.checkedBuilding).length) {
             result.list.forEach((item) => {
               if (item.id == this.checkedBuilding.id) {
-                this.checkGroup(item);
+                this.checkBuilding(item);
               }
             });
           } else {
-            this.checkGroup(result.list[0]);
+            this.checkBuilding(result.list[0]);
           }
         }
       });
   }
 
   // 获取选中楼栋下楼层列表
-  loading2 = false;
-  allUsers = [];
   getAllFloor() {
     // 初始化的时候搜索一次，然后前端过滤
     let postData = {
@@ -98,83 +98,75 @@ export class BuildingFloorComponent implements OnInit {
       sum: 9999,
       floor: { hosId: this.hosId, buildId: this.checkedBuilding.id },
     };
-    this.loading2 = true;
+    this.floorsLoading = true;
     this.mainService
       .getFetchDataList("simple/data", "floor", postData)
       .subscribe((result) => {
-        this.loading2 = false;
+        this.floorsLoading = false;
         if (result.status == 200) {
           this.allFloorList = result.list;
-          this.allUsers = JSON.parse(JSON.stringify(result.list));
-          this.refreshStatus(true);
+          this.refreshStatus();
         }
       });
   }
 
-  // 院区列表
-  getHospitalList() {
-    this.hosId = this.tool.getCurrentHospital().id;
-    this.hospitalList = [this.tool.getCurrentHospital()];
-  }
-  // 选中分组
-  positionY = 0; //记录其他建单Y轴滚动距离
-  checkGroup(data) {
+  // 选中楼栋
+  checkBuilding(data) {
     this.positionY = this.osComponentRef1.osInstance().scroll().position.y; //内容滚动的距离
     this.checkedBuilding = data;
     this.mapOfCheckedId = {};
     this.getAllFloor();
   }
+
   selectedUser(data) {
     this.mapOfCheckedId[data.id] = !this.mapOfCheckedId[data.id];
     this.refreshStatus();
   }
-  // 选中列表中当前分组用户
-  usersArr = [];
-  refreshStatus(first?): void {
+  // 选中列表中楼层
+  refreshStatus(): void {
     let arr = [];
     for (var m in this.mapOfCheckedId) {
       if (this.mapOfCheckedId[m]) {
         arr.push({ id: m });
       }
     }
-    this.usersArr = arr;
+    this.selectedFloor = arr;
   }
 
   // 新增/编辑楼栋模态框
-  coopModal: boolean = false; //模态框是否展示
-  add: boolean = true; //true：新增；false：编辑
   showCoopModal(type) {
     this.coopModal = true;
     this.add = type == "add";
     if (type == "edit") {
+      this.initForm();
       this.validateForm.controls.buildingName.setValue(
         this.checkedBuilding["buildingName"]
       );
     } else {
-      this.validateForm.controls.buildingName.setValue(null);
+      this.initForm();
     }
   }
+
   // 新增/编辑楼层模态框
-  floorModal: boolean = false; //模态框是否展示
-  addFloor: boolean = true; //true：新增；false：编辑
-  floorDataEdit; //正在编辑的楼层
   showFloorModal(e, type, data?) {
     this.floorModal = true;
     this.addFloor = type == "add";
     if (type == "edit") {
+      this.initFormFloor();
       this.floorDataEdit = data;
       this.validateFloorForm.controls.buildId.setValue(data.buildId);
       this.validateFloorForm.controls.floorName.setValue(data.floorName);
     } else {
-      this.validateFloorForm.controls.buildId.setValue(this.checkedBuilding.id);
-      this.validateFloorForm.controls.floorName.setValue(null);
+      this.initFormFloor();
     }
     e.stopPropagation();
   }
+
   // 隐藏楼栋模态框
   hideCoopModal() {
     this.coopModal = false;
   }
+
   // 隐藏楼层模态框
   hideFloorModal() {
     this.floorModal = false;
@@ -186,17 +178,16 @@ export class BuildingFloorComponent implements OnInit {
       buildingName: [null, [Validators.required]],
     });
   }
+
   // 初始化新增form表单floor
-  validateFloorForm: FormGroup;
   initFormFloor() {
     this.validateFloorForm = this.fb.group({
-      buildId: [null, [Validators.required]],
+      buildId: [this.checkedBuilding.id, [Validators.required]],
       floorName: [null, [Validators.required]],
     });
   }
 
   // 新增/编辑楼栋提交
-  validateForm: FormGroup;
   submitForm(): void {
     for (const i in this.validateForm.controls) {
       this.validateForm.controls[i].markAsDirty();
@@ -205,20 +196,20 @@ export class BuildingFloorComponent implements OnInit {
     if (this.validateForm.invalid) return;
     this.btnLoading = true;
     let postData;
-    if (this.add) {
-      let arr = this.buildingList.filter(
-        (item) => item.buildingName == this.validateForm.value.buildingName
+    let arr = this.buildingList.filter(
+      (item) => item.buildingName == this.validateForm.value.buildingName
+    );
+    //有重复名称
+    if (arr.length > 0) {
+      this.btnLoading = false;
+      this.showPromptModal(
+        "新增",
+        false,
+        `存在重复的楼栋名称【${this.validateForm.value.buildingName}】请修改后再保存！`
       );
-      //有重复名称
-      if (arr.length > 0) {
-        this.btnLoading = false;
-        this.showPromptModal(
-          "新增",
-          false,
-          `存在重复的楼栋名称【${this.validateForm.value.buildingName}】请修改后再保存！`
-        );
-        return;
-      }
+      return;
+    }
+    if (this.add) {
       postData = {
         buildingName: this.validateForm.value.buildingName,
         deleted: false,
@@ -248,6 +239,7 @@ export class BuildingFloorComponent implements OnInit {
         }
       });
   }
+
   // 新增/编辑楼层提交
   submitFormFloor(): void {
     for (const i in this.validateFloorForm.controls) {
@@ -257,20 +249,20 @@ export class BuildingFloorComponent implements OnInit {
     if (this.validateFloorForm.invalid) return;
     this.btnLoading = true;
     let postData;
-    if (this.addFloor) {
-      let arr = this.allFloorList.filter(
-        (item) => item.floorName == this.validateFloorForm.value.floorName
+    let arr = this.allFloorList.filter(
+      (item) => item.floorName == this.validateFloorForm.value.floorName
+    );
+    //有重复名称
+    if (arr.length > 0) {
+      this.btnLoading = false;
+      this.showPromptModal(
+        "新增",
+        false,
+        `同一个楼栋存在重复的楼层名称【${this.validateFloorForm.value.floorName}】请修改后再保存！`
       );
-      //有重复名称
-      if (arr.length > 0) {
-        this.btnLoading = false;
-        this.showPromptModal(
-          "新增",
-          false,
-          `同一个楼栋存在重复的楼层名称【${this.validateFloorForm.value.floorName}】请修改后再保存！`
-        );
-        return;
-      }
+      return;
+    }
+    if (this.addFloor) {
       postData = {
         buildId: this.validateFloorForm.value.buildId,
         floorName: this.validateFloorForm.value.floorName,
@@ -288,13 +280,14 @@ export class BuildingFloorComponent implements OnInit {
     }
     this.addFloorHandler(postData, false);
   }
+
   //新增楼层
   addFloorHandler(postData, flag) {
     this.mainService
       .simplePost(flag ? "addListData" : "addData", "floor", postData)
       .subscribe((result) => {
         this.hideFloorModal();
-        this.generate1.delModal = false;
+        this.generate1 && (this.generate1.delModal = false);
         this.hideGenerateModal();
         this.btnLoading = false;
         if (result["status"] == 200) {
@@ -310,7 +303,6 @@ export class BuildingFloorComponent implements OnInit {
   }
 
   //删除楼栋
-  delModal: boolean = false;
   showDelModal() {
     this.delModal = true;
   }
@@ -336,8 +328,6 @@ export class BuildingFloorComponent implements OnInit {
    * @param e 事件对象
    * @param data 有值就是单个删除，无值就是批量删除
    */
-  delFloorModal: boolean = false;
-  isDelSingle: boolean = false; //是否单个删除
   showDelFloorModal(e, data?) {
     if (data) {
       this.isDelSingle = true;
@@ -354,8 +344,9 @@ export class BuildingFloorComponent implements OnInit {
   // 确认删除
   confirmFloorDel() {
     this.btnLoading = true;
-    let ids = Object.keys(this.mapOfCheckedId); //批量删除选中的楼层
-    let postData = this.isDelSingle ? [this.floorDataEdit.id] : ids;
+    let postData = this.isDelSingle
+      ? [this.floorDataEdit.id]
+      : this.selectedFloor;
     this.mainService.delFloorList(postData).subscribe((result) => {
       this.hideDelFloorModal();
       this.btnLoading = false;
@@ -374,13 +365,18 @@ export class BuildingFloorComponent implements OnInit {
     this.ifSuccess = success;
     this.promptInfo = promptInfo;
     this.osComponentRef1.osInstance().scroll({ x: 0, y: this.positionY });
-    setTimeout(() => {
-      this.promptModalShow = true;
-      this.getBuildingList();
-    }, 100);
+    if (success) {
+      setTimeout(() => {
+        this.promptModalShow = true;
+        this.getBuildingList();
+      }, 100);
+    } else {
+      setTimeout(() => {
+        this.promptModalShow = true;
+      }, 100);
+    }
   }
   // 生成楼层
-  generateModal: boolean = false;
   generate() {
     this.generateModal = true;
   }