优化代码

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"><source [src]="audioSrc" type="audio/wav"></audio></div>
+              <div class="col" *ngIf="incidentData.assetDTO">关联资产：{{incidentData.assetDTO?.name}}</div>
             </div>
             <div class="row">
               <div class="col">报修科室：{{incidentData.department?.dept}}</div>

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

@@ -32,7 +32,7 @@
     <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();
@@ -48,8 +48,9 @@ export class IncidentHandleInfoSimpleComponent implements OnInit {
     this.incidentDataCopy = cloneDeep(this.incidentData);
     this.incidentDataCopy.synergetic = [];
     this.getHandleCategorys();
+    this.getClosecodes();
     this.getSynergeticList();
-    this.getAssetProductList();
+    this.getAssetList();
   }
 
   // 边输边搜节流阀
@@ -76,6 +77,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 +97,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',
@@ -101,10 +115,10 @@ export class IncidentHandleInfoSimpleComponent implements OnInit {
   }
 
   // 获取资产列表
-  assetProducList: any = [];
-  getAssetProductList(keyword = '') {
+  assetList: any = [];
+  getAssetList(keyword = '') {
     let postData = {
-      assetProduct: {
+      asset: {
         hosId: this.hosId,
         name: keyword,
       },
@@ -112,9 +126,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

@@ -73,7 +73,7 @@
     <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]);
       }
@@ -69,7 +69,7 @@ export class IncidentHandleInfoComponent implements OnInit, OnChanges {
     this.getHandleCategorys();
     this.getClosecodes();
     this.getSynergeticList();
-    this.getAssetProductList();
+    this.getAssetList();
     this.getIncidentCategoryList();
   }
 
@@ -122,7 +122,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',
@@ -170,10 +170,10 @@ export class IncidentHandleInfoComponent implements OnInit, OnChanges {
   }
 
   // 获取资产列表
-  assetProducList: any = [];
-  getAssetProductList(keyword = '') {
+  assetList: any = [];
+  getAssetList(keyword = '') {
     let postData = {
-      assetProduct: {
+      asset: {
         hosId: this.hosId,
         name: keyword,
       },
@@ -181,9 +181,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,
+        // 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) => {

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

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

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-visit/incident-ser-visit.component.ts

@@ -105,7 +105,7 @@ export class IncidentSerVisitComponent implements OnInit {
     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(addDays(currentLog.startTime, +currentLog.extra2), "HH时mm分前完成");
+          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日前完成");
         }

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/views/fuwutai/fuwutai.component.html

@@ -445,7 +445,7 @@
                   <div class="shijian">
                     <span class="left">
                       <span>
-                        处理人：{{ computedHandlerUser(data.data) }}
+                        处理人/组：{{ transferSynergetic(data.data) }}
                       </span>
                     </span>
                     <span class="right">
@@ -649,7 +649,7 @@
                   <div class="shijian">
                     <span class="left">
                       <span>
-                        处理人：{{ computedHandlerUser(data.data) }}
+                        处理人/组：{{ transferSynergetic(data.data) }}
                       </span>
                     </span>
                     <span class="right">

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

@@ -2262,6 +2262,7 @@ export class FuwutaiComponent implements OnInit {
     this.applicationRequesterList = [];
     this.fileList = [];
     this.repairImgs = [];
+    this.isRelatedDepartment = true;
   }
   // 打开新建工单
   deathTasktypeId; //获取这个写死的任务类型的id,送病人回病房
@@ -2281,7 +2282,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;
@@ -2534,7 +2535,6 @@ export class FuwutaiComponent implements OnInit {
 
     // 根据院区和故障现象带出责任部门，优先级，维修人/组
     if(this.incidentModel.category && e){
-
       let postData = {
         idx: 0,
         sum: 9999,
@@ -2567,6 +2567,11 @@ export class FuwutaiComponent implements OnInit {
             this.showGroupOrUser();
           }
         });
+    }else{
+      this.incidentModel.group = undefined;
+      this.applicationGroupList = [];
+      this.incidentModel.user = undefined;
+      this.applicationUserList = [];
     }
   }
   // 申请人列表（搜索）
@@ -2683,6 +2688,11 @@ export class FuwutaiComponent implements OnInit {
             this.showGroupOrUser();
           }
         });
+    }else{
+      this.incidentModel.group = undefined;
+      this.applicationGroupList = [];
+      this.incidentModel.user = undefined;
+      this.applicationUserList = [];
     }
   }
 
@@ -2895,6 +2905,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,
@@ -4426,14 +4443,13 @@ export class FuwutaiComponent implements OnInit {
     };
   }
 
-  // 处理人
-  computedHandlerUser(incidentData){
-    if(incidentData.state.value == 'pending' && incidentData.currentLog){
-      return incidentData.currentLog.workerName;
-    }
-    if(incidentData.state.value != 'pending' && incidentData.handlingPersonnelUser){
-      return incidentData.handlingPersonnelUser.name;
+  // 处理人+协同人
+  transferSynergetic(incidentData){
+    let str = incidentData.groupORHandlerUser || "";
+    if(incidentData.synergetic && incidentData.synergetic.length){
+        str += '，' + incidentData.synergetic.map(v => v.name).join('，');
     }
+    return str;
   }
 
   // 菜单拖拽-自由
@@ -4550,7 +4566,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/incident-management/incident-management.component.html

@@ -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,7 +90,8 @@
             <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.overdueTime"><span [ngStyle]="{ color: data.handleColourInfo ? data.handleColourInfo.value : '' }">{{ data.overdueTime | 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>{{ data.state?.name }}</td>

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

@@ -214,7 +214,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日前完成");
         }
@@ -337,7 +337,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 +353,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;