调度台留言列表

proxy.conf.json

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

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

@@ -41,8 +41,9 @@
               <td>
                 <div class="coop">
                   <span *ngIf="data.isExcute === 0" (click)="createOrder(data)">生成工单</span>
-                  <span (click)="visit(data)">回访录音</span>
+                  <span *ngIf="data.isExcute === 0 || data.isExcute === 1" (click)="addModal(data.recFileName)">回访录音</span>
                   <span *ngIf="data.isExcute === 0" (click)="showDelModal(data, '确认不受理后，将无法转换为事件工单!', '不受理', 'notAccepted')">不受理</span>
+                  <span *ngIf="data.isExcute === 1" (click)="openItsmDetails(data.incidentDTO)">查看故障单</span>
                 </div>
               </td>
             </tr>
@@ -60,7 +61,26 @@
   </div>
 </div>
 
+<!-- 回放录音模态框 -->
+<div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="modal">
+  <div class="modalBody">
+    <div class="title">回放录音<i class="icon_transport transport-guanbi" (click)="hideAddModal()"></i>
+    </div>
+    <div class="content audio">
+      <audio controls style="outline: none;">
+        <source [src]="audioPath" type="audio/wav">
+      </audio>
+    </div>
+    <div class=" display_flex justify-content_flex-center">
+      <button class="btn cancel" nz-button nzType="default" (click)="hideAddModal()">知道了</button>
+    </div>
+  </div>
+</div>
+
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow" [info]="promptInfo"></app-prompt-modal>
 
-<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading" (confirmDelEvent)="confirmDelFn()" [content]="tipsMsg1"></app-dialog-delete>
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading" (confirmDelEvent)="confirmDelFn()" [content]="tipsMsg1"></app-dialog-delete>
+
+<!-- 详情 -->
+<app-incident-detail [id]="coopData.id" *ngIf="detailModalShow" (closeModelHs)="closeDetailModelOrder($event)" (confirmModelHs)="confirmDetailModelOrder($event)"></app-incident-detail>

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

@@ -238,3 +238,176 @@
     }
   }
 }
+
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+
+  .modalBody {
+    width: 350px;
+    height: 220px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      width: 310px;
+      height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      & > div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 18px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+      .roundRobinTips {
+        font-size: 12px;
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 18px 14px 0 14px;
+        max-height: 497px;
+        overflow-y: auto;
+        &.audio {
+          padding: 0;
+          height: 126px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+
+            .desc {
+              margin-top: 5px;
+            }
+          }
+
+          .datesControl {
+            margin-top: -16px;
+
+            .ant-form-item-label {
+              line-height: 40px;
+            }
+          }
+
+          .timer {
+            .ant-form-item-label {
+              width: 100%;
+              text-align: left;
+            }
+
+            .numInp {
+              margin-right: 5px;
+            }
+
+            .line {
+              margin-right: 5px;
+            }
+          }
+
+          .timer2 {
+            .ant-form-item-label {
+              line-height: 20px;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}

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

@@ -116,6 +116,19 @@ export class IncidentSerMessageComponent implements OnInit {
     this.closeModelHs.emit({ show: false, data: data });
   }
 
+  // 播放录音弹框
+  audioPath = ""; //录音文件地址
+  addModal(recFileName) {
+    this.modal = true;
+    this.audioPath = location.origin + recFileName;
+    console.log(this.audioPath)
+  }
+  //关闭播放录音弹框
+  modal: boolean = false; //模态框
+  hideAddModal() {
+    this.modal = false;
+  }
+
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
   promptContent: string; //操作提示框提示信息
   ifSuccess: boolean; //操作成功/失败
@@ -149,10 +162,6 @@ export class IncidentSerMessageComponent implements OnInit {
         isExcute: this.activeTabValue === '' ? undefined : this.activeTabValue,
         startTime: this.searchDTO.dateRange ? format(startOfDay(this.searchDTO.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined,
         endTime: this.searchDTO.dateRange ? format(endOfDay(this.searchDTO.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined,
-        // orderBy: 'arrive_time desc',
-        // hosId: this.hosId,
-        // stype: this.searchCriteria.stype ? { id: this.searchCriteria.stype } : undefined,
-        // specimenDesc: this.searchCriteria.specimenDesc ? this.specimenDescList.find(v => v.id == this.searchCriteria.specimenDesc).name: undefined,
       }
     }
     this.loading = true;
@@ -162,6 +171,22 @@ export class IncidentSerMessageComponent implements OnInit {
       this.total = data.totalNum;
     })
   }
+
+  // 查看ITSM工单详情
+  detailModalShow = false; //弹窗开关
+  openItsmDetails(data) {
+    this.coopData = data;
+    this.detailModalShow = true;
+  }
+  // 关闭弹窗
+  closeDetailModelOrder(e) {
+    this.detailModalShow = JSON.parse(e).show;
+  }
+  // 弹窗确定
+  confirmDetailModelOrder(e){
+    console.log(e);
+    this.detailModalShow = false;
+  }
 }
 
 

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

@@ -3,6 +3,7 @@ import { CommonModule } from '@angular/common';
 
 import { IncidentSerMessageComponent } from './incident-ser-message.component';
 import { ShareModule } from 'src/app/share/share.module';
+import { IncidentDetailModule } from '../incident-detail/incident-detail.module';
 
 
 @NgModule({
@@ -12,6 +13,7 @@ import { ShareModule } from 'src/app/share/share.module';
   imports: [
     CommonModule,
     ShareModule,
+    IncidentDetailModule,
   ],
   exports: [
     IncidentSerMessageComponent,

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

@@ -817,7 +817,7 @@
               <div nz-row>
                 <div nz-col nzSpan="">
                   <nz-input-group nzAddOnAfter="秒">
-                    <nz-input-number class="w100" [(ngModel)]="workerInfoTime" [nzMin]="10" [nzStep]="1" placeholder="请输入配送人员刷新时间"></nz-input-number>
+                    <nz-input-number class="w100" [(ngModel)]="workerInfoTime" [nzMin]="60" [nzStep]="1" placeholder="请输入配送人员刷新时间"></nz-input-number>
                   </nz-input-group>
                 </div>
               </div>
@@ -829,7 +829,7 @@
               <div nz-row>
                 <div nz-col nzSpan="">
                   <nz-input-group nzAddOnAfter="秒">
-                    <nz-input-number class="w100" [(ngModel)]="orderInfoTime" [nzMin]="10" [nzStep]="1" placeholder="请输入工单刷新时间"></nz-input-number>
+                    <nz-input-number class="w100" [(ngModel)]="orderInfoTime" [nzMin]="60" [nzStep]="1" placeholder="请输入工单刷新时间"></nz-input-number>
                   </nz-input-group>
                 </div>
               </div>
@@ -1213,7 +1213,7 @@
           <div class="newTopItem">
             <span class="grayFont">申请人：</span>
             <ng-container *ngIf="buildType === '报修转事件'">{{incidentMsg.requesterName}}</ng-container>
-            <ng-container *ngIf="!buildType">
+            <ng-container *ngIf="buildType !== '报修转事件'">
               <nz-select style="width: 160px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('requester', $event)" nzPlaceHolder="请选择申请人" [(ngModel)]="incidentModel.requester" (ngModelChange)="changeApplyRequester($event)" nzAllowClear>
                 <ng-container *ngFor="let option of applicationRequesterList">
                   <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
@@ -2277,7 +2277,7 @@
           </button>
         </ng-container>
         <ng-container *ngIf="currentTabIndex === '99999'">
-          <label nz-checkbox [(ngModel)]="isBuildOrderAgagin" *ngIf="buildType !== '报修转事件'">是否连续建单</label>
+          <label nz-checkbox [(ngModel)]="isBuildOrderAgagin" *ngIf="buildType !== '报修转事件' && buildType !== '留言转事件'">是否连续建单</label>
           <button nz-button class="btn" nzType="primary" (click)="directOrder()">
             直接解决
           </button>

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

@@ -737,8 +737,8 @@ export class FuwutaiComponent implements OnInit {
   patientCareCol: number = 6; //顶部工单列数(4列-8人，7列-14人，6列-单排 ）
   hurseInfoHiding = '1'; //护工信息隐藏
   txtLabelCol: number = 1; //工单信息列数
-  workerInfoTime: number = 30; //配送人员刷新时间
-  orderInfoTime: number = 30; //工单刷新时间
+  workerInfoTime: number = 60; //配送人员刷新时间
+  orderInfoTime: number = 60; //工单刷新时间
   audioNotDispatched: boolean = true; //是否开启定时播报未派出工单提示音
   cotHeight: number; //工单初始化高度
   unassignedList: any = []; //未分派数据
@@ -1334,7 +1334,9 @@ export class FuwutaiComponent implements OnInit {
     let postData: any = {
       idx: 0,
       sum: 1,
-      hjzxRecord: {},
+      hjzxRecord: {
+        isExcute: 0,
+      },
     };
 
     this.mainService
@@ -2265,6 +2267,7 @@ export class FuwutaiComponent implements OnInit {
         "acceptUser": { id: this.tool.getCurrentUserId() },
         "callID": this.incidentModel.callID || undefined,
         "incomingPhone": this.incidentModel.incomingPhone || undefined,
+        "hjzxRecordId": this.incidentModel.hjzxRecordId || undefined,
       },
     };
 
@@ -2272,7 +2275,7 @@ export class FuwutaiComponent implements OnInit {
       if(this.buildType === '报修转事件'){
         postData.incident.fromWx = true;
       }
-      Object.assign(postData.incident, this.editOrder);
+      postData.incident = Object.assign({}, this.editOrder, postData.incident);
     }
 
     this.mainService
@@ -2923,13 +2926,14 @@ export class FuwutaiComponent implements OnInit {
         "incomingPhone": this.incidentModel.incomingPhone || undefined,
         "candidateGroups": this.incidentModel.group || undefined,
         "assignee": this.incidentModel.user || undefined,
+        "hjzxRecordId": this.incidentModel.hjzxRecordId || undefined,
       }
     };
     if(this.buildType){
       if(this.buildType === '报修转事件'){
         postData.incident.fromWx = true;
       }
-      Object.assign(postData.incident, this.editOrder);
+      postData.incident = Object.assign({}, this.editOrder, postData.incident);
     }
     console.log(postData);
     // return;
@@ -2992,13 +2996,14 @@ export class FuwutaiComponent implements OnInit {
         "incomingPhone": this.incidentModel.incomingPhone || undefined,
         "candidateGroups": this.incidentModel.group || undefined,
         "assignee": this.incidentModel.user || undefined,
+        "hjzxRecordId": this.incidentModel.hjzxRecordId || undefined,
       }
     };
     if(this.buildType){
       if(this.buildType === '报修转事件'){
         postData.incident.fromWx = true;
       }
-      Object.assign(postData.incident, this.editOrder);
+      postData.incident = Object.assign({}, this.editOrder, postData.incident);
     }
     console.log(postData);
     // return;
@@ -4249,33 +4254,47 @@ export class FuwutaiComponent implements OnInit {
           phone: e.data.ano,
         },
       };
+      this.maskFlag = this.msg.loading("正在加载中..", {
+        nzDuration: 0,
+      }).messageId;
+
       this.mainService
         .getFetchDataList("data", "department", postData)
         .subscribe((result) => {
+          this.msg.remove(this.maskFlag);
+          this.maskFlag = false;
           if (result.status == 200) {
-            console.log(result);
-            if (result.list.length > 0) {
-              //绑定了科室
-              if (!this.newOrderShow && !this.newOrderShowOpen) {
-                let incidentModel:any = {department: result.list[0]};
-                let incidentMsg:any = {};
+            this.mainService.getDictionary("list", "incident_source").subscribe((res) => {
+              let sourceList = res || [];
+              let incidentModel:any = {
+                hjzxRecordId: e.data.id,
+                incomingPhone: e.data.ano,
+              };
+              let incidentMsg:any = {};
+              let source = sourceList.find(v => v.value === 'record');
+              source && (incidentModel.source = source.id);
+              if (result.list.length > 0) {
+                //绑定了科室
+                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);
-                // incidentModel.source && (incidentModel.source = incidentModel.source.id);
-                // incidentModel.area && (incidentModel.area = incidentModel.area.id);
-                // incidentModel.place && (incidentModel.place = incidentModel.place.id);
+                this.incidentModel = incidentModel;
+                console.log('this.incidentModel:', this.incidentModel)
+                this.incidentMsg = incidentMsg;
+                this.showNewOrder('', '', true, '留言转事件');
+              } else {
+                //没绑定科室
                 this.incidentModel = incidentModel;
                 this.incidentMsg = incidentMsg;
-                console.log('this.applicationDeptList:', this.applicationDeptList)
-                console.log('incidentModel:', incidentModel)
                 this.showNewOrder('', '', true, '留言转事件');
               }
-            } else {
-              //没绑定科室
-              console.log(this.newOrderShow);
-              this.showNewOrder('', '', true, '留言转事件');
-            }
+            });
           }
         });
     }