7.管理端中分组管理，保存成功后依然选中上次所选择的分组

src/app/views/group-management/group-management.component.html

@@ -6,7 +6,7 @@
       <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" *ngIf="!loading1">
+    <div class="groups" [ngStyle]="{display:!loading1?'block':'none'}">
       <overlay-scrollbars #osComponentRef1 [ngStyle]="{ height:'100%' }">
         <div [ngClass]="{'item':true,'checked':data.id==checkedGroup.id}" *ngFor="let data of groupList"
           (click)="checkGroup(data)" [title]="data.scheduleClass.name+' '+data.groupName">

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

@@ -1,22 +1,31 @@
-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 { 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';
-import { ToolService } from '../../services/tool.service';
+import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
+import { ToolService } from "../../services/tool.service";
 
 @Component({
-  selector: 'app-group-management',
-  templateUrl: './group-management.component.html',
-  styleUrls: ['./group-management.component.less']
+  selector: "app-group-management",
+  templateUrl: "./group-management.component.html",
+  styleUrls: ["./group-management.component.less"],
 })
 export class GroupManagementComponent implements OnInit {
   tableHeight;
 
-  constructor(private fb: FormBuilder, private route: ActivatedRoute, private mainService: MainService, private msg: NzMessageService, private tool: ToolService) { }
-  @ViewChild('osComponentRef1', { read: OverlayScrollbarsComponent, static: false })
+  constructor(
+    private fb: FormBuilder,
+    private route: ActivatedRoute,
+    private mainService: MainService,
+    private msg: NzMessageService,
+    private tool: ToolService
+  ) {}
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
   osComponentRef1: OverlayScrollbarsComponent;
   ngOnInit() {
     this.initCoopBtns();
@@ -26,89 +35,96 @@ export class GroupManagementComponent implements OnInit {
     this.getScheduleList();
     this.tableHeight = document.body.clientHeight - 267;
   }
-  menu: any = JSON.parse(localStorage.getItem('menu')) || [];//菜单
+  menu: any = JSON.parse(localStorage.getItem("menu")) || []; //菜单
   isAllDisplayDataChecked = false;
   isIndeterminate = false;
   listOfDisplayData: any[] = [];
-  allUserList: any[] = [];//所有用户
-  groupUserList: any[] = [];//所选组内用户
+  allUserList: any[] = []; //所有用户
+  groupUserList: any[] = []; //所选组内用户
   mapOfCheckedId: { [key: string]: boolean } = {};
-  checkedGroup: any = {};//选中分组
-  groupList: Array<any> = [];//分组信息
-  hospitalList: Array<any> = [];//院区列表
-  hosId:any;//当前选择的院区id
-  scheduleList: Array<any> = [];//班次列表
-  searchName: string = '';//用户信息搜索输入框
+  checkedGroup: any = {}; //选中分组
+  groupList: Array<any> = []; //分组信息
+  hospitalList: Array<any> = []; //院区列表
+  hosId: any; //当前选择的院区id
+  scheduleList: Array<any> = []; //班次列表
+  searchName: string = ""; //用户信息搜索输入框
 
-  promptContent: string;//操作提示框提示信息
-  ifSuccess: boolean;//操作成功/失败
-  promptInfo: string;//操作结果提示信息
-  promptModalShow: boolean;//是否展示提示框
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //是否展示提示框
 
-  btnLoading: boolean = false;//确认按钮loading状态
-  saveLoading: boolean = false;//批量打印按钮loading状态
+  btnLoading: boolean = false; //确认按钮loading状态
+  saveLoading: boolean = false; //批量打印按钮loading状态
 
   // 初始化增删改按钮
   coopBtns: any = {
     look: false,
     add: false,
     edit: false,
-    del: false
+    del: false,
   };
 
   initCoopBtns() {
     // 二级菜单
-    let secondMenus = []
-    this.menu.forEach(e => {
-      e.childrens.forEach(el => {
-        secondMenus.push(el)
+    let secondMenus = [];
+    this.menu.forEach((e) => {
+      e.childrens.forEach((el) => {
+        secondMenus.push(el);
       });
     });
     let link = this.route.parent.snapshot.routeConfig.path;
-    let btns = []
-    secondMenus.forEach(e => {
+    let btns = [];
+    secondMenus.forEach((e) => {
       if (e.link == link) {
         btns = e.childrens || [];
       }
     });
-    btns.forEach(e => {
+    btns.forEach((e) => {
       switch (e.link) {
-        case 'look':
+        case "look":
           this.coopBtns.look = true;
           break;
-        case 'add':
+        case "add":
           this.coopBtns.add = true;
           break;
-        case 'edit':
+        case "edit":
           this.coopBtns.edit = true;
           break;
-        case 'del':
+        case "del":
           this.coopBtns.del = true;
           break;
       }
-    })
+    });
   }
   // 分组列表
   loading1 = false;
   getGroupList() {
     let that = this;
     let arr = [];
-    this.hospitalList.forEach(item => {
-      arr.push(item['id']);
-    })
+    this.hospitalList.forEach((item) => {
+      arr.push(item["id"]);
+    });
     let data = {
       idx: 0,
       sum: 999,
       group2: {
-        hospitals: arr.join()
-      }
-    }
+        hospitals: arr.join(),
+      },
+    };
     this.loading1 = true;
-    that.mainService.getFetchDataList('data', 'group2', data).subscribe(data1 => {
-      this.loading1 = false;
-      that.groupList = data1.list;
-      this.checkGroup(data1.list[0]);
-    })
+    that.mainService
+      .getFetchDataList("data", "group2", data)
+      .subscribe((data1) => {
+        this.loading1 = false;
+        that.groupList = data1.list;
+        console.log(this.checkedGroup);
+        if (Object.keys(this.checkedGroup).length) {
+          this.checkGroup(this.checkedGroup);
+        } else {
+          this.checkGroup(data1.list[0]);
+        }
+      });
   }
 
   // 获取选中院区下用户列表
@@ -124,26 +140,32 @@ export class GroupManagementComponent implements OnInit {
         user: {
           name: this.searchName,
           usertype: { id: 106 },
-          hospital: { id: this.checkedGroup['hospital']['id'] }
-        }
-      }
+          hospital: { id: this.checkedGroup["hospital"]["id"] },
+        },
+      };
       this.timeNum++;
       this.loading2 = true;
-      this.mainService.getFetchDataList('data', 'user', data).subscribe(result => {
-        this.timeNum--;
-        if (this.timeNum === 0) {
-          this.loading2 = false;
-          this.onlyFlag = false;
-        }
-        this.allUserList = result.list;
-        this.allUsers = JSON.parse(JSON.stringify(result.list));
-        this.refreshStatus(true)
-      })
+      this.mainService
+        .getFetchDataList("data", "user", data)
+        .subscribe((result) => {
+          this.timeNum--;
+          if (this.timeNum === 0) {
+            this.loading2 = false;
+            this.onlyFlag = false;
+          }
+          this.allUserList = result.list;
+          this.allUsers = JSON.parse(JSON.stringify(result.list));
+          this.refreshStatus(true);
+        });
     } else {
-      this.allUserList = this.allUsers.filter(item => {
-        return item.pinYin.includes(this.searchName) || item.name.includes(this.searchName) || item.inputCode.includes(this.searchName);
-      })
-      this.refreshStatus(true)
+      this.allUserList = this.allUsers.filter((item) => {
+        return (
+          item.pinYin.includes(this.searchName) ||
+          item.name.includes(this.searchName) ||
+          item.inputCode.includes(this.searchName)
+        );
+      });
+      this.refreshStatus(true);
     }
   }
   // 获取组内用户
@@ -179,19 +201,25 @@ export class GroupManagementComponent implements OnInit {
     const data = {
       idx: 0,
       scheduleClass: { hospital: { id: this.hosId } },
-      sum: 999
-    }
-    this.mainService.getFetchDataList('configuration', 'scheduleClass', data).subscribe(data => {
-      this.scheduleList = data.list;
-    })
+      sum: 999,
+    };
+    this.mainService
+      .getFetchDataList("configuration", "scheduleClass", data)
+      .subscribe((data) => {
+        this.scheduleList = data.list;
+      });
   }
 
   // 选中分组
+  positionY = 0; //记录其他建单Y轴滚动距离
   checkGroup(data) {
-    this.searchName = '';
+    this.positionY = this.osComponentRef1.osInstance().scroll().position.y; //内容滚动的距离
+    this.searchName = "";
     this.checkedGroup = data;
     this.mapOfCheckedId = {};
-    this.groupUserList = this.checkedGroup['users'] ? this.checkedGroup['users'] : [];
+    this.groupUserList = this.checkedGroup["users"]
+      ? this.checkedGroup["users"]
+      : [];
     this.getAllUser();
   }
 
@@ -204,8 +232,8 @@ export class GroupManagementComponent implements OnInit {
     if (first) {
       for (j = 0; j < that.groupUserList.length; j++) {
         for (i = 0; i < that.allUserList.length; i++) {
-          if (that.allUserList[i]['id'] == that.groupUserList[j]['id']) {
-            that.mapOfCheckedId[that.allUserList[i]['id']] = true;
+          if (that.allUserList[i]["id"] == that.groupUserList[j]["id"]) {
+            that.mapOfCheckedId[that.allUserList[i]["id"]] = true;
             break;
           }
         }
@@ -214,7 +242,7 @@ export class GroupManagementComponent implements OnInit {
     let arr = [];
     for (var m in that.mapOfCheckedId) {
       if (that.mapOfCheckedId[m]) {
-        arr.push({ 'id': m })
+        arr.push({ id: m });
       }
     }
     that.usersArr = arr;
@@ -226,34 +254,40 @@ export class GroupManagementComponent implements OnInit {
     that.saveLoading = true;
     let postData = {
       group2: {
-        id: that.checkedGroup['id'],
-        users: that.usersArr
-      }
-    }
-    that.mainService.coopData('updData', 'group2', postData).subscribe(data => {
-      that.saveLoading = false;
-      if (data.status == 200) {
-        that.showPromptModal('保存', true, '');
-      } else {
-        that.showPromptModal('保存', false, data.msg);
-      }
-    })
+        id: that.checkedGroup["id"],
+        users: that.usersArr,
+      },
+    };
+    that.mainService
+      .coopData("updData", "group2", postData)
+      .subscribe((data) => {
+        that.saveLoading = false;
+        if (data.status == 200) {
+          that.showPromptModal("保存", true, "");
+        } else {
+          that.showPromptModal("保存", false, data.msg);
+        }
+      });
   }
 
   // 新增/编辑模态框
-  coopModal: boolean = false;//模态框是否展示
-  add: boolean = true;//true：新增；false：编辑
+  coopModal: boolean = false; //模态框是否展示
+  add: boolean = true; //true：新增；false：编辑
   showCoopModal(type) {
     let that = this;
-    if (type == 'edit' && !that.checkedGroup['groupName']) {
-      that.msg.create('warning', '请选择需要编辑的分组！');
+    if (type == "edit" && !that.checkedGroup["groupName"]) {
+      that.msg.create("warning", "请选择需要编辑的分组！");
       return;
     }
     that.coopModal = true;
-    that.add = type == 'add';
-    if (type == 'edit') {
-      that.validateForm.controls.classes.setValue(that.checkedGroup['scheduleClass'].id + '');
-      that.validateForm.controls.groupName.setValue(that.checkedGroup['groupName']);
+    that.add = type == "add";
+    if (type == "edit") {
+      that.validateForm.controls.classes.setValue(
+        that.checkedGroup["scheduleClass"].id + ""
+      );
+      that.validateForm.controls.groupName.setValue(
+        that.checkedGroup["groupName"]
+      );
     } else {
       that.validateForm.controls.classes.setValue(null);
       that.validateForm.controls.groupName.setValue(null);
@@ -268,7 +302,7 @@ export class GroupManagementComponent implements OnInit {
   initForm() {
     this.validateForm = this.fb.group({
       classes: [null, [Validators.required]],
-      groupName: [null, [Validators.required]]
+      groupName: [null, [Validators.required]],
     });
   }
 
@@ -286,29 +320,31 @@ export class GroupManagementComponent implements OnInit {
       group2: {
         groupName: that.validateForm.value.groupName,
         hospital: { id: that.hosId - 0 },
-        scheduleClass: { id: that.validateForm.value.classes - 0 }
-      }
-    }
+        scheduleClass: { id: that.validateForm.value.classes - 0 },
+      },
+    };
     if (!that.add) {
-      data.group2['id'] = that.checkedGroup['id'];
+      data.group2["id"] = that.checkedGroup["id"];
     }
-    that.mainService.coopData((that.add ? 'addData' : 'updData'), 'group2', data).subscribe(data => {
-      that.hideCoopModal();
-      that.btnLoading = false;
-      that.initForm();
-      if (data.status == 200) {
-        that.showPromptModal((that.add ? '新增' : '编辑'), true, '');
-      } else {
-        that.showPromptModal((that.add ? '新增' : '编辑'), false, data.msg);
-      }
-    })
+    that.mainService
+      .coopData(that.add ? "addData" : "updData", "group2", data)
+      .subscribe((data) => {
+        that.hideCoopModal();
+        that.btnLoading = false;
+        that.initForm();
+        if (data.status == 200) {
+          that.showPromptModal(that.add ? "新增" : "编辑", true, "");
+        } else {
+          that.showPromptModal(that.add ? "新增" : "编辑", false, data.msg);
+        }
+      });
   }
 
   //删除modal
   delModal: boolean = false;
   showDelModal() {
-    if (!this.checkedGroup['groupName']) {
-      this.msg.create('warning', '请选择需要删除的分组！');
+    if (!this.checkedGroup["groupName"]) {
+      this.msg.create("warning", "请选择需要删除的分组！");
       return;
     }
     this.delModal = true;
@@ -320,16 +356,17 @@ export class GroupManagementComponent implements OnInit {
   confirmDel() {
     let that = this;
     that.btnLoading = true;
-    that.mainService.coopData('rmvData', 'group2', [that.checkedGroup['id']]).subscribe(data => {
-      that.hideDelModal();
-      that.btnLoading = false;
-      if (data.status == 200) {
-        that.showPromptModal('删除', true, '');
-      } else {
-        that.showPromptModal('删除', false, data.msg);
-      }
-    })
-
+    that.mainService
+      .coopData("rmvData", "group2", [that.checkedGroup["id"]])
+      .subscribe((data) => {
+        that.hideDelModal();
+        that.btnLoading = false;
+        if (data.status == 200) {
+          that.showPromptModal("删除", true, "");
+        } else {
+          that.showPromptModal("删除", false, data.msg);
+        }
+      });
   }
 
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
@@ -338,14 +375,10 @@ export class GroupManagementComponent implements OnInit {
     this.promptContent = con;
     this.ifSuccess = success;
     this.promptInfo = promptInfo;
+    this.osComponentRef1.osInstance().scroll({ x: 0, y: this.positionY });
     setTimeout(() => {
       this.promptModalShow = true;
       this.getGroupList();
     }, 100);
   }
-
-
-
-
-
 }

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -275,9 +275,8 @@ export class HushijiandanComponent implements OnInit {
   closeModel(e) {
     console.log(e);
     if (e === "other") {
-      this.getDeptTaskType("", "clear");
+      this.osComponentRef2.osInstance().scroll({ x: 0, y: this.positionY });
       this.getOrderList();
-      this.getSpecimenWorkOrderMsg();
     } else if (e === "bb") {
       this.getOrderList();
       this.getSpecimenWorkOrderMsg();
@@ -288,9 +287,9 @@ export class HushijiandanComponent implements OnInit {
   otherSearch = ""; //搜索的关键词
   oLoading = false;
   nLoading = false;
-  handleOffsetY=0;//记录其他建单Y轴滚动距离
+  positionY = 0; //记录其他建单Y轴滚动距离
   otherClick(item) {
-    this.handleOffsetY = this.osComponentRef2.osInstance().scroll().handleOffset.y;
+    this.positionY = this.osComponentRef2.osInstance().scroll().position.y; //内容滚动的距离
     this.selectOtherId = item.id;
     this.newShortcutOrder(item, "other");
   }
@@ -580,17 +579,16 @@ export class HushijiandanComponent implements OnInit {
               that.patientMsgList.push(e);
             }
           });
-          if (clear === "clear") {
-            this.otherSearch = "";
-            this.workOrderRemark = "";
-            this.customRemarks = [];
-            this.osComponentRef2.osInstance().scroll(this.handleOffsetY);
-            this.historyCustomRemarks = [];
-            let obj = that.othersList.find(
-              (item) => item.id == this.selectOtherId
-            );
-            obj && this.otherClick(obj);
-          }
+          // if (clear === "clear") {
+          //   this.otherSearch = "";
+          //   this.workOrderRemark = "";
+          //   this.customRemarks = [];
+          //   this.historyCustomRemarks = [];
+          //   let obj = that.othersList.find(
+          //     (item) => item.id == this.selectOtherId
+          //   );
+          //   obj && this.otherClick(obj);
+          // }
           console.log(this.selectOtherId);
           if (!this.selectOtherId) {
             if (that.othersList.length) {