录音盒

proxy.conf.json

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

src/app/components/bind-extension-number/bind-extension-number.component.html

@@ -0,0 +1,68 @@
+<!-- 绑定分机 -->
+<div class="init recallOrder display_flex justify-content_flex-center align-items_center">
+  <div class="con modalBody">
+    <div class="title">
+      绑定分机<i class="icon_transport transport-guanbi" (click)="cancelInit()"></i>
+    </div>
+    <div class="content">
+      <div class="scopeTab">
+        <div class="scopeTabItem" [ngClass]="{ active: item.value == activeScopeTab.value }" *ngFor="let item of scopeTabs" (click)="activeScopeTab = item">
+          <label nz-checkbox [(ngModel)]="item.checked" (ngModelChange)="changeFlag($event, item)">{{item.name}}</label>
+        </div>
+      </div>
+      <!-- 分机绑定 -->
+      <div class="conditions" *ngIf="activeScopeTab.value == 1">
+        <div nz-row class="row">
+          <div nz-col nzSpan="3" class="name">院区：</div>
+          <div nz-col nzSpan="21">
+            <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择院区" [(ngModel)]="formData1.hospital" (ngModelChange)="changeHospital($event)">
+              <ng-container *ngFor="let option of hospitalList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName" [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 nz-row class="row">
+          <div nz-col nzSpan="3" class="name">分机号：</div>
+          <div nz-col nzSpan="21">
+            <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择分机号" [(ngModel)]="formData1.number">
+              <ng-container *ngFor="let option of phoneNumList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.value" [nzValue]="option.value"></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>
+      <!-- 呼叫中心 -->
+      <div class="conditions" *ngIf="activeScopeTab.value == 2">
+        <div nz-row class="row">
+          <div nz-col nzSpan="3" class="name">分机号：</div>
+          <div nz-col nzSpan="21">
+            <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择分机号" [(ngModel)]="formData2.number">
+              <ng-container *ngFor="let option of hjzxCornetList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.value" [nzValue]="option.value"></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>
+    </div>
+    <div class="btns display_flex justify-content_flex-center">
+      <button class="btn" nz-button nzType="primary" [nzLoading]="websocketLoading" (click)="saveOrderScope()">
+        绑定
+      </button>
+      <button class="btn cancel" nz-button nzType="default" (click)="cancelInit()">
+        知道了
+      </button>
+    </div>
+  </div>
+</div>

src/app/components/bind-extension-number/bind-extension-number.component.less

@@ -0,0 +1,192 @@
+@import "../../../../src/theme.less";
+:host {
+  ::ng-deep .ant-checkbox-wrapper + .ant-checkbox-wrapper{
+    margin-left: 0!important;
+  }
+  .formItem {
+    width: 290px;
+  }
+  .name{
+    line-height: 32px;
+  }
+  .row{
+    margin-bottom: 24px!important;
+  }
+  .required{
+    position: relative;
+    &::before{
+      font-family: icon_transport;
+      font-size: 10px;
+      content:'\e606';
+      color: red;
+      position: absolute;
+      right: 100%;
+      top: 50%;
+      transform: translateY(-50%);
+      margin-right: 2px;
+    }
+  }
+  // 撤回工单
+  .recallOrder {
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.4);
+    z-index: 9999999;
+
+    .modalBody {
+      width: 350px;
+      height: 220px;
+      background: #fff;
+      border-radius: 5px;
+      padding: 10px 20px;
+      color: #333;
+
+      .title {
+        width: 100%;
+        text-align: center;
+        font-size: 18px;
+        position: relative;
+
+        i {
+          position: absolute;
+          right: 0;
+          top: 0;
+          font-size: 20px;
+          color: #666;
+          cursor: pointer;
+          padding: 0 5px;
+        }
+      }
+
+      .content {
+        width: 310px;
+        height: 117px;
+        background: #f9fafb;
+        border: 1px solid #e5e9ed;
+        border-radius: 5px;
+        overflow: hidden;
+        margin-top: 12px;
+
+        div {
+          text-align: center;
+          margin: 0;
+
+          &.icon {
+            margin-top: 17px;
+
+            i {
+              color: #ff3b53;
+              font-size: 30px !important;
+
+              &.transport-wenhao {
+                color: #f5a523;
+              }
+            }
+          }
+
+          &.defeat {
+            color: #333;
+            font-size: 18px;
+          }
+
+          &:nth-child(3) {
+            font-size: 14px;
+            color: #666;
+          }
+        }
+
+        .conditions {
+          height: 235px;
+          overflow: auto;
+          padding: 48px 80px;
+
+          div {
+            text-align: left;
+          }
+        }
+      }
+
+      .btns {
+        button {
+          margin-top: 10px;
+          margin-left: 5px;
+        }
+
+        .recDelBtn {
+          width: 115px;
+        }
+      }
+    }
+  }
+
+  // 初始化设置
+  .init {
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.4);
+    z-index: 99;
+
+    .con {
+      width: 832px;
+      height: auto;
+      background: #fff;
+      border-radius: 5px;
+      padding: 10px 20px;
+      color: #333;
+
+      .content {
+        width: 100%;
+        height: auto;
+
+        .scopeTab{
+          display: flex;
+          height: 60px;
+          border-bottom: 1px solid #D9D9D9;
+          .scopeTabItem{
+            flex: 1;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            border-right: 1px solid #D9D9D9;
+            background-color: #fff;
+            cursor: pointer;
+            &:last-of-type{
+              border-right: none;
+            }
+            &.active{
+              background-color: #F0F6ED;
+            }
+          }
+        }
+
+        .remin {
+          font-size: 14px;
+          color: #666;
+          line-height: 48px;
+          border-bottom: 1px solid #e5e9ed;
+        }
+
+        .boxes {
+          color: #333;
+          padding: 8px 12px;
+
+          & > div:nth-child(1) {
+            color: #333;
+            text-align: left;
+          }
+
+          & > div:nth-child(2) {
+            color: #666;
+            text-align: left;
+          }
+        }
+      }
+    }
+  }
+}

src/app/components/bind-extension-number/bind-extension-number.component.ts

@@ -0,0 +1,192 @@
+import { Component, OnInit, Output, Input } from '@angular/core';
+import { EventEmitter } 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 { WebsocketIncomingService } from 'src/app/services/websocket-incoming.service';
+import http from "../../../assets/js/http";
+
+@Component({
+  selector: 'app-bind-extension-number',
+  templateUrl: './bind-extension-number.component.html',
+  styleUrls: ['./bind-extension-number.component.less']
+})
+export class BindExtensionNumberComponent implements OnInit {
+  @Input() websocketLoading:boolean = false;
+  @Input() hsmsData:any = {
+    checkedHos: undefined,
+    scopeGroups: [],
+    orderScopeRadio: undefined,
+  }
+  @Input() itsmData:any = {
+    checkedHos: undefined,
+    scopeGroups: [],
+    orderScopeRadio: undefined,
+  }
+  @Output() confirmModal = new EventEmitter();
+  @Output() cancelModal = new EventEmitter();
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+    private icomingService: WebsocketIncomingService,
+  ) { }
+
+  user = JSON.parse(localStorage.getItem("user")); //用户信息
+  isLoading:boolean = false;
+  formData1:any = {};
+  formData2:any = {};
+  hospitalList:any[] = [];
+
+  // 工单范选项卡
+  scopeTabs:any[] = [
+    { name: '分机绑定', value: 1, checked: false },
+    { name: '呼叫中心', value: 2, checked: false },
+  ];
+  activeScopeTab = this.scopeTabs[0];
+
+  ngOnInit() {
+    console.log('itsmData', this.itsmData);
+    console.log('hsmsData', this.hsmsData);
+    this.getHospitalList();
+    this.getHjzxCornetList();
+    this.getCallCenterConfig();
+  }
+
+  // 获取院区列表
+  getHospitalList() {
+    // 工单范围
+    // 运维不限制部门，则取权限下的所有院区和部门
+    // 运维限制部门，则取运维选中的部门和配送选中的院区
+    if(this.itsmData.mdv2Switch){
+      // 开通运维
+      if(this.itsmData.allDuty === 1){
+        // 不限制部门
+        let hospitals = this.user.infoPermission.hospitals || [];
+        let dutyList = this.user.infoPermission.dutyList || [];
+        this.hospitalList = hospitals.concat(dutyList);
+      }else{
+        // 限制部门
+        if(this.hsmsData.hsmsSwitch){
+          // 开通配送
+          this.hospitalList = this.itsmData.checkedHos.concat(this.hsmsData.checkedHosDTO);
+        }else{
+          // 未开通配送
+          this.hospitalList = this.itsmData.checkedHos;
+        }
+      }
+    }else{
+      // 未开通运维
+      if(this.hsmsData.hsmsSwitch){
+        // 开通配送
+        this.hospitalList = [this.hsmsData.checkedHosDTO];
+      }else{
+        // 未开通配送
+        this.hospitalList = [];
+      }
+    }
+  }
+
+  //获取呼叫中心分机号码
+  hjzxCornetList:any[] = [];
+  getHjzxCornetList() {
+    this.isLoading = true;
+    this.mainService.getDictionary('list', 'hjzx_cornet').subscribe((data) => {
+      this.isLoading = false;
+      this.hjzxCornetList = data || [];
+    });
+  }
+
+  // 获取呼叫中心服务连接地址
+  callCenterConfigObj:any = {};
+  getCallCenterConfig() {
+    let data = {
+      idx: 0,
+      sum: 9999,
+      callCenterConfig: {},
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "callCenterConfig", data)
+      .subscribe((data) => {
+        if (data.status == 200) {
+          let list = data.list || [];
+          this.callCenterConfigObj = list.length ? list[0] : {};
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
+  }
+
+  // 修改院区
+  changeHospital(hosId){
+    this.phoneNumList = [];
+    this.getPhoneNumList(hosId);
+  }
+
+
+
+  // 修改选项卡-是否启动
+  changeFlag(flag, item){
+    if(flag){
+      this.scopeTabs.forEach(v => {
+        if(v.value != item.value){
+          v.checked = false;
+        }
+      })
+    }
+  }
+
+  //获取所有分机号码列表
+  phoneNumList:any[] = [];
+  getPhoneNumList(hosId) {
+    this.isLoading = true;
+    let postData = {
+      idx: 0,
+      sum: 100,
+      hospitalConfig: { hosId },
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "hospitalConfig", postData)
+      .subscribe((result) => {
+        this.isLoading = false;
+        this.phoneNumList = result.list.filter((item) => item.key.includes("phone_num_port") && item.value);
+        console.log('this.phoneNumList:', this.phoneNumList)
+      });
+  }
+
+  // 保存工单范围设置
+  saveOrderScope() {
+    let startObj = this.scopeTabs.find((item) => item.checked);
+    if(startObj){
+      if(startObj.value == 1){
+        // 录音盒
+        if(!this.formData1.number){
+          this.message.warning('请选择【分机绑定】分机号码')
+          return;
+        }
+        this.icomingService.setSign('box');
+        this.confirmModal.emit(this.formData1.number);
+      }else if(startObj.value == 2){
+        // 呼叫中心
+        if(!this.formData2.number){
+          this.message.warning('请选择【呼叫中心】分机号码')
+          return;
+        }
+        if(!this.callCenterConfigObj.socketUrl.trim()){
+          this.message.warning('呼叫中心服务连接地址未配置，请前往配置中心->三方配置中配置')
+          return;
+        }
+        this.icomingService.setSign('callCenter');
+        this.icomingService.setSocketUrl(`${http.wsName}://${this.callCenterConfigObj.socketUrl}`);
+        this.confirmModal.emit(this.formData2.number);
+      }
+    }else{
+      this.message.warning('请启动分机号码或呼叫中心')
+    }
+  }
+
+  // 关闭弹窗
+  cancelInit() {
+    this.cancelModal.emit();
+  }
+}

src/app/components/bind-extension-number/bind-extension-number.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { BindExtensionNumberComponent } from './bind-extension-number.component';
+import { ShareModule } from '../../share/share.module';
+
+
+@NgModule({
+  declarations: [
+    BindExtensionNumberComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+  ],
+  exports: [
+    BindExtensionNumberComponent,
+  ]
+})
+export class BindExtensionNumberModule { }

src/app/services/httpInterceptor.service.ts

@@ -38,7 +38,6 @@ export class HttpInterceptorService implements HttpInterceptor {
               this.message.info('登录失效，请重新登录！').onClose!.subscribe(() => {
                 localStorage.removeItem("user");
                 localStorage.removeItem("menu");
-                localStorage.removeItem("phones");
                 localStorage.removeItem("index");
                 this.router.navigate(['/login']);
               })

src/app/services/websocket-hjzx.service.ts

@@ -0,0 +1,122 @@
+/*
+ * @Author: seimin
+ * @Date: 2024-09-24 16:34:47
+ * @LastEditors: seimin
+ * @LastEditTime: 2024-09-24 16:38:01
+ * @Description: 呼叫中心websocket服务
+ */
+import { Injectable } from "@angular/core";
+import { Subject, Observable, from } from "rxjs";
+import * as Atmosphere from "atmosphere.js";
+
+@Injectable({
+  providedIn: "root",
+})
+export class WebsocketHjzxService {
+  constructor() { }
+  private lockReconnect = false; //避免ws重复连接
+  ws = null; //定义websocket
+  private url = ""; //ws连接地址
+  private urlParams; //ws连接传参
+  private isHandler = false; //是否手动
+  private subject;
+  private reconnectTimer = null;//重连的计时器
+  // 连接websocket
+  connectWs(url, data): Observable<any> {
+    this.url = url;
+    this.urlParams = data;
+    this.subject = new Subject<any>();
+    let request: any = {
+      webSocketUrl: url,
+      trackMessageLength: true, //校验数据完整性
+      transport: "websocket",
+      handleOnlineOffline: false,
+      suspend: false,
+      maxReconnectOnClose: 0,
+    };
+
+    request.onOpen = (response) => {
+      console.log("ws连接成功" + new Date().toLocaleString());
+      this.heartCheck.reset().start(this);
+      console.log(response);
+      this.ws.push(JSON.stringify(data));
+    };
+
+    request.onMessage = (response) => {
+      this.heartCheck.reset().start(this);
+      let message = response.responseBody;
+      try {
+        console.log("收到消息" + message);
+        if (message !== "pong") {
+          this.subject.next(JSON.parse(message));
+        }
+      } catch (e) {
+        console.log("This doesn't look like a valid JSON: ", message);
+        return;
+      }
+    };
+
+    request.onClose = (response) => {
+      console.log("ws连接关闭" + new Date().toLocaleString(), this.isHandler);
+      this.ws = null;
+      console.log(response)
+      if (!this.isHandler && response.status === 408) {
+        this.reconnect(this.url, this.urlParams);
+      }
+    };
+
+    request.onError = (response) => {
+      console.log("ws连接错误", this.isHandler);
+      this.ws = null;
+      if (response.status === 0) {
+        this.reconnect(this.url, this.urlParams);
+      }
+    };
+    this.ws = Atmosphere.subscribe(request);
+    return this.subject.asObservable();
+  }
+  //断线重连
+  private reconnect(url, data) {
+    if (this.lockReconnect) return;
+    this.lockReconnect = true;
+    this.reconnectTimer = setTimeout(() => {
+      //没连接上会一直重连，设置延迟避免请求过多
+      this.connectWs(url, data);
+      this.lockReconnect = false;
+    }, 15000);
+  }
+  private heartCheck = {
+    timeout: 30000, //发一次心跳的间隔时间
+    timeoutObj: null,
+    serverTimeoutObj: null,
+    reset: function () {
+      clearTimeout(this.timeoutObj);
+      clearTimeout(this.serverTimeoutObj);
+      return this;
+    },
+    start: function (_this) {
+      this.timeoutObj = setTimeout(() => {
+        //这里发送一个心跳，后端收到后，返回一个心跳消息，
+        //onmessage拿到返回的心跳就说明连接正常
+        if (_this.ws) {
+          _this.ws.push("ping");
+        }
+        this.serverTimeoutObj = setTimeout(() => {
+          //如果超过一定时间还没重置，说明后端主动断开了
+          _this.closeWs(); //如果onclose会执行reconnect，我们执行ws.close()就行了.如果直接执行reconnect 会触发onclose导致重连两次
+        }, this.timeout);
+      }, this.timeout);
+    },
+  };
+
+  // 断开websocket
+  closeWs(flag: boolean = false) {
+    this.isHandler = flag;
+    if (flag) {
+      clearTimeout(this.reconnectTimer);
+    }
+    if (this.ws) {
+      this.ws.close();
+    }
+  }
+}

src/app/services/websocket-incoming.service.ts

@@ -0,0 +1,99 @@
+/*
+ * @Author: seimin
+ * @Date: 2024-09-24 16:34:47
+ * @LastEditors: seimin
+ * @LastEditTime: 2024-09-26 11:09:46
+ * @Description: 来电弹屏websocket服务
+ */
+import { Injectable } from "@angular/core";
+import { Observable } from "rxjs";
+import { WebsocketPhoneService } from './websocket-phone.service';
+import { WebsocketHjzxService } from './websocket-hjzx.service';
+import { MainService } from './main.service';
+import http from "../../assets/js/http";
+
+@Injectable({
+  providedIn: "root",
+})
+export class WebsocketIncomingService {
+  constructor(
+    private mainService: MainService,
+    private phoneService: WebsocketPhoneService,
+    private hjzxService: WebsocketHjzxService,
+  ) { }
+
+  // 连接websocket { userCount }
+  private user = JSON.parse(localStorage.getItem("user")); //用户信息
+  connectWs(): Observable<any> {
+    let userCount = this.user.user.account + "|" + this.getPhoneNumber();
+    if(this.getSign() === 'box'){
+      return this.phoneService.connectWs(http.phoneWs, { userCount });
+    }else if(this.getSign() === 'callCenter'){
+      return this.hjzxService.connectWs(this.getSocketUrl(), { userCount });
+    }
+  }
+  // 断开websocket
+  closeWs(flag: boolean = false) {
+    console.log('sign', this.getSign())
+    if(this.getSign() === 'box'){
+      this.phoneService.closeWs(flag);
+    }else if(this.getSign() === 'callCenter'){
+      this.hjzxService.closeWs(flag);
+    }
+  }
+
+  // 绑定的分机号码
+  private phoneNumber:string = '';
+  // 获取绑定分机号码
+  getPhoneNumber() {
+    return this.phoneNumber || localStorage.getItem('phoneNumber');
+  }
+  // 设置绑定分机号码
+  setPhoneNumber(phoneNumber: string) {
+    this.phoneNumber = phoneNumber;
+    localStorage.setItem('phoneNumber', phoneNumber);
+  }
+  // 删除绑定分机号码
+  removePhoneNumber() {
+    this.phoneNumber = '';
+    localStorage.removeItem('phoneNumber');
+
+    this.removeSign();
+    this.removeSocketUrl();
+  }
+
+  // 标识(呼叫中心或录音盒)
+  // callCenter|box
+  private sign:string = '';
+  // 获取绑定标识
+  getSign() {
+    return this.sign || localStorage.getItem('sign');
+  }
+  // 设置绑定标识
+  setSign(sign: string) {
+    this.sign = sign;
+    localStorage.setItem('sign', sign);
+  }
+  // 删除绑定标识
+  removeSign() {
+    this.sign = '';
+    localStorage.removeItem('sign');
+  }
+
+  // 呼叫中心服务地址
+  private socketUrl:string = '';
+  // 获取呼叫中心服务地址
+  getSocketUrl() {
+    return this.socketUrl || localStorage.getItem('socketUrl');
+  }
+  // 设置呼叫中心服务地址
+  setSocketUrl(socketUrl: string) {
+    this.socketUrl = socketUrl;
+    localStorage.setItem('socketUrl', socketUrl);
+  }
+  // 删除呼叫中心服务地址
+  removeSocketUrl() {
+    this.socketUrl = '';
+    localStorage.removeItem('socketUrl');
+  }
+}

src/app/services/websocket-phone.service.ts

@@ -1,3 +1,10 @@
+/*
+ * @Author: seimin
+ * @Date: 2024-03-11 11:11:09
+ * @LastEditors: seimin
+ * @LastEditTime: 2024-09-24 16:38:23
+ * @Description: 录音盒websocket服务
+ */
 import { Injectable } from "@angular/core";
 import { Subject, Observable, from } from "rxjs";
 import * as Atmosphere from "atmosphere.js";

src/app/type/types.ts

@@ -11,6 +11,7 @@ export enum SourceId {
  * 接口地址
  */
 export interface baseUrlType {
+  wsName: string;//ws/wss
   domain: string; //chrome下载地址
   host: string; //接口地址
   specimenViewHost: string; //业务视图地址

src/app/views/fuwutai/fuwutai.component.html

@@ -22,7 +22,7 @@
     <div class="message_cot">
       <!-- 配送人员信息 -->
       <div class="cot_hid" [style.height]="cotHeight + 'px'">
-        <ng-container *ngIf="!wLoading && (typeData.type === 1 || typeData.type === 2)">
+        <ng-container *ngIf="!wLoading && typeData && (typeData.type === 1 || typeData.type === 2)">
           <div id="cotAll" class="cot_all" *ngIf="patientCareCol != 6">
             <div [ngClass]="{cot: true, fourCol: patientCareCol == 4, sevenCol: patientCareCol == 7}" *ngFor="let data of workerMessage">
               <div class="first" *ngIf="data">
@@ -47,7 +47,7 @@
             </div>
           </div>
         </ng-container>
-        <ng-container *ngIf="!wLoading && typeData.type === 3">
+        <ng-container *ngIf="!wLoading && typeData && typeData.type === 3">
           <div id="cotAll" class="cot_all">
             <div [ngClass]="{cot: true, sevenCol: true}" *ngFor="let data of workerMessage">
               <div class="first" *ngIf="data">
@@ -717,59 +717,6 @@
   <!-- 右侧悬浮框 -->
   <div id="fixedMenu" class="fixed">
     <div class="left" *ngIf="fixedTab != '' && showLastItems && fixedTab != 'newOrder' && fixedTab != 'toSystem' && fixedTab != 'logout'">
-      <!-- 绑定分机 -->
-      <div class="con bindingExtension" *ngIf="fixedTab == 'bindingExtension' && fixedTab != 'newOrder' && !phoneNumLoading">
-        <div class="title">绑定分机</div>
-        <overlay-scrollbars #osComponentRef7 [ngStyle]="{ height: '152px' }" class="conditions">
-          <div nz-row *ngIf="binding === 1">
-            <div nz-col nzSpan="24">
-              <div nz-row>
-                <nz-checkbox-wrapper class="w100" (nzOnChange)="changePhones($event)">
-                  <div nz-row>
-                    <div *ngFor="let data of phoneNumList" nz-col nzSpan="8">
-                      <label nz-checkbox [nzValue]="data.value" [ngModel]="data.checked">分机{{ data.value }}</label>
-                    </div>
-                  </div>
-                </nz-checkbox-wrapper>
-              </div>
-            </div>
-          </div>
-          <div nz-row *ngIf="binding === 2">
-            <div nz-col nzSpan="6">已绑定分机号：</div>
-            <div class="bindingExtension_content" nz-col nzSpan="24">
-              <span *ngFor="let data of phoneNumListBind; let last = last">
-                <span style="color: #333" *ngIf="!last">分机{{ data }}、</span>
-                <span style="color: #333" *ngIf="last">分机{{ data }}</span>
-              </span>
-            </div>
-          </div>
-          <div nz-row *ngIf="binding === 3">
-            <div nz-col nzSpan="24" class="noContentFlex">
-              <img class="noContent" src="../../assets/images/icon_jianchakong@big.png" alt="" />
-              <p>暂未绑定分机号</p>
-            </div>
-          </div>
-        </overlay-scrollbars>
-        <div class="btns display_flex justify-content_flex-center">
-          <button nz-button nzType="primary" nzValue="small" (click)="bindingHandle()" *ngIf="binding === 3">
-            绑定分机
-          </button>
-          <button nz-button nzType="primary" nzValue="small" (click)="bindingHandle()" *ngIf="binding === 2">
-            重新绑定
-          </button>
-          <button nz-button nzType="primary" nzValue="small" *ngIf="binding === 1" (click)="bindingOk()" [nzLoading]="bindOkLoading">
-            确定绑定
-          </button>
-        </div>
-      </div>
-      <div class="con bindingExtension display_flex justify-content_flex-center align-items_center" *ngIf="fixedTab == 'bindingExtension' && fixedTab != 'newOrder' && phoneNumLoading">
-        <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 class="con" *ngIf="fixedTab == 'colType' && fixedTab != 'newOrder'">
         <div class="title">展示形式</div>
@@ -970,76 +917,67 @@
       </div>
     </div>
     <div class="right">
-      <div class="fixedMenu hujiaozhongxin" *ngIf="hsmsData.hsmsSwitch || itsmData.mdv2Switch">
+      <div class="fixedMenuWrap">
+        <div class="fixedMenu" *ngIf="incomingService.getPhoneNumber()">
+          <div class="menuItems">
+            <div class="item itemLink ellipsis-oneline cursorDefault w100" nz-tooltip [nzTooltipTitle]="incomingService.getPhoneNumber()">
+              {{incomingService.getPhoneNumber()}}
+            </div>
+          </div>
+        </div>
+        <div class="fixedMenu" *ngIf="incomingService.getPhoneNumber() && incomingService.getSign() === 'box'">
+          <div class="menuItems">
+            <i class="icon_transport transport-shixian call-icon"></i>
+          </div>
+        </div>
+        <div class="fixedMenu" hidden>
+          <div class="menuItems">
+            <button nz-button nzType="link" class="item itemLink call-status">
+              示闲
+            </button>
+          </div>
+        </div>
+      </div>
+      <div class="fixedMenu" *ngIf="hsmsData.hsmsSwitch || itsmData.mdv2Switch">
         <div class="menuItems">
-          <button
-            nz-button
-            nzType="link"
-            class="item itemLink"
-            (click)="showNewOrder()"
-            [nzLoading]="getConfigTasktypeLoading || patientLogTasktypeLoading"
-          >
+          <button nz-button nzType="link" class="item itemLink" (click)="showNewOrder()" [nzLoading]="getConfigTasktypeLoading || patientLogTasktypeLoading">
             新建工单
           </button>
         </div>
       </div>
+      <div class="fixedMenu" *ngIf="!incomingService.getPhoneNumber()">
+        <div class="menuItems">
+          <button nz-button nzType="link" class="item itemLink" (click)="showBindExtensionNumber()">
+            绑定分机
+          </button>
+        </div>
+      </div>
+      <div class="fixedMenu" *ngIf="incomingService.getPhoneNumber()">
+        <div class="menuItems">
+          <button nz-button nzType="link" class="item itemLink" (click)="checkOut()">
+            签出
+          </button>
+        </div>
+      </div>
       <div class="fixedMenu">
         <div class="menuItems">
-          <div
-            class="others"
-            [ngStyle]="{
-              height: showLastItems
-                ? mainRole
-                  ? 35 * 6 + 'px'
-                  : 35 * 5 + 'px'
-                : 0
-            }"
-          >
-            <div
-              [ngClass]="{
-                item: true,
-                checked: fixedTab == 'bindingExtension'
-              }"
-              (click)="showBindingExtension()"
-            >
-              绑定分机
-            </div>
-            <div
-              [ngClass]="{ item: true, checked: fixedTab == 'orderScope' }"
-              (click)="showOrderScope()"
-            >
+          <div class="others" [ngStyle]="{ height: showLastItems ? mainRole ? 35 * 6 + 'px' : 35 * 5 + 'px' : 0 }">
+            <div [ngClass]="{ item: true, checked: fixedTab == 'orderScope' }" (click)="showOrderScope()">
               工单范围
             </div>
-            <div
-              [ngClass]="{ item: true, checked: fixedTab == 'colType' }"
-              (click)="checkFixedTab('colType')"
-            >
+            <div [ngClass]="{ item: true, checked: fixedTab == 'colType' }" (click)="checkFixedTab('colType')">
               展示形式
             </div>
-            <div
-              [ngClass]="{ item: true, checked: fixedTab == 'nucleicAcidPrinting' }"
-              (click)="checkFixedTab('nucleicAcidPrinting')"
-              *ngIf="isShowNucleicAcidPrinting"
-            >
+            <div [ngClass]="{ item: true, checked: fixedTab == 'nucleicAcidPrinting' }" (click)="checkFixedTab('nucleicAcidPrinting')" *ngIf="isShowNucleicAcidPrinting">
               核酸打印
             </div>
-            <div
-              [ngClass]="{ item: true, checked: fixedTab == 'queueNum' }"
-              (click)="checkFixedTab('queueNum')"
-            >
+            <div [ngClass]="{ item: true, checked: fixedTab == 'queueNum' }" (click)="checkFixedTab('queueNum')">
               叫号信息
             </div>
-            <div
-              [ngClass]="{ item: true, checked: fixedTab == 'toSystem' }"
-              *ngIf="mainRole"
-              (click)="checkFixedTab('toSystem')"
-            >
+            <div [ngClass]="{ item: true, checked: fixedTab == 'toSystem' }" *ngIf="mainRole" (click)="checkFixedTab('toSystem')">
               返回系统
             </div>
-            <div
-              [ngClass]="{ item: true, checked: fixedTab == 'logout' }"
-              (click)="checkFixedTab('logout')"
-            >
+            <div [ngClass]="{ item: true, checked: fixedTab == 'logout' }" (click)="checkFixedTab('logout')">
               退出系统
             </div>
           </div>
@@ -1171,7 +1109,6 @@
             </nz-select>
           </div>
           <div class="newTopItem">
-            <span class="tel grayFont" *ngIf="callNumber">来电号码：{{ callNumber }}</span>
             <span class="grayFont">任务类型：</span>
             <nz-select *ngIf="applyDept" style="width: 146px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="onSearchTaskBuild($event)" nzPlaceHolder="请选择任务类型" [(ngModel)]="taskBuild" (ngModelChange)="changeTaskBuild($event)">
               <ng-container *ngFor="let option of searchTaskList">
@@ -1183,6 +1120,9 @@
               </nz-option>
             </nz-select>
           </div>
+          <div class="newTopItem">
+            <span class="grayFont">来电电话：{{callNumber}}</span>
+          </div>
         </div>
       </div>
       <div class="title" *ngIf="currentTabIndex === '99999'">
@@ -2364,6 +2304,8 @@
     content="您确认要退出系统吗？"
   ></app-dialog-delete>
 </div>
+<!-- 绑定分机 -->
+<app-bind-extension-number [hsmsData]="hsmsData" [itsmData]="itsmData" [websocketLoading]="websocketLoading" *ngIf="showBindExtensionNumberModal" (confirmModal)="checkIn($event)" (cancelModal)="cancelBindExtensionNumber($event)"></app-bind-extension-number>
 <!-- 工单范围 -->
 <app-order-scope *ngIf="showInitModal" [hsmsData]="hsmsData" [itsmData]="itsmData" (confirmModal)="confirmOrderScope($event)" (cancelModal)="cancelOrderScope($event)"></app-order-scope>
 <!-- 消息弹框模板 -->

src/app/views/fuwutai/fuwutai.component.less

@@ -1715,19 +1715,35 @@
       position: relative;
       z-index: 8;
 
+      .fixedMenuWrap{
+        border-radius: 5px;
+        margin-bottom: 16px;
+        .fixedMenu{
+          border-radius: 0!important;
+          &:last-of-type{
+            border: none!important;
+          }
+        }
+      }
+
       .fixedMenu {
         border: 1px solid #e5e9ed;
         color: @primary-color;
         background: rgb(255, 255, 255);
         text-align: center;
         border-radius: 5px 0 0 5px;
-        // box-shadow: -3px 4px 15px rgba(234, 233, 233, .5);
-
-        &.hujiaozhongxin {
-          margin-bottom: 5px;
-        }
 
         .menuItems {
+          .call-icon{
+            font-size: 26px;
+            color: @primary-color;
+            padding: 16px 0;
+          }
+          .call-status{
+            background-color: @primary-color;
+            color: #fff;
+            width: 100%;
+          }
           .item {
             height: 35px;
             line-height: 35px;

src/app/views/fuwutai/fuwutai.component.ts

@@ -24,6 +24,7 @@ import { addDays, differenceInCalendarDays, getHours, getMinutes, setMinutes, pa
 import { UploadFile } from 'ng-zorro-antd';
 import { HttpRequest, HttpClient, HttpResponse } from '@angular/common/http';
 import cloneDeep from 'lodash-es/cloneDeep'
+import { WebsocketIncomingService } from 'src/app/services/websocket-incoming.service';
 
 // 日期禁用
 function range(start: number, end: number): number[] {
@@ -110,6 +111,7 @@ export class FuwutaiComponent implements OnInit {
     private tool: ToolService,
     private http: HttpClient,
     public route: ActivatedRoute,
+    public incomingService: WebsocketIncomingService,
   ) {}
   validateFormZy!: FormGroup;
   validateFormQt!: FormGroup;
@@ -145,13 +147,6 @@ export class FuwutaiComponent implements OnInit {
   targetDept; //目标科室
   noArrives = []; //未到达列表
   newLoading = false; //loading
-  //绑定分机
-  bindingExtensionShow = false; //展示/隐藏绑定分机弹框
-  binding = -1; //1-确定绑定，2-重新绑定，3-绑定分机
-  phoneNumList = []; //所有分机列表
-  phoneNumListBind = []; //已绑定分机列表
-  phoneNumListSelected = []; //选中的分机列表
-  phoneNumLoading = false; //分机弹窗切换页面loading
   //防抖
   changeInpSubject = new Subject();
   changeCommonInpSubject = new Subject();
@@ -229,7 +224,7 @@ export class FuwutaiComponent implements OnInit {
     types = types.slice(0, types.length - 1);
     let postData = {
       workOrder: {
-        serTaskTypes: types || "null",
+        serTaskTypes: types || undefined,
         serGdState: 1,
         range: this.orderScopeRadio,
         platform: 3,
@@ -436,7 +431,7 @@ export class FuwutaiComponent implements OnInit {
           if (go === "&go&") {
             this.applyDept = data["startDept"].id;
             this.applyStartDept = data["startDept"];
-            this.callNumber = data["phone"];
+            this.incidentModel.incomingPhone = this.callNumber = data["phone"];
             this.showPromptModal("建单", true, "", "closeGo");
           } else {
             this.showPromptModal("建单", true, "", "close");
@@ -471,7 +466,7 @@ export class FuwutaiComponent implements OnInit {
         if (go === "&go&") {
           this.applyDept = data["startDept"].id;
           this.applyStartDept = data["startDept"];
-          this.callNumber = data["phone"];
+          this.incidentModel.incomingPhone = this.callNumber = data["phone"];
           this.showPromptModal("建单", true, "", "closeGo");
         } else {
           this.showPromptModal("建单", true, "", "close");
@@ -530,7 +525,7 @@ export class FuwutaiComponent implements OnInit {
         if (go === "&go&") {
           this.applyDept = data["startDept"].id;
           this.applyStartDept = data["startDept"];
-          this.callNumber = data["phone"];
+          this.incidentModel.incomingPhone = this.callNumber = data["phone"];
           this.showPromptModal("建单", true, "", "closeGo");
         } else {
           this.showPromptModal("建单", true, "", "close");
@@ -696,7 +691,6 @@ export class FuwutaiComponent implements OnInit {
     this.initRole();
     this.initLogin();
     this.retract();
-    this.windowResize();
     this.refresh();
     this.initOrderScope();
     this.getOrderList(1);
@@ -715,7 +709,7 @@ export class FuwutaiComponent implements OnInit {
     document.removeEventListener("keydown", this.quickShowNewOrder.bind(this));
     this.quickShowNewOrder = null;
     clearTimeout(this.refreshTimerId);
-    this.phones.closeWs(true);
+    this.incomingService.closeWs(true);
     this.sers.closeWs(true);
   }
   ngAfterViewInit() {
@@ -800,6 +794,7 @@ export class FuwutaiComponent implements OnInit {
 
   // 工单范围设置回显
   checkedHos;// 配送-院区选择
+  checkedHosDTO;// 配送-院区选择
   scopeGroups = []; //配送-当前所属人员分组
   orderScopeRadio;// 配送-工单范围
 
@@ -825,6 +820,7 @@ export class FuwutaiComponent implements OnInit {
     }
     let scopeInfo = this.user.user.scope;
     this.checkedHos = scopeInfo.hospitalId ? scopeInfo.hospitalId.id : undefined;
+    this.checkedHosDTO = scopeInfo.hospitalId || undefined;
     this.orderScopeRadio = scopeInfo.range + "";
     let groupIds = scopeInfo.groupIds || [];
     let dutyGroupList = scopeInfo.dutyGroupList || [];
@@ -834,6 +830,7 @@ export class FuwutaiComponent implements OnInit {
     }
     this.hsmsData = {
       checkedHos: this.checkedHos,
+      checkedHosDTO: this.checkedHosDTO,
       scopeGroups: this.scopeGroups,
       orderScopeRadio: this.orderScopeRadio || '0',
       hsmsSwitch: scopeInfo.hsmsSwitch === 1,
@@ -865,7 +862,7 @@ export class FuwutaiComponent implements OnInit {
       this.cancelOrderScope();
       this.showPromptModal("保存", true, "");
       // 关闭phone的websocket
-      this.phones.closeWs(true);
+      this.incomingService.closeWs(true);
       this.getPhoneNum(false);
       this.user.user.scope = data.data;
       localStorage.setItem("user", JSON.stringify(this.user));
@@ -886,6 +883,28 @@ export class FuwutaiComponent implements OnInit {
     this.showInitModal = true;
   }
 
+  // 绑定分机
+  showBindExtensionNumberModal: boolean = false;
+  cancelBindExtensionNumber() {
+    this.showBindExtensionNumberModal = false;
+  }
+
+  showBindExtensionNumber() {
+    this.showBindExtensionNumberModal = true;
+  }
+
+  // 保存绑定分机-签入
+  checkIn(phoneNumber){
+    this.incomingService.setPhoneNumber(phoneNumber);
+    this.incomingService.closeWs(true);
+    this.getWebsocketPhone();
+  }
+
+  // 签出
+  checkOut(){
+    this.showDelModal(undefined, undefined,'您确认要签出吗？','签出','checkout');
+  }
+
   // 连接websocket
   getWebsocketSer() {
     this.sers
@@ -895,94 +914,128 @@ export class FuwutaiComponent implements OnInit {
         if (result && result.content) {
           this.createBasicNotification(result);
         }
-        this.windowResize();
       });
   }
-  // 连接websocket---phone
-  bindOkLoading = false;
+
+  // 连接websocket
+  websocketLoading:boolean = false; //websocket连接状态
   getWebsocketPhone() {
-    this.bindOkLoading = true;
-    let userCount =
-      this.user.user.account + "|" + this.phoneNumListSelected.join("_");
-    this.phones.connectWs(http.phoneWs, { userCount }).subscribe((data) => {
-      // data = { status: 201, phone: '013581394341' };//ceshi
-      console.log(data);
-      this.bindOkLoading = false;
-      if (data.status == 200 && data.phone) {
-        localStorage.setItem("phones", data.phone);
-        this.phoneNumListBind = data.phone.split("_");
-        this.phoneNumListBind.forEach((item) => {
-          let obj = this.phoneNumList.find((item1) => item1.value === item);
-          if (obj) {
-            obj.checked = true;
-          }
-        });
-        this.binding = 2;
-      } else if (data.status == 201 && data.phone) {
-        let dataObj = {
-          idx: 0,
-          sum: 10,
-          department: {
-            searchType: 2,
-            phone: data.phone,
-          },
-        };
-        this.mainService
-          .getFetchDataList("data", "department", dataObj)
-          .subscribe((result) => {
-            if (result.status == 200) {
-              console.log(result);
-              if (result.list.length > 0) {
-                //绑定了科室
-                // this.callNumber = '';
-                if (!this.newOrderShow && !this.newOrderShowOpen) {
-                  this.applyDeptMiddle = result.list[0];
-                  this.showNewOrder("yes");
-                }
-                // this.changeApplicationDepartment();
-              } else {
-                //没绑定科室
-                // this.callNumber = '';
-                console.log(this.newOrderShow);
-                if (!this.newOrderShow && !this.newOrderShowOpen) {
-                  this.applyDept = null;
-                  this.showNewOrder("no", data.phone);
+    this.websocketLoading = true;
+    this.incomingService.connectWs().subscribe((data) => {
+      const sign = this.incomingService.getSign();
+      if(sign === 'box'){
+        // 录音盒
+        // data = { status: 201, phone: '013581394341' };//ceshi
+        console.log(data);
+        this.websocketLoading = false;
+        this.incidentModel.callID = data.callId || undefined;
+        if (data.status == 200 && data.phone) {
+          this.msg.info('签入成功');
+          this.cancelBindExtensionNumber();
+        } else if (data.status == 201 && data.phone) {
+          this.incidentModel.incomingPhone = this.callNumber = data.phone;
+          let dataObj = {
+            idx: 0,
+            sum: 10,
+            department: {
+              searchType: 2,
+              phone: data.phone,
+            },
+          };
+          this.mainService
+            .getFetchDataList("data", "department", dataObj)
+            .subscribe((result) => {
+              if (result.status == 200) {
+                console.log(result);
+                if (result.list.length > 0) {
+                  //绑定了科室
+                  if (!this.newOrderShow && !this.newOrderShowOpen) {
+                    this.applyDeptMiddle = result.list[0];
+                    this.showNewOrder("yes", data.phone, true);
+                  }
+                } else {
+                  //没绑定科室
+                  console.log(this.newOrderShow);
+                  if (!this.newOrderShow && !this.newOrderShowOpen) {
+                    this.applyDept = null;
+                    this.showNewOrder("no", data.phone, true);
+                  }
                 }
-                // this.changeApplicationDepartment(data.phone);
               }
-            }
-          });
-      } else if (data.status == 201 && data.phone === "") {
-        //没绑定科室
-        // this.callNumber = '';
-        if (!this.newOrderShow && !this.newOrderShowOpen) {
-          this.applyDept = null;
-          this.showNewOrder("no", data.phone);
+            });
+        } else if (data.status == 201 && data.phone === "") {
+          //没绑定科室
+          if (!this.newOrderShow && !this.newOrderShowOpen) {
+            this.applyDept = null;
+            this.showNewOrder("no", data.phone, true);
+          }
         }
-        // this.changeApplicationDepartment(data.phone);
+      }else if(sign === 'callCenter'){
+        // 呼叫中心
+        console.log(data);
+        this.websocketLoading = false;
+        // this.incidentModel.callID = data.callId || undefined;
+        // if (data.status == 200 && data.phone) {
+        //   this.cancelBindExtensionNumber();
+        // } else if (data.status == 201 && data.phone) {
+        //   let dataObj = {
+        //     idx: 0,
+        //     sum: 10,
+        //     department: {
+        //       searchType: 2,
+        //       phone: data.phone,
+        //     },
+        //   };
+        //   this.mainService
+        //     .getFetchDataList("data", "department", dataObj)
+        //     .subscribe((result) => {
+        //       if (result.status == 200) {
+        //         console.log(result);
+        //         if (result.list.length > 0) {
+        //           //绑定了科室
+        //           if (!this.newOrderShow && !this.newOrderShowOpen) {
+        //             this.applyDeptMiddle = result.list[0];
+        //             this.showNewOrder("yes");
+        //           }
+        //         } else {
+        //           //没绑定科室
+        //           console.log(this.newOrderShow);
+        //           if (!this.newOrderShow && !this.newOrderShowOpen) {
+        //             this.applyDept = null;
+        //             this.showNewOrder("no", data.phone);
+        //           }
+        //         }
+        //       }
+        //     });
+        // } else if (data.status == 201 && data.phone === "") {
+        //   //没绑定科室
+        //   if (!this.newOrderShow && !this.newOrderShowOpen) {
+        //     this.applyDept = null;
+        //     this.showNewOrder("no", data.phone);
+        //   }
+        // }
       }
-      this.windowResize();
     });
   }
   //确定绑定
-  bindingOk() {
-    if (this.phoneNumListSelected.length > 0) {
-      this.phones.closeWs(true);
-      this.getWebsocketPhone();
-    } else {
-      localStorage.removeItem("phones");
-      this.binding = 3;
-      this.phoneNumListBind = [];
-      this.phoneNumList.forEach((item) => {
-        item.checked = false;
-      });
-      this.phones.closeWs(true);
-    }
-  }
+  // bindingOk() {
+  //   if (this.phoneNumListSelected.length > 0) {
+  //     this.incomingService.closeWs(true);
+  //     this.getWebsocketPhone();
+  //   } else {
+  //     this.incomingService.removePhoneNumber();
+  //     this.binding = 3;
+  //     this.phoneNumListBind = [];
+  //     this.phoneNumList.forEach((item) => {
+  //       item.checked = false;
+  //     });
+  //     this.incomingService.closeWs(true);
+  //   }
+  // }
   // 选择分机
-  changePhones(value) {
-    this.phoneNumListSelected = value;
-  }
+  // changePhones(value) {
+  //   this.phoneNumListSelected = value;
+  // }
 
   onChange(value: number): void {
     console.log(`onChange: ${value}`);
@@ -1256,53 +1309,54 @@ export class FuwutaiComponent implements OnInit {
     let that = this;
     that.typeId = typeId;
     this.typeData = this.scopeGroups.find(v => v.id === typeId);
-    let type = this.typeData.type;
-    // 配送
-    if(type === 1 || type === 2){
-      let postData = {
-        groups: [typeId],
-        idx: 0,
-        sum: 100,
-        hosId: this.checkedHos,
-      };
-      // if (typeId == -1) {
-      //   let groups = [];
-      //   that.scopeGroups.forEach((e) => {
-      //     groups.push(e.id);
-      //   });
-      //   postData.groups = groups;
-      // }
-      if (this.hurseInfoHiding == '1'){
-        that.workerMessage = [];
-        that.initTopCount();
-        return;
+    if(this.typeData){
+      let type = this.typeData.type;
+      // 配送
+      if(type === 1 || type === 2){
+        let postData = {
+          groups: [typeId],
+          idx: 0,
+          sum: 100,
+          hosId: this.checkedHos,
+        };
+        // if (typeId == -1) {
+        //   let groups = [];
+        //   that.scopeGroups.forEach((e) => {
+        //     groups.push(e.id);
+        //   });
+        //   postData.groups = groups;
+        // }
+        if (this.hurseInfoHiding == '1'){
+          that.workerMessage = [];
+          that.initTopCount();
+          return;
+        }
+        this.wLoading = true;
+        that.mainService.getSerInfo("getWorkInfo", postData).subscribe((data) => {
+          this.wLoading = false;
+          that.workerMessage = data.data ? data.data : [];
+          that.initTopCount();
+        });
       }
-      this.wLoading = true;
-      that.mainService.getSerInfo("getWorkInfo", postData).subscribe((data) => {
-        this.wLoading = false;
-        that.workerMessage = data.data ? data.data : [];
-        that.initTopCount();
-      });
-    }
 
-    // 运维
-    if(type === 3){
-      let postData = {
-        groups: [typeId],
-      };
-      if (this.hurseInfoHiding == '1'){
-        that.workerMessage = [];
-        that.initTopCount();
-        return;
+      // 运维
+      if(type === 3){
+        let postData = {
+          groups: [typeId],
+        };
+        if (this.hurseInfoHiding == '1'){
+          that.workerMessage = [];
+          that.initTopCount();
+          return;
+        }
+        this.wLoading = true;
+        that.mainService.incidentUserTaskCount(postData).subscribe((data:any) => {
+          this.wLoading = false;
+          that.workerMessage = data.data ? data.data : [];
+          that.initTopCount();
+        });
       }
-      this.wLoading = true;
-      that.mainService.incidentUserTaskCount(postData).subscribe((data:any) => {
-        this.wLoading = false;
-        that.workerMessage = data.data ? data.data : [];
-        that.initTopCount();
-      });
     }
-
   }
 
   // 获取回访列表
@@ -1313,7 +1367,7 @@ export class FuwutaiComponent implements OnInit {
       sum: 1,
       incident: {
         "groupIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.scopeGroups.map(v => v.id).toString() || undefined),
-        "hosIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.checkedHos.map(v => v.id).toString() || undefined),
+        "dutyIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.checkedHos.map(v => v.id).toString() || undefined),
         "urgentType": +this.itsmData.orderScopeRadio + 1,
         "queryTask": "callback",
         "assignee": this.tool.getCurrentUserId(),
@@ -1383,7 +1437,7 @@ export class FuwutaiComponent implements OnInit {
 
         postData.workOrderQuery = {
           workOrder: {
-            serTaskTypes: types || "null",
+            serTaskTypes: types || undefined,
             serGdState: stateId,
             range: this.orderScopeRadio,
             platform: 3,
@@ -1408,7 +1462,7 @@ export class FuwutaiComponent implements OnInit {
       if(stateId == 1){
         postData.incidentQuery.incident = {
           "groupIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.scopeGroups.map(v => v.id).toString() || undefined),
-          "hosIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.checkedHos.map(v => v.id).toString() || undefined),
+          "dutyIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.checkedHos.map(v => v.id).toString() || undefined),
           "urgentType": +this.itsmData.orderScopeRadio + 1,
           "queryTask": "storageAccept",
           "assignee": this.tool.getCurrentUserId(),
@@ -1417,7 +1471,7 @@ export class FuwutaiComponent implements OnInit {
       }else if(stateId == 2){
         postData.incidentQuery.incident = {
           "groupIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.scopeGroups.map(v => v.id).toString() || undefined),
-          "hosIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.checkedHos.map(v => v.id).toString() || undefined),
+          "dutyIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.checkedHos.map(v => v.id).toString() || undefined),
           "urgentType": +this.itsmData.orderScopeRadio + 1,
           "queryTask": "todoReassign",
           "deleteFlag": 0,
@@ -1425,7 +1479,7 @@ export class FuwutaiComponent implements OnInit {
       }else if(stateId == 3){
         postData.incidentQuery.incident = {
           "groupIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.scopeGroups.map(v => v.id).toString() || undefined),
-          "hosIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.checkedHos.map(v => v.id).toString() || undefined),
+          "dutyIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.checkedHos.map(v => v.id).toString() || undefined),
           "urgentType": +this.itsmData.orderScopeRadio + 1,
           "queryTask": "doing",
           "assignee": this.tool.getCurrentUserId(),
@@ -1491,21 +1545,6 @@ export class FuwutaiComponent implements OnInit {
       });
   }
 
-  // 页面resize
-  windowResize() {
-    let fixedMenu = document.getElementById("fixedMenu");
-    if (!fixedMenu) return;
-    window.addEventListener("resize", () => {
-      let wh = window.innerHeight;
-      let _y = parseFloat(fixedMenu.style.top);
-      if (!_y) return;
-      if (_y > wh - fixedMenu.clientHeight) {
-        _y = wh - fixedMenu.clientHeight;
-      }
-      fixedMenu.style.top = _y + "px";
-    });
-  }
-
   // 计算顶部行数
   showRowNum: number; // 已展示行数
   maxNum: number; //可展示行数最大值
@@ -1643,7 +1682,7 @@ export class FuwutaiComponent implements OnInit {
     }
     localStorage.removeItem("user");
     localStorage.removeItem("menu");
-    localStorage.removeItem("phones");
+    this.incomingService.removePhoneNumber();
     localStorage.removeItem("index");
     // 假退出
     this.mainService.logOut().subscribe((data) => {
@@ -1657,7 +1696,7 @@ export class FuwutaiComponent implements OnInit {
         }
         localStorage.removeItem("user");
         localStorage.removeItem("menu");
-        localStorage.removeItem("phones");
+        this.incomingService.removePhoneNumber();
         localStorage.removeItem("index");
       }
     });
@@ -1766,7 +1805,7 @@ export class FuwutaiComponent implements OnInit {
         this.incidentModel.department = isInit ? this.incidentModel.department : null;
 
         //正常初始化
-        this.getAutoWorkTypes();
+        this.getAutoWorkTypes(false);
         return;
       }
     }
@@ -1830,7 +1869,7 @@ export class FuwutaiComponent implements OnInit {
         this.searchTaskList.forEach((item) => {
           item.sid = item.associationTypeId + "_" + item.id;
         });
-        this.getAutoWorkTypes();
+        this.getAutoWorkTypes(true);
       }
     });
   }
@@ -1847,80 +1886,16 @@ export class FuwutaiComponent implements OnInit {
       hosId: this.checkedHos,
     });
   }
-  //打开绑定分机
-  showBindingExtension() {
-    if (this.fixedTab == "bindingExtension") {
-      this.fixedTab = "";
-      this.bindingExtensionShow = false;
-    } else {
-      this.bindingExtensionShow = true;
-      this.fixedTab = "bindingExtension";
-    }
-    if (this.phoneNumListBind.length) {
-      this.binding = 2; //重新绑定
-    } else {
-      this.binding = 3; //绑定分机
-    }
-    this.getPhoneNumList();
-  }
-  //获取所有分机号码列表
-  getPhoneNumList() {
-    if(!this.hsmsData.hsmsSwitch){
-      return;
-    }
-    this.phoneNumLoading = true;
-    let postData = {
-      idx: 0,
-      sum: 100,
-      hospitalConfig: { hosId: this.checkedHos },
-    };
-    this.mainService
-      .getFetchDataList("simple/data", "hospitalConfig", postData)
-      .subscribe((result) => {
-        this.phoneNumLoading = false;
-        this.phoneNumList = result.list.filter(
-          (item) => item.key.includes("phone_num_port") && item.value
-        );
-        this.phoneNumList.map((item) => {
-          return { ...item, checked: false };
-        });
-        this.phoneNumListBind.forEach((item) => {
-          let obj = this.phoneNumList.find((item1) => item1.value === item);
-          if (obj) {
-            obj.checked = true;
-          }
-        });
-      });
-  }
+
   getPhoneNum(flag = true) {
     if (!flag) {
       //切换院区的时候清除掉缓存中的号码
-      localStorage.removeItem("phones");
-    }
-    this.phoneNumListBind = localStorage.getItem("phones")
-      ? localStorage.getItem("phones").split("_")
-      : [];
-    this.phoneNumListSelected = localStorage.getItem("phones")
-      ? localStorage.getItem("phones").split("_")
-      : [];
-    if (this.phoneNumListBind.length) {
+      this.incomingService.removePhoneNumber();
+    }
+    if (this.incomingService.getPhoneNumber()) {
       this.getWebsocketPhone();
     }
   }
-  // 绑定分机，重新绑定
-  bindingHandle() {
-    this.binding = 1;
-    this.phoneNumList.forEach((item) => {
-      item.checked = false;
-    });
-    this.phoneNumList.forEach((item) => {
-      this.phoneNumListBind.forEach((v) => {
-        if (item.value == v) {
-          item.checked = true;
-        }
-      });
-    });
-  }
   // 点击tab切换
   tabClick(key) {
     let preCurrentTabIndex = this.currentTabIndex;
@@ -1943,11 +1918,11 @@ export class FuwutaiComponent implements OnInit {
     this.deptQtList["startStatus"] = 0;
     this.deptQtList["endStatus"] = 0;
 
-    if(this.currentTabIndex === '99999'){
-      if(this.incidentModel.department){
+    if(preCurrentTabIndex === '99999'){
+      if(this.applyDept){
         this.rightTitle_tab = [
-          { id: 2, name: '近期维修' },
-          { id: 3, name: '知识库' },
+          { id: 0, name: '近期配送' },
+          { id: 1, name: '转出院记录' },
         ]
         this.rightTitleHandler(this.rightTitle_tab[0].id);
       }
@@ -1964,11 +1939,11 @@ export class FuwutaiComponent implements OnInit {
       if(!this.incidentModel.source && source){
         this.incidentModel.source = source.id;
       }
-    }else if(preCurrentTabIndex === '99999'){
-      if(this.applyDept){
+    }else if(this.currentTabIndex === '99999'){
+      if(this.incidentModel.department){
         this.rightTitle_tab = [
-          { id: 0, name: '近期配送' },
-          { id: 1, name: '转出院记录' },
+          { id: 2, name: '近期维修' },
+          { id: 3, name: '知识库' },
         ]
         this.rightTitleHandler(this.rightTitle_tab[0].id);
       }
@@ -2588,6 +2563,7 @@ export class FuwutaiComponent implements OnInit {
               this.changeApplicationDepartment("");
             } else if (e === "&ks&") {
               //绑定了科室
+              // 配送--start
               let obj = this.applicationDepartmentList.find(
                 (item) => item.id == this.applyDeptMiddle.id
               );
@@ -2596,6 +2572,7 @@ export class FuwutaiComponent implements OnInit {
               }
               this.applyDept = this.applyDeptMiddle.id;
               this.changeApplicationDepartment("&ks&");
+              // 配送--end
             } else if (e === "&go&") {
               //继续建单
               let obj = this.applicationDepartmentList.find(
@@ -2730,14 +2707,15 @@ export class FuwutaiComponent implements OnInit {
       phone !== "&ks&" &&
       phone !== "&go&"
     ) {
-      this.callNumber = phone;
+      // this.incidentModel.incomingPhone = this.callNumber = phone;
       this.applyDept = null;
       this.noArrives = []; //近期配送
     } else if (phone === "&ks&") {
       let filter = this.applicationDepartmentList.filter(
         (item) => item.id == this.applyDept
       );
-      this.callNumber = filter[0].phone;
+      console.log('filter', filter)
+      // this.incidentModel.incomingPhone = this.callNumber = filter[0].phone;
       console.log(this.callNumber); //ceshi
       if (this.currentTabIndex == "255") {
         //患者转运
@@ -3024,12 +3002,13 @@ export class FuwutaiComponent implements OnInit {
       this.showPromptModal("操作", true, "", "");
     }else{
       this.newOrderShow = false; //关闭弹窗
+      this.newOrderShowOpen = false; //此时可出现新的弹窗
       this.showPromptModal("操作", true, "", "");
     }
   }
 
   // 新建工单->获取新建类型
-  getAutoWorkTypes() {
+  getAutoWorkTypes(isFirst) {
     this.workTypesArrange = {};
     // 运维
     if(this.itsmData.mdv2Switch){
@@ -3066,7 +3045,7 @@ export class FuwutaiComponent implements OnInit {
           this.workTypesFlag = arr.length >= 5;
           // 默认选中第一项
           if (arr.length > 0) {
-            this.tabClick(arr[arr.length - 1]);
+            isFirst ? this.tabClick(arr[0]) : this.tabClick(arr[arr.length - 1]);
           }
         }
       });
@@ -4150,7 +4129,7 @@ export class FuwutaiComponent implements OnInit {
     tipsMsg2: string,
     type: string,
   ) {
-    e.stopPropagation();
+    e && e.stopPropagation();
     this.confirmDelType = type;
     this.delModal = true;
     this.coopData = data;
@@ -4190,6 +4169,14 @@ export class FuwutaiComponent implements OnInit {
             this.showPromptModal(this.tipsMsg2, false, data.msg);
           }
         });
+    }else if (this.confirmDelType === "checkout") {
+      //签出
+      this.btnLoading = false;
+      this.delModal = false;
+      this.msg.info('签出成功');
+
+      this.incomingService.closeWs(true);
+      this.incomingService.removePhoneNumber();
     }
   }
 

src/app/views/fuwutai/fuwutai.module.ts

@@ -17,6 +17,7 @@ import { IncidentSerVisitModule } from 'src/app/components/incidentManagement/in
 import { IncidentSerMessageModule } from 'src/app/components/incidentManagement/incident-ser-message/incident-ser-message.module';
 import { IncidentSerCallModule } from 'src/app/components/incidentManagement/incident-ser-call/incident-ser-call.module';
 import { VirtualScrollerModule } from 'ngx-virtual-scroller';
+import { BindExtensionNumberModule } from 'src/app/components/bind-extension-number/bind-extension-number.module';
 
 
 @NgModule({
@@ -39,6 +40,7 @@ import { VirtualScrollerModule } from 'ngx-virtual-scroller';
     IncidentSerMessageModule,
     IncidentSerCallModule,
     VirtualScrollerModule,
+    BindExtensionNumberModule,
   ]
 })
 export class FuwutaiModule { }

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

@@ -4473,7 +4473,6 @@ export class HushijiandanComponent implements OnInit {
     }
     localStorage.removeItem("user");
     localStorage.removeItem("menu");
-    localStorage.removeItem("phones");
     localStorage.removeItem("index");
 
     // 假退出
@@ -4486,7 +4485,6 @@ export class HushijiandanComponent implements OnInit {
         }
         localStorage.removeItem("user");
         localStorage.removeItem("menu");
-        localStorage.removeItem("phones");
         localStorage.removeItem("index");
       }
     });

src/app/views/main/main.component.ts

@@ -504,7 +504,6 @@ export class MainComponent implements OnInit {
     }
     localStorage.removeItem("user");
     localStorage.removeItem("menu");
-    localStorage.removeItem("phones");
     localStorage.removeItem("index");
 
     // 假退出
@@ -517,7 +516,6 @@ export class MainComponent implements OnInit {
         }
         localStorage.removeItem("user");
         localStorage.removeItem("menu");
-        localStorage.removeItem("phones");
         localStorage.removeItem("index");
       }
     });

src/app/views/pathology/pathology.component.ts

@@ -48,8 +48,8 @@ export class PathologyComponent implements OnInit, OnDestroy {
   })
   osComponentRef5: OverlayScrollbarsComponent;
   constructor(
-	private mainService: MainService, 
-	public router: Router, 
+	private mainService: MainService,
+	public router: Router,
 	private route: ActivatedRoute,
 	public tool: ToolService,
 	private fb: FormBuilder,
@@ -95,7 +95,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
   completedFlag = false;
   completedSearchKey = "";
   completedLoad = false;
-	
+
 	barCode:any; //条码搜索
   // other
   loginUser: any = localStorage.getItem("user")
@@ -117,7 +117,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 	fixationModal:boolean = false //标本接收固定
 	verificationMoadl:boolean = false //标本核验
 	specimenCode:any; //标本条码
-	listOneData:any=[]; 
+	listOneData:any=[];
 	listOneLength:any;
 	pageOneIndex:any = 1;
 	pageSize:any = 10;
@@ -223,7 +223,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
       this.runTime();
     }, 500);
   }
-	
+
 	//tab切换
 	tabClick(type){
 		this.activeIndex = type
@@ -237,7 +237,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			this.getHospitalData()
 		}
 	}
-	
+
 	// 获取今日接收数据
 	getToday(){
 		this.mainService
@@ -252,7 +252,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 	changeUserInp(e){
 		this.changeInpSubjectUser.next([e]);
 	}
-	
+
 	// 获取配送人
 	getUserData(e){
 		let query={
@@ -269,7 +269,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			this.userData = res.list
 		});
 	}
-	
+
 	// 搜索
 	search() {
 	  this.pageOneIndex = 1;
@@ -308,7 +308,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 	      that.listOneLength = data.totalNum;
 	    });
 	}
-	
+
 	// 实时术中快速数据
 	getSpeedinessList() {
 		var that = this;
@@ -330,7 +330,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		    that.listTwoLength = data.totalNum;
 		  });
 	}
-	
+
 	// 打包配送
 	getPackList() {
 	  var that = this;
@@ -350,7 +350,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 	      that.listThreeLength = data.totalNum;
 	    });
 	}
-	
+
 	// 查看
 	project:any = [];
 	oneLook(e,data){
@@ -372,7 +372,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			}
 		});
 	}
-	
+
 	// 关闭查看
 	closeDetail(){
 		this.listDetailMoadl = false
@@ -380,7 +380,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			document.getElementById('Binput').focus();
 		},200)
 	}
-	
+
 	// 接收
 	connect(){
 		this.mainService.generateBatchNumber()
@@ -395,7 +395,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			}
 		})
 	}
-	
+
 	// 打包
 	packaging(){
 		this.mainService.generateBatchNumber()
@@ -410,14 +410,14 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			}
 		})
 	}
-	
+
 	//打包查看标本
 	threeLook(e,data){
 		localStorage.setItem("pathologyActiveIndex",this.activeIndex)
 		localStorage.setItem("dataType",'');
 		this.router.navigateByUrl(`/pathologyScan?packId=${data.id}&businessType=packagLook`);
 	}
-	
+
 	// 配送
 	distributionModal:boolean = false
 	distribution(e,data){
@@ -431,7 +431,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		this.handoverUserId = null
 		this.distributionModal = true
 	}
-	
+
 	// 确定配送
 	submitDistributionForm(){
 		for (const i in this.validateForm.controls) {
@@ -459,9 +459,9 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		      this.message.error(data.msg)
 		    }
 		  });
-		
+
 	}
-	
+
 	// 取消配送
 	hideDistributionModal(){
 		this.distributionModal = false
@@ -469,16 +469,16 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			document.getElementById('Binput').focus();
 		},200)
 	}
-	
+
 	changeHospitalInp(e){
 		// this.changeInpSubjectHospital.next([e]);
 	}
-	
+
 	changeDepartmentInp(e){
 		this.isDeptLoading = true
 		this.changeInpSubjectDepartment.next([e]);
 	}
-	
+
 	// 获取院区
 	getHospitalData(){
 		let arr = this.tool.getHospitalList().filter(i=>i.parent==undefined)
@@ -496,7 +496,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		//     this.hospital = res.list;
 		//   });
 	}
-	
+
 	// 选择院区
 	hospitalId:any=null;
 	changeHospDate(e){
@@ -504,7 +504,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		this.hospitalId = e
 		this.getDepartmentData('',e)
 	}
-	
+
 	// 获取科室
 	isDeptLoading:boolean = false;
 	getDepartmentData(e,hospital){
@@ -527,7 +527,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			  });
 		});
 	}
-	
+
 	// 补打
 	printModal:boolean = false;
 	parintLoading:boolean = false;
@@ -535,7 +535,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		this.rowData = item
 		this.printModal = true
 	}
-	
+
 	// 取消补打
 	hidePrintModal(){
 		this.printModal = false
@@ -543,7 +543,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			document.getElementById('Binput').focus();
 		},200)
 	}
-	
+
 	// 确定补打
 	confirmPrintDel(){
 		this.parintLoading = true
@@ -571,9 +571,9 @@ export class PathologyComponent implements OnInit, OnDestroy {
 				this.message.error(data.msg)
 			}
 		});
-		
+
 	}
-	
+
 	// 接收时间
 	startDate:any;
 	endDate:any;
@@ -582,12 +582,12 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		this.endDate = format(result[1], 'yyyy-MM-dd' +' '+'23:59:59');
 		this.acceptTime = [this.startDate,this.endDate]
 	}
-	
+
 	// 获取批次号
 	generateBatchNumber(){
 
 	}
-	
+
 	// 标本条码搜索
 	errorcODEMsg:any = null
 	batchNo:any = null;
@@ -625,7 +625,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 				})
 			}
 		})
-		
+
 	}
 	// 获取标本接收数据
 	pageReceptionIndex:any = 1;
@@ -661,7 +661,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 				this.listReceptionLength = res.totalNum;
 		  });
 	}
-	
+
 	// 确定接收包
 	submitReceptionForm(){
 		for (const i in this.validateConnectForm.controls) {
@@ -692,7 +692,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		    }
 		  });
 	}
-	
+
 	// 关闭配送接收
 	hideReceptionModal(){
 		this.receptionModal = false
@@ -700,12 +700,12 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			document.getElementById('Binput').focus();
 		},200)
 	}
-	
+
 	// 选择固定时间
 	formChangeDate(result){
 	  this.startDate = format(result, 'yyyy-MM-dd HH:mm:ss');
 	}
-	
+
 	// 监听人员交接接收人工号输入
 	connectUserId:any = null;
 	receptionName:any = null;
@@ -729,7 +729,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 监听人员交接配送人工号输入
 	dispatchingUserId:any = null;
 	dispatchingName:any = null;
@@ -753,7 +753,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 确定交接
 	mustReceived:any = null;
 	currReceived:any = null;
@@ -779,7 +779,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 				this.dispatchingName = null;
 				this.dispatchingUserId = null
 			}
-			
+
 			this.receptionName = null;
 			this.connectUserId = null
 			this.connectModal = true
@@ -789,7 +789,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 	hideConnectModal(){
 		this.connectModal = false
 	}
-	
+
 	// 确定人员交接
 	btnConnectLoading:boolean = false;
 	submitConnectForm(){
@@ -815,21 +815,21 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		    }
 		  });
 	}
-	
+
 	// 确定打包
 	packModal:boolean = false;
 	submitScanForm(){
 		this.packModal = true
 		// this.hideSpecimenModal()
 	}
-	
+
 	// 确定打包并打印
 	btnPackLoading:boolean = false;
 	printData:any = [];
 	submitPackForm(){
 		let that = this
 		let data: any = {
-			
+
 		};
 
 		this.btnPackLoading = true;
@@ -857,7 +857,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 关闭打包并打印
 	hidePackModal(){
 		this.packModal = false
@@ -865,7 +865,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			document.getElementById('specimen').focus();
 		},200)
 	}
-	
+
 	// 关闭交接/打包
 	hideSpecimenModal(){
 		this.barCode = null;
@@ -875,7 +875,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			document.getElementById('Binput').focus();
 		},200)
 	}
-	
+
 	// 获取标本详情
 	getSampleData(item){
 		// this.isSpinning = true
@@ -896,7 +896,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			}
 		});
 	}
-	
+
 	// 获取科室
 	getDept(){
 		this.setSpecimen()
@@ -925,7 +925,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			  .subscribe((res) => {
 			    that.operationData = res.list;
 			  });
-				
+
 			that.mainService
 			  .getFetchDataList("data", "department", data2)
 			  .subscribe((res) => {
@@ -934,7 +934,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			  });
 		});
 	}
-	
+
 	// 获取关联科室详情
 	getDeptDetail(){
 		this.mainService
@@ -954,7 +954,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 获取是否关联标本间
 	setSpecimen(){
 		this.validateForm = this.fb.group({
@@ -964,7 +964,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		});
 		this.relevanceModal = true
 	}
-	
+
 	// 确定关联科室
 	btnLoading:boolean = false;
 	submitForm(){
@@ -998,7 +998,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		    }
 		  });
 	}
-	
+
 	getNewDept(){
 		let postData = {
 		  currentHosId: this.hosId,
@@ -1024,12 +1024,12 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		  }
 		});
 	}
-	
+
 	// 获取当前用户信息
 	getCurrentUserNow() {
 	  this.mainService.getCurrentUser1().subscribe((data:any) => {
 	    if (data["status"] == 200) {
-				this.loginUser = data.data 
+				this.loginUser = data.data
 	      let user = JSON.parse(localStorage.getItem("user"));
 	      user.user.dept = data["data"].dept;
 	      user.user.currentHospital = data["data"].currentHospital;
@@ -1037,7 +1037,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 	    }
 	  });
 	}
-	
+
 	// 输入工号查询姓名
 	handoverUserId:any = null;
 	numberChange(e){
@@ -1060,7 +1060,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 提交固定标本接收
 	submitVerificationForm(){
 		for (const i in this.validateVerificationForm.controls) {
@@ -1068,7 +1068,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		  this.validateVerificationForm.controls[i].updateValueAndValidity();
 		}
 		if (this.validateVerificationForm.invalid) return;
-		
+
 		let data: any = {
 			id:this.codeData.id,
 			specimenDeptId:this.validateForm.value.specimen,
@@ -1092,14 +1092,14 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			}
 		});
 	}
-	
+
 	// 成功/失败提示框
 	closeModel(){
 		this.hideReceptionModal()
 		this.hideConnectModal()
 		this.hideSpecimenModal()
 	}
-	
+
 	// 关闭配送信息
 	hideVerificationModal(){
 		this.verificationMoadl = false
@@ -1113,13 +1113,13 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		this.businessType = 'connect'
 		this.changeInpSubjectSpecimen.next([e]);
 	}
-	
+
 	// 监听交接/打包扫描条码
 	tableLoading:boolean = false;
 	codeChange(e){
 		this.changeInpSubject.next([e]);
 	}
-	
+
 	// 标本接收搜索条码
 	errorMsg:any = null;
 	searchSpecimenData(e){
@@ -1154,7 +1154,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			}
 		})
 	}
-	
+
 	// 关闭多只标本
 	hideMultiModal(){
 		this.multiModal = false
@@ -1162,7 +1162,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			document.getElementById('specimen').focus();
 		},200)
 	}
-	
+
 	// 监听多只标本扫描
 	codeMultiChange(e){
 		if(!e){
@@ -1191,7 +1191,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			})
 		},500)
 	}
-	
+
 	// 多只标本确定接受
 	btnMultiLoading:boolean = false;
 	submitMultiForm(){
@@ -1199,7 +1199,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		this.btnMultiLoading = false
 		this.hideMultiModal()
 	}
-	
+
 	pathologyLogs:any=[];
 	specimenList:any=[]
 	stepLength:any = 0;
@@ -1208,19 +1208,19 @@ export class PathologyComponent implements OnInit, OnDestroy {
 	// 	this.getSampleData(item)
 	// 	clearInterval(this.logTimer);
 	// 	if(type==1){
-			
+
 	// 	}else if(type==2){
-			
+
 	// 	}else{
-			
+
 	// 	}
 	// }
-	
+
 	closeDetailMoadl(){
 		this.detailMoadl = false
 	}
-	
- 
+
+
   // 自动刷新倒计时
   autoUpdate(flag = true) {
     if (flag) {
@@ -1246,7 +1246,6 @@ export class PathologyComponent implements OnInit, OnDestroy {
     }
     localStorage.removeItem("user");
     localStorage.removeItem("menu");
-    localStorage.removeItem("phones");
     localStorage.removeItem("index");
 		localStorage.removeItem("scanCodeData");
 		localStorage.removeItem("dataType");
@@ -1261,7 +1260,6 @@ export class PathologyComponent implements OnInit, OnDestroy {
         }
         localStorage.removeItem("user");
         localStorage.removeItem("menu");
-        localStorage.removeItem("phones");
         localStorage.removeItem("index");
 				localStorage.removeItem("scanCodeData");
 				localStorage.removeItem("dataType");
@@ -1357,7 +1355,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
       }
     }, 1000);
   }
-	
+
 	promptModalShow:boolean = false;
 	promptContent:any = null;
 	ifSuccess:any = null;

src/app/views/pathologyScan/pathologyScan.component.ts

@@ -48,14 +48,14 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
   })
   osComponentRef5: OverlayScrollbarsComponent;
   constructor(
-	private mainService: MainService, 
-	public router: Router, 
+	private mainService: MainService,
+	public router: Router,
 	private route: ActivatedRoute,
 	public tool: ToolService,
 	private fb: FormBuilder,
 	private message: NzMessageService,
 	private sanitizer: DomSanitizer,
-	
+
 	) {}
   // 今日药单量
   todayTotal: undefined;
@@ -96,7 +96,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
   completedFlag = false;
   completedSearchKey = "";
   completedLoad = false;
-	
+
 	barCode:any; //条码搜索
   // other
   loginUser: any = localStorage.getItem("user")
@@ -118,7 +118,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 	fixationModal:boolean = false //标本接收固定
 	verificationMoadl:boolean = false //标本核验
 	specimenCode:any; //标本条码
-	listOneData:any=[]; 
+	listOneData:any=[];
 	listOneLength:any;
 	pageOneIndex:any = 1;
 	pageSize:any = 10;
@@ -210,7 +210,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			if(this.dataType=='pathologyPack'){
 				this.getJsData(4)
 			}
-			if(this.scanCodeData.pathologySpecimenDTOList && 
+			if(this.scanCodeData.pathologySpecimenDTOList &&
 			this.scanCodeData.pathologySpecimenDTOList.length>1){
 				this.muArr = []
 				for(let i of this.scanCodeData.pathologySpecimenDTOList){
@@ -219,7 +219,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 					}
 				}
 				this.getJsData(3)
-			}else if(this.scanCodeData.pathologySpecimenDTOList && 
+			}else if(this.scanCodeData.pathologySpecimenDTOList &&
 			this.scanCodeData.pathologySpecimenDTOList.length==1){
 				this.getJsData(1)
 			}
@@ -233,9 +233,9 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			}
 			this.getJsData(1)
 		}
-		
+
   }
-	
+
 	// 分页
 	noType:any='none';
 	pageChange(){
@@ -248,7 +248,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			this.getJsData(1)
 		}
 	}
-	
+
   // 当前时间日期
   runTime() {
     clearTimeout(this.timer);
@@ -266,7 +266,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			document.getElementById('specimen').focus();
 		},200)
 	}
-	
+
 	// 打包
 	packaging(){
 		this.fixationModal = true
@@ -275,7 +275,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			document.getElementById('specimen').focus();
 		},200)
 	}
-	
+
 	// 配送
 	distributionModal:boolean = false
 	distribution(e,data){
@@ -288,14 +288,14 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 		this.handoverUserId = null
 		this.distributionModal = true
 	}
-	
+
 	// 确定配送
 	submitDistributionForm(){
 		this.btnLoading = true
 		this.btnLoading = false
 		this.hideDistributionModal()
 	}
-	
+
 	// 取消配送
 	hideDistributionModal(){
 		this.distributionModal = false
@@ -303,23 +303,23 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			document.getElementById('Binput').focus();
 		},200)
 	}
-	
+
 	changeHospitalInp(e){
 		// this.changeInpSubjectHospital.next([e]);
 	}
-	
+
 	changeDepartmentInp(e){
 		// this.isDeptLoading = true
 		// this.changeInpSubjectDepartment.next([e]);
 	}
-	
+
 	// 补打
 	printModal:boolean = false;
 	parintLoading:boolean = false;
 	reprint(e,data){
 		this.printModal = true
 	}
-	
+
 	// 取消补打
 	hidePrintModal(){
 		this.printModal = false
@@ -327,7 +327,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			document.getElementById('Binput').focus();
 		},200)
 	}
-	
+
 	// 确定补打
 	confirmPrintDel(){
 		this.parintLoading = true
@@ -338,9 +338,9 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 		// } else {
 		// 	this.showPromptModal("操作", false, res.msg);
 		// }
-		
+
 	}
-	
+
 	// 接收时间
 	startDate:any;
 	endDate:any;
@@ -348,12 +348,12 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 		this.startDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
 		this.endDate = format(result[1], 'yyyy-MM-dd HH:mm:ss');
 	}
-	
+
 	// 获取批次号
 	generateBatchNumber(){
 
 	}
-	
+
 	// 获取标本接收数据
 	pageReceptionIndex:any = 1;
 	listReceptionLength:any = 0;
@@ -403,7 +403,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 				this.listReceptionLength = res.totalNum;
 		  });
 	}
-	
+
 	// 配送中包交接完成
 	connectAccomplish(){
 		this.validateConnectForm = this.fb.group({
@@ -412,14 +412,14 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 		});
 		this.dispatchingName = this.scanCodeData.deliveryUserDTO.name;
 		this.dispatchingUserId = this.scanCodeData.deliveryUserDTO.id
-		
+
 		this.receptionName = this.userInfo.name;
 		this.connectUserId = this.userInfo.id;
-		
+
 		this.receptionModal = true
 		this.barCode = null
 	}
-	
+
 	// 确定接收包
 	submitReceptionForm(){
 		for (const i in this.validateConnectForm.controls) {
@@ -448,17 +448,17 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 关闭配送接收
 	hideReceptionModal(){
 		this.receptionModal = false
 	}
-	
+
 	// 选择固定时间
 	formChangeDate(result){
 	  this.startDate = format(result, 'yyyy-MM-dd HH:mm:ss');
 	}
-	
+
 	// 监听人员交接接收人工号输入
 	connectUserId:any = null;
 	receptionName:any = null;
@@ -482,7 +482,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 监听人员交接配送人工号输入
 	dispatchingUserId:any = null;
 	dispatchingName:any = null;
@@ -506,7 +506,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 确定交接
 	mustReceived:any = null;
 	currReceived:any = null;
@@ -541,7 +541,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 	hideConnectModal(){
 		this.connectModal = false
 	}
-	
+
 	// 确定人员交接
 	btnConnectLoading:boolean = false;
 	submitConnectForm(){
@@ -568,21 +568,21 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 		    }
 		  });
 	}
-	
+
 	// 确定打包
 	packModal:boolean = false;
 	submitScanForm(){
 		this.packModal = true
 		// this.hideSpecimenModal()
 	}
-	
+
 	// 确定打包并打印
 	btnPackLoading:boolean = false;
 	printData:any = [];
 	submitPackForm(){
 		let that = this
 		let data: any = {
-			batchNo:this.batchNo, 
+			batchNo:this.batchNo,
 			deptId:this.deptId
 		};
 
@@ -613,7 +613,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 关闭打包并打印
 	hidePackModal(){
 		this.packModal = false
@@ -621,14 +621,14 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			document.getElementById('specimen').focus();
 		},200)
 	}
-	
+
 	// 关闭交接/打包
 	hideSpecimenModal(){
 		// 清空data
 		localStorage.setItem("scanCodeData",'')
 		this.router.navigateByUrl(`/pathology?type=detail`)
 	}
-	
+
 	// 获取标本详情
 	project:any = [];
 	getSampleData(item){
@@ -649,7 +649,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			}
 		});
 	}
-	
+
 	// 获取科室
 	getDept(){
 		this.setSpecimen()
@@ -678,7 +678,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			  .subscribe((res) => {
 			    that.operationData = res.list;
 			  });
-				
+
 			that.mainService
 			  .getFetchDataList("data", "department", data2)
 			  .subscribe((res) => {
@@ -687,7 +687,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			  });
 		});
 	}
-	
+
 	// 获取关联科室详情
 	getDeptDetail(){
 		this.mainService
@@ -707,7 +707,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 获取是否关联标本间
 	setSpecimen(){
 		this.validateForm = this.fb.group({
@@ -717,7 +717,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 		});
 		this.relevanceModal = true
 	}
-	
+
 	// 确定关联科室
 	btnLoading:boolean = false;
 	submitForm(){
@@ -751,7 +751,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 		    }
 		  });
 	}
-	
+
 	getNewDept(){
 		let postData = {
 		  currentHosId: this.hosId,
@@ -777,12 +777,12 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 		  }
 		});
 	}
-	
+
 	// 获取当前用户信息
 	getCurrentUserNow() {
 	  this.mainService.getCurrentUser1().subscribe((data:any) => {
 	    if (data["status"] == 200) {
-				this.loginUser = data.data 
+				this.loginUser = data.data
 	      let user = JSON.parse(localStorage.getItem("user"));
 	      user.user.dept = data["data"].dept;
 	      user.user.currentHospital = data["data"].currentHospital;
@@ -790,7 +790,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 	    }
 	  });
 	}
-	
+
 	// 输入工号查询姓名
 	handoverUserId:any = null;
 	numberChange(e){
@@ -813,7 +813,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 提交固定标本接收
 	submitVerificationForm(){
 		for (const i in this.validateVerificationForm.controls) {
@@ -821,7 +821,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 		  this.validateVerificationForm.controls[i].updateValueAndValidity();
 		}
 		if (this.validateVerificationForm.invalid) return;
-		
+
 		let data: any = {
 			id:this.codeData.id,
 			specimenDeptId:this.validateForm.value.specimen,
@@ -845,13 +845,13 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			}
 		});
 	}
-	
+
 	// 成功/失败提示框
 	closeModel(){
 		localStorage.setItem("scanCodeData",'')
 		this.router.navigateByUrl(`/pathology?type=detail`);
 	}
-	
+
 	// 关闭配送信息
 	hideVerificationModal(){
 		this.verificationMoadl = false
@@ -860,13 +860,13 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 		},200)
 	}
 
-	
+
 	// 监听交接/打包扫描条码
 	tableLoading:boolean = false;
 	codeChange(e){
 		this.changeInpSubject.next([e]);
 	}
-	
+
 	// 标本接收搜索条码
 	errorMsg:any = null;
 	searchSpecimenData(e){
@@ -916,7 +916,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			}
 		})
 	}
-	
+
 	// 关闭多只标本
 	hideMultiModal(){
 		localStorage.setItem("scanCodeData",'');
@@ -928,7 +928,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			document.getElementById('specimen').focus();
 		},200)
 	}
-	
+
 	// 监听多只标本扫描
 	codeMultiChange(e){
 		if(!e){
@@ -975,7 +975,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			})
 		},500)
 	}
-	
+
 	// 多只标本确定接受
 	btnMultiLoading:boolean = false;
 	submitMultiForm(){
@@ -1003,7 +1003,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			},500)
 		});
 	}
-	
+
 	// 多只标本打包
 	submitMultiScanForm(){
 		let data1 = JSON.parse(localStorage.getItem("scanCodeData"))
@@ -1030,7 +1030,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 			},500)
 		});
 	}
-	
+
 	// 查看详情
 	pathologyLogs:any=[];
 	specimenList:any=[]
@@ -1040,19 +1040,19 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 		this.getSampleData(item)
 		clearInterval(this.logTimer);
 		if(type==1){
-			
+
 		}else if(type==2){
-			
+
 		}else{
-			
+
 		}
 	}
-	
+
 	closeDetailMoadl(){
 		this.detailMoadl = false
 	}
-	
- 
+
+
   // 自动刷新倒计时
   autoUpdate(flag = true) {
     if (flag) {
@@ -1078,7 +1078,6 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
     }
     localStorage.removeItem("user");
     localStorage.removeItem("menu");
-    localStorage.removeItem("phones");
     localStorage.removeItem("index");
     // 假退出
     this.mainService.logOut().subscribe((data) => {
@@ -1090,7 +1089,6 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
         }
         localStorage.removeItem("user");
         localStorage.removeItem("menu");
-        localStorage.removeItem("phones");
         localStorage.removeItem("index");
       }
     });
@@ -1183,7 +1181,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
       }
     }, 1000);
   }
-	
+
 	promptModalShow:boolean = false;
 	promptContent:any = null;
 	ifSuccess:any = null;

src/app/views/pharmacy/pharmacy.component.ts

@@ -256,7 +256,6 @@ export class PharmacyComponent implements OnInit {
     }
     localStorage.removeItem("user");
     localStorage.removeItem("menu");
-    localStorage.removeItem("phones");
     localStorage.removeItem("index");
 
     // 假退出
@@ -269,7 +268,6 @@ export class PharmacyComponent implements OnInit {
         }
         localStorage.removeItem("user");
         localStorage.removeItem("menu");
-        localStorage.removeItem("phones");
         localStorage.removeItem("index");
       }
     });

src/app/views/pharmacy2/pharmacy2.component.ts

@@ -427,7 +427,6 @@ export class Pharmacy2Component implements OnInit, OnDestroy {
     }
     localStorage.removeItem("user");
     localStorage.removeItem("menu");
-    localStorage.removeItem("phones");
     localStorage.removeItem("index");
 
     // 假退出
@@ -440,7 +439,6 @@ export class Pharmacy2Component implements OnInit, OnDestroy {
         }
         localStorage.removeItem("user");
         localStorage.removeItem("menu");
-        localStorage.removeItem("phones");
         localStorage.removeItem("index");
       }
     });

src/app/views/specimen-room-view/specimen-room-view.component.ts

@@ -47,8 +47,8 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
   })
   osComponentRef5: OverlayScrollbarsComponent;
   constructor(
-	private mainService: MainService, 
-	public router: Router, 
+	private mainService: MainService,
+	public router: Router,
 	public tool: ToolService,
 	private fb: FormBuilder,
 	private message: NzMessageService,
@@ -92,7 +92,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
   completedFlag = false;
   completedSearchKey = "";
   completedLoad = false;
-	
+
 	barCode:any; //条码搜索
   // other
   loginUser: any = localStorage.getItem("user")
@@ -113,7 +113,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 	fixationModal:boolean = false //标本接收固定
 	verificationMoadl:boolean = false //标本核验
 	specimenCode:any; //标本条码
-	listOfData:any=[]; 
+	listOfData:any=[];
 	fixativeData:any = []; //固体液类型
 	hosId:any;
 	userId:any;
@@ -161,7 +161,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
       this.runTime();
     }, 500);
   }
-	
+
 	// 标本条码搜索
 	searchSpecimen(e){
 		if(!this.barCode){
@@ -199,12 +199,12 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			}
 		})
 	}
-	
+
 	// 选择固定时间
 	formChangeDate(result){
 	  this.startDate = format(result, 'yyyy-MM-dd HH:mm:ss');
 	}
-	
+
 	// 确定接受固定标本
 	startDate:any;
 	submitFixationForm(){
@@ -224,7 +224,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			this.verificationMoadl = true
 		});
 	}
-	
+
 	// 关闭接受固定标本
 	hideSpecimenModal(){
 		this.autoUpdate()
@@ -236,7 +236,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			document.getElementById('Binput').focus();
 		},200)
 	}
-	
+
 	// 获取标本详情
 	project:any = [];
 	getSampleData(item){
@@ -256,7 +256,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		  this.detailMoadl = true
 		});
 	}
-	
+
 	// 获取科室
 	getDept(){
 		this.setSpecimen()
@@ -285,7 +285,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			  .subscribe((res) => {
 			    that.operationData = res.list;
 			  });
-				
+
 			that.mainService
 			  .getFetchDataList("data", "department", data2)
 			  .subscribe((res) => {
@@ -294,7 +294,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			  });
 		});
 	}
-	
+
 	// 获取关联科室详情
 	getDeptDetail(){
 		this.mainService
@@ -314,7 +314,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 获取是否关联标本间
 	setSpecimen(){
 		this.validateForm = this.fb.group({
@@ -324,7 +324,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		});
 		this.relevanceModal = true
 	}
-	
+
 	// 确定关联科室
 	btnLoading:boolean = false;
 	submitForm(){
@@ -364,7 +364,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		    }
 		  });
 	}
-	
+
 	getNewDept(){
 		let postData = {
 		  currentHosId: this.hosId,
@@ -390,12 +390,12 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		  }
 		});
 	}
-	
+
 	// 获取当前用户信息
 	getCurrentUserNow() {
 	  this.mainService.getCurrentUser1().subscribe((data:any) => {
 	    if (data["status"] == 200) {
-				this.loginUser = data.data 
+				this.loginUser = data.data
 	      let user = JSON.parse(localStorage.getItem("user"));
 	      user.user.dept = data["data"].dept;
 	      user.user.currentHospital = data["data"].currentHospital;
@@ -403,7 +403,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 	    }
 	  });
 	}
-	
+
 	// 输入工号查询姓名
 	handoverUserId:any = null;
 	numberChange(e){
@@ -427,7 +427,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 提交固定标本接收
 	submitVerificationForm(){
 		for (const i in this.validateVerificationForm.controls) {
@@ -435,7 +435,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		  this.validateVerificationForm.controls[i].updateValueAndValidity();
 		}
 		if (this.validateVerificationForm.invalid) return;
-		
+
 		let data: any = {
 			id:this.codeData.id,
 			specimenDeptId:this.validateForm.value.specimen,
@@ -466,7 +466,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			}
 		});
 	}
-	
+
 	closeModel(){
 		this.verificationMoadl = false
 		this.fixationModal = false
@@ -474,7 +474,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			document.getElementById('Binput').focus();
 		},200)
 	}
-	
+
 	// 关闭固定接受标本
 	hideVerificationModal(){
 		this.verificationMoadl = false
@@ -482,19 +482,19 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			document.getElementById('Binput').focus();
 		},200)
 	}
-	
+
 
 	// 监听标本条码
 	specimenCodeChange(e){
 		this.changeInpSubjectSpecimen.next([e]);
 	}
-	
+
 	// 监听接受固定标本条码
 	tableLoading:boolean = false;
 	codeChange(e){
 		this.changeInpSubject.next([e]);
 	}
-	
+
 	fixationError:any;
 	searchSpecimenData(e){
 		if(!e){
@@ -514,13 +514,13 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			this.specimenCode = null
 			if(res.status==200){
 				this.codeData = res.data[0]
-				this.fixationError = null 
+				this.fixationError = null
 			}else{
-				this.fixationError = res.msg 
+				this.fixationError = res.msg
 			}
 		})
 	}
-	
+
 	// 查看详情
 	detailMoadl:boolean = false;
 	pathologyLogs:any=[];
@@ -531,14 +531,14 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		this.getSampleData(item)
 		clearInterval(this.logTimer);
 		if(type==1){
-			
+
 		}else if(type==2){
-			
+
 		}else{
-			
+
 		}
 	}
-	
+
 	closeDetailMoadl(){
 		setTimeout(_=>{
 			document.getElementById('Binput').focus();
@@ -546,7 +546,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		this.detailMoadl = false
 		this.autoUpdate(false);
 	}
-	
+
   // 统计
   // total() {
   //   let launch = JSON.parse(localStorage.getItem("user")).user.dept.id;
@@ -570,7 +570,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
   //   console.log(item);
   //   this.router.navigateByUrl(`specimenView2/detailSample/${item.id}`);
   // }
-	
+
   // // 查看流程信息弹窗
   // logPromptModalShow = false; //弹窗开关
   // scode = ""; //查看记录携带
@@ -807,7 +807,6 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
     }
     localStorage.removeItem("user");
     localStorage.removeItem("menu");
-    localStorage.removeItem("phones");
     localStorage.removeItem("index");
     // 假退出
     this.mainService.logOut().subscribe((data) => {
@@ -819,7 +818,6 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
         }
         localStorage.removeItem("user");
         localStorage.removeItem("menu");
-        localStorage.removeItem("phones");
         localStorage.removeItem("index");
       }
     });
@@ -906,7 +904,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
       }
     }, 1000);
   }
-	
+
 	promptModalShow:boolean = false;
 	promptContent:any = null;
 	ifSuccess:any = null;

src/app/views/specimen-view2/specimen-view2.component.ts

@@ -461,7 +461,6 @@ export class SpecimenView2Component implements OnInit, OnDestroy {
     }
     localStorage.removeItem("user");
     localStorage.removeItem("menu");
-    localStorage.removeItem("phones");
     localStorage.removeItem("index");
     // 假退出
     this.mainService.logOut().subscribe((data) => {
@@ -473,7 +472,6 @@ export class SpecimenView2Component implements OnInit, OnDestroy {
         }
         localStorage.removeItem("user");
         localStorage.removeItem("menu");
-        localStorage.removeItem("phones");
         localStorage.removeItem("index");
       }
     });

src/assets/js/http.ts

@@ -5,6 +5,7 @@ const port: string = location.port; //端口
 const protocolName: string = document.location.protocol; //http协议
 const wsName: string = protocolName === "http:" ? "ws" : "wss"; //ws协议
 const baseUrl: baseUrlType = {
+  wsName,
   domain: `${protocolName}//${domainName}:${port}`, //chrome下载地址
   host: `${protocolName}//${domainName}:${port}/service`, //接口地址
   specimenViewHost: `${protocolName}//${domainName}:${port}/specimenView`, //业务视图地址
@@ -15,6 +16,6 @@ const baseUrl: baseUrlType = {
   nurseWs: `${wsName}://${domainName}:${port}/webSocket/message/nurse`, //websocket护士端地址
   fwtWs: `${wsName}://${domainName}:${port}/webSocket/message/ser`, //websocket服务台地址
   // phoneWs: `${wsName}://${domainName}:${port}/webSocket/message/phone`, //websocket服务台来电地址
-  phoneWs: `${wsName}://192.168.3.111:29999/webSocket/message/phone`, //websocket服务台来电地址
+  phoneWs: `${wsName}://192.168.3.108:29999/webSocket/message/phone`, //websocket服务台来电地址-测试
 };
 export default baseUrl;

src/common.less

@@ -183,6 +183,16 @@
   overflow: hidden;
   text-overflow: ellipsis;
 }
+
+.ellipsis-oneline {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.cursorDefault{
+  cursor: default!important;
+}
 // list模板样式 end
 
 // button