Merge branch 'master' into develop

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",

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/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

@@ -165,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]))
+            }
           }
         }
       })

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 = '';
           }

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

@@ -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-ser-call/incident-ser-call.component.html

@@ -52,7 +52,7 @@
               <td>{{data.callType == 1?'呼入':(data.callType == 0?'呼出':'')}}</td>
               <td>
                 <div class="coop">
-                  <span *ngIf="data.path" (click)="recordcall(data)">回访录音</span>
+                  <span *ngIf="data.path" (click)="recordcall(data)">回放录音</span>
                 </div>
               </td>
             </tr>

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

@@ -19,6 +19,7 @@ export class IncidentSerCallComponent implements OnInit {
   searchDTO: any = {};
 
   @Input() itsmData:any;
+  @Input() hsmsData:any;
   @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
 
   constructor(
@@ -77,11 +78,32 @@ export class IncidentSerCallComponent implements OnInit {
     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": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.checkedHos.map(v => v.id).toString() || undefined),
+        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,

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

@@ -41,7 +41,7 @@
               <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 || 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>

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

@@ -6,15 +6,14 @@
       <ng-container *ngIf="!loading">
         <div class="items" *ngFor="let item of visitList">
           <div class="row">
-            <div class="col">单号：{{item.incidentsign}}</div>
-            <div class="col">优先级：<span [ngClass]="priorityColor(item.priorityId)">{{item.priorityDTO?.name}}</span></div>
-            <div class="col">院区-科室名称：{{item.hosName}}-{{item.department?.dept}}</div>
+            <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 }}</div>
+            <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>

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

@@ -2,6 +2,8 @@ import { Component, OnInit, Input, Output, EventEmitter, ViewChild } from '@angu
 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',
@@ -94,6 +96,24 @@ export class IncidentSerVisitComponent implements OnInit {
     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;
@@ -101,8 +121,8 @@ export class IncidentSerVisitComponent implements OnInit {
       idx: 0,
       sum: 9999,
       incident: {
-        "groupIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.scopeGroups.map(v => v.id).toString() || undefined),
-        "hosIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.checkedHos.map(v => v.id).toString() || undefined),
+        // "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(),

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/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
 			}

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

@@ -127,8 +127,10 @@ export class OrderScopeComponent implements OnInit {
     hosTaskTypes = {}; //当前权限下所有院区对应的任务类型
     hosGroups = {}; //当前权限下所有院区对应的人员分组
     getOrderScope() {
-      this.hosList = this.user.infoPermission.hospitals.filter(v => !this.tool.isDuty(v));
-      this.taskTypes = this.user.infoPermission.taskTypes;
+      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 = [],

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

@@ -118,7 +118,7 @@
                   <div class="gongdan" (click)="batchDispatchSelect(!data.checked, data.data.id, $event)">
                     <span class="left mr8" *ngIf="!flagList.itsmFlag1 && flagList.hsmsFlag1"><label nz-checkbox [ngModel]="data.checked" (ngModelChange)="batchDispatchSelect($event, data.data.id)"></label></span>
                     <span class="left gongdan_name" nz-tooltip [nzTooltipTitle]="data.data.taskType.taskName + (data.data.goodsRemark?'-'+data.data.goodsRemark:'')+'(' + data.data.gdcode + ')'">
-                      {{ data.data.isHalfInspect === 1 ? "半程陪检" : data.data.taskType.taskName }}<ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
+                      <strong>{{ data.data.isHalfInspect === 1 ? "半程陪检" : data.data.taskType.taskName }}</strong><ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
                     </span>
                     <div class="right_all">
                       <span nz-tooltip [nzTooltipTitle]="data.data.worker ? data.data.worker.phone : ''" class="right_all_name">{{ data.data.worker ? data.data.worker.name : "" }}</span>
@@ -225,9 +225,9 @@
                     </span>
                   </div>
 
-                  <div class="didian" *ngIf="transferHandlerLog(data.data.currentLog)">
+                  <div class="didian" *ngIf="data.data.overtimeRemark">
                     <span class="left">
-                      <span [innerHTML]="transferHandlerLog(data.data.currentLog)" nz-tooltip [nzTooltipTitle]="transferHandlerLog(data.data.currentLog)"></span>
+                      <span [innerHTML]="data.data.overtimeRemark" nz-tooltip [nzTooltipTitle]="data.data.overtimeRemark"></span>
                     </span>
                   </div>
                   <!-- 时间 -->
@@ -333,7 +333,7 @@
                       <label nz-checkbox [ngModel]="data.checked" (ngModelChange)="batchWithdrawalSelect($event, data.data.id)"></label>
                     </span>
                     <span class="left gongdan_name" nz-tooltip [nzTooltipTitle]="data.data.taskType.taskName + (data.data.goodsRemark?'-'+data.data.goodsRemark:'')+'(' + data.data.gdcode + ')'">
-                      {{ data.data.isHalfInspect === 1 ? "半程陪检" : data.data.taskType.taskName }}<ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
+                      <strong>{{ data.data.isHalfInspect === 1 ? "半程陪检" : data.data.taskType.taskName }}</strong><ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
                     </span>
                     <div class="right_all">
                       <span nz-tooltip [nzTooltipTitle]="data.data.worker ? data.data.worker.phone : ''" class="right_all_name">{{ data.data.worker ? data.data.worker.name : "" }}</span>
@@ -436,16 +436,16 @@
                     </span>
                   </div>
 
-                  <div class="didian" *ngIf="transferHandlerLog(data.data.currentLog)">
+                  <div class="didian" *ngIf="data.data.overtimeRemark">
                     <span class="left">
-                      <span [innerHTML]="transferHandlerLog(data.data.currentLog)" nz-tooltip [nzTooltipTitle]="transferHandlerLog(data.data.currentLog)"></span>
+                      <span [innerHTML]="data.data.overtimeRemark" nz-tooltip [nzTooltipTitle]="data.data.overtimeRemark"></span>
                     </span>
                   </div>
                   <!-- 时间 -->
                   <div class="shijian">
                     <span class="left">
                       <span>
-                        申请人：{{ data.data.requester?.name }}
+                        处理人/组：{{ transferSynergetic(data.data) }}
                       </span>
                     </span>
                     <span class="right">
@@ -537,7 +537,7 @@
                       <label nz-checkbox [ngModel]="data.checked" (ngModelChange)="batchWithdrawalSelect($event, data.data.id)"></label>
                     </span>
                     <span class="left gongdan_name" nz-tooltip [nzTooltipTitle]="data.data.taskType.taskName + (data.data.goodsRemark?'-'+data.data.goodsRemark:'')+'(' + data.data.gdcode + ')'">
-                      {{ data.data.isHalfInspect === 1 ? "半程陪检" : data.data.taskType.taskName }}<ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
+                      <strong>{{ data.data.isHalfInspect === 1 ? "半程陪检" : data.data.taskType.taskName }}</strong><ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
                     </span>
                     <div class="right_all">
                       <span nz-tooltip [nzTooltipTitle]="data.data.worker ? data.data.worker.phone : ''" class="right_all_name">{{ data.data.worker ? data.data.worker.name : "" }}</span>
@@ -640,16 +640,16 @@
                     </span>
                   </div>
 
-                  <div class="didian" *ngIf="transferHandlerLog(data.data.currentLog)">
+                  <div class="didian" *ngIf="data.data.overtimeRemark">
                     <span class="left">
-                      <span [innerHTML]="transferHandlerLog(data.data.currentLog)" nz-tooltip [nzTooltipTitle]="transferHandlerLog(data.data.currentLog)"></span>
+                      <span [innerHTML]="data.data.overtimeRemark" nz-tooltip [nzTooltipTitle]="data.data.overtimeRemark"></span>
                     </span>
                   </div>
                   <!-- 时间 -->
                   <div class="shijian">
                     <span class="left">
                       <span>
-                        申请人：{{ data.data.requester?.name }}
+                        处理人/组：{{ transferSynergetic(data.data) }}
                       </span>
                     </span>
                     <span class="right">
@@ -917,57 +917,6 @@
       </div>
     </div>
     <div class="right">
-      <div class="fixedMenuWrap" *ngIf="!websocketLoading">
-        <div class="fixedMenu" *ngIf="incomingService.getPhoneNumber()">
-          <div class="menuItems">
-            <div class="item itemLink ellipsis-oneline cursorDefault w100" nz-tooltip [nzTooltipTitle]="incomingService.getPhoneNumber()">
-              {{incomingService.getPhoneNumber()}}
-            </div>
-          </div>
-        </div>
-        <!-- 录音盒状态 -->
-        <div class="fixedMenu" *ngIf="incomingService.getPhoneNumber() && incomingService.getSign() === 'box'">
-          <div class="menuItems">
-            <i class="icon_transport transport-shixian call-icon"></i>
-          </div>
-        </div>
-        <!-- 呼叫中心状态 -->
-         <!-- 来电 -->
-        <div class="fixedMenu" *ngIf="jry_state=='laidian' && incomingService.getSign() === 'callCenter'">
-          <div class="menuItems">
-            <i class="icon_transport transport-laidian call-icon"></i>
-          </div>
-        </div>
-        <!-- 示忙  -->
-        <div class="fixedMenu" *ngIf="jry_state=='shimang' && incomingService.getSign() === 'callCenter'">
-          <div class="menuItems">
-            <i class="icon_transport transport-shimang1 call-icon"></i>
-          </div>
-        </div>
-        <!-- 示闲  -->
-        <div class="fixedMenu" *ngIf="jry_state=='shixian' && incomingService.getSign() === 'callCenter'">
-          <div class="menuItems">
-            <i class="icon_transport transport-shixian call-icon"></i>
-          </div>
-        </div>
-        <!-- 通话中  -->
-        <div class="fixedMenu" *ngIf="jry_state=='tonghuazhong' && incomingService.getSign() === 'callCenter'">
-          <div class="menuItems">
-            <i class="icon_transport transport-tonghuazhong call-icon"></i>
-          </div>
-        </div>
-
-        <div class="fixedMenu" *ngIf="incomingService.getSign() === 'callCenter' && ((jry_state == 'shimang' && isShixian) || jry_state == 'shixian')">
-          <div class="menuItems">
-            <button nz-button nzType="link" class="item itemLink call-status" (click)="jry_shixian($event)" *ngIf="jry_state=='shimang' && isShixian">
-              示闲
-            </button>
-            <button nz-button nzType="link" class="item itemLink call-status" (click)="jry_shimang($event)" *ngIf="jry_state == 'shixian'">
-              示忙
-            </button>
-          </div>
-        </div>
-      </div>
       <div class="fixedMenu" *ngIf="hsmsData.hsmsSwitch || itsmData.mdv2Switch">
         <div class="menuItems">
           <button nz-button nzType="link" class="item itemLink" (click)="showNewOrder()" [nzLoading]="getConfigTasktypeLoading || patientLogTasktypeLoading">
@@ -1023,14 +972,71 @@
     <div *ngIf="showLastItems && fixedTab != '' && fixedTab != 'logout' && fixedTab != 'toSystem' && fixedTab != 'newOrder'" (click)="fixedMenuShangla()" class="fixedMark"></div>
   </div>
 
+  <!-- 右侧悬浮框-录音盒或呼叫中心状态 -->
+  <div id="fixedMenuAll" class="fixedAll">
+    <div class="right">
+      <div class="fixedMenuWrap" *ngIf="!websocketLoading">
+        <div class="fixedMenu" *ngIf="incomingService.getPhoneNumber()">
+          <div class="menuItems">
+            <div class="item itemLink ellipsis-oneline cursorDefault w100" nz-tooltip [nzTooltipTitle]="incomingService.getPhoneNumber()">
+              {{incomingService.getPhoneNumber()}}
+            </div>
+          </div>
+        </div>
+        <!-- 录音盒状态 -->
+        <div class="fixedMenu" *ngIf="incomingService.getPhoneNumber() && incomingService.getSign() === 'box'">
+          <div class="menuItems">
+            <i class="icon_transport transport-shixian call-icon"></i>
+          </div>
+        </div>
+        <!-- 呼叫中心状态 -->
+         <!-- 来电 -->
+        <div class="fixedMenu" *ngIf="jry_state=='laidian' && incomingService.getSign() === 'callCenter'">
+          <div class="menuItems">
+            <i class="icon_transport transport-laidian call-icon"></i>
+          </div>
+        </div>
+        <!-- 示忙  -->
+        <div class="fixedMenu" *ngIf="jry_state=='shimang' && incomingService.getSign() === 'callCenter'">
+          <div class="menuItems">
+            <i class="icon_transport transport-shimang1 call-icon"></i>
+          </div>
+        </div>
+        <!-- 示闲  -->
+        <div class="fixedMenu" *ngIf="jry_state=='shixian' && incomingService.getSign() === 'callCenter'">
+          <div class="menuItems">
+            <i class="icon_transport transport-shixian call-icon"></i>
+          </div>
+        </div>
+        <!-- 通话中  -->
+        <div class="fixedMenu" *ngIf="jry_state=='tonghuazhong' && incomingService.getSign() === 'callCenter'">
+          <div class="menuItems">
+            <i class="icon_transport transport-tonghuazhong call-icon"></i>
+          </div>
+        </div>
+
+        <div class="fixedMenu" *ngIf="incomingService.getSign() === 'callCenter' && ((jry_state == 'shimang' && isShixian) || jry_state == 'shixian')">
+          <div class="menuItems">
+            <button nz-button nzType="link" class="item itemLink call-status" (click)="jry_shixian($event)" *ngIf="jry_state=='shimang' && isShixian">
+              示闲
+            </button>
+            <button nz-button nzType="link" class="item itemLink call-status" (click)="jry_shimang($event)" *ngIf="jry_state == 'shixian'">
+              示忙
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
   <!-- 左侧悬浮框 -->
-  <div id="fixedMenuLeft" class="fixedLeft">
+  <div id="fixedMenuLeft" class="fixedLeft" [hidden]="!itsmData.mdv2Switch && !hsmsData.hsmsSwitch">
     <div class="right">
       <div class="fixedMenu">
         <div class="menuItems">
           <div class="others">
-            <div class="item" (click)="visitOrder()">回访<span *ngIf="visitNum !== undefined">-{{visitNum}}</span></div>
-            <div class="item" (click)="messageOrder()">留言<span *ngIf="messageNum !== undefined">-{{messageNum}}</span></div>
+            <div class="item" (click)="visitOrder()" *ngIf="itsmData.mdv2Switch">回访<span *ngIf="visitNum !== undefined" [ngClass]="{ red: visitNum > 0}">-{{visitNum}}</span></div>
+            <div class="item" (click)="messageOrder()" *ngIf="itsmData.mdv2Switch">留言<span *ngIf="messageNum !== undefined" [ngClass]="{ red: visitNum > 0}">-{{messageNum}}</span></div>
             <div class="item itemLink" (click)="callOrder()">通话</div>
           </div>
         </div>
@@ -2239,7 +2245,7 @@
       </div>
       <div class="btns display_flex justify-content_flex-center align-items_center">
         <ng-container *ngIf="applyDept && currentTabIndex !== '99999'">
-          <button nz-button class="btn" nzType="primary" (click)="newOrderOk('go')" [nzLoading]="isGoLoading">
+          <button nz-button class="btn" nzType="primary" (click)="newOrderOk('&go&')" [nzLoading]="isGoLoading">
             继续建单
           </button>
           <button nz-button class="btn" nzType="primary" (click)="newOrderOk()" [nzLoading]="isOkLoading">
@@ -2410,4 +2416,4 @@
 <app-incident-ser-message [itsmData]="itsmData" *ngIf="messageShow" (closeModelHs)="closeMessage($event)"></app-incident-ser-message>
 
 <!-- 通话列表 -->
-<app-incident-ser-call [itsmData]="itsmData" *ngIf="callShow" (closeModelHs)="closeCall($event)"></app-incident-ser-call>
+<app-incident-ser-call [itsmData]="itsmData" [hsmsData]="hsmsData" *ngIf="callShow" (closeModelHs)="closeCall($event)"></app-incident-ser-call>

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

@@ -6,7 +6,7 @@
   padding: 16px;
   display: flex;
   flex-direction: column;
-  ::ng-deep .yyTime .ant-form-item-label {
+  ::ng-deep .bottomWrap .bottom .ant-form-item-label {
     line-height: 24px;
   }
 }
@@ -1548,7 +1548,7 @@
   // 右侧悬浮菜单
   .fixed {
     position: fixed;
-    top: 40%;
+    top: calc(40% + 115px + 16px);
     right: 0;
     z-index: 9;
     border-radius: 5px 0 0 5px;
@@ -1776,6 +1776,238 @@
     }
   }
 
+  // 右侧悬浮菜单-录音盒或呼叫中心状态
+  .fixedAll {
+    position: fixed;
+    top: 40%;
+    right: 0;
+    z-index: 10;
+    border-radius: 5px 0 0 5px;
+
+    &.maskFull{
+      &::after{
+        content: '';
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        z-index: 8;
+        cursor: move;
+      }
+    }
+
+    .fixedMark {
+      position: fixed;
+      left: 0;
+      top: 0;
+      width: 100%;
+      height: 100%;
+      background: rgba(0, 0, 0, 0.2);
+      z-index: 88;
+    }
+
+    // overflow: hidden;
+    & > .left {
+      width: 480px;
+      // height: 280px;
+      float: left;
+      background: #fff;
+      padding: 16px;
+      border-radius: 5px;
+      border: 1px solid #e5e9ed;
+      // box-shadow: -8px 5px 15px #eae9e9;
+      position: relative;
+      z-index: 98;
+
+      .con {
+        background: #f9fafb;
+        width: 100%;
+        // height: 300px;
+        // overflow: auto;
+        border-radius: 5px;
+        border: 1px solid #e5e9ed;
+        padding: 16px;
+        &.bindingExtension {
+          min-height: 246px;
+          .bindingExtension_content {
+            display: flex;
+            flex-wrap: wrap;
+          }
+          .noContentFlex {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            height: 136px;
+            flex-direction: column;
+            .noContent {
+              width: 128px;
+            }
+            p {
+              margin-top: 8px;
+            }
+          }
+          .ant-checkbox-wrapper {
+            font-size: 12px;
+            width: 100%;
+            display: flex;
+            margin-top: 8px;
+            justify-content: space-between;
+            align-items: center;
+            ::ng-deep .ant-checkbox {
+              font-size: 12px;
+              top: 0;
+            }
+            ::ng-deep .ant-checkbox + span {
+              flex: 1;
+            }
+          }
+        }
+
+        &.tableCon {
+          padding: 0;
+
+          .table {
+            font-size: 14px;
+
+            tr {
+              td {
+                padding: 15px 6px;
+                text-align: center;
+
+                & > .tdiv {
+                  overflow: hidden;
+
+                  .name {
+                    float: left;
+                  }
+
+                  .num {
+                    float: right;
+                    font-size: 12px;
+
+                    span {
+                      color: @primary-color;
+                      font-size: 14px;
+                    }
+                  }
+                }
+
+                .notOpen {
+                  color: #666;
+                  font-size: 12px;
+
+                  img {
+                    margin-bottom: 8px;
+                  }
+                }
+              }
+            }
+          }
+        }
+
+        .title {
+          color: #333;
+          text-align: center;
+        }
+
+        .conditions {
+          & > .ant-row {
+            margin: 8px 0;
+            display: flex;
+            align-items: center;
+
+            .ant-row {
+              .ant-col-6 {
+                margin: 2px 0;
+              }
+            }
+
+            .checkAll {
+              width: 100%;
+              border-bottom: 1px solid rgb(233, 233, 233);
+              color: @primary-color;
+            }
+          }
+        }
+
+        .btns {
+          padding: 5px 20px 0 20px;
+        }
+      }
+    }
+
+    .right {
+      // opacity: .5;
+      width: 80px;
+      float: left;
+      // background: rgba(255, 255, 255, 0.5);
+      border-radius: 5px 0 0 5px;
+      position: relative;
+      z-index: 8;
+
+      .fixedMenuWrap{
+        border-radius: 5px;
+        margin-bottom: 16px;
+        .fixedMenu{
+          border-radius: 0!important;
+        }
+      }
+
+      .fixedMenu {
+        border: 1px solid #e5e9ed;
+        color: @primary-color;
+        background: rgb(255, 255, 255);
+        text-align: center;
+        border-radius: 5px 0 0 5px;
+
+        .menuItems {
+          .call-icon{
+            font-size: 26px;
+            color: @primary-color;
+            padding: 16px 0;
+            &.transport-shimang1{
+              color: red;
+            }
+          }
+          .call-status{
+            background-color: @primary-color;
+            color: #fff;
+            width: 100%;
+          }
+          .item {
+            height: 35px;
+            line-height: 35px;
+            padding: 0 6px;
+            cursor: pointer;
+            border-bottom: 1px solid #e5e9ed;
+            user-select: none;
+            &.itemLink {
+              border-bottom: none;
+              border-radius: 0;
+            }
+
+            &.checked {
+              background: #fff;
+              color: #52ab77;
+              opacity: 1;
+              box-shadow: -3px 4px 7px #eae9e9;
+            }
+          }
+
+          .others {
+            transition: height 0.4s linear;
+            overflow: hidden;
+          }
+        }
+
+        .arrow {
+          cursor: pointer;
+        }
+      }
+    }
+  }
+
   // 左侧悬浮菜单
   .fixedLeft {
     position: fixed;

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

@@ -438,6 +438,9 @@ export class FuwutaiComponent implements OnInit {
             this.incidentModel.incomingPhone = this.callNumber = data["phone"];
             this.showPromptModal("建单", true, "", "closeGo");
           } else {
+            if(this.incomingService.getSign() === 'callCenter' && this.incomingService.getPhoneNumber()){
+              this.jry_shixian();
+            }
             this.showPromptModal("建单", true, "", "close");
           }
         } else {
@@ -473,6 +476,9 @@ export class FuwutaiComponent implements OnInit {
           this.incidentModel.incomingPhone = this.callNumber = data["phone"];
           this.showPromptModal("建单", true, "", "closeGo");
         } else {
+          if(this.incomingService.getSign() === 'callCenter' && this.incomingService.getPhoneNumber()){
+            this.jry_shixian();
+          }
           this.showPromptModal("建单", true, "", "close");
         }
       } else {
@@ -532,6 +538,9 @@ export class FuwutaiComponent implements OnInit {
           this.incidentModel.incomingPhone = this.callNumber = data["phone"];
           this.showPromptModal("建单", true, "", "closeGo");
         } else {
+          if(this.incomingService.getSign() === 'callCenter' && this.incomingService.getPhoneNumber()){
+            this.jry_shixian();
+          }
           this.showPromptModal("建单", true, "", "close");
         }
       } else {
@@ -704,10 +713,10 @@ export class FuwutaiComponent implements OnInit {
     this.initControlView();
     this.moveMenu("fixedMenu");
     this.moveMenu("fixedMenuLeft");
+    this.moveMenuAll("fixedMenuAll");
     if(this.incomingService.getSign() === 'box'){
       this.getPhoneNum();
     }else if(this.incomingService.getSign() === 'callCenter'){
-      let _this = this;
       setTimeout(this.getPhoneNum.bind(this), 2000)
     }else{
       this.websocketLoading = false;
@@ -967,6 +976,7 @@ export class FuwutaiComponent implements OnInit {
     //呼入回调函数
     TLWSA.onCallin = function (jso) {
       console.log(jso);
+      _this.incidentModel = {};
       _this.callNumber = _this.incidentModel.incomingPhone = jso.caller;//来电的电话
       _this.incidentModel.callID = jso.crs;//来电的话机id
       if (jso) {
@@ -1250,12 +1260,12 @@ export class FuwutaiComponent implements OnInit {
   // 保存工单信息
   confirmOrderScope(data){
     if (data.status == 200) {
-      this.websocketLoading = true;
+      // this.websocketLoading = true;
       this.cancelOrderScope();
       this.showPromptModal("保存", true, "");
       // 关闭phone的websocket
-      this.incomingService.closeWs(true);
-      this.getPhoneNum(false);
+      // this.incomingService.closeWs(true);
+      // this.getPhoneNum(false);
       this.user.user.scope = data.data;
       localStorage.setItem("user", JSON.stringify(this.user));
       this.initOrderScope();
@@ -1326,7 +1336,10 @@ export class FuwutaiComponent implements OnInit {
       this.incomingService.connectWs().subscribe((data) => {
         // data = { status: 201, phone: '013581394341' };//ceshi
         console.log(data);
+        console.log(this.incidentModel);
         this.websocketLoading = false;
+        this.incidentModel = {};
+        this.incidentMsg = {};
         this.incidentModel.callID = data.callId || undefined;
         if (data.status == 200 && data.phone) {
           this.msg.info('签入成功');
@@ -1338,7 +1351,7 @@ export class FuwutaiComponent implements OnInit {
           //没绑定科室
           if (!this.newOrderShow && !this.newOrderShowOpen) {
             this.applyDept = null;
-            this.showNewOrder("no", data.phone, true);
+            this.showNewOrder("no", data.phone, true, '来电弹屏');
           }
         }
       });
@@ -1370,15 +1383,33 @@ export class FuwutaiComponent implements OnInit {
           if (result.list.length > 0) {
             //绑定了科室
             if (!this.newOrderShow && !this.newOrderShowOpen) {
+              let incidentModel:any = Object.assign({}, this.incidentModel);
+              let incidentMsg:any = Object.assign({}, this.incidentMsg);
+              incidentModel.department = result.list[0];
+              incidentModel.department && incidentModel.department.hospital && (incidentModel.hosId = incidentModel.department.hospital.parent ? incidentModel.department.hospital.parent.id : incidentModel.department.hospital.id);
+              incidentModel.department && incidentModel.department.building && (incidentModel.area = incidentModel.department.building.id);
+              incidentModel.department && incidentModel.department.floor && (incidentModel.place = incidentModel.department.floor.id);
+              incidentModel.department && incidentModel.department.address && (incidentModel.houseNumber = incidentModel.department.address);
+              incidentModel.department && (incidentMsg.deptManyPhone = incidentModel.department.manyPhone);
+              incidentModel.department && (incidentMsg.deptName = incidentModel.department.dept);
+
+              incidentModel.department && (incidentModel.department = incidentModel.department.id);
+
+              this.incidentModel = incidentModel;
+              this.incidentMsg = incidentMsg;
+              this.searchApplicationRequester();
               this.applyDeptMiddle = result.list[0];
-              this.showNewOrder("yes", this.incidentModel.incomingPhone, true);
+              this.showNewOrder("yes", this.incidentModel.incomingPhone, true, '来电弹屏');
             }
           } else {
             //没绑定科室
             console.log(this.newOrderShow);
+            console.log(this.incidentModel);
+            console.log(this.incidentMsg);
+            this.incidentMsg = {};
             if (!this.newOrderShow && !this.newOrderShowOpen) {
               this.applyDept = null;
-              this.showNewOrder("no", this.incidentModel.incomingPhone, true);
+              this.showNewOrder("no", this.incidentModel.incomingPhone, true, '来电弹屏');
             }
           }
         }
@@ -1587,7 +1618,11 @@ export class FuwutaiComponent implements OnInit {
 
     let postData = {
       incident: {
-        department: { id },
+        "deleteFlag": 0,
+        queryTask: 'all',
+        department: {
+          id,
+        },
       },
       idx: 0,
       sum: 6,
@@ -1803,11 +1838,14 @@ export class FuwutaiComponent implements OnInit {
   // 获取回访列表
   visitNum:any;
   getVisitList(){
+    if(!this.itsmData.mdv2Switch){
+      return;
+    }
     let postData: any = {
       idx: 0,
       sum: 1,
       incident: {
-        "groupIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.scopeGroups.map(v => v.id).toString() || undefined),
+        // "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",
@@ -1826,6 +1864,9 @@ export class FuwutaiComponent implements OnInit {
   // 获取留言列表
   messageNum:any;
   getMessageList(){
+    if(!this.itsmData.mdv2Switch){
+      return;
+    }
     let postData: any = {
       idx: 0,
       sum: 1,
@@ -1902,7 +1943,7 @@ export class FuwutaiComponent implements OnInit {
       }
       if(stateId == 1){
         postData.incidentQuery.incident = {
-          "groupIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.scopeGroups.map(v => v.id).toString() || undefined),
+          // "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": "storageAccept",
@@ -1911,7 +1952,7 @@ export class FuwutaiComponent implements OnInit {
         }
       }else if(stateId == 2){
         postData.incidentQuery.incident = {
-          "groupIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.scopeGroups.map(v => v.id).toString() || undefined),
+          // "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": "todoReassign",
@@ -1919,12 +1960,13 @@ export class FuwutaiComponent implements OnInit {
         }
       }else if(stateId == 3){
         postData.incidentQuery.incident = {
-          "groupIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.scopeGroups.map(v => v.id).toString() || undefined),
+          // "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": "doing",
           "assignee": this.tool.getCurrentUserId(),
           "deleteFlag": 0,
+          "platform": 3,
         }
       }
     }
@@ -2230,11 +2272,20 @@ export class FuwutaiComponent implements OnInit {
   resetOrderData(){
     this.applicationRequesterList = [];
     this.fileList = [];
+    this.repairImgs = [];
+    this.isRelatedDepartment = true;
+    this.solutionId = undefined;
   }
   // 打开新建工单
   deathTasktypeId; //获取这个写死的任务类型的id,送病人回病房
   deathTasktypeIdPatient; //获取这个写死的任务类型的id,转出院记录
   async showNewOrder(des = '', phone = '', isInit = false, buildType = '') {
+    if(this.incomingService.getSign() === 'callCenter' && this.incomingService.getPhoneNumber()){
+      //进入弹窗,强制示忙
+      setTimeout(()=>{
+        tlwsa.tlaAcw();
+      },0)
+    }
     this.buildType = buildType;
     if(this.itsmData.mdv2Switch){
       this.resetOrderData();
@@ -2243,7 +2294,7 @@ export class FuwutaiComponent implements OnInit {
       this.searchApplicationPriority();
       this.searchApplicationSource();
       isInit ? this.searchApplicationDepartment('itsm', undefined, undefined, undefined, true) : this.searchApplicationDepartment('itsm');
-      isInit && ((this.isRelatedDepartment && this.incidentModel.department) || (!this.isRelatedDepartment && this.incidentModel.hosId) ) && this.incidentModel.hosId && this.searchApplicationBuilding();
+      isInit && ((this.isRelatedDepartment && this.incidentModel.department) || (!this.isRelatedDepartment && this.incidentModel.hosId) || this.buildType === '报修转事件' ) && this.incidentModel.hosId && this.searchApplicationBuilding();
       isInit && this.incidentModel.area && this.searchApplicationFloor();
       if(!this.hsmsData.hsmsSwitch){
         this.taskBuild = null;
@@ -2323,6 +2374,11 @@ export class FuwutaiComponent implements OnInit {
         this.searchTaskList.forEach((item) => {
           item.sid = item.associationTypeId + "_" + item.id;
         });
+        // if(phone){
+        //   this.getAutoWorkTypes(true, isInit);
+        // }else{
+        //   this.getAutoWorkTypes(false, isInit);
+        // }
         this.getAutoWorkTypes(false, isInit);
       }
     });
@@ -2385,16 +2441,10 @@ export class FuwutaiComponent implements OnInit {
 
       let deptObj = this.applicationDeptList.find(v => v.id == this.incidentModel.department);
 
-      if(this.applyDept !== this.incidentModel.department){
+      if(this.applyDept != this.incidentModel.department){
         this.applyDept = this.incidentModel.department;
         this.searchApplicationDepartment('hsms', deptObj ? deptObj.dept : '', undefined, this.incidentModel.department);
       }
-
-      // 回显事件来源
-      let source = this.applicationSourceList.find(v => v.value === 'phone');
-      if(!this.incidentModel.source && source){
-        this.incidentModel.source = source.id;
-      }
     }else if(this.currentTabIndex === '99999'){
       if(this.incidentModel.department){
         this.rightTitle_tab = [
@@ -2406,7 +2456,7 @@ export class FuwutaiComponent implements OnInit {
 
       let deptObj = this.applicationDepartmentList.find(v => v.id == this.applyDept);
 
-      if(this.incidentModel.department !== this.applyDept && !isInit){
+      if(this.incidentModel.department != this.applyDept && (!isInit || !this.buildType)){
         this.incidentModel.department = this.applyDept;
         this.searchApplicationDepartment('itsm', deptObj ? deptObj.dept : '', undefined, this.applyDept);
       }
@@ -2497,7 +2547,6 @@ export class FuwutaiComponent implements OnInit {
 
     // 根据院区和故障现象带出责任部门，优先级，维修人/组
     if(this.incidentModel.category && e){
-
       let postData = {
         idx: 0,
         sum: 9999,
@@ -2530,6 +2579,11 @@ export class FuwutaiComponent implements OnInit {
             this.showGroupOrUser();
           }
         });
+    }else{
+      this.incidentModel.group = undefined;
+      this.applicationGroupList = [];
+      this.incidentModel.user = undefined;
+      this.applicationUserList = [];
     }
   }
   // 申请人列表（搜索）
@@ -2646,6 +2700,11 @@ export class FuwutaiComponent implements OnInit {
             this.showGroupOrUser();
           }
         });
+    }else{
+      this.incidentModel.group = undefined;
+      this.applicationGroupList = [];
+      this.incidentModel.user = undefined;
+      this.applicationUserList = [];
     }
   }
 
@@ -2858,6 +2917,13 @@ export class FuwutaiComponent implements OnInit {
   // 处理组列表
   applicationGroupList:any[] = [];
   searchApplicationGroup(keyWord?) {
+    if(!this.incidentModel.duty){
+      this.incidentModel.group = undefined;
+      this.applicationGroupList = [];
+      this.incidentModel.user = undefined;
+      this.applicationUserList = [];
+      return;
+    }
     let postData = {
       idx: 0,
       sum: 20,
@@ -2923,6 +2989,11 @@ export class FuwutaiComponent implements OnInit {
         this.isLoading = false;
         if (data.status == 200) {
           this.applicationPriorityList = data.list;
+          // 回显事件来源
+          let source = this.applicationSourceList.find(v => v.value === 'phone');
+          if(!this.incidentModel.source && source){
+            this.incidentModel.source = source.id;
+          }
         }
       });
   }
@@ -3069,6 +3140,8 @@ export class FuwutaiComponent implements OnInit {
             let ids = this.applicationDeptList.map(v => v.id);
             isInit && !ids.includes(this.incidentModel.department) && (this.applicationDeptList.unshift({id: this.incidentModel.department, dept: this.incidentMsg.deptName}))
             console.log(this.applicationDeptList);
+            console.log(this.incidentModel);
+            console.log(this.incidentMsg);
             deptId && this.changeApplyDept(deptId);
           }
         }
@@ -3101,7 +3174,7 @@ export class FuwutaiComponent implements OnInit {
 
     let deptObj = this.applicationDepartmentList.find(v => v.id == e);
 
-    if(this.incidentModel.department !== e){
+    if(this.incidentModel.department != e){
       this.incidentModel.department = e;
       this.searchApplicationDepartment('itsm', deptObj ? deptObj.dept : '', undefined, e);
     }
@@ -3120,7 +3193,7 @@ export class FuwutaiComponent implements OnInit {
 
     let deptObj = this.applicationDeptList.find(v => v.id == e);
 
-    if(this.applyDept !== e){
+    if(this.applyDept != e){
       this.applyDept = e;
       this.searchApplicationDepartment('hsms', deptObj ? deptObj.dept : '', undefined, e);
     }
@@ -3155,8 +3228,44 @@ export class FuwutaiComponent implements OnInit {
     }
     this.searchApplicationRequester();
 
-    // 回显维修人/组
-    this.showGroupOrUser();
+    // 根据院区和故障现象带出责任部门，优先级，维修人/组
+    if(this.incidentModel.category && this.incidentModel.hosId){
+      let postData = {
+        idx: 0,
+        sum: 9999,
+        incidentCategoryConfig: {
+          categoryId: this.incidentModel.category,
+          hosId: this.incidentModel.hosId,
+        },
+      };
+      console.log(postData);
+      // return;
+      this.isLoading = true;
+      this.mainService
+        .getFetchDataList("simple/data", "incidentCategoryConfig", postData)
+        .subscribe((data) => {
+          this.isLoading = false;
+          if (data.status == 200) {
+            let list = data.list || [];
+            if(list.length > 0){
+              console.log(list[0]);
+              this.incidentCategoryConfig = list[0];
+            }else{
+              this.incidentCategoryConfig = {};
+            }
+
+            // 根据院区和故障现象带出责任部门，优先级，维修人/组
+            this.incidentModel.duty = this.incidentCategoryConfig.dutyDTO;
+            this.incidentModel.priorityId = this.incidentCategoryConfig.priority;
+
+            // 回显维修人/组
+            this.showGroupOrUser();
+          }
+        });
+    }else{
+      // 回显维修人/组
+      this.showGroupOrUser();
+    }
   }
   // 申请科室列表（搜索）失去焦点的时候
   changeApplicationDepartment(phone?) {
@@ -3479,6 +3588,9 @@ export class FuwutaiComponent implements OnInit {
       this.incidentModel.group = undefined;
       this.showPromptModal("操作", true, "", "");
     }else{
+      if(this.incomingService.getSign() === 'callCenter' && this.incomingService.getPhoneNumber()){
+        this.jry_shixian();
+      }
       this.newOrderShow = false; //关闭弹窗
       this.newOrderShowOpen = false; //此时可出现新的弹窗
       this.showPromptModal("操作", true, "", "");
@@ -3988,7 +4100,11 @@ export class FuwutaiComponent implements OnInit {
     this.fixedTab = '';
   }
 
+  // 取消
   newOrderCancel(): void {
+    if(this.incomingService.getSign() === 'callCenter' && this.incomingService.getPhoneNumber()){
+      this.jry_shixian();
+    }
     this.newOrderShow = false;
     this.newOrderShowOpen = false;
     this.currentTabIndex = "";
@@ -4316,11 +4432,12 @@ export class FuwutaiComponent implements OnInit {
     return timeStr;
   }
 
-  // 菜单拖拽
+  // 菜单拖拽-上下
   moveMenu(nodeId) {
     let fixedMenu = document.getElementById(nodeId);
     if (!fixedMenu) return;
     fixedMenu.onmousedown = function (e) {
+      fixedMenu.classList.remove('maskFull');
       let y = e.clientY - fixedMenu.offsetTop;
       document.onmousemove = function (ev) {
         fixedMenu.classList.add('maskFull');
@@ -4339,6 +4456,47 @@ export class FuwutaiComponent implements OnInit {
     };
   }
 
+  // 处理人+协同人
+  transferSynergetic(incidentData){
+    let str = incidentData.groupORHandlerUser || "";
+    if(incidentData.synergetic && incidentData.synergetic.length){
+        str += '，' + incidentData.synergetic.map(v => v.name).join('，');
+    }
+    return str;
+  }
+
+  // 菜单拖拽-自由
+  moveMenuAll(nodeId) {
+    let fixedMenu = document.getElementById(nodeId);
+    if (!fixedMenu) return;
+    fixedMenu.onmousedown = function (e) {
+      fixedMenu.classList.remove('maskFull');
+      let x = e.clientX - fixedMenu.offsetLeft;
+      let y = e.clientY - fixedMenu.offsetTop;
+      document.onmousemove = function (ev) {
+        fixedMenu.classList.add('maskFull');
+        var _y = ev.clientY - y > 0 ? ev.clientY - y : 0;
+        var h = window.innerHeight;
+        if (_y > h - fixedMenu.clientHeight) {
+          _y = h - fixedMenu.clientHeight;
+        }
+        fixedMenu.style.top = _y + "px";
+
+        var _x = ev.clientX - x > 0 ? ev.clientX - x : 0;
+        var w = window.innerWidth;
+        if (_x > w - fixedMenu.clientWidth) {
+          _x = w - fixedMenu.clientWidth;
+        }
+        fixedMenu.style.right = w - _x - fixedMenu.clientWidth + "px";
+      };
+      document.onmouseup = function () {
+        fixedMenu.classList.remove('maskFull');
+        document.onmousemove = null;
+        document.onmouseup = null;
+      };
+    };
+  }
+
   @ViewChild("msgTemplate", { static: false }) msgTemplate: TemplateRef<any>; //消息通知模板
   // 消息提醒
   createBasicNotification(msgs): void {
@@ -4391,6 +4549,12 @@ export class FuwutaiComponent implements OnInit {
 
   // 运维、配送工单切换
   filterOrderList(type, state){
+    if(!this.itsmData.mdv2Switch && this.hsmsData.hsmsSwitch){
+      return;
+    }
+    if(this.itsmData.mdv2Switch && !this.hsmsData.hsmsSwitch){
+      return;
+    }
     this.flagList[`${type}Flag${state}`] = !this.flagList[`${type}Flag${state}`];
     this.getOrderList(state, state === 1);
   }
@@ -4416,7 +4580,7 @@ export class FuwutaiComponent 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日前完成");
         }

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/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日前完成");
         }
@@ -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;

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 {
     // 假退出

src/app/views/pathology/pathology.component.html

@@ -21,6 +21,10 @@
       </div>
 			<div class="error-class">{{errorcODEMsg}}</div>
     </div>
+		<div class="nurseCode" (click)="showNurseCode()">
+		  <i class="nurseCodeIcon icon_transport transport-erweima"></i
+		  >二维码
+		</div>
     <div class="userInfo">
       <div class="wel">欢迎您：</div>
       <div class="user">
@@ -235,6 +239,26 @@
   <!-- <router-outlet></router-outlet> -->
 </div>
 
+<!-- 科室二维码模态框 -->
+<!-- 在模态框所在的 div 添加属性 [appDrag] -->
+<div appDrag class="modal" *ngIf="isShowNurseCode">
+  <div class="header drag-title">
+    <h2>签到二维码</h2>
+    <i
+      class="icon-close icon_transport transport-guanbi1"
+      (click)="closeNurseCode()"
+    ></i>
+  </div>
+  <div class="dialog-center">
+    <div class="dialog-code">
+      <img [src]="nurseCodeImg" alt="" />
+    </div>
+  </div>
+  <div class="dialog-operate">
+    <strong class="dialog-refresh" (click)="showNurseCode()">刷新</strong>
+    <span>{{ refreshQRCodeTime }}s</span>
+  </div>
+</div>
 <!-- 科室切换提示框 -->
 <app-hs-prompt-modal
   [changeShow]="changeShow"

src/app/views/pathology/pathology.component.less

@@ -82,7 +82,7 @@
     }
 
     .pharmacy-name {
-      // flex: 1;
+      flex: 1;
       // border-right: 1px solid #e5e9ed;
       display: flex;
       // justify-content: space-between;
@@ -199,15 +199,30 @@
 		}
 	}
 	
+	.nurseCode {
+	  width: 80px;
+	  font-size: 14px;
+	  color: #333;
+	  display: flex;
+	  justify-content: space-between;
+	  align-items: center;
+	  margin-right: 20px;
+	  cursor: pointer;
+	
+	  .nurseCodeIcon {
+	    margin-right: 8px;
+	    font-size: 24px;
+	    color: #929292;
+	  }
+	}
+	
   .userInfo {
-    // display: none;
-    width: 336px;
-    // height: 100%;
-    // float: right;
-    padding: 8px;
+    width: 260px;
+    height: 100%;
+    padding: 8px 36px 8px 8px;
     box-sizing: border-box;
     font-size: 14px;
-    // border-left: 1px solid #e5e9ed;
+    border-left: 1px solid #e5e9ed;
 
     .wel {
       line-height: 15px;
@@ -1094,4 +1109,90 @@
 }
 .spin-style{
 	z-index:9999;
-}
+}
+
+  .modal {
+    // 相对于 background 定位， 位置暂时设置为 0，0，0，0 在指令中将其位置水平垂直居中在页面中间
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    width: 280px;
+    height: 310px;
+    z-index: 3100;
+    background: #f9fafb;
+    box-shadow: 1px 1px 20px rgba(0, 0, 0, 0.3);
+    border-radius: 30px;
+    border: 1px solid @hs_border_color;
+    overflow: hidden;
+    cursor: move;
+
+    .drag-title {
+      height: 50px;
+      line-height: 50px;
+      position: relative;
+
+      h2 {
+        height: 100%;
+        font-size: 18px;
+        color: #333;
+        text-align: center;
+        margin: 0;
+      }
+
+      .icon-close {
+        position: absolute;
+        top: 0;
+        right: 16px;
+        font-size: 16px;
+        cursor: pointer;
+        color: @hs_border_color;
+      }
+    }
+
+    .dialog-center {
+      width: 235px;
+      height: 208px;
+      background-color: #fff;
+      border: 1px solid @hs_border_color;
+      margin: 0 auto;
+      border-radius: 30px;
+      position: relative;
+
+      .dialog-code {
+        width: 180px;
+        height: 200px;
+        overflow: hidden;
+        position: absolute;
+        margin: auto;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        left: 0;
+
+        img {
+          width: 100%;
+        }
+      }
+    }
+
+    .dialog-operate {
+      display: flex;
+      height: 40px;
+      justify-content: space-between;
+      align-items: center;
+      font-size: 14px;
+
+      .dialog-refresh {
+        color: @primary-color;
+        margin-left: 40px;
+        cursor: pointer;
+      }
+
+      span {
+        color: #999;
+        margin-right: 40px;
+      }
+    }
+  }

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

@@ -166,6 +166,8 @@ export class PathologyComponent implements OnInit, OnDestroy {
 	toDayData:any = null;
 	toDayTime:any = null;
 	backType='list';
+	loginUserDeptId: number = JSON.parse(localStorage.getItem("user")).user.dept
+	  .id; //登录人所属科室
   ngOnDestroy() {
     clearTimeout(this.timer);
     clearTimeout(this.logTimer);
@@ -215,6 +217,36 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			this.getToday()
 		},60000)
   }
+	
+	isShowNurseCode = false; //是否展开科室二维码
+	nurseCodeImg = ""; //图片
+	refreshQRCodeTime = 0; //刷新时间间隔
+	// 关闭科室二维码
+	closeNurseCode() {
+	  this.isShowNurseCode = false;
+	  clearInterval(this.timers);
+	  this.timer = null;
+	}
+	// 展开科室二维码
+	timers = null;
+	showNurseCode() {
+	  this.isShowNurseCode = true;
+	  this.mainService.getDeptCode([this.loginUserDeptId]).subscribe((data) => {
+	    if (data["status"] == 200) {
+	      this.nurseCodeImg = data["data"][0].base64;
+	      this.refreshQRCodeTime = data["data"][0].refreshQRCodeTime;
+	      clearInterval(this.timers);
+	      this.timers = setInterval(() => {
+	        this.refreshQRCodeTime = Math.max(--this.refreshQRCodeTime, 0);
+	        if (this.refreshQRCodeTime === 0) {
+	          clearInterval(this.timers);
+	          this.showNurseCode();
+	        }
+	      }, 1000);
+	    }
+	  });
+	}
+	
   // 当前时间日期
   runTime() {
     clearTimeout(this.timer);

src/app/views/pathology/pathology.module.ts

@@ -4,11 +4,12 @@ import { CommonModule } from '@angular/common';
 import { PathologyRoutingModule } from './pathology-routing.module';
 import { ShareModule } from 'src/app/share/share.module';
 import { PathologyComponent } from './pathology.component';
-
+import { DragModule } from 'src/app/directives/drag/drag.module';
 
 @NgModule({
   declarations: [PathologyComponent],
   imports: [
+		DragModule,
     CommonModule,
     PathologyRoutingModule,
     ShareModule

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

@@ -36,7 +36,7 @@
         }}</span>
       </div>
       <div class="userInfo-wrap">
-        <div class="logOut" (click)="changeKsNow()">切换科室</div>
+        <div class="logOut" (click)="setSpecimen()">切换科室</div>
         <div class="logOut" (click)="logOut()">退出</div>
       </div>
     </div>

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

@@ -62,7 +62,7 @@
     display: flex;
 		color: #000;
     .pharmacy-logo {
-      width: 221px;
+      width: 100px;
       background-color: #fff;
       display: flex;
       flex-direction: column;
@@ -82,7 +82,7 @@
     }
 
     .pharmacy-name {
-      // flex: 1;
+      flex: 1;
       // border-right: 1px solid #e5e9ed;
       display: flex;
       // justify-content: space-between;
@@ -159,14 +159,12 @@
     }
   }
   .userInfo {
-    // display: none;
-    width: 336px;
-    // height: 100%;
-    // float: right;
-    padding: 8px;
-    box-sizing: border-box;
-    font-size: 14px;
-    // border-left: 1px solid #e5e9ed;
+		width: 260px;
+		height: 100%;
+		padding: 8px 36px 8px 8px;
+		box-sizing: border-box;
+		font-size: 14px;
+		border-left: 1px solid #e5e9ed;
 
     .wel {
       line-height: 15px;

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

@@ -317,11 +317,19 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 
 	// 获取是否关联标本间
 	setSpecimen(){
-		this.validateForm = this.fb.group({
-		  specimen: [null, [Validators.required]],
-			operation: [null, [Validators.required]],
-			generate:[1, [Validators.required]],
-		});
+		if(this.validateForm){
+			this.validateForm = this.fb.group({
+			  specimen: [this.validateForm.value.specimen, [Validators.required]],
+				operation: [this.validateForm.value.operation, [Validators.required]],
+				generate:[this.validateForm.value.generate, [Validators.required]],
+			});
+		}else{
+			this.validateForm = this.fb.group({
+			  specimen: [null, [Validators.required]],
+				operation: [null, [Validators.required]],
+				generate:[1, [Validators.required]],
+			});
+		}
 		this.relevanceModal = true
 	}
 

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";
 }

src/assets/iconfont/iconfont.json

@@ -6,6 +6,48 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "39318134",
+      "name": "护士执行护理工作",
+      "font_class": "hushizhihanghuligongzuo",
+      "unicode": "e7ba",
+      "unicode_decimal": 59322
+    },
+    {
+      "icon_id": "376638",
+      "name": "配置",
+      "font_class": "peizhi1",
+      "unicode": "e6bb",
+      "unicode_decimal": 59067
+    },
+    {
+      "icon_id": "12911869",
+      "name": "筛选",
+      "font_class": "shaixuan",
+      "unicode": "e659",
+      "unicode_decimal": 58969
+    },
+    {
+      "icon_id": "2213025",
+      "name": "home_title_class",
+      "font_class": "shangban",
+      "unicode": "e695",
+      "unicode_decimal": 59029
+    },
+    {
+      "icon_id": "5766821",
+      "name": "调度-fill",
+      "font_class": "tiaodu-fill",
+      "unicode": "e6b5",
+      "unicode_decimal": 59061
+    },
+    {
+      "icon_id": "28467714",
+      "name": "护士",
+      "font_class": "hushi",
+      "unicode": "e657",
+      "unicode_decimal": 58967
+    },
+    {
       "icon_id": "11833563",
       "name": "下载",
       "font_class": "xiazai",
@@ -923,6 +965,13 @@
       "unicode_decimal": 60006
     },
     {
+      "icon_id": "42129639",
+      "name": "更多",
+      "font_class": "gengduoda-copy",
+      "unicode": "eeed",
+      "unicode_decimal": 61165
+    },
+    {
       "icon_id": "2675116",
       "name": "搜索",
       "font_class": "sousuo",

upload/development120.js

@@ -0,0 +1,50 @@
+const shell = require('shelljs')
+const path = require('path');
+const config = {
+  ip: "192.168.3.120", // ssh地址
+  username: "root", // ssh 用户名
+  port: 22,      //端口
+  password: "100100", // ssh 密码
+  path: '/home/itsm/project/web/hsms/pc', // 上传地址,删除地址
+  buildPath: '../dist/pc' // 本地打包后文件地址
+}
+let Client = require('ssh2-sftp-client');
+
+function connectSSh() {
+  let sftp = new Client();
+  sftp.connect({
+    host: config.ip,
+    port: config.port,
+    username: config.username,
+    password: config.password
+  }).then(() => {
+    console.log("-----先执行删除服务器文件-----")
+    return sftp.rmdir(config.path, true);
+  }).then(() => {
+    // 上传文件
+    console.log("-----开始上传-----")
+    return sftp.uploadDir(path.resolve(__dirname, config.buildPath), config.path);
+  }).then((data) => {
+    console.log("-----上传完成-----");
+    sftp.end();
+  }).catch((err) => {
+    console.log(err, '-----失败-----');
+    sftp.end();
+  });
+}
+function runTask() {
+  //打包完成
+  console.log(`当前NodeJs版本是${process.version}`);
+  const isNodeVersionLt17 = parseInt(process.version.slice(1)) < 17;
+  const execStr = isNodeVersionLt17 ? 'npm run build' : 'npm run build:17';
+  if (shell.exec(execStr).code == 0) {
+    // if (shell.exec(`find dist -name '*.js' -print0 | xargs -0 gzip -k`).code == 0) {
+      // if (shell.exec(`find dist -name '*.css' -print0 | xargs -0 gzip -k`).code == 0) {
+        console.log("-----打包成功-----");
+        //提交上传
+        connectSSh();
+      // }
+    // }
+  }
+}
+runTask()