巡检和故障工单优化

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

@@ -16,7 +16,8 @@
             </div>
             <div class="row">
               <div class="col">报修类型：{{incidentData.repairIncidentType?.name}}</div>
-              <div class="col display_flex flex2">报修录音：<audio class="audio" controls style="outline: none;" *ngIf="incidentData.reqRecord && audioRequireSrc"><source [src]="audioRequireSrc" type="audio/mp3"></audio></div>
+              <div class="col display_flex">报修录音：<audio class="audio" controls style="outline: none;" *ngIf="incidentData.reqRecord && audioRequireSrc"><source [src]="audioRequireSrc" type="audio/mp3"></audio></div>
+              <div class="col">报修来源：{{incidentData.source?.name}}</div>
             </div>
             <div class="row">
               <div class="col">故障现象：{{incidentData.category?.mutiCategory}}</div>
@@ -39,7 +40,7 @@
             </div>
             <div class="row">
               <div class="col">来电电话：{{incidentData.incomingPhone}}</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 display_flex">来电录音：<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">

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

@@ -318,7 +318,7 @@
     }
   }
   .audio{
-    width: 264px;
+    width: 220px;
     height: 1.5em;
   }
 }

src/app/share/inspection-execute-detail/inspection-execute-detail.component.html

@@ -81,6 +81,19 @@
               </div>
             </div>
           </div>
+          <div class="top" *ngIf="orderInfo.incidentDTO">
+            <div class="info" nz-row>
+              <div nz-col nzSpan="8">
+                关联故障单：{{ orderInfo.incidentDTO.incidentsign }}
+              </div>
+              <div nz-col nzSpan="8">
+                状态：{{ orderInfo.incidentDTO.state?.name }}
+              </div>
+              <div nz-col nzSpan="8">
+                处理人/组：{{ orderInfo.incidentDTO.groupORHandlerUser }}
+              </div>
+            </div>
+          </div>
         </div>
       </div>
     </overlay-scrollbars>

src/app/views/incident-management/incident-management-routing.module.ts

@@ -1,12 +1,20 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 import { IncidentManagementComponent } from './incident-management.component';
+import { InspectionExecuteDetailComponent } from 'src/app/share/inspection-execute-detail/inspection-execute-detail.component';
 
 
 const routes: Routes = [
   {
     path: '',
     component: IncidentManagementComponent,
+    children: [
+      {
+        // 查看详情
+        path: 'inspectionExecuteDetail/:id',
+        component: InspectionExecuteDetailComponent,
+      }
+    ]
   }
 ];
 

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

@@ -120,6 +120,7 @@
             <td>{{ data.state?.name }}</td>
             <td>
               <div class="coop">
+                <span *ngIf="coopBtns.look && data.inspectionTaskId" (click)="viewInspectionDetail($event,data.inspectionTaskId)">查看巡检</span>
                 <span *ngIf="coopBtns.look" (click)="detail($event,data)">查看</span>
                 <span *ngIf="data.computedEditFlag" (click)="edit($event,data)">编辑</span>
                 <span *ngIf="data.computedVisitFlag" (click)="visit($event,data)">回访</span>
@@ -184,6 +185,15 @@
           </nz-form-control>
         </nz-form-item>
         <nz-form-item>
+          <nz-form-label [nzSpan]="5" nzFor="sourceValue">报修来源</nz-form-label>
+          <nz-form-control [nzSpan]="19" nzErrorTip="请选择报修来源!">
+            <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="false" nzAllowClear
+            nzPlaceHolder="请选择报修来源" formControlName="sourceValue">
+              <nz-option [nzLabel]="data.name" [nzValue]="data.value" *ngFor="let data of sourceList"></nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
           <nz-form-label [nzSpan]="5" nzFor="deleteFlag">是否已删除</nz-form-label>
           <nz-form-control [nzSpan]="19" nzErrorTip="请选择是否已删除!">
             <nz-radio-group formControlName="deleteFlag">
@@ -201,6 +211,9 @@
   </div>
 </div>
 
+<!-- 查看详情 -->
+<router-outlet></router-outlet>
+
 <!-- 处理 -->
 <app-incident-handle [id]="coopData.id" *ngIf="handleModalShow" (closeModelHs)="closeHandleModelOrder($event)" (confirmModelHs)="confirmHandleModelOrder($event)"></app-incident-handle>
 

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

@@ -36,6 +36,7 @@ export class IncidentManagementComponent implements OnInit, OnDestroy {
   gdState: number; //选择工单状态
   gdStates: any; //工单状态列表
   overdueStates: any; //逾期查询列表
+  sourceList: any; //报修来源列表
   pageIndex: number = 1; //页码
   listLength: number = 10; //总条数
   pageSize: number = 10; //每页条数
@@ -111,6 +112,7 @@ export class IncidentManagementComponent implements OnInit, OnDestroy {
     this.initTabs();
     this.getGdStates();
     this.getOverdueStates();
+    this.getSourceList();
     this.getIncidentCategoryList();
     this.loading1 = true;
     this.debounceSubject.next(true);
@@ -358,6 +360,7 @@ export class IncidentManagementComponent implements OnInit, OnDestroy {
         levelCategory: this.validateSearchForm.value.levelCategory ? { id: this.validateSearchForm.value.levelCategory } : undefined,
         acceptUser: this.validateSearchForm.value.acceptUser ? { id: this.validateSearchForm.value.acceptUser } : undefined,
         selectType: this.validateSearchForm.value.selectType || undefined,
+        source: this.validateSearchForm.value.sourceValue ? { value: this.validateSearchForm.value.sourceValue } : undefined,
         deleteFlag: this.validateSearchForm.value.deleteFlag,
 				candidateGroupId: null,
       },
@@ -514,6 +517,13 @@ export class IncidentManagementComponent implements OnInit, OnDestroy {
     });
   }
 
+  // 获取报修来源
+  getSourceList() {
+    this.mainService.getDictionary("list", "incident_source").subscribe((data) => {
+      this.sourceList = data || [];
+    });
+  }
+
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
   showPromptModal(con, success, promptInfo?) {
     this.promptModalShow = false;
@@ -599,6 +609,12 @@ export class IncidentManagementComponent implements OnInit, OnDestroy {
     this.getList(true);
   }
 
+  // 查看巡检
+  viewInspectionDetail(e, id) {
+    e.stopPropagation();
+    this.router.navigateByUrl("/main/incidentManagement/inspectionExecuteDetail/" + id);
+  }
+
   // 延期处理-弹窗
   postponeModalShow = false; //弹窗开关
   postpone(e, data) {
@@ -688,6 +704,7 @@ export class IncidentManagementComponent implements OnInit, OnDestroy {
         levelCategory: this.validateSearchForm.value.levelCategory ? { id: this.validateSearchForm.value.levelCategory } : undefined,
         acceptUser: this.validateSearchForm.value.acceptUser ? { id: this.validateSearchForm.value.acceptUser } : undefined,
         selectType: this.validateSearchForm.value.selectType || undefined,
+        source: this.validateSearchForm.value.sourceValue ? { value: this.validateSearchForm.value.sourceValue } : undefined,
         deleteFlag: this.validateSearchForm.value.deleteFlag,
 				candidateGroupId: undefined
       },
@@ -797,6 +814,7 @@ export class IncidentManagementComponent implements OnInit, OnDestroy {
       acceptUser: [null],
       selectType: [null],
       deleteFlag: [0],
+      sourceValue: [null],
     });
   }
 

src/app/views/inspection-execute/inspection-execute.component.html

@@ -66,15 +66,16 @@
         <thead>
           <tr class="thead">
             <th nzWidth="5%" nzShowCheckbox [(nzChecked)]="isAllDisplayDataChecked" (nzCheckedChange)="checkAll($event)"></th>
-            <th nzWidth="10%">单号</th>
-            <th nzWidth="10%">计划主题|批次号</th>
-            <th nzWidth="10%">巡检点|巡检单</th>
-            <th nzWidth="10%">截至时间</th>
-            <th nzWidth="10%">签到方式</th>
-            <th nzWidth="10%">执行人|组</th>
-            <th nzWidth="10%">是否异常</th>
-            <th nzWidth="10%">状态</th>
-            <th nzWidth="15%">操作</th>
+            <th nzWidth="9%">单号</th>
+            <th nzWidth="9%">计划主题|批次号</th>
+            <th nzWidth="9%">巡检点|巡检单</th>
+            <th nzWidth="9%">截至时间</th>
+            <th nzWidth="9%">签到方式</th>
+            <th nzWidth="9%">执行人|组</th>
+            <th nzWidth="9%">是否异常</th>
+            <th nzWidth="9%">状态</th>
+            <th nzWidth="9%">故障单号|状态</th>
+            <th nzWidth="14%">操作</th>
           </tr>
         </thead>
         <tbody>
@@ -88,8 +89,10 @@
             <td>{{data.userDTO?.name || data.groupDTO?.groupName}}</td>
             <td [ngClass]="{ red: data.exception === 1 }">{{data.exception === 1 ? '是' : '否'}}</td>
             <td>{{data.status?.name}}</td>
+            <td>{{data.incidentDTO?.incidentsign}}<br>{{data.incidentDTO?.state?.name}}</td>
             <td>
               <div class="coop">
+                <span *ngIf="coopBtns.look && data.incidentId" (click)="viewIncidentDetail($event, data)">查看故障单</span>
                 <span *ngIf="coopBtns.look" (click)="detail($event,data.id)">查看</span>
                 <span *ngIf="coopBtns.designate && data.status.value == 1" (click)="showInspectionExecuteAssign(data)">指派</span>
                 <span *ngIf="coopBtns.del" (click)="showDelModal(data,'您确认要删除选中的巡检任务吗？','删除','del')">删除</span>
@@ -127,3 +130,6 @@
 
 <!-- 查看详情 -->
 <router-outlet></router-outlet>
+
+<!-- 详情 -->
+<app-incident-detail [id]="coopData.incidentId" *ngIf="detailModalShow" (closeModelHs)="closeDetailModelOrder($event)" (confirmModelHs)="confirmDetailModelOrder($event)"></app-incident-detail>

src/app/views/inspection-execute/inspection-execute.component.ts

@@ -69,6 +69,23 @@ export class InspectionExecuteComponent implements OnInit {
     this.router.navigateByUrl("/main/inspectionExecute/inspectionExecuteDetail/" + id);
   }
 
+  // 查看故障单详情-弹窗
+  detailModalShow = false; //弹窗开关
+  viewIncidentDetail(e, data) {
+    e.stopPropagation();
+    this.coopData = data;
+    this.detailModalShow = true;
+  }
+  // 关闭弹窗
+  closeDetailModelOrder(e) {
+    this.detailModalShow = JSON.parse(e).show;
+  }
+  // 弹窗确定
+  confirmDetailModelOrder(e){
+    console.log(e);
+    this.detailModalShow = false;
+  }
+
   // 派单给人
   inspectionExecuteAssignPromptModalShow = false;
   showInspectionExecuteAssign(data?) {

src/app/views/inspection-execute/inspection-execute.module.ts

@@ -4,6 +4,7 @@ import { CommonModule } from '@angular/common';
 import { InspectionExecuteRoutingModule } from './inspection-execute-routing.module';
 import { InspectionExecuteComponent } from './inspection-execute.component';
 import { ShareModule } from 'src/app/share/share.module';
+import { IncidentDetailModule } from 'src/app/components/incidentManagement/incident-detail/incident-detail.module';
 
 
 @NgModule({
@@ -13,7 +14,8 @@ import { ShareModule } from 'src/app/share/share.module';
   imports: [
     CommonModule,
     InspectionExecuteRoutingModule,
-    ShareModule
+    ShareModule,
+    IncidentDetailModule,
   ]
 })
 export class InspectionExecuteModule { }