展示形式

proxy.conf.json

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

src/app/components/display-form/display-form.component.html

@@ -0,0 +1,85 @@
+<!-- 展示形式 -->
+<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="conditions" *ngIf="!isLoading">
+        <div nz-row>
+          <div nz-col nzSpan="4">护工信息隐藏：</div>
+          <div nz-col nzSpan="20">
+            <nz-radio-group class="w100" [(ngModel)]="hurseInfoHiding">
+              <label nz-radio [nzValue]="1">是</label>
+              <label nz-radio [nzValue]="0">否</label>
+            </nz-radio-group>
+          </div>
+        </div>
+        <div nz-row>
+          <div nz-col nzSpan="4">护工信息：</div>
+          <div nz-col nzSpan="20">
+            <nz-radio-group class="w100" [(ngModel)]="patientCareCol">
+              <!-- <label nz-radio [nzValue]="6">单排</label> -->
+              <label nz-radio [nzValue]="7">14人</label>
+              <!-- <label nz-radio [nzValue]="4">8人</label> -->
+            </nz-radio-group>
+          </div>
+        </div>
+        <div nz-row>
+          <div nz-col nzSpan="4">工单信息：</div>
+          <div nz-col nzSpan="20">
+            <nz-radio-group class="w100" [(ngModel)]="txtLabelCol">
+              <label nz-radio [nzValue]="1">一排一列</label>
+              <!-- <label nz-radio [nzValue]="2">一排两列</label> -->
+            </nz-radio-group>
+          </div>
+        </div>
+        <div nz-row>
+          <div nz-col nzSpan="4">配送人员刷新：</div>
+          <div nz-col nzSpan="4">
+            <nz-input-group nzAddOnAfter="秒">
+              <nz-input-number class="w100" [(ngModel)]="workerInfoTime" [nzMin]="60" [nzStep]="1" placeholder="请输入配送人员刷新时间"></nz-input-number>
+            </nz-input-group>
+          </div>
+        </div>
+        <div nz-row>
+          <div nz-col nzSpan="4">工单刷新：</div>
+          <div nz-col nzSpan="4">
+            <nz-input-group nzAddOnAfter="秒">
+              <nz-input-number class="w100" [(ngModel)]="orderInfoTime" [nzMin]="60" [nzStep]="1" placeholder="请输入工单刷新时间"></nz-input-number>
+            </nz-input-group>
+          </div>
+        </div>
+        <div nz-row>
+          <div nz-col nzSpan="8">是否开启定时播报未派出工单提示音：</div>
+          <div nz-col nzSpan="16">
+            <nz-radio-group class="w100" [(ngModel)]="audioNotDispatched">
+              <label nz-radio [nzValue]="true">是</label>
+              <label nz-radio [nzValue]="false">否</label>
+            </nz-radio-group>
+          </div>
+        </div>
+        <div nz-row>
+          <div nz-col nzSpan="4">排序方式：</div>
+          <div nz-col nzSpan="20">
+            <nz-radio-group class="w100" [(ngModel)]="orderType">
+              <label nz-radio nzValue="priority">优先级</label>
+              <label nz-radio nzValue="time">建单时间</label>
+            </nz-radio-group>
+          </div>
+        </div>
+      </div>
+      <div class="conditions display_flex align-items_center justify-content_flex-center" *ngIf="isLoading">
+        <nz-spin nzSimple></nz-spin>
+      </div>
+    </div>
+    <div class="btns display_flex justify-content_flex-center">
+      <button class="btn" nz-button nzType="primary" [nzLoading]="saveLoading" (click)="saveOrderScope()" *ngIf="!isLoading">
+        保存
+      </button>
+      <button class="btn cancel" nz-button nzType="default" (click)="cancelInit()">
+        知道了
+      </button>
+    </div>
+  </div>
+</div>

src/app/components/display-form/display-form.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/display-form/display-form.component.ts

@@ -0,0 +1,125 @@
+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-display-form',
+  templateUrl: './display-form.component.html',
+  styleUrls: ['./display-form.component.less']
+})
+export class DisplayFormComponent implements OnInit {
+  @Output() confirmModal = new EventEmitter();
+  @Output() cancelModal = new EventEmitter();
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) { }
+
+  controlView = {}; //展示形式
+  patientCareCol: number = 7; //顶部工单列数(4列-8人，7列-14人，6列-单排 ）
+  hurseInfoHiding = 1; //护工信息隐藏
+  txtLabelCol: number = 1; //工单信息列数
+  orderRefreshTime: number = 30; //工单刷新倒计时
+  orderInfoTime: number = 60; //工单刷新时间
+  workerRefreshTime: number = 30; //配送人员刷新倒计时
+  workerInfoTime: number = 60; //配送人员刷新时间
+  audioNotDispatched: boolean = true; //是否开启定时播报未派出工单提示音
+  orderType: string = 'priority'; //排序方式
+
+  ngOnInit() {
+    this.initControlView();
+  }
+
+  isLoading:boolean = false;
+  initControlView() {
+    this.isLoading = true;
+    let postData = {
+      controlView: {},
+      idx: 0,
+      sum: 1,
+    };
+    this.mainService
+      .coopTypeConfig("fetchDataList", "controlView", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.controlView = data.list[0] ? data.list[0] : [];
+        if (!data.list.length) return;
+        // switch (data.list[0].workerNum) {
+        //   case 1:
+        //     this.patientCareCol = 6;
+        //     break;
+        //   case 2:
+        //     this.patientCareCol = 7;
+        //     break;
+        //   case 3:
+        //     this.patientCareCol = 4;
+        //     break;
+        // }
+        this.patientCareCol = 7;
+        this.hurseInfoHiding = data.list[0].hurseInfoHiding ? 1 : 0;
+        // this.txtLabelCol = data.list[0].labelNum;
+        this.txtLabelCol = 1;
+        this.orderRefreshTime = this.orderInfoTime = data.list[0].orderInfoTime;
+        this.workerRefreshTime = this.workerInfoTime = data.list[0].workerInfoTime;
+        this.audioNotDispatched = data.list[0].unsendOrderVoice !== false;
+        this.orderType = data.list[0].orderType || 'priority';
+      });
+  }
+
+  // 保存展示形式
+  saveLoading: boolean = false; //保存按钮loading状态
+  saveOrderScope() {
+    if(!this.workerInfoTime){
+      this.message.warning('配送人员刷新时间必填！')
+      return;
+    }
+    if(!this.orderInfoTime){
+      this.message.warning('工单刷新时间必填！')
+      return;
+    }
+    this.saveLoading = true;
+    let wn;
+    switch (this.patientCareCol) {
+      case 6:
+        wn = 1;
+        break;
+      case 7:
+        wn = 2;
+        break;
+      case 4:
+        wn = 3;
+        break;
+    }
+
+    let postData = {
+      controlView: {
+        workerNum: wn,
+        labelNum: this.txtLabelCol,
+        workerInfoTime: this.workerInfoTime,
+        orderInfoTime: this.orderInfoTime,
+        unsendOrderVoice: this.audioNotDispatched,
+        hurseInfoHiding: this.hurseInfoHiding == 1,
+        orderType: this.orderType,
+      },
+    };
+    if (this.controlView["id"]) {
+      postData.controlView["id"] = this.controlView["id"];
+    }
+
+    console.log(postData);
+    this.mainService
+      .coopTypeConfig("addData", "controlView", postData)
+      .subscribe((data) => {
+        this.saveLoading = false;
+        this.confirmModal.emit(data);
+      });
+  }
+
+  // 关闭弹窗
+  cancelInit() {
+    this.cancelModal.emit();
+  }
+}

src/app/components/display-form/display-form.module.ts

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

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

@@ -93,7 +93,7 @@
           </nz-select>
         </div>
         <span class="toLastTime">
-          <span class="order" (click)="orderList(1)">{{orderType1 === 'priority' ? '优先级' : '时间'}}</span>
+          <span class="order" (click)="orderList()">{{orderType === 'priority' ? '优先级' : '建单时间'}}</span>
           <span class="itsmOrHsms" [ngClass]="{bold: flagList.itsmFlag1}" *ngIf="itsmData.mdv2Switch" (click)="filterOrderList('itsm', 1)">运维</span>
           <span class="itsmOrHsms" *ngIf="itsmData.mdv2Switch && hsmsData.hsmsSwitch">|</span>
           <span class="itsmOrHsms" [ngClass]="{bold: flagList.hsmsFlag1}" *ngIf="hsmsData.hsmsSwitch" (click)="filterOrderList('hsms', 1)">配送</span>
@@ -313,7 +313,7 @@
       <div class="head">
         <span class="auto_tit"><span *ngIf="flagList.hsmsFlag2">待到达</span><span *ngIf="flagList.itsmFlag2 && flagList.hsmsFlag2">/</span><span *ngIf="flagList.itsmFlag2">待接单</span>({{ arriveList.length }}条)</span>
         <span class="toLastTime">
-          <span class="order" (click)="orderList(2)">{{orderType2 === 'priority' ? '优先级' : '时间'}}</span>
+          <span class="order" (click)="orderList()">{{orderType === 'priority' ? '优先级' : '建单时间'}}</span>
           <span class="itsmOrHsms" [ngClass]="{bold: flagList.itsmFlag2}" *ngIf="itsmData.mdv2Switch" (click)="filterOrderList('itsm', 2)">运维</span>
           <span class="itsmOrHsms" *ngIf="itsmData.mdv2Switch && hsmsData.hsmsSwitch">|</span>
           <span class="itsmOrHsms" [ngClass]="{bold: flagList.hsmsFlag2}" *ngIf="hsmsData.hsmsSwitch" (click)="filterOrderList('hsms', 2)">配送</span>
@@ -527,7 +527,7 @@
       <div class="head">
         <span class="auto_tit"><span *ngIf="flagList.hsmsFlag3">执行中</span><span *ngIf="flagList.itsmFlag3 && flagList.hsmsFlag3">/</span><span *ngIf="flagList.itsmFlag3">处理中</span>({{ executionList.length }}条)</span>
         <span class="toLastTime">
-          <span class="order" (click)="orderList(3)">{{orderType3 === 'priority' ? '优先级' : '时间'}}</span>
+          <span class="order" (click)="orderList()">{{orderType === 'priority' ? '优先级' : '建单时间'}}</span>
           <span class="itsmOrHsms" [ngClass]="{bold: flagList.itsmFlag3}" *ngIf="itsmData.mdv2Switch" (click)="filterOrderList('itsm', 3)">运维</span>
           <span class="itsmOrHsms" *ngIf="itsmData.mdv2Switch && hsmsData.hsmsSwitch">|</span>
           <span class="itsmOrHsms" [ngClass]="{bold: flagList.hsmsFlag3}" *ngIf="hsmsData.hsmsSwitch" (click)="filterOrderList('hsms', 3)">配送</span>
@@ -737,7 +737,7 @@
   <div id="fixedMenu" class="fixed">
     <div class="left" *ngIf="fixedTab != '' && showLastItems && fixedTab != 'newOrder' && fixedTab != 'toSystem' && fixedTab != 'logout'">
       <!-- 展示形式 -->
-      <div class="con" *ngIf="fixedTab == 'colType' && fixedTab != 'newOrder'">
+      <!-- <div class="con" *ngIf="fixedTab == 'colType'">
         <div class="title">展示形式</div>
         <div class="conditions">
           <div nz-row>
@@ -824,7 +824,7 @@
             保存
           </button>
         </div>
-      </div>
+      </div> -->
       <!-- 叫号信息 -->
       <div
         class="con tableCon"
@@ -963,7 +963,7 @@
             <div [ngClass]="{ item: true, checked: fixedTab == 'orderScope' }" (click)="showOrderScope()">
               工单范围
             </div>
-            <div [ngClass]="{ item: true, checked: fixedTab == 'colType' }" (click)="checkFixedTab('colType')">
+            <div [ngClass]="{ item: true, checked: fixedTab == 'colType' }" (click)="showDisplayForm()">
               展示形式
             </div>
             <div [ngClass]="{ item: true, checked: fixedTab == 'nucleicAcidPrinting' }" (click)="checkFixedTab('nucleicAcidPrinting')" *ngIf="isShowNucleicAcidPrinting">
@@ -2168,6 +2168,8 @@
 <app-bind-extension-number [hsmsData]="hsmsData" [itsmData]="itsmData" [websocketLoading]="websocketLoading" *ngIf="showBindExtensionNumberModal" (confirmModal)="checkIn($event)" (cancelModal)="cancelBindExtensionNumber($event)"></app-bind-extension-number>
 <!-- 工单范围 -->
 <app-order-scope *ngIf="showInitModal" [hsmsData]="hsmsData" [itsmData]="itsmData" (confirmModal)="confirmOrderScope($event)" (cancelModal)="cancelOrderScope($event)"></app-order-scope>
+<!-- 展示形式 -->
+<app-display-form *ngIf="showDisplayFormModal" (confirmModal)="confirmDisplayForm($event)" (cancelModal)="cancelDisplayForm($event)"></app-display-form>
 <!-- 消息弹框模板 -->
 <ng-template #msgTemplate let-msg="data">
   <div class="msgTemBox ant-notification-notice-content">

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

@@ -764,9 +764,6 @@ export class FuwutaiComponent implements OnInit {
     this.retract();
     this.refresh();
     this.initOrderScope();
-    this.getOrderList(1);
-    this.getOrderList(2);
-    this.getOrderList(3);
     this.getVisitList();
     this.getMessageList();
     this.initControlView();
@@ -1196,8 +1193,8 @@ export class FuwutaiComponent implements OnInit {
   executionSearchCon: string = ""; //执行中搜索框内容
   workerMessage: any = []; //顶部全部工单
   // 展示形式
-  patientCareCol: number = 6; //顶部工单列数(4列-8人，7列-14人，6列-单排 ）
-  hurseInfoHiding = '1'; //护工信息隐藏
+  patientCareCol: number = 7; //顶部工单列数(4列-8人，7列-14人，6列-单排 ）
+  hurseInfoHiding = 1; //护工信息隐藏
   txtLabelCol: number = 1; //工单信息列数
   workerInfoTime: number = 60; //配送人员刷新时间
   orderInfoTime: number = 60; //工单刷新时间
@@ -1336,7 +1333,6 @@ export class FuwutaiComponent implements OnInit {
       this.user.user.scope = data.data;
       localStorage.setItem("user", JSON.stringify(this.user));
       this.initOrderScope();
-      this.initControlView();
     } else {
       this.showPromptModal("保存", false, data.msg);
     }
@@ -1352,6 +1348,26 @@ export class FuwutaiComponent implements OnInit {
     this.showInitModal = true;
   }
 
+  // 展示形式
+  showDisplayFormModal: boolean = false;
+  cancelDisplayForm() {
+    this.showDisplayFormModal = false;
+  }
+
+  showDisplayForm() {
+    this.showDisplayFormModal = true;
+  }
+
+  confirmDisplayForm(data){
+    if (data.status == 200) {
+      this.cancelDisplayForm();
+      this.msg.success('保存成功');
+      this.initControlView();
+    } else {
+      this.msg.error(data.msg || '保存失败');
+    }
+  }
+
   // 绑定分机
   showBindExtensionNumberModal: boolean = false;
   cancelBindExtensionNumber() {
@@ -1883,7 +1899,7 @@ export class FuwutaiComponent implements OnInit {
         //   });
         //   postData.groups = groups;
         // }
-        if (this.hurseInfoHiding == '1'){
+        if (this.hurseInfoHiding == 1){
           that.workerMessage = [];
           that.initTopCount();
           return;
@@ -1901,7 +1917,7 @@ export class FuwutaiComponent implements OnInit {
         let postData = {
           groups: [typeId],
         };
-        if (this.hurseInfoHiding == '1'){
+        if (this.hurseInfoHiding == 1){
           that.workerMessage = [];
           that.initTopCount();
           return;
@@ -1978,7 +1994,7 @@ export class FuwutaiComponent implements OnInit {
     let types = "";
 
     let postData:any = {
-      orderType: this['orderType' + stateId],
+      orderType: this.orderType,
     };
     // 配送
     if(this.flagList['hsmsFlag' + stateId]){
@@ -2307,9 +2323,9 @@ export class FuwutaiComponent implements OnInit {
   }
 
   // 护工信息展示形式
-  changPatientCareCol(e) {
-    this.initTopCount();
-  }
+  // changPatientCareCol(e) {
+  //   this.initTopCount();
+  // }
 
   // 获取配置文件写死的任务类型ID(送病人回病房9)，选择此任务类型的话，患者信息从终点科室获取
   getConfigTasktypeLoading: boolean = false;
@@ -4593,9 +4609,6 @@ export class FuwutaiComponent implements OnInit {
   // 初始化展示形式
   controlView = {}; //展示形式
   initControlView() {
-    if(!this.hsmsData.hsmsSwitch){
-      return;
-    }
     let that = this;
     let postData = {
       controlView: {},
@@ -4607,24 +4620,31 @@ export class FuwutaiComponent implements OnInit {
       .subscribe((data) => {
         that.controlView = data.list[0] ? data.list[0] : [];
         if (!data.list.length) return;
-        switch (data.list[0].workerNum) {
-          case 1:
-            that.patientCareCol = 6;
-            break;
-          case 2:
-            that.patientCareCol = 7;
-            break;
-          case 3:
-            that.patientCareCol = 4;
-            break;
-        }
-        this.hurseInfoHiding = data.list[0].hurseInfoHiding ? "1" : "0";
-        that.txtLabelCol = data.list[0].labelNum;
+        // switch (data.list[0].workerNum) {
+        //   case 1:
+        //     that.patientCareCol = 6;
+        //     break;
+        //   case 2:
+        //     that.patientCareCol = 7;
+        //     break;
+        //   case 3:
+        //     that.patientCareCol = 4;
+        //     break;
+        // }
+        that.patientCareCol = 7;
+        this.hurseInfoHiding = data.list[0].hurseInfoHiding ? 1 : 0;
+        // that.txtLabelCol = data.list[0].labelNum;
+        that.txtLabelCol = 1;
         that.orderRefreshTime = that.orderInfoTime = data.list[0].orderInfoTime;
         that.workerRefreshTime = that.workerInfoTime =
           data.list[0].workerInfoTime;
         that.audioNotDispatched = data.list[0].unsendOrderVoice !== false;
+        this.orderType = data.list[0].orderType || 'priority';
         that.checkTab(this.typeId);
+
+        this.getOrderList(1);
+        this.getOrderList(2);
+        this.getOrderList(3);
       });
   }
 
@@ -4652,7 +4672,8 @@ export class FuwutaiComponent implements OnInit {
         workerInfoTime: that.workerInfoTime,
         orderInfoTime: that.orderInfoTime,
         unsendOrderVoice: that.audioNotDispatched,
-        hurseInfoHiding: that.hurseInfoHiding === "1",
+        hurseInfoHiding: that.hurseInfoHiding === 1,
+        orderType: this.orderType,
       },
     };
     if (that.controlView["id"]) {
@@ -4665,10 +4686,10 @@ export class FuwutaiComponent implements OnInit {
       .subscribe((data) => {
         that.saveLoading = false;
         if (data.status == 200) {
-          that.showPromptModal("保存", true, "");
-          that.initControlView();
+          that.msg.success('排序成功');
+          this.initControlView();
         } else {
-          that.showPromptModal("保存", false, data.msg);
+          that.msg.error(data.msg || '排序失败');
         }
       });
   }
@@ -4695,23 +4716,23 @@ export class FuwutaiComponent implements OnInit {
 
   showPromptModalRefresh(){
     this.getUnassignedBuilding2();
-      this.resetList();
-      this.getOrderList(1);
-      this.getOrderList(2);
-      this.getOrderList(3);
-      this.getVisitList();
-      this.getMessageList();
-      if (this.currentRTab === 0) {
-        this.getWorkOrders(this.applyDept);
-      } else if (this.currentRTab === 1) {
-        this.getPatientLog(this.applyDept);
-      } else if (this.currentRTab === 2) {
-        this.getItsmOrders(this.incidentModel.department);
-      } else if (this.currentRTab === 3) {
-        this.getDictionaryList();
-      }
-      this.fixedTab = "";
-      this.fixedMenuShangla();
+    this.resetList();
+    this.getOrderList(1);
+    this.getOrderList(2);
+    this.getOrderList(3);
+    this.getVisitList();
+    this.getMessageList();
+    if (this.currentRTab === 0) {
+      this.getWorkOrders(this.applyDept);
+    } else if (this.currentRTab === 1) {
+      this.getPatientLog(this.applyDept);
+    } else if (this.currentRTab === 2) {
+      this.getItsmOrders(this.incidentModel.department);
+    } else if (this.currentRTab === 3) {
+      this.getDictionaryList();
+    }
+    this.fixedTab = "";
+    this.fixedMenuShangla();
   }
 
   // 格式化时分秒
@@ -4867,12 +4888,10 @@ export class FuwutaiComponent implements OnInit {
   }
 
   // 排序
-  orderType1:any = 'priority';//priority:优先级，time:时间
-  orderType2:any = 'priority';//priority:优先级，time:时间
-  orderType3:any = 'priority';//priority:优先级，time:时间
-  orderList(state){
-    this['orderType' + state] = this['orderType' + state] === 'priority' ? 'time' : 'priority';
-    this.getOrderList(state, state === 1);
+  orderType: string = 'priority'; //排序方式 priority:优先级，time:时间
+  orderList(){
+    this.orderType = this.orderType === 'priority' ? 'time' : 'priority';
+    this.saveControlView();
   }
 
   // 优先级颜色

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

@@ -18,6 +18,7 @@ import { IncidentSerMessageModule } from 'src/app/components/incidentManagement/
 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';
+import { DisplayFormModule } from 'src/app/components/display-form/display-form.module';
 
 
 @NgModule({
@@ -41,6 +42,7 @@ import { BindExtensionNumberModule } from 'src/app/components/bind-extension-num
     IncidentSerCallModule,
     VirtualScrollerModule,
     BindExtensionNumberModule,
+    DisplayFormModule,
   ]
 })
 export class FuwutaiModule { }