Merge branch 'master' of http://git.dashitech.com/seimin/zy-pc

angular.json

@@ -39,7 +39,9 @@
             ],
             "scripts": [
               "node_modules/echarts/dist/echarts.min.js",
-              "./node_modules/swiper/swiper-bundle.min.js"
+              "./node_modules/swiper/swiper-bundle.min.js",
+              "src/assets/libs/TLWebSocketAgent.js",
+              "src/assets/libs/ola_api.js"
             ]
           },
           "configurations": {
@@ -110,7 +112,9 @@
             ],
             "scripts": [
               "node_modules/echarts/dist/echarts.min.js",
-              "./node_modules/swiper/swiper-bundle.min.js"
+              "./node_modules/swiper/swiper-bundle.min.js",
+              "src/assets/libs/TLWebSocketAgent.js",
+              "src/assets/libs/ola_api.js"
             ]
           }
         },

package-lock.json

@@ -32,6 +32,7 @@
         "ngx-echarts": "^4.2.2",
         "ngx-print": "~1.2.1",
         "ngx-sortablejs": "^3.1.3",
+        "ngx-virtual-scroller": "^4.0.3",
         "npm": "^6.14.15",
         "overlayscrollbars": "^1.11.0",
         "overlayscrollbars-ngx": "^0.1.1",
@@ -829,6 +830,12 @@
         "npm": ">= 6.2.0"
       }
     },
+    "node_modules/@tweenjs/tween.js": {
+      "version": "17.4.0",
+      "resolved": "https://registry.npmmirror.com/@tweenjs/tween.js/-/tween.js-17.4.0.tgz",
+      "integrity": "sha512-J3fzl1F6wvh8KXVVcIuHN12xi1ZDcPA/0Vix+ZcJYwZWVHUwfIqfvzYXXEw7ybeev6477KCTt9fKydU+ajUqcg==",
+      "license": "MIT"
+    },
     "node_modules/@types/big.js": {
       "version": "6.2.2",
       "resolved": "https://registry.npmmirror.com/@types/big.js/-/big.js-6.2.2.tgz",
@@ -947,6 +954,12 @@
       "integrity": "sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==",
       "dev": true
     },
+    "node_modules/@types/tween.js": {
+      "version": "17.2.0",
+      "resolved": "https://registry.npmmirror.com/@types/tween.js/-/tween.js-17.2.0.tgz",
+      "integrity": "sha512-mOsqurEtFEzwgkVc/jDVE2XrjZBYTbrmDUyCr9GXmnfc6q5otokxFtKvSY/B21zgz9LVRIvRTawKczjKi57wrA==",
+      "license": "MIT"
+    },
     "node_modules/@types/webpack-sources": {
       "version": "0.1.12",
       "resolved": "https://registry.npmmirror.com/@types/webpack-sources/-/webpack-sources-0.1.12.tgz",
@@ -7652,6 +7665,20 @@
         "sortablejs": ">=1.7.0"
       }
     },
+    "node_modules/ngx-virtual-scroller": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmmirror.com/ngx-virtual-scroller/-/ngx-virtual-scroller-4.0.3.tgz",
+      "integrity": "sha512-JBqUJ/f7GRCZDnI/JeiFoTmYR8rC/Hyv8L5I7ImePM6f/hwiFNRsrK8Abdd0E3TwklwgmZAK875te9XQJrgsyQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@tweenjs/tween.js": "17.4.0",
+        "@types/tween.js": "17.2.0"
+      },
+      "peerDependencies": {
+        "@angular/core": ">=6.0.0",
+        "tslib": "^1.10.0"
+      }
+    },
     "node_modules/nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmmirror.com/nice-try/-/nice-try-1.0.5.tgz",

package.json

@@ -7,6 +7,7 @@
     "start:17": "set NODE_OPTIONS=--openssl-legacy-provider && ng serve --proxy-config proxy.conf.json --port 4210 --disable-host-check --public-host=dashitech.com --host 0.0.0.0",
     "build:17": "set NODE_OPTIONS=--openssl-legacy-provider --max_old_space_size=4096 && npm run build",
     "development": "node ./upload/development.js",
+    "development120": "node ./upload/development120.js",
     "production": "node ./upload/production.js",
     "test": "ng test",
     "lint": "ng lint",
@@ -40,6 +41,7 @@
     "ngx-echarts": "^4.2.2",
     "ngx-print": "~1.2.1",
     "ngx-sortablejs": "^3.1.3",
+    "ngx-virtual-scroller": "^4.0.3",
     "npm": "^6.14.15",
     "overlayscrollbars": "^1.11.0",
     "overlayscrollbars-ngx": "^0.1.1",

proxy.conf.json

@@ -14,5 +14,13 @@
     "pathRewrite": {
       "^/file": "/file"
     }
+  },
+  "/record": {
+    "target": "http://192.168.3.108",
+    "logLevel": "debug",
+    "changeOrigin": true,
+    "pathRewrite": {
+      "^/record": "/record"
+    }
   }
 }

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()">
+        {{activeScopeTab.value == 1 ? '绑定' : '签入'}}
+      </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,191 @@
+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';
+
+@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(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/components/configurationCenter/configuration-callcenter/configuration-callcenter.component.html

@@ -3,7 +3,6 @@
     <div class="addressAssign">
       <overlay-scrollbars #osComponentRef2 class="contentBody2">
         <div class="contentBody">
-          <div class="hospital">{{currentHospital.hosName}}</div>
           <div class="classList">
             节假日班次：
             <nz-select class="select" [nzDropdownMatchSelectWidth]="false" nzAllowClear [(ngModel)]="dataInfo.holidayClassId"
@@ -28,6 +27,10 @@
               </nz-option>
             </nz-select>
           </div>
+          <div class="classList">
+            呼叫中心服务连接：
+            <input style="width: 270px;" nz-input placeholder="请填写呼叫中心服务连接" [(ngModel)]="dataInfo.socketUrl" />
+          </div>
         </div>
       </overlay-scrollbars>
       <div class="contentBtns">

src/app/components/configurationCenter/configuration-callcenter/configuration-callcenter.component.ts

@@ -33,9 +33,9 @@ export class ConfigurationCallcenterComponent implements OnInit {
   submitMessageForm(): void {
     this.btnLoading = true;
     let postData:any = {
-      hosId: this.currentHospital.id,
       workdayClassId: this.dataInfo.workdayClassId,
       holidayClassId: this.dataInfo.holidayClassId,
+      socketUrl: this.dataInfo.socketUrl,
     };
     postData = { ...this.dataInfo, ...postData };
     this.mainService
@@ -80,9 +80,7 @@ export class ConfigurationCallcenterComponent implements OnInit {
     let data = {
       idx: 0,
       sum: 9999,
-      callCenterConfig: {
-        hosId: this.currentHospital.id,
-      },
+      callCenterConfig: {},
     };
     this.loading1 = true;
     this.mainService

src/app/components/configurationCenter/configuration-category/configuration-category.component.ts

@@ -169,7 +169,7 @@ export class ConfigurationCategoryComponent implements OnInit {
       group2: {
         groupName: keyword,
         hospitals: this.validateConfigForm.value.dutyId,
-        type: 1,
+        type: 3,
       },
       idx: 0,
       sum: 10,
@@ -653,7 +653,7 @@ export class ConfigurationCategoryComponent implements OnInit {
           userGroup: this.validateConfigForm.value.userGroup,
           groupId: this.validateConfigForm.value.groupId || undefined,
           userId: this.validateConfigForm.value.userGroup === 1 ? this.validateConfigForm.value.userId : undefined,
-          hosId: this.currentHospital.id,
+          hosId: this.hospitalConfig === 1 ? this.currentHospital.id  : this.validateConfigForm.value.hosId,
         }
       };
     } else {

src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.component.html

@@ -41,8 +41,8 @@
                     </nz-input-group>
                   </nz-form-control>
                 </nz-form-item>
-                <i class="icon_transport transport-tag27fuben ml8" (click)="addField(i)"></i>
-                <i class="icon_transport transport-shanchu1 ml8" *ngIf="dictionaryList.length > 1 && !data.system" (click)="removeField(data, i)"></i>
+                <i class="icon_transport transport-tag27fuben ml8" (click)="addField(i)" *ngIf="!(activeDictionaryKey.key === 'incident_status' || activeDictionaryKey.key === 'incident_degree')"></i>
+                <i class="icon_transport transport-shanchu1 ml8" *ngIf="dictionaryList.length > 1 && !data.system && !(activeDictionaryKey.key === 'incident_status' || activeDictionaryKey.key === 'incident_degree')" (click)="removeField(data, i)"></i>
               </div>
             </div>
           </form>

src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, ViewChild } from "@angular/core";
+import { Component, OnInit, ViewChild, Input } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import { MainService } from "../../../services/main.service";
 import { Validators, FormGroup, FormBuilder, FormControl } from '@angular/forms';
@@ -33,23 +33,16 @@ export class ConfigurationDictionaryComponent implements OnInit {
   osComponentRef2: OverlayScrollbarsComponent;
 
   ngOnInit() {
-    this.initDictionaryForm();
+    this.activeDictionaryKey = this.dictionaryKeyList[0];
     this.getDictionaryList();
+    this.initDictionaryForm();
   }
 
   // 数据字典key列表
-  dictionaryKeyList: any[] = [
-    { id: 1, name: '积分配置', key: "incident_category_score"},
-    { id: 2, name: '事件来源', key: "incident_source"},
-    { id: 3, name: '处理结果', key: "incident_closecode"},
-    { id: 4, name: '处理方式', key: "incident_handle_type"},
-    { id: 5, name: '状态', key: "incident_status"},
-    { id: 6, name: '维修记录', key: "repair_type"},
-    { id: 7, name: '满意度评价', key: "incident_degree"},
-  ];
+  @Input() dictionaryKeyList: any[] = [];
 
   // 点击数据字典key
-  activeDictionaryKey:any = this.dictionaryKeyList[0];
+  activeDictionaryKey:any;
   clickDictionaryKey(item){
     this.activeDictionaryKey = item;
     this.getDictionaryList();
@@ -107,6 +100,7 @@ export class ConfigurationDictionaryComponent implements OnInit {
           this.btnLoading = false;
           this.delModal = false;
           if (data.status == 200) {
+            this.mainService.clearDictionary();
             this.showPromptModal(this.tipsMsg2, true, "");
           } else {
             this.showPromptModal(this.tipsMsg2, false, data.msg);
@@ -171,7 +165,11 @@ export class ConfigurationDictionaryComponent implements OnInit {
       this.dictionaryList.forEach((obj, i) => {
         for (const key in obj) {
           if(key !== 'id' && key !== 'system'){
-            this.validateDictionaryForm.addControl(key + '_' + obj.id, new FormControl({value: obj[key], disabled: key === 'value' ? obj.system : false}, [Validators.required]))
+            if(this.activeDictionaryKey.key === 'incident_status' || this.activeDictionaryKey.key === 'incident_degree'){
+              this.validateDictionaryForm.addControl(key + '_' + obj.id, new FormControl({value: obj[key], disabled: true}, [Validators.required]))
+            }else{
+              this.validateDictionaryForm.addControl(key + '_' + obj.id, new FormControl({value: obj[key], disabled: key === 'value' ? obj.system : false}, [Validators.required]))
+            }
           }
         }
       })
@@ -247,6 +245,7 @@ export class ConfigurationDictionaryComponent implements OnInit {
       .subscribe((result) => {
         this.btnLoading = false;
         if (result.status == 200) {
+          this.mainService.clearDictionary();
           this.showPromptModal('保存', true, '');
         } else {
           this.showPromptModal('保存', false, result.msg || '');

src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { ConfigurationDictionaryComponent } from './configuration-dictionary.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    ConfigurationDictionaryComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+  ],
+  exports: [
+    ConfigurationDictionaryComponent,
+  ]
+})
+export class ConfigurationDictionaryModule { }

src/app/components/incidentManagement/incident-detail/incident-detail.component.html

@@ -35,8 +35,8 @@
             </div>
             <div class="row">
               <div class="col">来电电话：{{incidentData.incomingPhone}}</div>
-              <div class="col"><audio class="audio" controls style="outline: none;" *ngIf="incidentData.callID"><source [src]="audioSrc"></audio></div>
-              <div class="col">关联资产：{{incidentData.assetDTO?.name}}</div>
+              <div class="col"><audio class="audio" controls style="outline: none;" *ngIf="incidentData.callID && audioSrc"><source [src]="audioSrc" type="audio/wav"></audio></div>
+              <div class="col"><ng-container *ngIf="incidentData.assetDTO">关联资产：{{incidentData.assetDTO?.name}}</ng-container></div>
             </div>
             <div class="row">
               <div class="col">报修科室：{{incidentData.department?.dept}}</div>
@@ -59,8 +59,9 @@
               <div class="col">解决方案：{{incidentData.handleDescription}}</div>
             </div>
             <div class="row">
-              <div class="col">是否生成知识库：{{incidentData.transSolution == 1 ? '是' : '否'}}</div>
-              <div class="col flex2">是否引用知识库：{{incidentData.solutionNo ? '是' : '否'}}</div>
+              <div class="col">是否生成知识库：{{incidentData.solutionCode ? '是' : '否'}}</div>
+              <div class="col">生成知识库编号：{{incidentData.solutionCode}}</div>
+              <div class="col">是否引用知识库：{{incidentData.solutionNo ? '是' : '否'}}</div>
             </div>
             <div class="row">
               <div class="col thumbs">

src/app/components/incidentManagement/incident-detail/incident-detail.component.ts

@@ -59,7 +59,7 @@ export class IncidentDetailComponent implements OnInit {
     this.activeTabValue = item.value;
 
     if(this.activeTabValue == 1){
-      this.incidentData.callID && this.getCallrecord();
+      this.incidentData.callID && this.getCallLog();
       this.incidentData.reqAttachment && this.getRepairImgs();
     }else if(this.activeTabValue == 2){
       this.getHandleImgs();
@@ -173,19 +173,29 @@ export class IncidentDetailComponent implements OnInit {
 
   // 获取通话音频
   audioSrc =  '';//音频
-  getCallrecord() {
+  getCallLog() {
     let postData = {
       idx: 0,
       sum: 1,
-      callrecord: {callAccept: this.incidentData.callID},
+      callLog: {callAccept: this.incidentData.callID},
     };
     this.mainService
-      .getFetchDataList('simple/data', 'callrecord', postData)
+      .getFetchDataList('simple/data', 'callLog', postData)
       .subscribe((result) => {
         if(result.status == 200){
           result.list = result.list || [];
           if(result.list.length){
-            this.audioSrc = location.origin + result.list[0].recordingFileName;
+            if(result.list[0].path){
+              this.mainService.getCallLogPath({ path: result.list[0].path, hosId: result.list[0].hosId }).subscribe((result) => {
+                if (result["state"] == 200) {
+                  this.audioSrc = location.origin + result["relativePath"];
+                }else{
+                  this.audioSrc = '';
+                }
+              });
+            }else{
+              this.audioSrc = '';
+            }
           }else{
             this.audioSrc = '';
           }
@@ -228,11 +238,6 @@ export class IncidentDetailComponent implements OnInit {
     return this.incidentData.synergetic && this.incidentData.synergetic.length ? this.incidentData.synergetic.map(v => v.name).join('，') : '';
   }
 
-  // 是否进入汇总单
-  isInSummaryOrder(){
-    return this.incidentData.duty && this.itsmSummarySheet.value == 1 && (this.incidentData.handlingPersonnelUser.id == this.tool.getCurrentUserId());
-  }
-
   // 获取院区配置信息
   itsmSummarySheet:any = {};//是否需要填写汇总单
   getHospitalConfig() {
@@ -250,12 +255,10 @@ export class IncidentDetailComponent implements OnInit {
         let list = result.list || [];
         this.itsmSummarySheet = list.find(v => v.key == 'itsmSummarySheet') || {};
         console.log(this.itsmSummarySheet)
-        if(this.isInSummaryOrder()){
-          // 维修汇总单
-          if(this.incidentData.state.value == 'close' && this.incidentData.summaryId){
-            let flag = this.tabs.some(v => v.value === 4);
-            !flag && this.tabs.splice(2, 0, {name: '汇总单', value: 4});
-          }
+        // 维修汇总单
+        if(this.incidentData.state.value == 'close' && this.itsmSummarySheet.value == 1 && this.incidentData.summaryId){
+          let flag = this.tabs.some(v => v.value === 4);
+          !flag && this.tabs.splice(2, 0, {name: '汇总单', value: 4});
         }
       });
   }

src/app/components/incidentManagement/incident-direct-order/incident-direct-order.component.html

@@ -0,0 +1,36 @@
+<div class="save display_flex justify-content_flex-center align-items_center add">
+  <div class="modalBody">
+    <div class="title">直接解决<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="content">
+      <form nz-form [formGroup]="validateForm" class="addForm">
+        <nz-form-item [hidden]="itsmSimpleHandle.value == 1">
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="handleDescription">解决方案</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请填写解决方案!">
+            <textarea nz-input rows="4" placeholder="请填写解决方案" formControlName="handleDescription"></textarea>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="closecode">处理结果</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择处理结果!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="closecode" nzShowSearch
+              nzPlaceHolder="请选择处理结果" nzServerSearch>
+              <ng-container *ngFor="let data of closecodeList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+      </form>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nz-button nzType="primary" (click)="submitForm()"[nzLoading]="isLoading">确认</button>
+      <button nz-button nzType="default" class="btn cancel" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>
+
+<!-- 遮罩 -->
+<app-mask *ngIf="maskFlag"></app-mask>

src/app/components/incidentManagement/incident-direct-order/incident-direct-order.component.less

@@ -0,0 +1,125 @@
+@import "../../../../../src/theme.less";
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+
+  .modalBody {
+    width: 350px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      width: 100%;
+      height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 16px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 19px 14px 0 14px;
+        max-height: 500px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              text-align: left;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button:nth-child(1) {
+        margin-right: 20px;
+      }
+    }
+  }
+}

src/app/components/incidentManagement/incident-direct-order/incident-direct-order.component.ts

@@ -0,0 +1,120 @@
+import { Component, OnInit, Input, Output, EventEmitter, ViewChild } from '@angular/core';
+import { MainService } from '../../../services/main.service';
+import { Router, ActivatedRoute } from '@angular/router';
+import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
+import { NzMessageService } from 'ng-zorro-antd';
+import { ToolService } from 'src/app/services/tool.service';
+import { FormGroup, Validators, FormBuilder, FormControl } from '@angular/forms';
+
+@Component({
+  selector: 'app-incident-direct-order',
+  templateUrl: './incident-direct-order.component.html',
+  styleUrls: ['./incident-direct-order.component.less']
+})
+export class IncidentDicrectOrderComponent implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+  @Output() confirmModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  @Input() id: any;
+
+  constructor(
+    private mainService: MainService,
+    private router: Router,
+    private route: ActivatedRoute,
+    private message: NzMessageService,
+    private tool: ToolService,
+    private fb: FormBuilder,
+  ) { }
+
+  isLoading = false;
+  hosId:any;
+
+  ngOnInit() {
+    this.hosId = this.tool.getCurrentHospital().id;
+    this.initForm();
+    this.getClosecodes();
+    this.getHospitalConfig();
+  }
+
+  // 初始化新增form表单
+  validateForm: FormGroup; //新增/编辑表单
+  initForm() {
+    this.validateForm = this.fb.group({
+      handleDescription: [null],//解决方案
+      closecode: [null, [Validators.required]],//处理结果
+    });
+    console.log(this.validateForm.controls)
+  }
+
+  requiredChange(name:string, required: boolean): void {
+    if (!required) {
+      this.validateForm.get(name)!.clearValidators();
+      this.validateForm.get(name)!.markAsPristine();
+    } else {
+      this.validateForm.get(name)!.setValidators(Validators.required);
+      this.validateForm.get(name)!.markAsDirty();
+    }
+    this.validateForm.get(name)!.updateValueAndValidity();
+  }
+
+  // 获取处理结果列表
+  closecodeList:any[] = [];
+  getClosecodes(){
+    this.mainService.getDictionary("list", "incident_closecode").subscribe((data) => {
+      this.closecodeList = data || [];
+    });
+  }
+
+  // 获取院区配置信息
+  itsmSimpleHandle:any = {};//是否简单处理
+  getHospitalConfig() {
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      hospitalConfig: {
+        model: "itsm",
+        hosId: this.hosId,
+      },
+    }
+    this.mainService
+      .getFetchDataList("simple/data", "hospitalConfig", postData)
+      .subscribe((result) => {
+        let list = result.list || [];
+        this.itsmSimpleHandle = list.find(v => v.key == 'itsmSimpleHandle') || {};
+        if(this.itsmSimpleHandle.value != 1){
+          this.requiredChange('handleDescription', true);
+        }
+      });
+  }
+
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+  }
+
+  // 表单提交
+  maskFlag:any = false;
+  submitForm(): void {
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty();
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateForm.invalid) {
+      return;
+    }
+
+    this.confirmModelHs.emit({
+      handleDescription: this.validateForm.value.handleDescription,
+      closecode: this.validateForm.value.closecode,
+    });//emits(向上弹射)事件
+  }
+}
+
+
+
+

src/app/components/incidentManagement/incident-direct-order/incident-direct-order.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { IncidentDicrectOrderComponent } from './incident-direct-order.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    IncidentDicrectOrderComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+  ],
+  exports: [
+    IncidentDicrectOrderComponent,
+  ]
+})
+export class IncidentDicrectOrderModule { }

src/app/components/incidentManagement/incident-handle-info-simple/incident-handle-info-simple.component.html

@@ -27,12 +27,12 @@
     </div>
   </div>
 
-  <div class="formItem">
+  <div class="formItem" *ngIf="itsmIncidentAsset.value == 1">
     <div class="name"><i class="icon_transport transport-required red" style="visibility: hidden;"></i>关联资产：</div>
     <div class="value w100">
       <nz-select class="w100" [(ngModel)]="incidentDataCopy.assetId" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
         (nzOnSearch)="changeInp('assetId', $event)" nzAllowClear  nzPlaceHolder="请选择关联资产">
-          <ng-container *ngFor="let option of assetProducList">
+          <ng-container *ngFor="let option of assetList">
             <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
           </ng-container>
           <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>

src/app/components/incidentManagement/incident-handle-info-simple/incident-handle-info-simple.component.ts

@@ -36,7 +36,7 @@ export class IncidentHandleInfoSimpleComponent implements OnInit {
       if(v[0] === 'synergetic'){
         this.getSynergeticList(v[1]);
       }else if(v[0] === 'assetId'){
-        this.getAssetProductList(v[1]);
+        this.getAssetList(v[1]);
       }
     });
     this.init();
@@ -47,9 +47,11 @@ export class IncidentHandleInfoSimpleComponent implements OnInit {
     this.hosId = this.tool.getCurrentHospital().id;
     this.incidentDataCopy = cloneDeep(this.incidentData);
     this.incidentDataCopy.synergetic = [];
+    this.getHospitalConfig();
     this.getHandleCategorys();
+    this.getClosecodes();
     this.getSynergeticList();
-    this.getAssetProductList();
+    this.getAssetList();
   }
 
   // 边输边搜节流阀
@@ -76,6 +78,19 @@ export class IncidentHandleInfoSimpleComponent implements OnInit {
     });
   }
 
+  // 获取处理结果列表
+  closecodeList:any[] = [];
+  getClosecodes(){
+    this.mainService.getDictionary("list", "incident_closecode").subscribe((data) => {
+      this.closecodeList = data || [];
+      console.log(this.incidentDataCopy)
+      if(!this.incidentDataCopy.closecode){
+        let closecode = this.closecodeList.find(v => v.value == '1');
+        this.incidentDataCopy.closecode = closecode ? closecode.id : undefined;
+      }
+    });
+  }
+
   // 获取协同人员
   hosId:any;
   isLoading = false;
@@ -83,7 +98,7 @@ export class IncidentHandleInfoSimpleComponent implements OnInit {
   getSynergeticList(keyword = '') {
     let postData = {
       user: {
-        hospital: { id: this.hosId },
+        hospital: { id: this.incidentDataCopy.duty.id },
         name: keyword,
         simpleQuery: true,
         roleCodes: 'first-line support',
@@ -100,11 +115,30 @@ export class IncidentHandleInfoSimpleComponent implements OnInit {
       });
   }
 
+  // 获取院区配置信息
+  itsmIncidentAsset:any = {};//是否事件关联资产
+  getHospitalConfig() {
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      hospitalConfig: {
+        model: "itsm",
+        hosId: this.hosId,
+      },
+    }
+    this.mainService
+      .getFetchDataList("simple/data", "hospitalConfig", postData)
+      .subscribe((result) => {
+        let list = result.list || [];
+        this.itsmIncidentAsset = list.find(v => v.key == 'itsmIncidentAsset') || {};
+      });
+  }
+
   // 获取资产列表
-  assetProducList: any = [];
-  getAssetProductList(keyword = '') {
+  assetList: any = [];
+  getAssetList(keyword = '') {
     let postData = {
-      assetProduct: {
+      asset: {
         hosId: this.hosId,
         name: keyword,
       },
@@ -112,9 +146,9 @@ export class IncidentHandleInfoSimpleComponent implements OnInit {
       sum: 20,
     };
     this.mainService
-      .getFetchDataList("simple/data", "assetProduct", postData)
+      .getFetchDataList("simple/data", "asset", postData)
       .subscribe((data) => {
-        this.assetProducList = data.list;
+        this.assetList = data.list;
       });
   }
 

src/app/components/incidentManagement/incident-handle-info/incident-handle-info.component.html

@@ -68,12 +68,12 @@
     </div>
   </div>
 
-  <div class="formItem">
+  <div class="formItem" *ngIf="itsmIncidentAsset.value == 1">
     <div class="name"><i class="icon_transport transport-required red" style="visibility: hidden;"></i>关联资产：</div>
     <div class="value w100">
       <nz-select class="w100" [(ngModel)]="incidentDataCopy.assetId" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
         (nzOnSearch)="changeInp('assetId', $event)" nzAllowClear  nzPlaceHolder="请选择关联资产">
-          <ng-container *ngFor="let option of assetProducList">
+          <ng-container *ngFor="let option of assetList">
             <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
           </ng-container>
           <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>

src/app/components/incidentManagement/incident-handle-info/incident-handle-info.component.ts

@@ -45,7 +45,7 @@ export class IncidentHandleInfoComponent implements OnInit, OnChanges {
       if(v[0] === 'synergetic'){
         this.getSynergeticList(v[1]);
       }else if(v[0] === 'assetId'){
-        this.getAssetProductList(v[1]);
+        this.getAssetList(v[1]);
       }else if(v[0] === 'category'){
         this.getIncidentCategoryList(v[1]);
       }
@@ -66,10 +66,11 @@ export class IncidentHandleInfoComponent implements OnInit, OnChanges {
       this.incidentDataCopy.transSolution = 0;
     }
     console.log('this.incidentDataCopy:', this.incidentDataCopy)
+    this.getHospitalConfig();
     this.getHandleCategorys();
     this.getClosecodes();
     this.getSynergeticList();
-    this.getAssetProductList();
+    this.getAssetList();
     this.getIncidentCategoryList();
   }
 
@@ -122,7 +123,7 @@ export class IncidentHandleInfoComponent implements OnInit, OnChanges {
   getSynergeticList(keyword = '') {
     let postData = {
       user: {
-        hospital: { id: this.hosId },
+        hospital: { id: this.incidentDataCopy.duty.id },
         name: keyword,
         simpleQuery: true,
         roleCodes: 'first-line support',
@@ -169,11 +170,30 @@ export class IncidentHandleInfoComponent implements OnInit, OnChanges {
     })
   }
 
+  // 获取院区配置信息
+  itsmIncidentAsset:any = {};//是否事件关联资产
+  getHospitalConfig() {
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      hospitalConfig: {
+        model: "itsm",
+        hosId: this.hosId,
+      },
+    }
+    this.mainService
+      .getFetchDataList("simple/data", "hospitalConfig", postData)
+      .subscribe((result) => {
+        let list = result.list || [];
+        this.itsmIncidentAsset = list.find(v => v.key == 'itsmIncidentAsset') || {};
+      });
+  }
+
   // 获取资产列表
-  assetProducList: any = [];
-  getAssetProductList(keyword = '') {
+  assetList: any = [];
+  getAssetList(keyword = '') {
     let postData = {
-      assetProduct: {
+      asset: {
         hosId: this.hosId,
         name: keyword,
       },
@@ -181,9 +201,9 @@ export class IncidentHandleInfoComponent implements OnInit, OnChanges {
       sum: 20,
     };
     this.mainService
-      .getFetchDataList("simple/data", "assetProduct", postData)
+      .getFetchDataList("simple/data", "asset", postData)
       .subscribe((data) => {
-        this.assetProducList = data.list;
+        this.assetList = data.list;
       });
   }
 

src/app/components/incidentManagement/incident-handle-order/incident-handle-order.component.ts

@@ -35,7 +35,7 @@ export class IncidentHandleOrderComponent implements OnInit {
     });
     this.hosId = this.tool.getCurrentHospital().id;
     this.getSummaryList();
-    this.getConsumableList();
+    this.getHospitalConfig();
     this.getWorkHourManagementList();
   }
 
@@ -143,18 +143,44 @@ export class IncidentHandleOrderComponent implements OnInit {
     this.changeInpSubject.next([model, e]);
   }
 
+  // 获取院区配置信息
+  itsmZeroStock:any = {};//是否支持零库存
+  itsmParentConsumable:any = {};//是否支持父级科室耗材
+  getHospitalConfig() {
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      hospitalConfig: {
+        model: "itsm",
+        hosId: this.hosId,
+      },
+    }
+    this.mainService
+      .getFetchDataList("simple/data", "hospitalConfig", postData)
+      .subscribe((result) => {
+        let list = result.list || [];
+        this.itsmZeroStock = list.find(v => v.key == 'itsmZeroStock') || {};
+        this.itsmParentConsumable = list.find(v => v.key == 'itsmParentConsumable') || {};
+        this.getConsumableList();
+      });
+  }
+
   // 获取耗材
   consumableList: any = [];
   getConsumableList(keyword = '', isShowValue = false) {
-    let postData = {
+    let postData:any = {
       consumable: {
         name: keyword,
-        hosId: this.hosId,
         showZero: true,
       },
       idx: 0,
       sum: 20,
     };
+    if(this.itsmParentConsumable.value == 1){
+      postData.consumable.upHosId = this.hosId;
+		}else{
+      postData.consumable.hosId = this.hosId;
+		}
     this.mainService
       .getFetchDataList("simple/data", "consumable", postData)
       .subscribe((data) => {
@@ -276,6 +302,7 @@ export class IncidentHandleOrderComponent implements OnInit {
     let postData = {
       workHourManagement: {
         hosId: this.hosId,
+        showSecond: 1,
       },
       idx: 0,
       sum: 9999,

src/app/components/incidentManagement/incident-handle-repair/incident-handle-repair.component.html

@@ -39,8 +39,8 @@
 <div class="detailItem">
   <div class="name">电话录音：</div>
   <div class="value">
-    <audio class="audio" controls style="outline: none;" *ngIf="incidentData.callID">
-      <source [src]="audioSrc">
+    <audio class="audio" controls style="outline: none;" *ngIf="incidentData.callID && audioSrc">
+      <source [src]="audioSrc" type="audio/wav">
     </audio>
   </div>
 </div>

src/app/components/incidentManagement/incident-handle-repair/incident-handle-repair.component.ts

@@ -21,25 +21,35 @@ export class IncidentHandleRepairComponent implements OnInit {
 
   ngOnInit() {
     this.hosId = this.tool.getCurrentHospital().id;
-    this.incidentData.callID && this.getCallrecord();
+    this.incidentData.callID && this.getCallLog();
     this.incidentData.reqAttachment && this.getRepairImgs();
   }
 
   // 获取通话音频
   audioSrc =  '';//音频
-  getCallrecord() {
+  getCallLog() {
     let postData = {
       idx: 0,
       sum: 1,
-      callrecord: {callAccept: this.incidentData.callID},
+      callLog: {callAccept: this.incidentData.callID},
     };
     this.mainService
-      .getFetchDataList('simple/data', 'callrecord', postData)
+      .getFetchDataList('simple/data', 'callLog', postData)
       .subscribe((result) => {
         if(result.status == 200){
           result.list = result.list || [];
           if(result.list.length){
-            this.audioSrc = location.origin + result.list[0].recordingFileName;
+            if(result.list[0].path){
+              this.mainService.getCallLogPath({ path: result.list[0].path, hosId: result.list[0].hosId }).subscribe((result) => {
+                if (result["state"] == 200) {
+                  this.audioSrc = location.origin + result["relativePath"];
+                }else{
+                  this.audioSrc = '';
+                }
+              });
+            }else{
+              this.audioSrc = '';
+            }
           }else{
             this.audioSrc = '';
           }

src/app/components/incidentManagement/incident-handle/incident-handle.component.html

@@ -1,6 +1,6 @@
 <div class="modal display_flex justify-content_flex-center align-items_center" *ngIf="incidentData">
   <div class="modalBody">
-    <div class="title">详细处理<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="title">{{itsmSimpleHandle.value == 1 ? '简单处理' : '详细处理'}}<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
     <div class="content">
       <overlay-scrollbars #osComponentRef1 class="detail">
         <app-incident-handle-repair [incidentData]="incidentData"></app-incident-handle-repair>

src/app/components/incidentManagement/incident-handle/incident-handle.component.less

@@ -114,10 +114,8 @@
         height: 100%;
         border-left: 1px solid #E9E9E9;
         .knowageItem{
-          padding: 16px 16px 0;
-          &:last-of-type{
-            padding-bottom: 16px;
-          }
+          padding: 16px;
+          border-bottom: 1px solid #E9E9E9;
         }
         .knowageTitle{
           font-size: 16px;

src/app/components/incidentManagement/incident-handle/incident-handle.component.ts

@@ -133,7 +133,7 @@ export class IncidentHandleComponent implements OnInit {
       let solutionStatusList = data[0] || [];
       let solutionTypeList = data[1] || [];
 
-      this.solutionStatus = solutionStatusList.find(item => item.value == 2);
+      this.solutionStatus = solutionStatusList.find(item => item.value == 3);
       	console.log('this.solutionStatus:', this.solutionStatus)
       this.solutionType = solutionTypeList.find(item => item.value == 1);
       	console.log('this.solutionType:', this.solutionType)
@@ -159,7 +159,7 @@ export class IncidentHandleComponent implements OnInit {
       idx: 0,
       sum: 9999,
       solution: {
-        category: categoryId,
+        categoryId,
 				status: this.solutionStatus,
 				type: this.solutionType,
       },
@@ -321,6 +321,7 @@ export class IncidentHandleComponent implements OnInit {
         incident: {
           ...incidentDataCopy,
           handleCategory: incidentDataCopy.handleCategory ? { id: incidentDataCopy.handleCategory }: undefined,
+          closecode: incidentDataCopy.closecode ? { id: incidentDataCopy.closecode }: undefined,
           synergetic: incidentDataCopy.synergetic.length ? incidentDataCopy.synergetic.map(v => ({id: v})): undefined,
         },
       }

src/app/components/incidentManagement/incident-recording/incident-recording.component.html

@@ -0,0 +1,14 @@
+<div class="save display_flex justify-content_flex-center align-items_center add">
+  <div class="modalBody">
+    <div class="title">回放录音<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    </div>
+    <div class="content audio">
+      <audio controls style="outline: none;">
+        <source [src]="audioPath" type="audio/wav">
+      </audio>
+    </div>
+    <div class=" display_flex justify-content_flex-center">
+      <button class="btn cancel" nz-button nzType="default" (click)="hideModal()">知道了</button>
+    </div>
+  </div>
+</div>

src/app/components/incidentManagement/incident-recording/incident-recording.component.less

@@ -0,0 +1,173 @@
+@import "../../../../../src/theme.less";
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+
+  .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: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 18px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+      .roundRobinTips {
+        font-size: 12px;
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 18px 14px 0 14px;
+        max-height: 497px;
+        overflow-y: auto;
+        &.audio {
+          padding: 0;
+          height: 126px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+
+            .desc {
+              margin-top: 5px;
+            }
+          }
+
+          .datesControl {
+            margin-top: -16px;
+
+            .ant-form-item-label {
+              line-height: 40px;
+            }
+          }
+
+          .timer {
+            .ant-form-item-label {
+              width: 100%;
+              text-align: left;
+            }
+
+            .numInp {
+              margin-right: 5px;
+            }
+
+            .line {
+              margin-right: 5px;
+            }
+          }
+
+          .timer2 {
+            .ant-form-item-label {
+              line-height: 20px;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}

src/app/components/incidentManagement/incident-recording/incident-recording.component.ts

@@ -0,0 +1,29 @@
+import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
+
+@Component({
+  selector: 'app-incident-recording',
+  templateUrl: './incident-recording.component.html',
+  styleUrls: ['./incident-recording.component.less']
+})
+export class IncidentRecordingComponent implements OnInit {
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  @Input() path: any;
+
+  constructor() { }
+
+  audioPath = ""; //录音文件地址
+
+  ngOnInit() {
+    this.audioPath = location.origin + this.path;
+  }
+
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+  }
+}
+
+
+
+

src/app/components/incidentManagement/incident-recording/incident-recording.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { IncidentRecordingComponent } from './incident-recording.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    IncidentRecordingComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+  ],
+  exports: [
+    IncidentRecordingComponent,
+  ]
+})
+export class IncidentRecordingModule { }

src/app/components/incidentManagement/incident-reject/incident-reject.component.html

@@ -0,0 +1,22 @@
+<div class="save display_flex justify-content_flex-center align-items_center add">
+  <div class="modalBody">
+    <div class="title">不受理<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="content">
+      <form nz-form [formGroup]="validateForm" class="addForm">
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="rejectRemark">不受理原因</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请填写不受理原因!">
+            <textarea rows="4" nz-input formControlName="rejectRemark" placeholder="请填写不受理原因"></textarea>
+          </nz-form-control>
+        </nz-form-item>
+      </form>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nz-button nzType="primary" (click)="submitForm()"[nzLoading]="isLoading">确认</button>
+      <button nz-button nzType="default" class="btn cancel" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>
+
+<!-- 遮罩 -->
+<app-mask *ngIf="maskFlag"></app-mask>

src/app/components/incidentManagement/incident-reject/incident-reject.component.less

@@ -0,0 +1,125 @@
+@import "../../../../../src/theme.less";
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+
+  .modalBody {
+    width: 350px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      width: 100%;
+      height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 16px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 19px 14px 0 14px;
+        max-height: 500px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              text-align: left;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button:nth-child(1) {
+        margin-right: 20px;
+      }
+    }
+  }
+}

src/app/components/incidentManagement/incident-reject/incident-reject.component.ts

@@ -0,0 +1,65 @@
+import { Component, OnInit, Input, Output, EventEmitter, ViewChild } from '@angular/core';
+import { MainService } from '../../../services/main.service';
+import { Router, ActivatedRoute } from '@angular/router';
+import { NzMessageService } from 'ng-zorro-antd';
+import { ToolService } from 'src/app/services/tool.service';
+import { FormGroup, Validators, FormBuilder } from '@angular/forms';
+
+@Component({
+  selector: 'app-incident-reject',
+  templateUrl: './incident-reject.component.html',
+  styleUrls: ['./incident-reject.component.less']
+})
+export class IncidentRejectComponent implements OnInit {
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+  @Output() confirmModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  @Input() id: any;
+
+  constructor(
+    private mainService: MainService,
+    private router: Router,
+    private route: ActivatedRoute,
+    private message: NzMessageService,
+    private tool: ToolService,
+    private fb: FormBuilder,
+  ) { }
+
+  isLoading = false;
+
+  ngOnInit() {
+    this.initForm();
+  }
+
+  // 初始化新增form表单
+  validateForm: FormGroup; //新增/编辑表单
+  initForm() {
+    this.validateForm = this.fb.group({
+      rejectRemark: [null, [Validators.required]],//不受理原因
+    });
+    console.log(this.validateForm.controls)
+  }
+
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+  }
+
+  // 表单提交
+  maskFlag:any = false;
+  submitForm(): void {
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty();
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateForm.invalid) {
+      return;
+    }
+
+    this.confirmModelHs.emit(this.validateForm.value.rejectRemark);
+  }
+}
+
+
+
+

src/app/components/incidentManagement/incident-reject/incident-reject.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { IncidentRejectComponent } from './incident-reject.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    IncidentRejectComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+  ],
+  exports: [
+    IncidentRejectComponent,
+  ]
+})
+export class IncidentRejectModule { }

src/app/components/incidentManagement/incident-ser-call/incident-ser-call.component.html

@@ -0,0 +1,77 @@
+<div class="modal display_flex align-items_center">
+  <div class="modalBody">
+    <div class="title">通话记录<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="content">
+      <div class="list-template w100" style="padding: 16px;">
+        <div class="list-template__content">
+          <div class="list-template__top" nz-row style="padding: 0;">
+            <div nz-col nzXl='18' class="list-template__searchBox">
+              <div class="list-template__searchItem">
+                <span class="label">主叫号码：</span>
+                <input nz-input class="formItem" placeholder="请输入主叫号码" [(ngModel)]="searchDTO.dTMFA" />
+              </div>
+              <div class="list-template__searchItem">
+                <span class="label">被叫号码：</span>
+                <input nz-input class="formItem" placeholder="请输入被叫号码" [(ngModel)]="searchDTO.dTMFB" />
+              </div>
+              <div class="list-template__searchItem">
+                <span class="label">开始时间：</span>
+                <nz-date-picker class="formItem" [ngModel]="searchDTO.responseTime" (ngModelChange)="searchDTO.responseTime = $event" nzShowTime></nz-date-picker>
+              </div>
+            </div>
+            <div nz-col nzXl='6' class="list-template__btns">
+              <button nz-button class="btn default ml8 mt0" (click)='search()'>搜索</button>
+              <button nz-button class="btn default ml8 mt0" (click)='reset()'>重置</button>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="tableWrap">
+        <nz-table class="hospitalTable" [nzData]="messageList" nzSize="small" [nzShowPagination]="false" [nzLoading]="loading">
+          <thead>
+            <tr class="thead">
+              <th nzWidth="12.5%">主叫号码</th>
+              <th nzWidth="12.5%">被叫号码</th>
+              <th nzWidth="12.5%">开始时间</th>
+              <th nzWidth="12.5%">结束时间</th>
+              <th nzWidth="12.5%">通话时长</th>
+              <th nzWidth="12.5%">已接/未接</th>
+              <th nzWidth="12.5%">呼入/呼出</th>
+              <th nzWidth="12.5%">操作</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr *ngFor="let data of messageList;let i = index;">
+              <td>{{ data.dTMFA }}</td>
+              <td>{{ data.dTMFB }}</td>
+              <td>{{ data.responseTime}}</td>
+              <td>{{ data.overTime}}</td>
+              <td *ngIf="data.longTime!==undefined">{{data.longTime}}秒</td>
+              <td *ngIf="data.longTime===undefined"></td>
+              <td>{{data.callState == 1?'已接':'未接'}}</td>
+              <td>{{data.callType == 1?'呼入':(data.callType == 0?'呼出':'')}}</td>
+              <td>
+                <div class="coop">
+                  <span *ngIf="data.path" (click)="recordcall(data)">回放录音</span>
+                </div>
+              </td>
+            </tr>
+          </tbody>
+        </nz-table>
+        <div class="pagination">
+          <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+          <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="total"
+            [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList()"
+            (nzPageSizeChange)="getList()" [nzShowTotal]="totalTemplate">
+          </nz-pagination>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<!-- 回放录音模态框 -->
+<app-incident-recording [path]="coopData.relativePath" *ngIf="recordingModalShow" (closeModelHs)="closeRecordingModelOrder($event)"></app-incident-recording>
+
+<!-- 遮罩 -->
+<app-mask *ngIf="maskFlag"></app-mask>

src/app/components/incidentManagement/incident-ser-call/incident-ser-call.component.less

@@ -0,0 +1,240 @@
+@import "../../../../theme.less";
+.coop {
+  button{
+    color: #333;
+  }
+  span,button {
+    display: inline-block;
+    padding: 0 8px;
+    cursor: pointer;
+    position: relative;
+
+    &::after {
+      content: "|";
+      position: absolute;
+      top: 0;
+      right: 0;
+    }
+
+    &:hover,
+    &:active {
+      color: @primary-color;
+    }
+
+    &:nth-last-child(1) {
+      &::after {
+        content: "";
+      }
+    }
+  }
+}
+.tabs{
+  width: 100%;
+  height: 56px;
+  border-bottom: 1px solid #D9D9D9;
+  display: flex;
+  align-items: center;
+  .tab{
+    width: 100px;
+    display: flex;
+    height: 100%;
+    justify-content: center;
+    align-items: center;
+    font-size: #333;
+    cursor: pointer;
+    &.active{
+      color: @primary-color;
+      border-bottom: 2px solid @primary-color;
+    }
+  }
+}
+.modal {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+  .tableWrap{
+    margin: 0 16px 16px!important;
+    background: #F9FAFB;
+    border-radius: 8px;
+    border: 1px solid #D9D9D9;
+    width: calc(100% - 32px);
+    min-height: 501px;
+    padding: 16px 16px 0;
+    ::ng-deep .ant-table-body{
+      margin: 0!important;
+    }
+  }
+  .hospitalTable {
+    width: 100%;
+    td {
+      text-align: center !important;
+      position: relative;
+      word-break: break-all;
+    }
+    .thead {
+      background-image: linear-gradient(to right, @bg-start, @bg-end);
+      th {
+        text-align: center !important;
+        color: #fff;
+        background: transparent;
+      }
+    }
+  }
+
+  .ji {
+    position: absolute;
+    right: 0px;
+    top: -3px;
+    width: 30px;
+  }
+
+  .list-template__top{
+    div{
+      text-align: left!important;
+    }
+  }
+
+  .modalBody {
+    width: 1315px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+    &.modalBody-search {
+      width: 480px;
+      min-height: 250px;
+    }
+
+    .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 {
+      min-height: 117px;
+      // background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      &.content-search {
+        min-height: 147px;
+        justify-content: start;
+        .defeat-search {
+          width: 100%;
+          height: 52px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          border-bottom: solid 1px #e5e9ed;
+          em {
+            color: #666;
+            font-style: normal;
+          }
+        }
+        .form {
+          width: 100%;
+          padding: 0 16px;
+          .ant-form-item-label,
+          .ant-form-explain {
+            text-align: left !important;
+          }
+        }
+      }
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.defeat {
+          color: #333;
+          font-size: 28px;
+        }
+        &.countDown {
+          font-size: 14px;
+          color: 666;
+          em {
+            font-style: normal;
+            color: @primary-color;
+          }
+        }
+
+        &.pagination {
+          font-size: 14px;
+          color: #666;
+          padding-top: 16px;
+          padding-bottom: 16px;
+          text-align: right;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 18px 14px 0 14px;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}

src/app/components/incidentManagement/incident-ser-call/incident-ser-call.component.ts

@@ -0,0 +1,122 @@
+import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
+import { format, startOfDay, endOfDay } from 'date-fns';
+import { MainService } from 'src/app/services/main.service';
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from 'ng-zorro-antd';
+@Component({
+  selector: 'app-incident-ser-call',
+  templateUrl: './incident-ser-call.component.html',
+  styleUrls: ['./incident-ser-call.component.less']
+})
+export class IncidentSerCallComponent implements OnInit {
+  // 切换科室，切换弹窗
+  loading = false;
+  messageList: any = [];// 通话记录列表
+  pageIndex: number = 1;//表格当前页码
+  pageSize: number = 10;//表格每页展示条数
+  total: number = 0;//表格总数据量
+
+  searchDTO: any = {};
+
+  @Input() itsmData:any;
+  @Input() hsmsData:any;
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) { }
+
+  ngOnInit() {
+    this.getMessageList(1);
+  }
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit({ show: false });//emits(向上弹射)事件
+  }
+
+  // 搜索
+  search() {
+    this.getMessageList(1);
+  }
+  // 重置
+  reset() {
+    this.searchDTO = {};
+    this.getMessageList(1);
+  }
+
+  // 回放录音
+  coopData:any = {};
+  recordingModalShow = false; //弹窗开关
+  maskFlag:any = false;
+  recordcall(data) {
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService.getCallLogPath({ path: data.path, hosId: data.hosId }).subscribe((result) => {
+      this.message.remove(this.maskFlag);
+      this.maskFlag = false;
+      if (result["state"] == 200) {
+        this.coopData = { relativePath: result["relativePath"] };
+        this.recordingModalShow = true;
+      }
+    });
+  }
+  // 关闭弹窗
+  closeRecordingModelOrder(e) {
+    this.recordingModalShow = JSON.parse(e).show;
+  }
+
+  // 分页获取数据
+  getList(){
+    this.getMessageList();
+  }
+
+  // 获取通话记录列表
+  getMessageList(idx?) {
+    if (idx) {
+      this.pageIndex = 1;
+    }
+    console.log(this.itsmData)
+    console.log(this.hsmsData)
+    let hosIds;
+    if(this.itsmData.mdv2Switch){
+      if(this.itsmData.allDuty == 1){
+        hosIds = undefined;
+      }else{
+        hosIds = this.itsmData.checkedHos.map(v => v.id).toString();
+      }
+    }
+    if(this.hsmsData.hsmsSwitch){
+      if(this.itsmData.mdv2Switch){
+        if(this.itsmData.allDuty == 1){
+          hosIds = undefined;
+        }else{
+          hosIds += ',' + this.hsmsData.checkedHos;
+        }
+      }else{
+        hosIds = this.hsmsData.checkedHos.toString();
+      }
+    }
+    let postData = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      callLog: {
+        hosIds,
+        dTMFA: this.searchDTO.dTMFA || undefined,
+        dTMFB: this.searchDTO.dTMFB || undefined,
+        responseTime: this.searchDTO.responseTime ? format(this.searchDTO.responseTime, 'yyyy-MM-dd HH:mm:ss') : undefined,
+      }
+    }
+    this.loading = true;
+    this.mainService.getFetchDataList('simple/data','callLog',postData).subscribe(data => {
+      this.loading = false;
+      this.messageList = data.list || [];
+      this.total = data.totalNum;
+    })
+  }
+}
+
+
+

src/app/components/incidentManagement/incident-ser-call/incident-ser-call.module.ts

@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { IncidentSerCallComponent } from './incident-ser-call.component';
+import { ShareModule } from 'src/app/share/share.module';
+import { IncidentRecordingModule } from '../incident-recording/incident-recording.module';
+
+
+@NgModule({
+  declarations: [
+    IncidentSerCallComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+    IncidentRecordingModule,
+  ],
+  exports: [
+    IncidentSerCallComponent,
+  ]
+})
+export class IncidentSerCallModule { }

src/app/components/incidentManagement/incident-ser-message/incident-ser-message.component.html

@@ -0,0 +1,73 @@
+<div class="modal display_flex align-items_center">
+  <div class="modalBody">
+    <div class="title">留言记录<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="content">
+      <div class="tabs">
+        <div class="tab" *ngFor="let item of tabs" (click)="clickTbab(item)" [ngClass]="{ active: activeTabValue === item.value }">{{ item.name }}</div>
+      </div>
+      <div class="list-template w100" style="padding: 16px;">
+        <div class="list-template__content">
+          <div class="list-template__top" nz-row style="padding: 0;">
+            <div nz-col nzXl='18' class="list-template__searchBox">
+              <div class="list-template__searchItem">
+                <span class="label">留言时间</span>：
+                <nz-range-picker style="width: 373px;" nzShowTime [(ngModel)]="searchDTO.dateRange" (nzOnCalendarChange)="onCalendarChangeDate($event)"></nz-range-picker>
+              </div>
+            </div>
+            <div nz-col nzXl='6' class="list-template__btns">
+              <button nz-button class="btn default ml8 mt0" (click)='search()'>搜索</button>
+              <button nz-button class="btn default ml8 mt0" (click)='reset()'>重置</button>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="tableWrap">
+        <nz-table class="hospitalTable" [nzData]="messageList" nzSize="small" [nzShowPagination]="false" [nzLoading]="loading">
+          <thead>
+            <tr class="thead">
+              <th nzWidth="8%">序号</th>
+              <th nzWidth="23%">留言时间</th>
+              <th nzWidth="23%">来电号码</th>
+              <th nzWidth="23%">处理状态</th>
+              <th nzWidth="23%">操作</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr *ngFor="let data of messageList;let i = index;">
+              <td>{{ (pageIndex - 1) * pageSize + i + 1 }}</td>
+              <td>{{ data.recTime | date:'yyyy-MM-dd HH:mm' }}</td>
+              <td>{{ data.ano}}</td>
+              <td>{{ data.isExcute == 1 ? '已受理' : (data.isExcute == 2 ? '不受理' : '未受理') }}</td>
+              <td>
+                <div class="coop">
+                  <span *ngIf="data.isExcute === 0" (click)="createOrder(data)">生成工单</span>
+                  <span *ngIf="data.isExcute === 0 || data.isExcute === 1" (click)="recordcall(data)">回放录音</span>
+                  <span *ngIf="data.isExcute === 0" (click)="showDelModal(data, '确认不受理后，将无法转换为事件工单!', '不受理', 'notAccepted')">不受理</span>
+                  <span *ngIf="data.isExcute === 1" (click)="openItsmDetails(data.incidentDTO)">查看故障单</span>
+                </div>
+              </td>
+            </tr>
+          </tbody>
+        </nz-table>
+        <div class="pagination">
+          <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+          <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="total"
+            [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList()"
+            (nzPageSizeChange)="getList()" [nzShowTotal]="totalTemplate">
+          </nz-pagination>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<!-- 回放录音模态框 -->
+<app-incident-recording [path]="coopData.recFileName" *ngIf="recordingModalShow" (closeModelHs)="closeRecordingModelOrder($event)"></app-incident-recording>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow" [info]="promptInfo"></app-prompt-modal>
+
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading" (confirmDelEvent)="confirmDelFn()" [content]="tipsMsg1"></app-dialog-delete>
+
+<!-- 详情 -->
+<app-incident-detail [id]="coopData.id" *ngIf="detailModalShow" (closeModelHs)="closeDetailModelOrder($event)" (confirmModelHs)="confirmDetailModelOrder($event)"></app-incident-detail>

src/app/components/incidentManagement/incident-ser-message/incident-ser-message.component.less

@@ -0,0 +1,240 @@
+@import "../../../../theme.less";
+.coop {
+  button{
+    color: #333;
+  }
+  span,button {
+    display: inline-block;
+    padding: 0 8px;
+    cursor: pointer;
+    position: relative;
+
+    &::after {
+      content: "|";
+      position: absolute;
+      top: 0;
+      right: 0;
+    }
+
+    &:hover,
+    &:active {
+      color: @primary-color;
+    }
+
+    &:nth-last-child(1) {
+      &::after {
+        content: "";
+      }
+    }
+  }
+}
+.tabs{
+  width: 100%;
+  height: 56px;
+  border-bottom: 1px solid #D9D9D9;
+  display: flex;
+  align-items: center;
+  .tab{
+    width: 100px;
+    display: flex;
+    height: 100%;
+    justify-content: center;
+    align-items: center;
+    font-size: #333;
+    cursor: pointer;
+    &.active{
+      color: @primary-color;
+      border-bottom: 2px solid @primary-color;
+    }
+  }
+}
+.modal {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+  .tableWrap{
+    margin: 0 16px 16px!important;
+    background: #F9FAFB;
+    border-radius: 8px;
+    border: 1px solid #D9D9D9;
+    width: calc(100% - 32px);
+    min-height: 501px;
+    padding: 16px 16px 0;
+    ::ng-deep .ant-table-body{
+      margin: 0!important;
+    }
+  }
+  .hospitalTable {
+    width: 100%;
+    td {
+      text-align: center !important;
+      position: relative;
+      word-break: break-all;
+    }
+    .thead {
+      background-image: linear-gradient(to right, @bg-start, @bg-end);
+      th {
+        text-align: center !important;
+        color: #fff;
+        background: transparent;
+      }
+    }
+  }
+
+  .ji {
+    position: absolute;
+    right: 0px;
+    top: -3px;
+    width: 30px;
+  }
+
+  .list-template__top{
+    div{
+      text-align: left!important;
+    }
+  }
+
+  .modalBody {
+    width: 1315px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+    &.modalBody-search {
+      width: 480px;
+      min-height: 250px;
+    }
+
+    .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 {
+      min-height: 117px;
+      // background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      &.content-search {
+        min-height: 147px;
+        justify-content: start;
+        .defeat-search {
+          width: 100%;
+          height: 52px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          border-bottom: solid 1px #e5e9ed;
+          em {
+            color: #666;
+            font-style: normal;
+          }
+        }
+        .form {
+          width: 100%;
+          padding: 0 16px;
+          .ant-form-item-label,
+          .ant-form-explain {
+            text-align: left !important;
+          }
+        }
+      }
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.defeat {
+          color: #333;
+          font-size: 28px;
+        }
+        &.countDown {
+          font-size: 14px;
+          color: 666;
+          em {
+            font-style: normal;
+            color: @primary-color;
+          }
+        }
+
+        &.pagination {
+          font-size: 14px;
+          color: #666;
+          padding-top: 16px;
+          padding-bottom: 16px;
+          text-align: right;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 18px 14px 0 14px;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}

src/app/components/incidentManagement/incident-ser-message/incident-ser-message.component.ts

@@ -0,0 +1,181 @@
+import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
+import { format, startOfDay, endOfDay } from 'date-fns';
+import { MainService } from 'src/app/services/main.service';
+import { ToolService } from 'src/app/services/tool.service';
+@Component({
+  selector: 'app-incident-ser-message',
+  templateUrl: './incident-ser-message.component.html',
+  styleUrls: ['./incident-ser-message.component.less']
+})
+export class IncidentSerMessageComponent implements OnInit {
+  // 切换科室，切换弹窗
+  loading = false;
+  messageList: any = [];// 留言列表
+  pageIndex: number = 1;//表格当前页码
+  pageSize: number = 10;//表格每页展示条数
+  total: number = 0;//表格总数据量
+
+  tabs:any[] = [
+    {id: 1, name: '全部', value: '', num: ''},
+    {id: 2, name: '未受理', value: 0, num: ''},
+    {id: 3, name: '已受理', value: 1, num: ''},
+    {id: 4, name: '不受理', value: 2, num: ''},
+  ]
+
+  searchDTO: any = {};
+
+  @Input() itsmData:any;
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  constructor(private mainService: MainService, private tool: ToolService) { }
+
+  ngOnInit() {
+    this.clickTbab(this.tabs[1]);
+  }
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit({ show: false });//emits(向上弹射)事件
+  }
+
+  // 点击tab
+  activeTabValue:any;
+  clickTbab(item){
+    this.activeTabValue = item.value;
+    this.getMessageList(1);
+  }
+
+  onCalendarChangeDate(dateArr){
+    console.log(dateArr)
+    if(dateArr.length == 2){
+      let dateStart = new Date(dateArr[0]);
+      let dateEnd = new Date(dateArr[1]);
+      dateStart.setHours(0,0,0);
+      dateEnd.setHours(23,59,59);
+      this.searchDTO.dateRange = [dateStart,dateEnd];
+    }
+  }
+
+  // 搜索
+  search() {
+    this.getMessageList(1);
+  }
+  // 重置
+  reset() {
+    this.searchDTO = {};
+    this.getMessageList(1);
+  }
+
+  delModal: boolean = false; //删除模态框
+  tipsMsg1: string; //提示框信息
+  tipsMsg2: string; //操作后信息
+  confirmDelType: string; //确认的类型（启用/停用，删除）
+  coopData:any = {};
+  showDelModal(data, tipsMsg1: string, tipsMsg2: string, type: string) {
+    this.confirmDelType = type;
+    this.delModal = true;
+    this.coopData = data;
+    this.tipsMsg1 = tipsMsg1;
+    this.tipsMsg2 = tipsMsg2;
+  }
+  // 隐藏删除框
+  hideDelModal() {
+    this.delModal = false;
+  }
+  // 确认删除
+  btnLoading: boolean = false; //确认按钮loading状态
+  confirmDelFn() {
+    this.btnLoading = true;
+    if (this.confirmDelType === "notAccepted") {
+      //不受理
+      this.mainService
+        .simplePost("updData", "hjzxRecord", { ...this.coopData, item: undefined, isExcute: 2 })
+        .subscribe((data) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          if (data.status == 200) {
+            this.showPromptModal(this.tipsMsg2, true, "");
+          } else {
+            this.showPromptModal(this.tipsMsg2, false, data.msg);
+          }
+        });
+    }
+  }
+
+  // 生成工单
+  createOrder(data){
+    this.closeModelHs.emit({ show: false, data: data });
+  }
+
+  // 回放录音
+  recordingModalShow = false; //弹窗开关
+  recordcall(data) {
+    this.coopData = data;
+    this.recordingModalShow = true;
+  }
+  // 关闭弹窗
+  closeRecordingModelOrder(e) {
+    this.recordingModalShow = JSON.parse(e).show;
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //是否展示提示框
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+      this.getList();
+    }, 100);
+  }
+
+  // 分页获取数据
+  getList(){
+    this.getMessageList();
+  }
+
+  // 获取留言列表
+  getMessageList(idx?) {
+    if (idx) {
+      this.pageIndex = 1;
+    }
+    let postData = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      hjzxRecord: {
+        isExcute: this.activeTabValue === '' ? undefined : this.activeTabValue,
+        startTime: this.searchDTO.dateRange ? format(startOfDay(this.searchDTO.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined,
+        endTime: this.searchDTO.dateRange ? format(endOfDay(this.searchDTO.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined,
+      }
+    }
+    this.loading = true;
+    this.mainService.getFetchDataList('simple/data','hjzxRecord',postData).subscribe(data => {
+      this.loading = false;
+      this.messageList = data.list || [];
+      this.total = data.totalNum;
+    })
+  }
+
+  // 查看ITSM工单详情
+  detailModalShow = false; //弹窗开关
+  openItsmDetails(data) {
+    this.coopData = data;
+    this.detailModalShow = true;
+  }
+  // 关闭弹窗
+  closeDetailModelOrder(e) {
+    this.detailModalShow = JSON.parse(e).show;
+  }
+  // 弹窗确定
+  confirmDetailModelOrder(e){
+    console.log(e);
+    this.detailModalShow = false;
+  }
+}
+
+
+

src/app/components/incidentManagement/incident-ser-message/incident-ser-message.module.ts

@@ -0,0 +1,24 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { IncidentSerMessageComponent } from './incident-ser-message.component';
+import { ShareModule } from 'src/app/share/share.module';
+import { IncidentDetailModule } from '../incident-detail/incident-detail.module';
+import { IncidentRecordingModule } from '../incident-recording/incident-recording.module';
+
+
+@NgModule({
+  declarations: [
+    IncidentSerMessageComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+    IncidentDetailModule,
+    IncidentRecordingModule,
+  ],
+  exports: [
+    IncidentSerMessageComponent,
+  ]
+})
+export class IncidentSerMessageModule { }

src/app/components/incidentManagement/incident-ser-visit/incident-ser-visit.component.html

@@ -0,0 +1,36 @@
+<div class="modal display_flex align-items_center">
+  <div class="modalBody">
+    <div class="title">待回访<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <overlay-scrollbars #osComponentRef1 class="content">
+      <nz-spin nzSimple [nzSpinning]="loading" class="mt8 text_align_center"></nz-spin>
+      <ng-container *ngIf="!loading">
+        <div class="items" *ngFor="let item of visitList">
+          <div class="row">
+            <div class="col"><span [ngClass]="priorityColor(item.priorityId)">{{item.priorityDTO?.name}}</span> {{item.incidentsign}}</div>
+            <div class="col">{{item.hosName}} {{item.department?.dept}}</div>
+          </div>
+          <div class="row">
+            <div class="col">故障描述：{{item.description}}</div>
+          </div>
+          <div class="row">
+            <div class="col">详细地址：{{ item.place ? item.place.building.buildingName : '' }}{{ item.place ? item.place.floorName : '' }}{{ item.houseNumber }} <span [innerHTML]="item.overtimeRemark"></span></div>
+          </div>
+          <div class="row">
+            <div class="col">申请时间：{{ item.startDate | date: 'yyyy-MM-dd HH:mm'}}</div>
+            <div class="col">处理人：{{computedHandlerUser(item)}}</div>
+            <div class="col btns">
+              <input type="button" class="mid_bot mr8" value="回访" (click)="visit(item)" />
+              <input type="button" class="btm_bot" value="查看" (click)="openItsmDetails(item)" />
+            </div>
+          </div>
+        </div>
+      </ng-container>
+    </overlay-scrollbars>
+  </div>
+</div>
+
+<!-- 详情 -->
+<app-incident-detail [id]="coopData.id" *ngIf="detailModalShow" (closeModelHs)="closeDetailModelOrder($event)" (confirmModelHs)="confirmDetailModelOrder($event)"></app-incident-detail>
+
+<!-- 回访 -->
+<app-incident-visit [id]="coopData.id" *ngIf="visitModalShow" (closeModelHs)="closeVisitModelOrder($event)" (confirmModelHs)="confirmVisitModelOrder($event)"></app-incident-visit>

src/app/components/incidentManagement/incident-ser-visit/incident-ser-visit.component.less

@@ -0,0 +1,155 @@
+@import "../../../../theme.less";
+.modal {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+  .hospitalTable {
+    width: 100%;
+    td {
+      text-align: center !important;
+      position: relative;
+      word-break: break-all;
+    }
+    .thead {
+      background-image: linear-gradient(to right, @bg-start, @bg-end);
+      th {
+        text-align: center !important;
+        color: #fff;
+        background: transparent;
+      }
+    }
+  }
+
+  .ji {
+    position: absolute;
+    right: 0px;
+    top: -3px;
+    width: 30px;
+  }
+
+  .list-template__top{
+    div{
+      text-align: left!important;
+    }
+  }
+
+  .tab {
+    width: 100%;
+    height: 60px;
+    border-bottom: 1px solid #e5e9ed;
+    background-color: #fff;
+
+    .item {
+      text-align: center;
+      line-height: 60px;
+      height: 100%;
+      border-right: 1px solid #e5e9ed;
+
+      &:nth-last-child(1) {
+        border: none;
+      }
+
+      &.checked {
+        background: #f0f6ed;
+      }
+    }
+  }
+
+  .modalBody {
+    width: 742px;
+    height: 707px;
+    background: #fff;
+    border-radius: 5px;
+    padding-bottom: 30px;
+    color: #333;
+    &.modalBody-search {
+      width: 480px;
+      min-height: 250px;
+    }
+
+    .title {
+      width: 100%;
+      height: 40px;
+      line-height: 40px;
+      text-align: center;
+      font-size: 16px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 16px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 16px;
+      }
+    }
+
+    .content {
+      height: calc(100% - 40px);
+      border-top: 1px solid #D9D9D9;
+      border-bottom: 1px solid #D9D9D9;
+      .items{
+        border-bottom: 1px solid #D9D9D9;
+        padding: 16px 48px;
+        font-size: 14px;
+        &:last-of-type{
+          border-bottom: none;
+        }
+        .row{
+          position: relative;
+          display: flex;
+          margin-top: 12px;
+          &:first-of-type{
+            margin-top: 0;
+          }
+          .col{
+            margin-right: 48px;
+            &:last-of-type{
+              margin-right: 0;
+            }
+            &.btns{
+              position: absolute;
+              bottom: 0;
+              right: 0;
+            }
+          }
+        }
+        /* 中按钮 */
+        .mid_bot {
+          width: 65px;
+          border-radius: 4px;
+          color: white;
+          background-color: @primary-color;
+          border: 1px @primary-color solid;
+          cursor: pointer;
+          height: 27px;
+        }
+
+        /* 下按钮 */
+        .btm_bot {
+          width: 65px;
+          border-radius: 4px;
+          color: #78797a;
+          background-color: #FFF;
+          border: 1px #e5e9ed solid;
+          cursor: pointer;
+          height: 27px;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+}

src/app/components/incidentManagement/incident-ser-visit/incident-ser-visit.component.ts

@@ -0,0 +1,143 @@
+import { Component, OnInit, Input, Output, EventEmitter, ViewChild } from '@angular/core';
+import { ToolService } from 'src/app/services/tool.service';
+import { MainService } from 'src/app/services/main.service';
+import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
+import cloneDeep from 'lodash-es/cloneDeep'
+import { format, addHours, addDays } from 'date-fns';
+@Component({
+  selector: 'app-incident-ser-visit',
+  templateUrl: './incident-ser-visit.component.html',
+  styleUrls: ['./incident-ser-visit.component.less']
+})
+export class IncidentSerVisitComponent implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  // 切换科室，切换弹窗
+  loading = false;
+  visitList: any = [];// 列表
+  pageIndex: number = 1;//表格当前页码
+  pageSize: number = 10;//表格每页展示条数
+  total: number = 0;//表格总数据量
+
+  @Input() itsmData:any;
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  constructor(private mainService: MainService, private tool: ToolService) { }
+
+  ngOnInit() {
+    this.getVisitList();
+  }
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+  }
+
+  // 优先级颜色
+  priorityColor(priorityId) {
+    // 极低|低
+    if(priorityId == 1 || priorityId == 2){
+      return '';
+    } else if(priorityId == 3){
+      return 'yellow';
+    } else if(priorityId == 4 || priorityId == 5){
+      return 'red';
+    }
+  }
+
+  // 处理人
+  computedHandlerUser(item){
+    if(item.state.value == 'pending' && item.currentLog){
+      return item.currentLog.workerName;
+    }
+    if(item.state.value != 'pending' && item.handlingPersonnelUser){
+      return item.handlingPersonnelUser.name;
+    }
+  }
+
+  // 查看ITSM工单详情
+  detailModalShow = false; //弹窗开关
+  coopData:any = {};
+  openItsmDetails(data) {
+    this.coopData = data;
+    this.detailModalShow = true;
+  }
+  // 关闭弹窗
+  closeDetailModelOrder(e) {
+    this.detailModalShow = JSON.parse(e).show;
+  }
+  // 弹窗确定
+  confirmDetailModelOrder(e){
+    console.log(e);
+    this.detailModalShow = false;
+  }
+
+  // 回访-弹窗
+  visitModalShow = false; //弹窗开关
+  visit(data) {
+    this.coopData = data;
+    this.visitModalShow = true;
+  }
+  // 关闭弹窗
+  closeVisitModelOrder(e) {
+    this.visitModalShow = JSON.parse(e).show;
+  }
+  // 弹窗确定
+  confirmVisitModelOrder(e){
+    console.log(e);
+    this.visitModalShow = false;
+    this.getList();
+  }
+
+  // 分页获取数据
+  getList(){
+    this.getVisitList();
+  }
+
+  // 延期记录
+  transferHandlerLog = function (currentLog) {
+    if(!currentLog){
+        return '';
+    }
+    currentLog = cloneDeep(currentLog);
+    if(currentLog.extra1DTO && currentLog.extra2 && currentLog.startTime){
+        if(currentLog.extra2==0.5){
+          currentLog.extra2 = 4;
+          return currentLog.extra1DTO.name+" "+ format(addHours(currentLog.startTime, +currentLog.extra2), "MM月dd日") + format(addHours(currentLog.startTime, +currentLog.extra2), "HH时mm分前完成");
+        }else{
+          return currentLog.extra1DTO.name+" "+ format(addDays(currentLog.startTime, +currentLog.extra2), "MM月dd日前完成");
+        }
+    }else{
+        return '';
+    }
+  }
+
+  // 获取回访列表
+  getVisitList(){
+    this.loading = true;
+    let postData: any = {
+      idx: 0,
+      sum: 9999,
+      incident: {
+        // "groupIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.scopeGroups.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(),
+        "deleteFlag": 0,
+      },
+    };
+
+    this.mainService
+      .getFetchDataList("simple/data", "incident", postData)
+      .subscribe((result) => {
+        this.loading = false;
+        this.visitList = result.list.map(v => ({...v, endDeptsName: v.endDepts ? v.endDepts.map(v => v.dept).toString() : ''}));
+      });
+  }
+}
+
+
+

src/app/components/incidentManagement/incident-ser-visit/incident-ser-visit.module.ts

@@ -0,0 +1,24 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { IncidentSerVisitComponent } from './incident-ser-visit.component';
+import { ShareModule } from 'src/app/share/share.module';
+import { IncidentDetailModule } from '../incident-detail/incident-detail.module';
+import { IncidentVisitModule } from '../incident-visit/incident-visit.module';
+
+
+@NgModule({
+  declarations: [
+    IncidentSerVisitComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+    IncidentDetailModule,
+    IncidentVisitModule,
+  ],
+  exports: [
+    IncidentSerVisitComponent,
+  ]
+})
+export class IncidentSerVisitModule { }

src/app/components/incidentManagement/incident-substitutio-assign/incident-substitution-assign.component.ts

@@ -28,6 +28,7 @@ export class IncidentSubstitutionAssignComponent implements OnInit {
         this.getGroups(v[1]);
       }
     });
+
     this.initForm();
     this.getHospitals(1);
   }
@@ -43,6 +44,20 @@ export class IncidentSubstitutionAssignComponent implements OnInit {
       groupId: [null, [Validators.required]],//组
     });
     console.log(this.validateForm.controls)
+
+    // 默认回显当前人的院区和责任部门
+    let { hospital, type } = this.tool.getHospitalOrDuty();
+    if(type === 'duty'){
+      // 是责任部门
+      this.changeHospital(hospital.parent.id);
+      this.validateForm.controls.hosId.setValue(hospital.parent.id);
+      this.validateForm.controls.dutyId.setValue(hospital.id);
+      this.changeDuty(hospital.id);
+    }else{
+      // 不是责任部门
+      this.changeHospital(hospital.id);
+      this.validateForm.controls.hosId.setValue(hospital.id);
+    }
   }
 
   // 修改院区
@@ -171,7 +186,7 @@ export class IncidentSubstitutionAssignComponent implements OnInit {
       group2: {
         groupName: keyword,
         hospitals: this.validateForm.value.dutyId,
-        type: 1,
+        type: 3,
       },
       idx: 0,
       sum: 10,

src/app/components/incidentManagement/incident-substitutio-redeploy/incident-substitution-redeploy.component.ts

@@ -117,7 +117,7 @@ export class IncidentSubstitutionRedeployComponent implements OnInit {
       group2: {
         groupName: keyword,
         hospitals: this.duty.id,
-        type: 1,
+        type: 3,
       },
       idx: 0,
       sum: 10,

src/app/components/incidentManagement/incident-substitution/incident-substitution.component.less

@@ -12,7 +12,7 @@
   width: 100%;
   height: 100%;
   background: rgba(0, 0, 0, 0.4);
-  z-index: 8;
+  z-index: 18;
   .ji {
     position: absolute;
     right: 0px;

src/app/components/knowledge-look/knowledge-look.component.less

@@ -128,7 +128,7 @@
 					z-index:9999;
 				}
 			.view-box{
-				height: 400px;
+				height: 628px;
 				display: flex;
 				border: 1px solid #eee;
 				.left-box{

src/app/components/knowledge-look/knowledge-look.component.ts

@@ -41,7 +41,7 @@ export class KnowledgeLookComponent implements OnInit {
 			idx: 0,
 			sum: 9999,
 			solution: {
-				hosId: this.hosId,
+				// hosId: data.hosId,
 				operationType:'lookOver',
 				solutionNumber:data.solutionNumber
 			}
@@ -53,7 +53,7 @@ export class KnowledgeLookComponent implements OnInit {
 				this.getFile()
 				let data = res.list
 				this.detailData = data
-				let content = data[0].content
+				let content = data.length ? data[0].content : ''
 				if(content){
 					this.richText = this.sanitizer.bypassSecurityTrustHtml(content);
 				}else{
@@ -67,7 +67,7 @@ export class KnowledgeLookComponent implements OnInit {
 					}
 				}
 				this.lookData = data[0]
-				this.solutionLogs = data[0].solutionLogs
+				this.solutionLogs = data.length ? data[0].solutionLogs : []
 				this.stepLength = this.solutionLogs.length
 				this.isSpinning = false
 			});

src/app/components/order-scope/order-scope.component.html

@@ -0,0 +1,103 @@
+<!-- 工单范围 -->
+<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">{{item.name}}</label>
+        </div>
+      </div>
+      <!-- 运维 -->
+      <div class="conditions" *ngIf="activeScopeTab.value == 1">
+        <div nz-row>
+          <div nz-col nzSpan="4">是否不限制部门：</div>
+          <div nz-col nzSpan="20">
+            <nz-radio-group class="w100" [(ngModel)]="allDuty" (ngModelChange)="changeAllDuty($event)" [nzDisabled]="!activeScopeTab.checked">
+              <label nz-radio [nzValue]="1">是</label>
+              <label nz-radio [nzValue]="0">否</label>
+            </nz-radio-group>
+          </div>
+        </div>
+        <div nz-row>
+          <div nz-col nzSpan="3" [ngClass]="{ required: allDuty === 0 }">运维部门：</div>
+          <div nz-col nzSpan="21">
+            <nz-checkbox-group *ngIf="allDuty === 0" class="w100" style="display: flex; flex-wrap: wrap; gap:8px;" [nzDisabled]="!activeScopeTab.checked" [(ngModel)]="itsmCheckedHos" (ngModelChange)="changeItsmHospital($event)"></nz-checkbox-group>
+          </div>
+        </div>
+        <div nz-row>
+          <div nz-col nzSpan="3">运维分组：</div>
+          <div nz-col nzSpan="21">
+            <label class="checkAll mb8" nz-checkbox *ngIf="itsmCheckedGroup.length" [nzDisabled]="!activeScopeTab.checked" [(ngModel)]="isAllItsmGroupChecked" (ngModelChange)="updateAllItsmGroupChecked()">
+              全选
+            </label>
+            <nz-checkbox-group class="w100" style="display: flex; flex-wrap: wrap; gap:8px;" [nzDisabled]="!activeScopeTab.checked" [(ngModel)]="itsmCheckedGroup" (ngModelChange)="changeItsmGroup($event)"></nz-checkbox-group>
+          </div>
+        </div>
+        <div nz-row>
+          <div nz-col nzSpan="3">工单范围：</div>
+          <div nz-col nzSpan="21">
+            <nz-radio-group class="w100" [(ngModel)]="itsmOrderScopeRadio" [nzDisabled]="!activeScopeTab.checked">
+              <label nz-radio nzValue="0">全工单</label>
+              <label nz-radio nzValue="1">急单</label>
+              <label nz-radio nzValue="2">急单以及超时工单</label>
+            </nz-radio-group>
+          </div>
+        </div>
+      </div>
+      <!-- 配送 -->
+      <div class="conditions" *ngIf="activeScopeTab.value == 2">
+        <div nz-row>
+          <div nz-col nzSpan="3" class="required">院区：</div>
+          <div nz-col nzSpan="21">
+            <nz-radio-group class="w100" style="display: flex; flex-wrap: wrap; gap:8px;" [(ngModel)]="checkedHos" [nzDisabled]="!activeScopeTab.checked" (ngModelChange)="changeCheckedHos($event)">
+              <label *ngFor="let data of hosList" nz-radio [nzValue]="data.id">{{ data.hosName }}</label>
+            </nz-radio-group>
+          </div>
+        </div>
+        <div nz-row>
+          <div nz-col nzSpan="3">工单类型：</div>
+          <div nz-col nzSpan="21" *ngIf="hosTaskTypes && checkedHos && hosTaskTypes['hos' + checkedHos]">
+            <label class="checkAll mb8" nz-checkbox *ngIf="hosTaskTypes['hos' + checkedHos].length" [nzDisabled]="!activeScopeTab.checked" [(ngModel)]="allTypeChecked" (ngModelChange)="updateAllTypeChecked()">
+              全选
+            </label>
+            <nz-checkbox-wrapper class="w100" style="display: flex; flex-wrap: wrap; gap:8px;" (nzOnChange)="changeTaskTypes($event)">
+              <label nz-checkbox [nzDisabled]="!activeScopeTab.checked" [nzValue]="data.id" [ngModel]="initTypes[data.id]" *ngFor="let data of hosTaskTypes['hos' + checkedHos]">{{ data.taskName }}</label>
+            </nz-checkbox-wrapper>
+          </div>
+        </div>
+        <div nz-row>
+          <div nz-col nzSpan="3">人员分组：</div>
+          <div nz-col nzSpan="21" *ngIf="hosGroups && checkedHos && hosGroups['hos' + checkedHos]">
+            <label class="checkAll mb8" [nzDisabled]="!activeScopeTab.checked" nz-checkbox *ngIf="hosGroups['hos' + checkedHos].length" [(ngModel)]="allGroupChecked" (ngModelChange)="updateAllGroupChecked()">
+              全选
+            </label>
+            <nz-checkbox-wrapper class="w100" style="display: flex; flex-wrap: wrap; gap:8px;" (nzOnChange)="changeGroups($event)">
+              <label nz-checkbox [nzDisabled]="!activeScopeTab.checked" [nzValue]="data.id" [ngModel]="initGroups[data.id]" *ngFor="let data of hosGroups['hos' + checkedHos]">{{ data.groupName }}</label>
+            </nz-checkbox-wrapper>
+          </div>
+        </div>
+        <div nz-row>
+          <div nz-col nzSpan="3">工单范围：</div>
+          <div nz-col nzSpan="21">
+            <nz-radio-group class="w100" [nzDisabled]="!activeScopeTab.checked" [(ngModel)]="orderScopeRadio">
+              <label nz-radio nzValue="0">全工单</label>
+              <label nz-radio nzValue="1">急单</label>
+              <label nz-radio nzValue="2">急单以及超时工单</label>
+            </nz-radio-group>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="btns display_flex justify-content_flex-center">
+      <button class="btn" nz-button nzType="primary" [nzLoading]="saveLoading" (click)="saveOrderScope()">
+        保存
+      </button>
+      <button class="btn cancel" nz-button nzType="default" (click)="cancelInit()">
+        知道了
+      </button>
+    </div>
+  </div>
+</div>

src/app/components/order-scope/order-scope.component.less

@@ -0,0 +1,184 @@
+@import "../../../../src/theme.less";
+:host {
+  ::ng-deep .ant-checkbox-wrapper + .ant-checkbox-wrapper{
+    margin-left: 0!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: 400px;
+          overflow: auto;
+          padding: 16px 20px;
+
+          div {
+            text-align: left;
+            margin-bottom: 8px;
+          }
+        }
+      }
+
+      .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/order-scope/order-scope.component.ts

@@ -0,0 +1,433 @@
+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';
+
+@Component({
+  selector: 'app-order-scope',
+  templateUrl: './order-scope.component.html',
+  styleUrls: ['./order-scope.component.less']
+})
+export class OrderScopeComponent implements OnInit {
+  @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,
+  ) { }
+
+  user = JSON.parse(localStorage.getItem("user")); //用户信息
+  checkedHos;//转运-院区
+  orderScopeRadio:any = '0';//转运-工单范围
+
+  itsmCheckedHos:any[] = [];//运维-院区
+  itsmCheckedGroup:any[] = [];//运维-分组
+  itsmOrderScopeRadio:any = '0';//运维-工单范围
+  isAllItsmGroupChecked:boolean = false;//运维-是否全选分组
+
+  ngOnInit() {
+    this.initHsms();
+    this.initItsm();
+  }
+
+  initHsms(){
+    console.log('hsmsData：', this.hsmsData);
+    let index = this.scopeTabs.findIndex(v => v.value === 2);
+    this.scopeTabs[index].checked = this.hsmsData.hsmsSwitch;
+    this.checkedHos = this.hsmsData.checkedHos;
+    this.orderScopeRadio = this.hsmsData.orderScopeRadio;
+    this.initOrderScope();
+    this.getOrderScope();
+  }
+
+  initItsm(){
+    console.log('itsmData', this.itsmData);
+    let index = this.scopeTabs.findIndex(v => v.value === 1);
+    this.scopeTabs[index].checked = this.itsmData.mdv2Switch;
+    this.itsmOrderScopeRadio = this.itsmData.orderScopeRadio;
+    this.itsmInitOrderScope();
+    this.itsmGetOrderScope();
+  }
+
+    // 工单范选项卡
+    scopeTabs:any[] = [
+      { name: '运维', value: 1, checked: false },
+      { name: '配送', value: 2, checked: false },
+    ];
+    activeScopeTab = this.scopeTabs[0];
+    //#region 工单范围-运维start
+    allDuty:number = 1;
+    itsmInitOrderScope(){
+
+    }
+    // 工单范围数据
+    itsmGetOrderScope() {
+      // 是否不限制部门
+      this.allDuty = this.itsmData.allDuty === undefined ? 1 : this.itsmData.allDuty;
+      // 权限内的院区和组
+      let hosList = this.user.infoPermission.dutyList || [];
+      let groups = this.user.infoPermission.dutyGroupList || [];
+
+      // 选中的院区和组
+      let itsmCheckedHos = this.itsmData.checkedHos || [];
+      let itsmCheckedGroup = this.itsmData.scopeGroups || [];
+
+      let hosIds = itsmCheckedHos.map(v => v.id);
+      let groupIds = itsmCheckedGroup.map(v => v.id);
+
+      this.itsmCheckedHos = hosList.map(v => ({ label: v.hosName, value: v.id, checked: hosIds.includes(v.id) }));
+      this.itsmCheckedGroup = groups.filter(v => hosIds.includes(v.hospital.id)).map(v => ({ label: v.hospital.hosName + '-' + v.groupName, value: v.id, checked: groupIds.includes(v.id) }));
+      this.isAllItsmGroupChecked = this.itsmCheckedGroup.length ? this.itsmCheckedGroup.every(v => v.checked) : false;
+    }
+
+    // 全选、全不选分组
+    updateAllItsmGroupChecked(){
+      this.itsmCheckedGroup.forEach(v => v.checked = this.isAllItsmGroupChecked);
+    }
+    // 选择分组
+    changeItsmGroup(e){
+      this.isAllItsmGroupChecked = this.itsmCheckedGroup.length ? this.itsmCheckedGroup.every(v => v.checked) : false;
+    }
+    // 选择院区
+    changeItsmHospital(hospitalList){
+      console.log('hospitalList:', hospitalList)
+      // 权限内的院区和组
+      let groups = this.user.infoPermission.dutyGroupList || [];
+
+      // 选中的院区和组
+      let itsmCheckedHos = this.itsmCheckedHos || [];
+      let itsmCheckedGroup = this.itsmCheckedGroup || [];
+
+      let hosIds = itsmCheckedHos.filter(v => v.checked).map(v => v.value);
+      let groupIds = itsmCheckedGroup.filter(v => v.checked).map(v => v.value);
+
+      this.itsmCheckedGroup = groups.filter(v => hosIds.includes(v.hospital.id)).map(v => ({ label: v.hospital.hosName + '-' + v.groupName, value: v.id, checked: groupIds.includes(v.id) }));
+      console.log('this.itsmCheckedGroup:', this.itsmCheckedGroup)
+      this.isAllItsmGroupChecked = this.itsmCheckedGroup.length ? this.itsmCheckedGroup.every(v => v.checked) : false;
+    }
+    //#endregion 工单范围-运维end
+
+    //#region 工单范围-配送start
+    // 工单范围数据
+    hosList = []; //院区
+    taskTypes = []; //当前权限下所有工单类型
+    userGroups = []; //当前权限下所有人员分组
+    hosTaskTypes = {}; //当前权限下所有院区对应的任务类型
+    hosGroups = {}; //当前权限下所有院区对应的人员分组
+    getOrderScope() {
+      let hospitals = this.user.infoPermission.hospitals || []
+      this.hosList = hospitals.filter(v => !this.tool.isDuty(v));
+      this.taskTypes = this.user.infoPermission.taskTypes || [];
+      let userGroups = this.user.infoPermission.groups || [];
+      this.userGroups = this.user.infoPermission.groups.filter(v => v.type !== 3);
+      this.hosList.forEach((e) => {
+        let arrT = [],
+          arrG = [];
+        this.taskTypes.forEach((el) => {
+          if (el.hosId.id == e.id) {
+            arrT.push(el);
+            this.hosTaskTypes["hos" + e.id] = arrT;
+          }
+        });
+
+        this.userGroups.forEach((ele) => {
+          if (ele.hospital.id == e.id) {
+            arrG.push(ele);
+            this.hosGroups["hos" + e.id] = arrG;
+          }
+        });
+      });
+      console.log(this.hosTaskTypes, this.hosGroups);
+
+      // 工单范围全选按钮是否选中
+      this.allTypeChecked = false;
+      if (this.user.user.scope && this.user.user.scope.typeIds) {
+        if (
+          this.user.user.scope.typeIds.length ==
+          this.hosTaskTypes["hos" + this.checkedHos].length
+        ) {
+          this.allTypeChecked = true;
+        }
+      }
+      this.allGroupChecked = false;
+      if (this.user.user.scope && this.user.user.scope.groupIds) {
+        if (
+          this.user.user.scope.groupIds.length ==
+          this.hosGroups["hos" + this.checkedHos].length
+        ) {
+          this.allGroupChecked = true;
+        }
+      }
+    }
+
+    // 工单类型全选
+    allTypeChecked: boolean = false; //工单类型全选框
+    updateAllTypeChecked() {
+      let arr = [];
+      this.hosTaskTypes["hos" + this.checkedHos].forEach((e) => {
+        arr.push(e.id);
+      });
+      this.changeTaskTypes(this.allTypeChecked ? arr : [], false);
+
+    }
+
+    // 修改院区
+    changeCheckedHos(e){
+      this.getTypeAndGroup();
+    }
+
+    // 工单类型
+    checkedTypes = []; //已选中taskTypes的ID数组
+    changeType: boolean = false; //是否改变工单类型
+    hosTypesChecked = {}; //当前权限下所有院区下选中的工单类型
+    changeTaskTypes(val, isOwn = true) {
+      this.checkedTypes = val;
+      this.changeType = true;
+      this.hosTypesChecked["hos" + this.checkedHos] = val;
+      console.log(this.hosTypesChecked);
+      if (val.length == this.hosTaskTypes["hos" + this.checkedHos].length) {
+        this.allTypeChecked = true;
+      } else {
+        this.allTypeChecked = false;
+      }
+
+      if(isOwn){
+        let obj = {};
+        console.log('arr:', val)
+        console.log('hosTaskTypes:', this.hosTaskTypes)
+        val.forEach((e) => {
+          obj[e] = true;
+        });
+        this.initTypes = obj;
+      }else{
+        let obj = {};
+        console.log('arr:', val)
+        console.log('hosTaskTypes:', this.hosTaskTypes)
+        val.forEach((e) => {
+          obj[e] = this.allTypeChecked;
+        });
+        this.initTypes = obj;
+      }
+    }
+
+    // 人员分组全选
+    allGroupChecked: boolean = false; //工单类型全选框
+    updateAllGroupChecked() {
+      let arr = [];
+      this.hosGroups["hos" + this.checkedHos].forEach((e) => {
+        arr.push(e.id);
+      });
+      this.changeGroups(this.allGroupChecked ? arr : [], false);
+
+    }
+    // 人员分组
+    checkedGroups = [];
+    changeGroup: boolean = false; //是否改变分组
+    hosGroupsChecked = {}; //当前权限下所有院区下选中的人员分组
+    changeGroups(val, isOwn = true) {
+      this.checkedGroups = val;
+      this.changeGroup = true;
+      this.hosGroupsChecked["hos" + this.checkedHos] = val;
+      console.log(this.hosGroupsChecked);
+      if (val.length == this.hosGroups["hos" + this.checkedHos].length) {
+        this.allGroupChecked = true;
+      } else {
+        this.allGroupChecked = false;
+      }
+
+      if(isOwn){
+        let obj = {};
+        val.forEach((e) => {
+          obj[e] = true;
+        });
+        this.initGroups = obj;
+      }else{
+        let obj = {};
+        val.forEach((e) => {
+          obj[e] = this.allGroupChecked;
+        });
+        this.initGroups = obj;
+      }
+    }
+
+    // 工单范围院区切换
+    getTypeAndGroup() {
+      this.allTypeChecked = false;
+      this.allGroupChecked = false;
+      for (let k1 in this.initTypes) {
+        this.initTypes[k1] = false;
+      }
+      for (let k1 in this.initGroups) {
+        this.initGroups[k1] = false;
+      }
+      // this.orderScopeRadio = "0";
+    }
+
+    // 切换是否不限制部门
+    changeAllDuty(e){
+      console.log(e);
+      this.itsmCheckedHos.forEach(v => (v.checked = false));
+      this.itsmCheckedGroup = [];
+    }
+
+    // 保存工单范围设置
+    saveLoading: boolean = false; //保存按钮loading状态
+    saveOrderScope() {
+      // 配送的院区必填
+      let value2 = this.scopeTabs.find(v => v.value == 2 );
+      if(value2.checked && !this.checkedHos){
+        this.message.warning('【配送】的院区必填！')
+        return;
+      }
+
+      // 运维限制部门的时候，部门必填
+      let value1 = this.scopeTabs.find(v => v.value == 1 );
+      if(value1.checked && !this.itsmCheckedHos.filter(v => v.checked).length && this.allDuty != 1){
+        this.message.warning('【运维】的部门必填！')
+        return;
+      }
+
+      this.saveLoading = true;
+      let types = [];
+      if (!this.changeType) {
+        // 没有改变当前工单类型设置，取初始化设置，
+        for (var i in this.initTypes) {
+          if (this.initTypes[i]) {
+            types.push(Number(i));
+          }
+        }
+      } else {
+        let arr = this.hosTypesChecked["hos" + this.checkedHos] || [];
+        arr.forEach(function (val) {
+          types.push(Number(val));
+        });
+      }
+
+      let groups = [];
+      if (!this.changeGroup) {
+        // 没有改变当前分组设置，取初始化设置，
+        for (var k in this.initGroups) {
+          if (this.initGroups[k]) {
+            groups.push(Number(k));
+          }
+        }
+      } else {
+        let arr = this.hosGroupsChecked["hos" + this.checkedHos] || [];
+        arr.forEach(function (val) {
+          groups.push(Number(val));
+        });
+      }
+      types = [...new Set(types)];
+      groups = [...new Set(groups)];
+
+      let groupsId = [];
+      groups.forEach((e) => {
+        groupsId.push({ id: e });
+      });
+      let typesId = [];
+      types.forEach((e) => {
+        typesId.push({ id: e });
+      });
+
+      let itsm = this.scopeTabs.find(v => v.value == 1);
+      let hsms = this.scopeTabs.find(v => v.value == 2);
+
+      let postData:any = {
+        workerOrderScope: {
+          userId: this.user.user.id,
+          mdv2Switch: Number(itsm.checked),
+          hsmsSwitch: Number(hsms.checked),
+          range: 0,
+          dutyRange: 0,
+        },
+      };
+
+      if(itsm.checked){
+        postData.workerOrderScope.allDuty = this.allDuty;
+        postData.workerOrderScope.dutyIds = this.itsmCheckedHos.filter(v => v.checked).map(v => v.value).toString() || undefined;
+        postData.workerOrderScope.dutyGroupIds = this.itsmCheckedGroup.filter(v => v.checked).map(v => v.value).toString() || undefined;
+        postData.workerOrderScope.dutyRange = this.itsmOrderScopeRadio - 0;
+      }
+      if(hsms.checked){
+        postData.workerOrderScope.hospitalId = this.checkedHos ? { id: this.checkedHos - 0 } : undefined;
+        postData.workerOrderScope.typeIds = typesId || undefined;
+        postData.workerOrderScope.groupIds = groupsId || undefined;
+        postData.workerOrderScope.range = this.orderScopeRadio - 0;
+      }
+      if (this.user.user.scope && this.user.user.scope.id) {
+        postData.workerOrderScope["id"] = this.user.user.scope.id;
+      }
+      console.log('allDuty', this.allDuty)
+      console.log('itsmCheckedHos', this.itsmCheckedHos)
+      console.log('itsmCheckedGroup', this.itsmCheckedGroup)
+      console.log('itsmOrderScopeRadio', this.itsmOrderScopeRadio)
+      console.log(postData);
+      // return;
+      this.mainService
+        .coopTypeConfig("addData", "workerOrderScope", postData)
+        .subscribe((data) => {
+          this.saveLoading = false;
+          this.confirmModal.emit(data);
+        });
+    }
+
+    // 关闭弹窗
+    cancelInit() {
+      this.cancelModal.emit();
+    }
+
+    // 工单范围设置回显
+    initTypes = {}; //工单类型
+    initGroups = {}; //人员分组
+    initOrderScope() {
+      if (!this.user || !this.user.user || !this.user.user.scope) return;
+      let scopeInfo = this.user.user.scope;
+      if (!this.taskTypes.length) {
+        this.initTypes = {};
+      } else {
+        this.taskTypes.forEach((val, idx) => {
+          this.initTypes[val.id] = false;
+        });
+      }
+      if (!scopeInfo.typeIds) {
+        this.initTypes = {};
+        this.allTypeChecked = false;
+      } else {
+        scopeInfo.typeIds.forEach((val, idx) => {
+          this.initTypes[val.id] = true;
+        });
+      }
+
+      console.log(this.initTypes);
+
+      if (!this.userGroups || !this.userGroups.length) {
+        this.initGroups = {};
+      } else {
+        this.userGroups.forEach((val, idx) => {
+          this.initGroups[val.id] = false;
+        });
+      }
+      if (!scopeInfo.groupIds || !scopeInfo.groupIds.length) {
+        this.initGroups = {};
+      } else {
+        scopeInfo.groupIds.forEach((val, idx) => {
+          this.initGroups[val.id] = true;
+        });
+      }
+      console.log(this.initGroups);
+      console.log(this.initTypes);
+    }
+    //#endregion 工单范围-配送end
+}

src/app/components/order-scope/order-scope.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { OrderScopeComponent } from './order-scope.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    OrderScopeComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+  ],
+  exports: [
+    OrderScopeComponent,
+  ]
+})
+export class OrderScopeModule { }

src/app/pipes/string-to-first-name.pipe.ts

@@ -0,0 +1,17 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+  name: 'stringToFirstValue'
+})
+export class StringToFirstValuePipe implements PipeTransform {
+
+  transform(value: string, ...args: any[]): any {
+    if(value){
+      return value.split(',')[0];
+    }else{
+      return '';
+    }
+
+  }
+
+}

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/main.service.ts

@@ -993,7 +993,19 @@ export class MainService {
 	    headers: this.headers,
 	  });
 	}
-	
+
+	// 调度台工单列表
+	orderList(data) {
+	  return this.http.post(host.host + `/ser/merge/orderList`,data, {
+	    headers: this.headers,
+	  });
+	}
+  // 调度台头部运维分组
+	incidentUserTaskCount(data) {
+	  return this.http.post(host.host + `/incident/incidentUserTaskCount`,data, {
+      headers: this.headers,
+	  });
+	}
 	// 大输液-科室汇总统计
 	summaryData(data) {
 	  return this.http.post(host.host + `/infusion/solutions/dept/summary`,data, {

src/app/services/tool.service.ts

@@ -63,7 +63,7 @@ export class ToolService {
   getCurrentUserId() {
     return JSON.parse(localStorage.getItem("user")).user.id;
   }
-  //返回院区或责任部门
+  //返回当前人的院区是院区或责任部门
   getHospitalOrDuty() {
     let hospital = this.getCurrentHospital();
     let type = 'hospital';//默认是院区
@@ -83,6 +83,11 @@ export class ToolService {
     }
   }
 
+  //判断是否是责任部门
+  isDuty(hospital) {
+    return hospital.type && hospital.type.value == 6;
+  }
+
   // 返回当前用户的组
   getCurrentGroupList(){
     return JSON.parse(localStorage.getItem("user")).user.group || [];
@@ -111,6 +116,14 @@ export class ToolService {
         jurisdiction = e.childrens || []; //匹配路由后，取得对应的权限
       }
     });
+    if(!jurisdiction.length){
+      // type为panel路由
+      menu.forEach(v => {
+        if(v.type === 'panel' && v.link == link && v.childrens){
+          jurisdiction = v.childrens || []; //匹配路由后，取得对应的权限
+        }
+      })
+    }
     jurisdiction.forEach((e) => {
       switch (e.link) {
         case "look":
@@ -236,8 +249,8 @@ export class ToolService {
         case "assign":
           coopBtns.assign = true; //指派
           break;
-        case "postpone":
-          coopBtns.postpone = true; //延期处理
+        case "handle":
+          coopBtns.handle = true; //处理
           break;
         case "settings":
           coopBtns.settings = true; //设置
@@ -260,6 +273,15 @@ export class ToolService {
         case "visit":
           coopBtns.visit = true; //回访
           break;
+        case "continue":
+            coopBtns.continue = true; //继续建单
+            break;
+        case "generate":
+          coopBtns.generate = true; //生成
+          break;
+        case "reject":
+          coopBtns.reject = true; //不受理
+          break;
       }
     });
     console.log(coopBtns);

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

@@ -0,0 +1,19 @@
+/*
+ * @Author: seimin
+ * @Date: 2024-09-24 16:34:47
+ * @LastEditors: seimin
+ * @LastEditTime: 2024-09-29 15:38:58
+ * @Description: 呼叫中心websocket服务
+ */
+import { Injectable } from "@angular/core";
+declare const tlwsa: any;
+@Injectable({
+  providedIn: "root",
+})
+export class WebsocketHjzxService {
+  constructor() { }
+
+  closeWs(flag: boolean = false){
+    flag && tlwsa.tlaClose();
+  }
+}

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

@@ -0,0 +1,111 @@
+/*
+ * @Author: seimin
+ * @Date: 2024-09-24 16:34:47
+ * @LastEditors: seimin
+ * @LastEditTime: 2024-09-29 15:41:54
+ * @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 });
+    }
+  }
+  // 断开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 || sessionStorage.getItem('phoneNumber');
+  }
+  // 设置绑定分机号码
+  setPhoneNumber(phoneNumber: string) {
+    this.phoneNumber = phoneNumber;
+    sessionStorage.setItem('phoneNumber', phoneNumber);
+  }
+  // 删除绑定分机号码
+  removePhoneNumber() {
+    this.phoneNumber = '';
+    sessionStorage.removeItem('phoneNumber');
+  }
+
+  // 上次绑定的分机号码
+  private phoneNumberPre:string = '';
+  // 获取上次绑定分机号码
+  getPhoneNumberPre() {
+    return this.phoneNumberPre || sessionStorage.getItem('phoneNumberPre');
+  }
+  // 设置上次绑定分机号码
+  setPhoneNumberPre(phoneNumberPre: string) {
+    this.phoneNumberPre = phoneNumberPre;
+    sessionStorage.setItem('phoneNumberPre', phoneNumberPre);
+  }
+  // 删除上次绑定分机号码
+  removePhoneNumberPre() {
+    this.phoneNumberPre = '';
+    sessionStorage.removeItem('phoneNumberPre');
+  }
+
+  // 标识(呼叫中心或录音盒)
+  // callCenter|box
+  private sign:string = '';
+  // 获取绑定标识
+  getSign() {
+    return this.sign || sessionStorage.getItem('sign');
+  }
+  // 设置绑定标识
+  setSign(sign: string) {
+    this.sign = sign;
+    sessionStorage.setItem('sign', sign);
+  }
+  // 删除绑定标识
+  removeSign() {
+    this.sign = '';
+    sessionStorage.removeItem('sign');
+  }
+
+  // 呼叫中心服务地址
+  private socketUrl:string = '';
+  // 获取呼叫中心服务地址
+  getSocketUrl() {
+    return this.socketUrl || sessionStorage.getItem('socketUrl');
+  }
+  // 设置呼叫中心服务地址
+  setSocketUrl(socketUrl: string) {
+    this.socketUrl = socketUrl;
+    sessionStorage.setItem('socketUrl', socketUrl);
+  }
+  // 删除呼叫中心服务地址
+  removeSocketUrl() {
+    this.socketUrl = '';
+    sessionStorage.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/share/share.module.ts

@@ -57,6 +57,7 @@ import { wangEditorComponent } from './wang-editor/wang-editor.component';
 import { StripHtmlPipe } from '../pipes/strip-html.pipe.';
 import { PathologyAddComponent } from './pathology-add/pathology-add.component';
 import { PathologyDetailComponent } from './pathology-detail/pathology-detail.component';
+import { StringToFirstValuePipe } from '../pipes/string-to-first-name.pipe';
 
 @NgModule({
   declarations: [
@@ -91,6 +92,7 @@ import { PathologyDetailComponent } from './pathology-detail/pathology-detail.co
 		PathologyDetailComponent,
     DateTransformPipe,
     DataToNamePipe,
+    StringToFirstValuePipe,
     DialogDeleteComponent,
     DialogBxComponent,
     DialogSurgeryComponent,
@@ -162,6 +164,7 @@ import { PathologyDetailComponent } from './pathology-detail/pathology-detail.co
     OverlayscrollbarsModule,
     DateTransformPipe,
     DataToNamePipe,
+    StringToFirstValuePipe,
     DialogDeleteComponent,
     DialogBxComponent,
     DialogSurgeryComponent,

src/app/views/data-dictionary/data-dictionary.component.ts

@@ -321,6 +321,9 @@ export class DataDictionaryComponent implements OnInit {
         this.hideModal();
         this.btnLoading = false;
         if (result["status"] == 200) {
+          if(this.checkedDictionary.type === 'dictionary'){
+            this.mainService.clearDictionary();
+          }
           this.showPromptModal(this.add ? "新增" : "编辑", true, "");
         } else {
           this.showPromptModal(
@@ -359,6 +362,9 @@ export class DataDictionaryComponent implements OnInit {
       this.hideDelDictionaryModal();
       this.btnLoading = false;
       if (result.status == 200) {
+        if(this.checkedDictionary.type === 'dictionary'){
+          this.mainService.clearDictionary();
+        }
         this.showPromptModal("删除", true, "");
       } else {
         this.showPromptModal("删除", false, result.msg);

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

@@ -6,6 +6,18 @@ import { FuwutaiComponent } from './fuwutai.component';
 import { ShareModule } from 'src/app/share/share.module';
 
 import { NgxPrintModule } from 'ngx-print';
+import { OrderScopeModule } from 'src/app/components/order-scope/order-scope.module';
+import { IncidentDicrectOrderModule } from 'src/app/components/incidentManagement/incident-direct-order/incident-direct-order.module';
+import { KnowledgeLookModule } from 'src/app/components/knowledge-look/knowledge-look.module';
+import { IncidentDetailModule } from 'src/app/components/incidentManagement/incident-detail/incident-detail.module';
+import { IncidentRejectModule } from 'src/app/components/incidentManagement/incident-reject/incident-reject.module';
+import { IncidentSubstitutionModule } from 'src/app/components/incidentManagement/incident-substitution/incident-substitution.module';
+import { IncidentHandleModule } from 'src/app/components/incidentManagement/incident-handle/incident-handle.module';
+import { IncidentSerVisitModule } from 'src/app/components/incidentManagement/incident-ser-visit/incident-ser-visit.module';
+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({
@@ -17,6 +29,18 @@ import { NgxPrintModule } from 'ngx-print';
     ShareModule,
     FuwutaiRoutingModule,
     NgxPrintModule,
+    OrderScopeModule,
+    IncidentDicrectOrderModule,
+    KnowledgeLookModule,
+    IncidentDetailModule,
+    IncidentRejectModule,
+    IncidentSubstitutionModule,
+    IncidentHandleModule,
+    IncidentSerVisitModule,
+    IncidentSerMessageModule,
+    IncidentSerCallModule,
+    VirtualScrollerModule,
+    BindExtensionNumberModule,
   ]
 })
 export class FuwutaiModule { }

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

@@ -160,12 +160,13 @@
                 [nzDropdownMatchSelectWidth]="false"
                 formControlName="groupType"
                 nzShowSearch
-                nzAllowClear 
+                nzAllowClear
                 [nzDisabled]="isDisabledGroupType"
                 nzPlaceHolder="请选择分组类型"
               >
-                <nz-option nzLabel="统计分组" nzValue="1"></nz-option>
+                <nz-option nzLabel="配送分组" nzValue="1"></nz-option>
                 <nz-option nzLabel="派单分组" nzValue="2"></nz-option>
+                <nz-option nzLabel="运维分组" nzValue="3"></nz-option>
               </nz-select>
             </nz-form-control>
           </nz-form-item>
@@ -179,7 +180,7 @@
                 class="formItem"
                 nzServerSearch
                 nzShowSearch
-                [nzLoading]="editLoading" 
+                [nzLoading]="editLoading"
                 nzPlaceHolder="请选择分组组长"
                 formControlName="groupLeader"
                 (nzOnSearch)="changeInp($event)"

src/app/views/hospital-config/hospital-config.component.ts

@@ -441,7 +441,7 @@ export class HospitalConfigComponent implements OnInit {
    * @returns
    */
   getGroupList(hosId) {
-    let postData = { idx: 0, sum: 100, group2: { hospitals: hosId, type: 1 } };
+    let postData = { idx: 0, sum: 100, group2: { hospitals: hosId, typeIds: '1,3' } };
     return this.mainService
       .getFetchDataList("data", "group2", postData)
       .toPromise();

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/incident-config/incident-config.component.html

@@ -18,7 +18,7 @@
   </ng-container>
   <!-- 数据字典 -->
   <ng-container *ngIf="activeTagId === 3">
-    <app-configuration-dictionary></app-configuration-dictionary>
+    <app-configuration-dictionary [dictionaryKeyList]="dictionaryKeyList"></app-configuration-dictionary>
   </ng-container>
   <!-- 消息通知 -->
   <ng-container *ngIf="activeTagId === 4">

src/app/views/incident-config/incident-config.component.ts

@@ -22,6 +22,17 @@ export class IncidentConfigComponent implements OnInit, AfterViewInit {
     { id: 7, name: '院区配置',},
   ];
 
+  // 数据字典
+  dictionaryKeyList:any[] = [
+    { id: 1, name: '积分配置', key: "incident_category_score"},
+    { id: 2, name: '事件来源', key: "incident_source"},
+    { id: 3, name: '处理结果', key: "incident_closecode"},
+    { id: 4, name: '处理方式', key: "incident_handle_type"},
+    { id: 5, name: '状态', key: "incident_status"},
+    { id: 6, name: '维修记录', key: "repair_type"},
+    { id: 7, name: '满意度评价', key: "incident_degree"},
+  ]
+
   ngOnInit(): void {}
 
   ngAfterViewInit(){

src/app/views/incident-config/incident-config.module.ts

@@ -6,11 +6,11 @@ import { IncidentConfigComponent } from './incident-config.component';
 import { ShareModule } from 'src/app/share/share.module';
 import { ConfigurationCategoryComponent } from 'src/app/components/configurationCenter/configuration-category/configuration-category.component';
 import { ConfigurationPriorityComponent } from 'src/app/components/configurationCenter/configuration-priority/configuration-priority.component';
-import { ConfigurationDictionaryComponent } from 'src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.component';
 import { ConfigurationManHourComponent } from 'src/app/components/configurationCenter/configuration-manHour/configuration-manHour.component';
 import { ConfigurationDeptUserComponent } from 'src/app/components/configurationCenter/configuration-deptUser/configuration-deptUser.component';
 import { ConfigurationMessageComponent } from 'src/app/components/configurationCenter/configuration-message/configuration-message.component';
 import { ConfigurationHospitalComponent } from 'src/app/components/configurationCenter/configuration-hospital/configuration-hospital.component';
+import { ConfigurationDictionaryModule } from 'src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.module';
 
 
 @NgModule({
@@ -18,7 +18,6 @@ import { ConfigurationHospitalComponent } from 'src/app/components/configuration
     IncidentConfigComponent,
     ConfigurationCategoryComponent,
     ConfigurationPriorityComponent,
-    ConfigurationDictionaryComponent,
 		ConfigurationManHourComponent,
 		ConfigurationDeptUserComponent,
     ConfigurationMessageComponent,
@@ -27,7 +26,8 @@ import { ConfigurationHospitalComponent } from 'src/app/components/configuration
   imports: [
     CommonModule,
     IncidentConfigRoutingModule,
-    ShareModule
+    ShareModule,
+    ConfigurationDictionaryModule,
   ]
 })
 export class IncidentConfigModule { }

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

@@ -1,7 +1,7 @@
 <div class="list-template pt0">
   <div class="list-template__content">
     <div class="list-template__tab">
-      <div class="list-template__tabItem" [ngClass]="{'active': queryTask == item.key}" (click)="changeTab(item.key)" *ngFor="let item of tabs">{{item.value}}({{item.num}})</div>
+      <div class="list-template__tabItem" [ngClass]="{'active': queryTask == item.key}" (click)="changeTab(item.key)" *ngFor="let item of tabs">{{item.value}}<span [ngClass]="{ red: item.isRed && item.num > 0}">({{item.num}})</span></div>
     </div>
     <div class="list-template__top" nz-row>
       <div nz-col nzXl='18' class="list-template__searchBox">
@@ -72,7 +72,7 @@
             <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
             <td class="text_align_left">
               <span [ngClass]="priorityColor(data.priorityId)">{{ data.priorityDTO?.name }}</span>
-              {{ data.incidentsign }} {{ data.description }}
+              {{ data.incidentsign }} {{ data.acceptDate | date: 'yyyy-MM-dd HH:mm' }}<br>{{ data.description }}
               <i class="icon_transport transport-a-11111 ml8" *ngIf="data.reqAttachment"></i>
               <i class="icon_transport transport-luyin ml8" *ngIf="data.reqRecord"></i>
             </td>
@@ -90,19 +90,20 @@
             <td>
               {{ data.acceptUser?.name || '无' }}<br>
               {{ transferSynergetic(data) }}<br>
-              <span [ngStyle]="{ color: data.handleColourInfo ? data.handleColourInfo.value : '' }">{{ data.overdueTime | date: 'MM-dd HH:mm' }}</span>前接单
+              <ng-container *ngIf="(data.state.value === 'pending' || data.state.value === 'reassign') && data.overdueResponseDate"><span [ngStyle]="{ color: data.acceptColourInfo ? data.acceptColourInfo.value : '' }">{{ data.overdueResponseDate | date: 'MM-dd HH:mm' }}</span>前接单</ng-container>
+              <ng-container *ngIf="data.state.value === 'handler' && data.overdueTime"><span [ngStyle]="{ color: data.handleColourInfo ? data.handleColourInfo.value : '' }">{{ data.overdueTime | date: 'MM-dd HH:mm' }}</span>前处理</ng-container>
             </td>
-            <td [innerHTML]="transferHandlerLog(data.currentLog)"></td>
+            <td [innerHTML]="data.overtimeRemark"></td>
             <td>{{ data.state?.name }}</td>
             <td>
               <div class="coop">
                 <span *ngIf="coopBtns.look" (click)="detail($event,data)">查看</span>
-                <span *ngIf="computedVisit(data)" (click)="visit($event,data)">回访</span>
-                <span *ngIf="computedReceive(data)" (click)="showDelModal($event, data,'您确认要接单吗？','接单','receive')">接单</span>
-                <span *ngIf="computedHandle(data)" (click)="handle($event,data)">处理</span>
-                <span *ngIf="computedSubstitution(data)" (click)="substitution($event,data)">换人处理</span>
-                <span *ngIf="computedPostpone(data)" (click)="postpone($event,data)">延期处理</span>
-                <span *ngIf="computedSetDuty(data)" (click)="setDuty($event,data)">设置责任部门</span>
+                <span *ngIf="data.computedVisitFlag" (click)="visit($event,data)">回访</span>
+                <span *ngIf="data.computedReceiveFlag" (click)="showDelModal($event, data,'您确认要接单吗？','接单','receive')">接单</span>
+                <span *ngIf="data.computedHandleFlag" (click)="handle($event,data)">处理</span>
+                <span *ngIf="data.computedSubstitutionFlag" (click)="substitution($event,data)">换人处理</span>
+                <span *ngIf="data.computedPostponeFlag" (click)="postpone($event,data)">延期处理</span>
+                <span *ngIf="data.computedSetDutyFlag" (click)="setDuty($event,data)">设置责任部门</span>
                 <span *ngIf="coopBtns.del && data.deleteFlag !== 1" (click)="showDelModal($event, data,'您确认要删除吗？','删除','del')">删除</span>
               </div>
             </td>

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

@@ -48,15 +48,15 @@ export class IncidentManagementComponent implements OnInit {
   btnLoading: boolean = false; //提交按钮loading状态
 
   tabs:any[] = [
-    // {key: 'all', value: '全部故障', num: 0},
-    {key: 'todo', value: '待我接单', num: 0},
-    {key: 'doing', value: '待我处理', num: 0},
-    // {key: 'reassign', value: '重新指派', num: 0},
-    // {key: 'callback', value: '待我回访', num: 0},
-    {key: 'resolve', value: '由我解决', num: 0},
-    {key: 'owns', value: '与我关联', num: 0},
-    {key: 'storage', value: '暂存', num: 0},
-    // {key: 'badEvaluate', value: '异常评价', num: 0},
+    // {key: 'all', value: '全部故障', num: 0, isRed: false},
+    {key: 'todo', value: '待我接单', num: 0, isRed: true},
+    {key: 'doing', value: '待我处理', num: 0, isRed: true},
+    // {key: 'reassign', value: '重新指派', num: 0, isRed: false},
+    // {key: 'callback', value: '待我回访', num: 0, isRed: false},
+    {key: 'resolve', value: '由我解决', num: 0, isRed: false},
+    {key: 'owns', value: '与我关联', num: 0, isRed: false},
+    {key: 'storage', value: '暂存', num: 0, isRed: false},
+    // {key: 'badEvaluate', value: '异常评价', num: 0, isRed: false},
   ]
 
   searchDTO: any = {};
@@ -87,8 +87,8 @@ export class IncidentManagementComponent implements OnInit {
     this.coopBtns = this.tool.initCoopBtns(this.route);
     this.initTabs();
     this.getDeparts();
-    this.getUsers('', null, 'handle');
-    this.getUsers('', null, 'acceptUser');
+    this.getUsers('', 'handle');
+    this.getUsers('', 'acceptUser');
     this.getGdStates();
     this.getOverdueStates();
     this.getIncidentCategoryList();
@@ -99,18 +99,18 @@ export class IncidentManagementComponent implements OnInit {
   // 初始化tab
   initTabs(){
     if (this.coopBtns.all) {
-        this.tabs.splice(0, 0 , {key: 'all', value: '全部故障', num: 0});
+        this.tabs.splice(0, 0 , {key: 'all', value: '全部故障', num: 0, isRed: false});
     }
     if (this.coopBtns.callback) {
         let index = this.tabs.findIndex(v => v.key == 'resolve');
-        this.tabs.splice(index, 0 , {key: 'callback', value: '待我回访', num: 0});
+        this.tabs.splice(index, 0 , {key: 'callback', value: '待我回访', num: 0, isRed: false});
     }
     if (this.coopBtns.reassign) {
         let index = this.tabs.findIndex(v => v.key == 'doing');
-        this.tabs.splice(index + 1, 0 , {key: 'reassign', value: '重新指派', num: 0});
+        this.tabs.splice(index + 1, 0 , {key: 'reassign', value: '重新指派', num: 0, isRed: false});
     }
     // if (this.coopBtns.badEvaluate) {
-    //     this.tabs.push({key: 'badEvaluate', value: '异常评价', num: 0});
+    //     this.tabs.push({key: 'badEvaluate', value: '异常评价', num: 0, isRed: false});
     // }
   }
 
@@ -150,12 +150,13 @@ export class IncidentManagementComponent implements OnInit {
   }
 
   // 获取处理人
-  getUsers(e?, those?, type?) {
-    let that = those || this;
+  getUsers(e?, type?) {
+    let that = this;
     let postData = {
       user: {
         name: e || "",
-        hospital: { id: that.hospital },
+        hospital: { id: that.tool.getCurrentHospital().id },
+        engineer: 1,
         simpleQuery: true,
       },
       idx: 0,
@@ -214,7 +215,7 @@ export class IncidentManagementComponent implements OnInit {
     if(currentLog.extra1DTO && currentLog.extra2 && currentLog.startTime){
         if(currentLog.extra2==0.5){
           currentLog.extra2 = 4;
-          return currentLog.extra1DTO.name+"<br>"+ format(addHours(currentLog.startTime, +currentLog.extra2), "MM月dd日")+"<br>"+ format(addDays(currentLog.startTime, +currentLog.extra2), "HH时mm分前完成");
+          return currentLog.extra1DTO.name+"<br>"+ format(addHours(currentLog.startTime, +currentLog.extra2), "MM月dd日")+"<br>"+ format(addHours(currentLog.startTime, +currentLog.extra2), "HH时mm分前完成");
         }else{
           return currentLog.extra1DTO.name+"<br>"+ format(addDays(currentLog.startTime, +currentLog.extra2), "MM月dd日前完成");
         }
@@ -245,17 +246,17 @@ export class IncidentManagementComponent implements OnInit {
 
   // 是否显示处理按钮
   computedHandle(data){
-    return data.state.value === 'handler' && data.handlingPersonnelUser && data.handlingPersonnelUser.id == this.tool.getCurrentUserId() && data.deleteFlag !== 1;
+    return this.coopBtns.handle && data.state.value === 'handler' && data.handlingPersonnelUser && data.handlingPersonnelUser.id == this.tool.getCurrentUserId() && data.deleteFlag !== 1;
   }
 
   // 是否显示换人处理按钮
   computedSubstitution(data){
-    return data.state.value === 'pending' || data.state.value === 'handler' || (data.state.value === 'reassign' && this.coopBtns.assign) && data.deleteFlag !== 1;
+    return (data.state.value === 'pending' || data.state.value === 'handler' || (data.state.value === 'reassign' && this.coopBtns.assign)) && data.deleteFlag !== 1;
   }
 
   // 是否显示延期处理按钮
   computedPostpone(data){
-    return this.coopBtns.postpone && data.state.value == 'handler' && data.handlingPersonnelUser && data.handlingPersonnelUser.id == this.tool.getCurrentUserId() && data.deleteFlag !== 1;
+    return data.state.value == 'handler' && data.handlingPersonnelUser && data.handlingPersonnelUser.id == this.tool.getCurrentUserId() && data.deleteFlag !== 1;
   }
 
   // 是否显示设置责任部门按钮
@@ -316,7 +317,17 @@ export class IncidentManagementComponent implements OnInit {
       .getFetchDataList("simple/data", "incident", postData)
       .subscribe((result) => {
         this.loading1 = false;
-        this.listOfData = result.list.map(v => ({...v, endDeptsName: v.endDepts ? v.endDepts.map(v => v.dept).toString() : ''}));
+        let list = result.list || [];
+        list.forEach((item) => {
+          item.endDeptsName = item.endDepts ? item.endDepts.map(v => v.dept).toString() : '';
+          item.computedVisitFlag = this.computedVisit(item);
+          item.computedReceiveFlag = this.computedReceive(item);
+          item.computedHandleFlag = this.computedHandle(item);
+          item.computedSubstitutionFlag = this.computedSubstitution(item);
+          item.computedPostponeFlag = this.computedPostpone(item);
+          item.computedSetDutyFlag = this.computedSetDuty(item);
+        });
+        this.listOfData = list;
         this.listLength = result.totalNum;
       });
 
@@ -337,7 +348,7 @@ export class IncidentManagementComponent implements OnInit {
         if(!incident){
             incident = {};
         }
-        if(this.queryTask === 'all' || this.queryTask === 'callback' || this.queryTask === 'badEvaluate'){
+        if(incident.queryTask === 'all' || incident.queryTask === 'callback' || incident.queryTask === 'badEvaluate'){
           let { hospital, type } = this.tool.getHospitalOrDuty();
           if(type === 'duty'){
             // 当前的所属责任部门
@@ -353,7 +364,7 @@ export class IncidentManagementComponent implements OnInit {
 
         incident.assignee = this.tool.getCurrentUserId();
 
-        if(this.queryTask === 'todo' || this.queryTask === 'owns'){
+        if(incident.queryTask === 'todo' || incident.queryTask === 'owns'){
           incident.candidateGroups = this.tool.getCurrentGroupList().map(v => v.id).toString();
         }else{
           delete incident.candidateGroups;
@@ -690,7 +701,7 @@ export class IncidentManagementComponent implements OnInit {
     this.getList(true);
   }
 
-  // 处理-弹窗
+  // 换人处理-弹窗
   substitutionModalShow = false; //弹窗开关
   substitution(e, data) {
     e.stopPropagation();

src/app/views/inspection-plan-config/inspection-plan-config.component.ts

@@ -207,7 +207,7 @@ export class InspectionPlanConfigComponent implements OnInit, AfterViewInit {
       group2: {
         groupName: keyword,
         hospitals: this.currentHospital.id,
-        type: 1,
+        type: 3,
       },
       idx: 0,
       sum: 10,

src/app/views/login/login.component.html

@@ -46,6 +46,7 @@
       <strong>点击下载谷歌浏览器👉</strong>
       <a [href]="http.domain+'/chrome64/ChromeSetup32.exe'">win32</a>
       <a [href]="http.domain+'/chrome64/ChromeSetup64.exe'">win64</a>
+      <a href="javascript:;" (click)="showScreen($event)">录屏</a>
     </div>
   </div>
 </div>

src/app/views/login/login.component.ts

@@ -9,6 +9,8 @@ import { baseUrlType } from "src/app/type/types";
 import { ToolService } from 'src/app/services/tool.service';
 import { Title } from '@angular/platform-browser';
 import { MarkingService } from 'src/app/services/marking.service';
+
+declare var MediaRecorder: any;
 @Component({
   selector: "app-login",
   templateUrl: "./login.component.html",
@@ -301,4 +303,35 @@ export class LoginComponent implements OnInit {
     });
     return parents;
   }
+
+  // 录屏
+  isRecording:boolean = false;
+  async showScreen(e){
+    if(this.isRecording || !navigator.mediaDevices){
+      return;
+    }
+    e.preventDefault();
+    let stream = await (navigator.mediaDevices as any).getDisplayMedia({ video: true });
+    let mime = MediaRecorder.isTypeSupported("video/webm; codecs=vp9") ? "video/webm; codecs=vp9" : "video/webm";
+
+    let mediaRecorder = new MediaRecorder(stream, { mimeType: mime });
+    let chunks = [];
+    //录制
+    mediaRecorder.addEventListener('dataavailable', (e) => {
+      this.isRecording = true;
+      chunks.push(e.data)
+    })
+    //停止
+    mediaRecorder.addEventListener('stop', () => {
+      let blob = new Blob(chunks, { type: chunks[0].type });
+      let url = URL.createObjectURL(blob);
+      let a = document.createElement('a');
+      a.href = url;
+      a.download = 'video.webm';
+      a.click();
+      this.isRecording = false;
+    })
+    //手动启动
+    mediaRecorder.start()
+  }
 }

src/app/views/main/main.component.html

@@ -1,28 +1,25 @@
 <nz-layout class="app-layout display_flex flex_auto ant-layout-has-sider">
   <overlay-scrollbars #osComponentRef1 class="menu-sidebar">
     <div class="sidebar-logo display_flex align-items_center justify-content_flex-center">
-      <div style="line-height: normal;height:100%;" class="display_flex align-items_center justify-content_flex-center flex-direction_column">
-        <img [src]="tool.logoUrl">
-        <span>{{tool.logoTitle}}</span>
+      <div class="display_flex align-items_center justify-content_flex-center logoTitle">
+        <div class="title ellipsis-multiline" nz-tooltip nzTooltipTitle="{{tool.logoTitle}}">{{tool.logoTitle}}</div>
       </div>
     </div>
     <!-- 导航重写，兼容chrome39 -->
     <ul id="ds-menu">
       <li class="mainMenuOne" (click)="totoMenu('首页')" [ngClass]="{mainMenuSelected:indexFlag}">
         <i nz-icon nzType="home"></i>
-        <span>首页</span>
+        <span nz-tooltip nzTooltipTitle="首页">首页</span>
       </li>
       <li *ngFor="let data of menus" class="mainMenuWrap">
         <div class="mainMenuOne" (click)="clickMenuOne(data)" [ngClass]="{mainMenuSelected:data.flagBg}">
           <i class="icon_transport" [ngClass]="data.icon" *ngIf="isTransportIcon(data.icon)"></i>
           <i nz-icon [nzType]="data.icon" *ngIf="!isTransportIcon(data.icon)"></i>
-          <span>{{data.title}}</span>
-          <span class="icon_transport transport-xialajiantou"
-            [ngStyle]="{transform:data.flag?'rotate(180deg)':'rotate(0deg)',color:data.flag?'#fff':'#999'}"></span>
+          <span nz-tooltip nzTooltipTitle="{{data.title}}">{{data.title}}</span>
+          <span class="icon_transport transport-xialajiantou" [ngStyle]="{transform:data.flag?'rotate(180deg)':'rotate(0deg)',color:data.flag?'#fff':'#999'}"></span>
         </div>
         <ul>
-          <li *ngFor="let item of data.childrens" class="mainMenu" (click)="totoMenu(item.title,item,data)"
-            [ngStyle]="{height:data.flag?'44px':0}" [ngClass]="{menuTwoSelected:item.flag}">
+          <li *ngFor="let item of data.childrens" class="mainMenu" (click)="totoMenu(item.title,item,data)" [ngStyle]="{height:data.flag?'44px':0}" [ngClass]="{menuTwoSelected:item.flag}" nz-tooltip nzTooltipTitle="{{item.title}}">
             {{item.title}}
           </li>
         </ul>
@@ -33,42 +30,37 @@
     <nz-header>
       <div class="app-header display_flex justify-content_space-between align-items_center">
         <div class="left">
-          <button nz-button nzType="primary" *ngIf='deskRole' (click)="toFuwutai()">调度台</button>
-          <button nz-button nzType="primary" *ngIf="nurseRole" (click)="toHuShi()">护士端</button>
-          <button nz-button nzType="primary" *ngIf="pharmacyRole" (click)="toPharmacy()">药房端</button>
-          <button nz-button nzType="primary" *ngIf="pharmacyRole" (click)="toPharmacy2()">药房端2</button>
-          <button nz-button nzType="primary" *ngIf="largeScreenRole" (click)="toBigScreen('largeScreen')">大屏端</button>
-          <button nz-button nzType="primary" *ngIf="largeScreenRole2" (click)="toBigScreen('largeScreen2')">大屏端2</button>
-          <button nz-button nzType="primary" *ngIf="specimenViewRole" (click)="toBigScreen('specimenView')" [nzLoading]="deptTypeLoading">业务视图</button>
-          <button nz-button nzType="primary" *ngIf="specimenViewRole2" (click)="toSpecimenView2()">标本视图</button>
-					<button nz-button nzType="primary" *ngIf="specimenRoomView" (click)="toSpecimenRoomView()">标本间端</button>
-					<button nz-button nzType="primary" *ngIf="pathology" (click)="toPathology()">病理科端</button>
-					<button nz-button nzType="primary" *ngIf="disinfectionSupplyRole" (click)="toDisinfectionSupply()">全局业务查看</button>
-          <button nz-button nzType="primary" *ngIf="configurationCenterRole" (click)="toConfigurationCenter()">配置中心</button>
+          <i class="icon_transport transport-tiaodu-fill green" *ngIf='deskRole' (click)="toFuwutai()" nz-tooltip nzTooltipTitle="调度台"></i>
+          <i class="icon_transport transport-hushizhihanghuligongzuo green" *ngIf="nurseRole" (click)="toHuShi()" nz-tooltip nzTooltipTitle="护士端"></i>
+          <i class="icon_transport transport-peizhi1 green" *ngIf="configurationCenterRole" (click)="toConfigurationCenter()" nz-tooltip nzTooltipTitle="配置中心"></i>
+          <i class="icon_transport transport-shangban green" *ngIf='PCCommutesToWork && userInfo.user && !userInfo.user.online' (click)="GoWork()" nz-tooltip nzTooltipTitle="我要上班"></i>
+          <i class="icon_transport transport-shangban green" *ngIf='PCCommutesToWork && userInfo.user && userInfo.user.online' (click)="GoWork()" nz-tooltip nzTooltipTitle="我要下班"></i>
+          <div class="dropdown" *ngIf="pharmacyRole || largeScreenRole || largeScreenRole2 || specimenViewRole || specimenViewRole2 || specimenRoomView || pathology || disinfectionSupplyRole">
+            <i class="icon_transport transport-gengduoda-copy" (mouseenter)="showDropdown1 = true" (mouseleave)="showDropdown1 = false"></i>
+            <div class="dropdown-content ct" [hidden]="!showDropdown1" (mouseenter)="showDropdown1 = true" (mouseleave)="showDropdown1 = false">
+              <div class="dropdownItem" *ngIf="pharmacyRole" (click)="toPharmacy()">药房端</div>
+              <div class="dropdownItem" *ngIf="pharmacyRole" (click)="toPharmacy2()">药房端2</div>
+              <div class="dropdownItem" *ngIf="largeScreenRole" (click)="toBigScreen('largeScreen')">大屏端</div>
+              <div class="dropdownItem" *ngIf="largeScreenRole2" (click)="toBigScreen('largeScreen2')">大屏端2</div>
+              <div class="dropdownItem" *ngIf="specimenViewRole" (click)="toBigScreen('specimenView')">业务视图</div>
+              <div class="dropdownItem" *ngIf="specimenViewRole2" (click)="toSpecimenView2()">标本视图</div>
+              <div class="dropdownItem" *ngIf="specimenRoomView" (click)="toSpecimenRoomView()">标本间端</div>
+              <div class="dropdownItem" *ngIf="pathology" (click)="toPathology()">病理科端</div>
+              <div class="dropdownItem" *ngIf="disinfectionSupplyRole" (click)="toDisinfectionSupply()">全局业务查看</div>
+            </div>
+          </div>
         </div>
         <div class="right">
-          <button class="mr8" nz-button nzType="primary" *ngIf='PCCommutesToWork && userInfo.user && !userInfo.user.online' (click)="GoWork()">我要上班</button>
-          <button class="mr8" nz-button nzType="primary" *ngIf='PCCommutesToWork && userInfo.user && userInfo.user.online' (click)="GoWork()">我要下班</button>
-          <!-- <div class="msg">
-            <div class="msgBtn display_flex align-items_center justify-content_flex-center" nz-popover [nzPopoverContent]="contentTemplate" nzPopoverPlacement="bottomRight">
-              <i nz-icon nzType="bell" nzTheme="outline"></i>
-            </div>
-            <ng-template #contentTemplate>
-              <div>
-                <p>消息通知</p>
-              </div>
-            </ng-template>
-          </div> -->
-          <div class="userInfo">
-            <div class="wel" [title]="'欢迎您，' + currentHospital.hosName + '：'">欢迎您，{{currentHospital.hosName}}：</div>
-            <div class="user">
+          <div class="userInfo dropdown">
+            <div class="user" (mouseenter)="showDropdown = true" (mouseleave)="showDropdown = false">
               <img src="../../assets/images/icon_keshi.png" alt="">
-              <span [title]="(userInfo&&userInfo.user)?userInfo.user.name:''">{{(userInfo&&userInfo.user)?userInfo.user.name:''}}</span>
+              <span><ng-container *ngIf="currentHospital.hosName">{{currentHospital.hosName}}-</ng-container>{{(userInfo&&userInfo.user)?userInfo.user.name:''}}</span>
+              <i class="icon_transport transport-xiala1 ml8"></i>
             </div>
-            <div class="logOut">
-              <span (click)="hosFlag1 = true">选择院区</span>
-              <span (click)="showUpPwd()">修改密码</span>
-              <span (click)="logOut()">退出</span>
+            <div class="dropdown-content r8" [hidden]="!showDropdown" (mouseenter)="showDropdown = true" (mouseleave)="showDropdown = false">
+              <div class="dropdownItem" (click)="selectHospital()">选择院区</div>
+              <div class="dropdownItem" (click)="showUpPwd()">修改密码</div>
+              <div class="dropdownItem" (click)="logOut()">退出</div>
             </div>
           </div>
         </div>

src/app/views/main/main.component.less

@@ -17,9 +17,46 @@ nz-sider {
   overflow-y: auto;
 }
 
+// 下拉列表
+.dropdown{
+  position: relative;
+  height: 48px;
+  line-height: 48px;
+  .dropdown-content {
+    position: absolute;
+    top: 48px;
+    background-color: #fff;
+    width: 156px;
+    box-shadow: 0px 2px 4px 1px #D9D9D9;
+    z-index: 999999;
+    border-radius: 4px;
+    border: 1px solid rgba(0,0,0,0.15);
+    color: rgba(0,0,0,0.65);
+    &.ct{
+      left: 50%;
+      transform: translateX(-50%);
+    }
+    &.r8{
+      right: 8px;
+    }
+  }
+
+  .dropdown-content .dropdownItem {
+    height: 40px;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    padding: 0 24px;
+  }
+
+  .dropdown-content .dropdownItem:hover {
+    background-color: #e9f7e9;
+  }
+}
+
 .menu-sidebar {
-  width: 224px;
-  flex: 0 0 224px;
+  width: 175px;
+  flex: 0 0 175px;
   position: relative;
   z-index: 8;
   min-height: 100vh;
@@ -79,7 +116,7 @@ nz-sider {
     box-shadow: 0 2px 8px rgba(0, 0, 0, 0.45);
 
     & > i {
-      margin-left: 24px;
+      margin-left: 16px;
       margin-right: 10px;
       font-size: 14px;
     }
@@ -113,7 +150,11 @@ nz-sider {
     margin: 0;
     padding: 0;
     li {
-      padding-left: 48px;
+      white-space: nowrap;
+      overflow: hidden;//文本超出隐藏
+      text-overflow: ellipsis;//文本超出省略号替代
+      padding-left: 40px;
+      padding-right: 40px;
       transition: height 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
       box-shadow: 0 -1px 0 rgba(0, 0, 0, 0.45) inset;
     }
@@ -123,14 +164,19 @@ nz-sider {
 
 .sidebar-logo {
   position: relative;
-  height: 88px;
+  height: 48px;
   overflow: hidden;
-  line-height: 64px;
+  line-height: 48px;
   background: #fff;
   transition: all 0.3s;
 
-  span {
-    margin-top: 8px;
+  .logoTitle{
+    padding: 0 8px;
+    line-height: normal;
+    height:100%;
+  }
+
+  .title {
     color: @primary-color;
     font-weight: 600;
     font-size: 13px;
@@ -147,13 +193,13 @@ nz-sider {
 nz-header.ant-layout-header {
   padding: 0;
   width: 100%;
-  z-index: 2;
+  z-index: 99;
   background: #fff;
-  height: 88px;
+  height: 48px;
 
   .app-header {
     position: relative;
-    height: 88px;
+    height: 48px;
     padding: 0;
     background: #fff;
     box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
@@ -161,10 +207,19 @@ nz-header.ant-layout-header {
     border-bottom: 1px solid rgba(0, 21, 41, 0.08);
 
     .left {
+      height: 100%;
       flex: 1;
       display: flex;
-      flex-wrap: wrap;
       align-items: center;
+      justify-content: flex-end;
+      .icon_transport{
+        margin-right: 24px;
+        cursor: pointer;
+        font-size: 20px;
+        height: 48px;
+        line-height: 48px;
+        display: inline-block;
+      }
       .menuLabel {
         color: #333;
         font-size: 22px;
@@ -206,10 +261,9 @@ nz-header.ant-layout-header {
       }
 
       .userInfo {
-        width: 260px;
         height: 100%;
         float: right;
-        padding: 8px 36px 8px 8px;
+        padding: 0 24px;
         box-sizing: border-box;
         font-size: 14px;
         border-left: 1px solid #e5e9ed;
@@ -223,22 +277,22 @@ nz-header.ant-layout-header {
 
         .user {
           overflow: hidden;
-          font-size: 20px;
-          height: 40px;
+          height: 48px;
           display: flex;
           justify-content: center;
           align-items: center;
+          font-size: 16px;
+          cursor: pointer;
 
           img {
-            width: 36px;
-            height: 36px;
+            width: 32px;
+            height: 32px;
             margin-right: 8px;
           }
 
-          span {
-            white-space: nowrap;
-            overflow: hidden;//文本超出隐藏
-            text-overflow: ellipsis;//文本超出省略号替代
+          span, .transport-xiala1 {
+            height: 48px;
+            line-height: 48px;
           }
         }
 

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

@@ -452,18 +452,20 @@ export class MainComponent implements OnInit {
     }
   }
   //获取系统设置中的科室类型
-  deptTypeLoading = false;
   getTypeByDept(id) {
     let postData = {
       idx: 0,
       sum: 1,
       systemConfiguration: { keyconfig: "busiViewDeptId" },
     };
-    this.deptTypeLoading = true;
+    this.maskFlag = this.msg.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
     this.mainService
       .getFetchDataList("simple/data", "systemConfiguration", postData)
       .subscribe((result) => {
-        this.deptTypeLoading = false;
+        this.msg.remove(this.maskFlag);
+        this.maskFlag = false;
         if (result.status == 200) {
           let remember = JSON.parse(localStorage.getItem("remember"));
           window.open(
@@ -493,6 +495,15 @@ export class MainComponent implements OnInit {
     this.iShowMenuModal = false;
   }
 
+  // 下拉
+  showDropdown:boolean = false;
+  showDropdown1:boolean = false;
+
+  // 选择院区
+  selectHospital(){
+    this.hosFlag1 = true
+  }
+
   // 退出
   logOut(): void {
     // 假退出
@@ -504,7 +515,6 @@ export class MainComponent implements OnInit {
     }
     localStorage.removeItem("user");
     localStorage.removeItem("menu");
-    localStorage.removeItem("phones");
     localStorage.removeItem("index");
 
     // 假退出
@@ -517,7 +527,6 @@ export class MainComponent implements OnInit {
         }
         localStorage.removeItem("user");
         localStorage.removeItem("menu");
-        localStorage.removeItem("phones");
         localStorage.removeItem("index");
       }
     });

src/app/views/other-config/other-config.component.html

@@ -18,7 +18,7 @@
   </ng-container>
   <!-- 数据字典 -->
   <ng-container *ngIf="activeTagId === 3">
-    <!-- <app-configuration-dictionary></app-configuration-dictionary> -->
+    <app-configuration-dictionary [dictionaryKeyList]="dictionaryKeyList"></app-configuration-dictionary>
   </ng-container>
 </div>
 

src/app/views/other-config/other-config.component.ts

@@ -15,9 +15,14 @@ export class OtherConfigComponent implements OnInit, AfterViewInit {
   tagList:any = [
     { id: 1, name: '呼叫中心',},
     { id: 2, name: '微信配置',},
-    // { id: 3, name: '数据字典',},
+    { id: 3, name: '数据字典',},
   ];
 
+  // 数据字典
+  dictionaryKeyList:any[] = [
+    { id: 1, name: '呼叫中心分机号', key: "hjzx_cornet"},
+  ]
+
   ngOnInit(): void {}
 
   ngAfterViewInit(){

src/app/views/other-config/other-config.module.ts

@@ -6,6 +6,7 @@ import { OtherConfigComponent } from './other-config.component';
 import { ShareModule } from 'src/app/share/share.module';
 import { ConfigurationWechatComponent } from 'src/app/components/configurationCenter/configuration-wechat/configuration-wechat.component';
 import { ConfigurationCallcenterComponent } from 'src/app/components/configurationCenter/configuration-callcenter/configuration-callcenter.component';
+import { ConfigurationDictionaryModule } from 'src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.module';
 
 
 @NgModule({
@@ -17,7 +18,8 @@ import { ConfigurationCallcenterComponent } from 'src/app/components/configurati
   imports: [
     CommonModule,
     OtherConfigRoutingModule,
-    ShareModule
+    ShareModule,
+    ConfigurationDictionaryModule,
   ]
 })
 export class OtherConfigModule { }

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;
@@ -255,7 +255,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
       this.runTime();
     }, 500);
   }
-	
+
 	//tab切换
 	tabClick(type){
 		this.activeIndex = type
@@ -269,7 +269,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			this.getHospitalData()
 		}
 	}
-	
+
 	// 获取今日接收数据
 	getToday(){
 		this.mainService
@@ -284,7 +284,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 	changeUserInp(e){
 		this.changeInpSubjectUser.next([e]);
 	}
-	
+
 	// 获取配送人
 	getUserData(e){
 		let query={
@@ -301,7 +301,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			this.userData = res.list
 		});
 	}
-	
+
 	// 搜索
 	search() {
 	  this.pageOneIndex = 1;
@@ -340,7 +340,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 	      that.listOneLength = data.totalNum;
 	    });
 	}
-	
+
 	// 实时术中快速数据
 	getSpeedinessList() {
 		var that = this;
@@ -362,7 +362,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		    that.listTwoLength = data.totalNum;
 		  });
 	}
-	
+
 	// 打包配送
 	getPackList() {
 	  var that = this;
@@ -382,7 +382,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 	      that.listThreeLength = data.totalNum;
 	    });
 	}
-	
+
 	// 查看
 	project:any = [];
 	oneLook(e,data){
@@ -404,7 +404,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			}
 		});
 	}
-	
+
 	// 关闭查看
 	closeDetail(){
 		this.listDetailMoadl = false
@@ -412,7 +412,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			document.getElementById('Binput').focus();
 		},200)
 	}
-	
+
 	// 接收
 	connect(){
 		this.mainService.generateBatchNumber()
@@ -427,7 +427,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			}
 		})
 	}
-	
+
 	// 打包
 	packaging(){
 		this.mainService.generateBatchNumber()
@@ -442,14 +442,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){
@@ -463,7 +463,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		this.handoverUserId = null
 		this.distributionModal = true
 	}
-	
+
 	// 确定配送
 	submitDistributionForm(){
 		for (const i in this.validateForm.controls) {
@@ -491,9 +491,9 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		      this.message.error(data.msg)
 		    }
 		  });
-		
+
 	}
-	
+
 	// 取消配送
 	hideDistributionModal(){
 		this.distributionModal = false
@@ -501,16 +501,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)
@@ -528,7 +528,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		//     this.hospital = res.list;
 		//   });
 	}
-	
+
 	// 选择院区
 	hospitalId:any=null;
 	changeHospDate(e){
@@ -536,7 +536,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		this.hospitalId = e
 		this.getDepartmentData('',e)
 	}
-	
+
 	// 获取科室
 	isDeptLoading:boolean = false;
 	getDepartmentData(e,hospital){
@@ -559,7 +559,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			  });
 		});
 	}
-	
+
 	// 补打
 	printModal:boolean = false;
 	parintLoading:boolean = false;
@@ -567,7 +567,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		this.rowData = item
 		this.printModal = true
 	}
-	
+
 	// 取消补打
 	hidePrintModal(){
 		this.printModal = false
@@ -575,7 +575,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			document.getElementById('Binput').focus();
 		},200)
 	}
-	
+
 	// 确定补打
 	confirmPrintDel(){
 		this.parintLoading = true
@@ -603,9 +603,9 @@ export class PathologyComponent implements OnInit, OnDestroy {
 				this.message.error(data.msg)
 			}
 		});
-		
+
 	}
-	
+
 	// 接收时间
 	startDate:any;
 	endDate:any;
@@ -614,12 +614,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;
@@ -657,7 +657,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 				})
 			}
 		})
-		
+
 	}
 	// 获取标本接收数据
 	pageReceptionIndex:any = 1;
@@ -693,7 +693,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 				this.listReceptionLength = res.totalNum;
 		  });
 	}
-	
+
 	// 确定接收包
 	submitReceptionForm(){
 		for (const i in this.validateConnectForm.controls) {
@@ -724,7 +724,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		    }
 		  });
 	}
-	
+
 	// 关闭配送接收
 	hideReceptionModal(){
 		this.receptionModal = false
@@ -732,12 +732,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;
@@ -761,7 +761,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 监听人员交接配送人工号输入
 	dispatchingUserId:any = null;
 	dispatchingName:any = null;
@@ -785,7 +785,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 确定交接
 	mustReceived:any = null;
 	currReceived:any = null;
@@ -811,7 +811,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 				this.dispatchingName = null;
 				this.dispatchingUserId = null
 			}
-			
+
 			this.receptionName = null;
 			this.connectUserId = null
 			this.connectModal = true
@@ -821,7 +821,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 	hideConnectModal(){
 		this.connectModal = false
 	}
-	
+
 	// 确定人员交接
 	btnConnectLoading:boolean = false;
 	submitConnectForm(){
@@ -847,21 +847,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;
@@ -889,7 +889,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 关闭打包并打印
 	hidePackModal(){
 		this.packModal = false
@@ -897,7 +897,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			document.getElementById('specimen').focus();
 		},200)
 	}
-	
+
 	// 关闭交接/打包
 	hideSpecimenModal(){
 		this.barCode = null;
@@ -907,7 +907,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			document.getElementById('Binput').focus();
 		},200)
 	}
-	
+
 	// 获取标本详情
 	getSampleData(item){
 		// this.isSpinning = true
@@ -928,7 +928,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			}
 		});
 	}
-	
+
 	// 获取科室
 	getDept(){
 		this.setSpecimen()
@@ -957,7 +957,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			  .subscribe((res) => {
 			    that.operationData = res.list;
 			  });
-				
+
 			that.mainService
 			  .getFetchDataList("data", "department", data2)
 			  .subscribe((res) => {
@@ -966,7 +966,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			  });
 		});
 	}
-	
+
 	// 获取关联科室详情
 	getDeptDetail(){
 		this.mainService
@@ -986,7 +986,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 获取是否关联标本间
 	setSpecimen(){
 		this.validateForm = this.fb.group({
@@ -996,7 +996,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		});
 		this.relevanceModal = true
 	}
-	
+
 	// 确定关联科室
 	btnLoading:boolean = false;
 	submitForm(){
@@ -1030,7 +1030,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		    }
 		  });
 	}
-	
+
 	getNewDept(){
 		let postData = {
 		  currentHosId: this.hosId,
@@ -1056,12 +1056,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;
@@ -1069,7 +1069,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 	    }
 	  });
 	}
-	
+
 	// 输入工号查询姓名
 	handoverUserId:any = null;
 	numberChange(e){
@@ -1092,7 +1092,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 提交固定标本接收
 	submitVerificationForm(){
 		for (const i in this.validateVerificationForm.controls) {
@@ -1100,7 +1100,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,
@@ -1124,14 +1124,14 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			}
 		});
 	}
-	
+
 	// 成功/失败提示框
 	closeModel(){
 		this.hideReceptionModal()
 		this.hideConnectModal()
 		this.hideSpecimenModal()
 	}
-	
+
 	// 关闭配送信息
 	hideVerificationModal(){
 		this.verificationMoadl = false
@@ -1145,13 +1145,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){
@@ -1186,7 +1186,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			}
 		})
 	}
-	
+
 	// 关闭多只标本
 	hideMultiModal(){
 		this.multiModal = false
@@ -1194,7 +1194,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			document.getElementById('specimen').focus();
 		},200)
 	}
-	
+
 	// 监听多只标本扫描
 	codeMultiChange(e){
 		if(!e){
@@ -1223,7 +1223,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			})
 		},500)
 	}
-	
+
 	// 多只标本确定接受
 	btnMultiLoading:boolean = false;
 	submitMultiForm(){
@@ -1231,7 +1231,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		this.btnMultiLoading = false
 		this.hideMultiModal()
 	}
-	
+
 	pathologyLogs:any=[];
 	specimenList:any=[]
 	stepLength:any = 0;
@@ -1240,19 +1240,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) {
@@ -1278,7 +1278,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");
@@ -1293,7 +1292,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");
@@ -1389,7 +1387,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/repository-manage/repository-manage.component.ts

@@ -41,7 +41,7 @@ export class RepositoryManageComponent implements OnInit {
   ) {}
   ngOnInit() {
     this.searchParentDeptSubject.pipe(debounceTime(500)).subscribe((e) => {
-			
+
     });
 		this.hosId = this.tool.getCurrentHospital().id;
     this.coopBtns = this.tool.initCoopBtns(this.route);
@@ -58,7 +58,7 @@ export class RepositoryManageComponent implements OnInit {
   validateForm: FormGroup; //新增/编辑表单
   coopId: number; //表格中执行操作的id
   department: number; //所属科室
-	hosId: number; 
+	hosId: number;
 	loadAllConsumeDept: boolean = true;//是否加载所有消耗科室
   solutionNumber; //编号
 	title; //标题
@@ -115,7 +115,7 @@ export class RepositoryManageComponent implements OnInit {
   hideDelModal1() {
     this.editModal = false;
   }
-	
+
   // 编辑保存
   confirmDel1() {
     var that = this;
@@ -180,7 +180,7 @@ export class RepositoryManageComponent implements OnInit {
         that.listLength = data.totalNum;
       });
   }
-	
+
 	// 版本号点击
 	versionsClick(data, index){
 		this.vIndex = index
@@ -192,14 +192,14 @@ export class RepositoryManageComponent implements OnInit {
 			this.richText = ''
 		}
 	}
-	
+
 	// 点击附件
 	fileClick(data){
 		console.log(222,data)
 		let a: any = document.createElement('a') // 创建一个元素
 		a.style = 'display: none' // 不能在页面中被看到，把他隐藏起来
 		a.style.height = '0px' // 给个0高度，避免影响页面布局
-		a.download = data.name; 
+		a.download = data.name;
 		a.href = data.url // 文件url地址
 		document.body.appendChild(a)  //  将其绑定在body上才能发挥作用
 		a.click() // 触发a标签的click事件
@@ -209,7 +209,7 @@ export class RepositoryManageComponent implements OnInit {
   hideModal() {
     this.modal = false;
   }
-	
+
 	// 审核通过
 	confirmDel4() {
 		let data: any = {
@@ -229,16 +229,16 @@ export class RepositoryManageComponent implements OnInit {
 				}
 			});
 	}
-	
+
 	hideDelModal4() {
 	  this.auditModal = false;
 	}
-	
+
 	// 审核驳回
 	rejectCancel(){
 		this.rejectModal = false
 	}
-	
+
 	// 审核驳回
 	rejectOk(){
 		if(this.rejectData==null){
@@ -263,11 +263,11 @@ export class RepositoryManageComponent implements OnInit {
 				}
 			});
 	}
-	
+
 	closeModel(){
 		this.hideModal()
 	}
-	
+
   // 表单提交
 	auditModal = false;
   submitForm(type): void {
@@ -279,18 +279,18 @@ export class RepositoryManageComponent implements OnInit {
 			this.rejectModal = true
 		}
   }
-	
+
 	// 升级
 	upgrade(e, data){
 		e.stopPropagation();
 		this.router.navigateByUrl(`/repositoryManageAdd/${data.id}?type=upgrade`);
 	}
-	
+
 	// 新增
 	addForm(){
 		this.router.navigateByUrl(`/repositoryManageAdd/0`);
 	}
-	
+
 	// 查看
 	look(e, data){
 		e.stopPropagation();
@@ -334,7 +334,7 @@ export class RepositoryManageComponent implements OnInit {
 				this.isSpinning = false
 			});
 	}
-	
+
 	getFile(){
 		this.mainService
 			.getPreviewImage('solution', this.rowId)
@@ -347,7 +347,7 @@ export class RepositoryManageComponent implements OnInit {
 				});
 			});
 	}
-	
+
 	// 审核
 	rowId=null;
 	audit(e, data){
@@ -375,22 +375,22 @@ export class RepositoryManageComponent implements OnInit {
 				this.detailData = data
 				this.richText = this.sanitizer.bypassSecurityTrustHtml(data[0].content);
 				for(let i of data[0].solutionLogs){
-					i.time = format(i.operationTime, 'yyyy-MM-dd HH:mm') 
+					i.time = format(i.operationTime, 'yyyy-MM-dd HH:mm')
 				}
 				this.lookData = data[0]
 				this.solutionLogs = data[0].solutionLogs
 				this.stepLength = this.solutionLogs.length
 				this.isSpinning = false
 			});
-	
+
 	}
-	
+
 	// 编辑
 	edit(e, data) {
 	  e.stopPropagation();
 	  this.router.navigateByUrl(`/repositoryManageAdd/${data.id}?type=edit`);
 	}
-	
+
 	// 停用
 	pauseModal = false;
 	pause(e, data){
@@ -398,7 +398,7 @@ export class RepositoryManageComponent implements OnInit {
 		this.pauseModal = true;
 		this.coopId = data.id;
 	}
-	
+
 	// 确认停用
 	confirmDel2() {
 	  var that = this;
@@ -419,12 +419,12 @@ export class RepositoryManageComponent implements OnInit {
 				}
 			});
 	}
-	
+
 	hideDelModal2() {
 	  this.pauseModal = false;
 	}
-	
-	
+
+
 	// 恢复
 	renewModal = false;
 	renew(e, data){
@@ -432,7 +432,7 @@ export class RepositoryManageComponent implements OnInit {
 		this.renewModal = true;
 		this.coopId = data.id;
 	}
-	
+
 	// 确认恢复
 	confirmDel3() {
 	  var that = this;
@@ -453,11 +453,11 @@ export class RepositoryManageComponent implements OnInit {
 				}
 			});
 	}
-	
+
 	hideDelModal3() {
 	  this.renewModal = false;
 	}
-	
+
 
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
   showPromptModal(con, success, promptInfo?) {

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(){
 		if(this.validateForm){
@@ -332,7 +332,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		}
 		this.relevanceModal = true
 	}
-	
+
 	// 确定关联科室
 	btnLoading:boolean = false;
 	submitForm(){
@@ -372,7 +372,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		    }
 		  });
 	}
-	
+
 	getNewDept(){
 		let postData = {
 		  currentHosId: this.hosId,
@@ -398,12 +398,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;
@@ -411,7 +411,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 	    }
 	  });
 	}
-	
+
 	// 输入工号查询姓名
 	handoverUserId:any = null;
 	numberChange(e){
@@ -435,7 +435,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 				}
 		  });
 	}
-	
+
 	// 提交固定标本接收
 	submitVerificationForm(){
 		for (const i in this.validateVerificationForm.controls) {
@@ -443,7 +443,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,
@@ -474,7 +474,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			}
 		});
 	}
-	
+
 	closeModel(){
 		this.verificationMoadl = false
 		this.fixationModal = false
@@ -482,7 +482,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			document.getElementById('Binput').focus();
 		},200)
 	}
-	
+
 	// 关闭固定接受标本
 	hideVerificationModal(){
 		this.verificationMoadl = false
@@ -490,19 +490,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){
@@ -522,13 +522,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=[];
@@ -539,14 +539,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();
@@ -554,7 +554,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		this.detailMoadl = false
 		this.autoUpdate(false);
 	}
-	
+
   // 统计
   // total() {
   //   let launch = JSON.parse(localStorage.getItem("user")).user.dept.id;
@@ -578,7 +578,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
   //   console.log(item);
   //   this.router.navigateByUrl(`specimenView2/detailSample/${item.id}`);
   // }
-	
+
   // // 查看流程信息弹窗
   // logPromptModalShow = false; //弹窗开关
   // scode = ""; //查看记录携带
@@ -815,7 +815,6 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
     }
     localStorage.removeItem("user");
     localStorage.removeItem("menu");
-    localStorage.removeItem("phones");
     localStorage.removeItem("index");
     // 假退出
     this.mainService.logOut().subscribe((data) => {
@@ -827,7 +826,6 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
         }
         localStorage.removeItem("user");
         localStorage.removeItem("menu");
-        localStorage.removeItem("phones");
         localStorage.removeItem("index");
       }
     });
@@ -914,7 +912,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/app/views/users-management/users-management.component.ts

@@ -257,7 +257,7 @@ export class UsersManagementComponent implements OnInit {
     let groupData = {
       group2: {
         hospitals: hid,
-        type:1
+        typeIds: '1,3',
       },
       idx: 0,
       sum: 9999,
@@ -303,7 +303,7 @@ export class UsersManagementComponent implements OnInit {
     let groupData = {
       group2: {
         hospitals: id,
-        type:1
+        typeIds: '1,3',
       },
       idx: 0,
       sum: 9999,
@@ -469,7 +469,7 @@ export class UsersManagementComponent implements OnInit {
     let groupData = {
       group2: {
         hospitals: hid,
-        type:1
+        typeIds: '1,3',
       },
       idx: 0,
       sum: 9999,

src/assets/iconfont/demo_index.html

@@ -55,6 +55,42 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon icon_transport">&#xe7ba;</span>
+                <div class="name">护士执行护理工作</div>
+                <div class="code-name">&amp;#xe7ba;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe6bb;</span>
+                <div class="name">配置</div>
+                <div class="code-name">&amp;#xe6bb;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe659;</span>
+                <div class="name">筛选</div>
+                <div class="code-name">&amp;#xe659;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe695;</span>
+                <div class="name">home_title_class</div>
+                <div class="code-name">&amp;#xe695;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe6b5;</span>
+                <div class="name">调度-fill</div>
+                <div class="code-name">&amp;#xe6b5;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe657;</span>
+                <div class="name">护士</div>
+                <div class="code-name">&amp;#xe657;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon icon_transport">&#xe62b;</span>
                 <div class="name">下载</div>
                 <div class="code-name">&amp;#xe62b;</div>
@@ -841,6 +877,12 @@
               </li>
           
             <li class="dib">
+              <span class="icon icon_transport">&#xeeed;</span>
+                <div class="name">更多</div>
+                <div class="code-name">&amp;#xeeed;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon icon_transport">&#xe633;</span>
                 <div class="name">搜索</div>
                 <div class="code-name">&amp;#xe633;</div>
@@ -906,9 +948,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'icon_transport';
-  src: url('iconfont.woff2?t=1724726830485') format('woff2'),
-       url('iconfont.woff?t=1724726830485') format('woff'),
-       url('iconfont.ttf?t=1724726830485') format('truetype');
+  src: url('iconfont.woff2?t=1729066208752') format('woff2'),
+       url('iconfont.woff?t=1729066208752') format('woff'),
+       url('iconfont.ttf?t=1729066208752') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -935,6 +977,60 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon icon_transport transport-hushizhihanghuligongzuo"></span>
+            <div class="name">
+              护士执行护理工作
+            </div>
+            <div class="code-name">.transport-hushizhihanghuligongzuo
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-peizhi1"></span>
+            <div class="name">
+              配置
+            </div>
+            <div class="code-name">.transport-peizhi1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-shaixuan"></span>
+            <div class="name">
+              筛选
+            </div>
+            <div class="code-name">.transport-shaixuan
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-shangban"></span>
+            <div class="name">
+              home_title_class
+            </div>
+            <div class="code-name">.transport-shangban
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-tiaodu-fill"></span>
+            <div class="name">
+              调度-fill
+            </div>
+            <div class="code-name">.transport-tiaodu-fill
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-hushi"></span>
+            <div class="name">
+              护士
+            </div>
+            <div class="code-name">.transport-hushi
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon icon_transport transport-xiazai"></span>
             <div class="name">
               下载
@@ -2114,6 +2210,15 @@
           </li>
           
           <li class="dib">
+            <span class="icon icon_transport transport-gengduoda-copy"></span>
+            <div class="name">
+              更多
+            </div>
+            <div class="code-name">.transport-gengduoda-copy
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon icon_transport transport-sousuo"></span>
             <div class="name">
               搜索
@@ -2214,6 +2319,54 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-hushizhihanghuligongzuo"></use>
+                </svg>
+                <div class="name">护士执行护理工作</div>
+                <div class="code-name">#transport-hushizhihanghuligongzuo</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-peizhi1"></use>
+                </svg>
+                <div class="name">配置</div>
+                <div class="code-name">#transport-peizhi1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-shaixuan"></use>
+                </svg>
+                <div class="name">筛选</div>
+                <div class="code-name">#transport-shaixuan</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-shangban"></use>
+                </svg>
+                <div class="name">home_title_class</div>
+                <div class="code-name">#transport-shangban</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-tiaodu-fill"></use>
+                </svg>
+                <div class="name">调度-fill</div>
+                <div class="code-name">#transport-tiaodu-fill</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-hushi"></use>
+                </svg>
+                <div class="name">护士</div>
+                <div class="code-name">#transport-hushi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#transport-xiazai"></use>
                 </svg>
                 <div class="name">下载</div>
@@ -3262,6 +3415,14 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-gengduoda-copy"></use>
+                </svg>
+                <div class="name">更多</div>
+                <div class="code-name">#transport-gengduoda-copy</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#transport-sousuo"></use>
                 </svg>
                 <div class="name">搜索</div>

src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "icon_transport"; /* Project id 4543613 */
-  src: url('iconfont.woff2?t=1724726830485') format('woff2'),
-       url('iconfont.woff?t=1724726830485') format('woff'),
-       url('iconfont.ttf?t=1724726830485') format('truetype');
+  src: url('iconfont.woff2?t=1729066208752') format('woff2'),
+       url('iconfont.woff?t=1729066208752') format('woff'),
+       url('iconfont.ttf?t=1729066208752') format('truetype');
 }
 
 .icon_transport {
@@ -13,6 +13,30 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.transport-hushizhihanghuligongzuo:before {
+  content: "\e7ba";
+}
+
+.transport-peizhi1:before {
+  content: "\e6bb";
+}
+
+.transport-shaixuan:before {
+  content: "\e659";
+}
+
+.transport-shangban:before {
+  content: "\e695";
+}
+
+.transport-tiaodu-fill:before {
+  content: "\e6b5";
+}
+
+.transport-hushi:before {
+  content: "\e657";
+}
+
 .transport-xiazai:before {
   content: "\e62b";
 }
@@ -537,6 +561,10 @@
   content: "\ea66";
 }
 
+.transport-gengduoda-copy:before {
+  content: "\eeed";
+}
+
 .transport-sousuo:before {
   content: "\e633";
 }