工单详情

proxy.conf.json

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

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

@@ -1,50 +1,126 @@
 <div class="save display_flex justify-content_flex-center align-items_center add">
   <div class="modalBody">
-    <div class="title">延期处理<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="title">查看<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
     <div class="content">
-      <form nz-form [formGroup]="validateForm" class="addForm">
-        <nz-form-item>
-          <nz-form-label [nzSpan]="6" nzRequired nzFor="repairTypeId">延期原因</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择延期原因!">
-            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="repairTypeId" nzPlaceHolder="请选择延期原因" nzServerSearch>
-              <ng-container *ngFor="let data of repairTypeList">
-                <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
-              </ng-container>
-              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
-                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
-              </nz-option>
-            </nz-select>
-          </nz-form-control>
-        </nz-form-item>
-        <nz-form-item>
-          <nz-form-label [nzSpan]="6" nzRequired nzFor="deferralDayId">延期天数</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择延期天数!">
-            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="deferralDayId" nzPlaceHolder="请选择延期天数" nzServerSearch>
-              <ng-container *ngFor="let data of deferralDayList">
-                <nz-option *ngIf="!isLoading" [nzLabel]="data.text" [nzValue]="data.value"></nz-option>
-              </ng-container>
-              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
-                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
-              </nz-option>
-            </nz-select>
-          </nz-form-control>
-        </nz-form-item>
-        <nz-form-item>
-          <nz-form-label [nzSpan]="6" nzRequired nzFor="deferralRemark">延期说明</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请输入延期说明!">
-            <nz-input-group>
-              <textarea formControlName="deferralRemark" nz-input rows="3" placeholder="请输入延期说明"></textarea>
-            </nz-input-group>
-          </nz-form-control>
-        </nz-form-item>
-      </form>
+      <div class="workingArea">
+        <div class="tabs">
+          <div class="tab" *ngFor="let item of tabs" (click)="clickTbab(item)" [ngClass]="{ active: activeTabValue === item.value }">{{ item.name }}</div>
+        </div>
+        <overlay-scrollbars #osComponentRef1 class="detail">
+          <!-- 报修信息 -->
+          <div class="repair" *ngIf="activeTabValue === 1">
+            <div class="row">
+              <div class="col">单号：{{incidentData.incidentsign}}</div>
+              <div class="col">优先级：{{incidentData.priorityDTO?.name}}</div>
+              <div class="col">状态：{{incidentData.state?.name}}</div>
+            </div>
+            <div class="row">
+              <div class="col">故障现象：{{incidentData.category?.mutiCategory}}</div>
+            </div>
+            <div class="row">
+              <div class="col">故障描述：{{incidentData.description}}</div>
+            </div>
+            <div class="row">
+              <div class="col">详细地址：{{ incidentData.place?.building?.buildingName }}{{ incidentData.place?.floorName }}{{ incidentData.houseNumber }}</div>
+            </div>
+            <div class="row">
+              <div class="col thumbs">
+                <span class="colName">报修图片：</span>
+                <div class="thumbList">
+                  <div class="thumb" *ngFor="let item of repairImgs;let index = index;" (click)="previewImageHandler(repairImgs, index)"><img [src]="item.thumbFilePath" alt=""></div>
+                </div>
+              </div>
+              <div class="col">联系人：{{incidentData.contacts}}</div>
+              <div class="col">联系电话：{{incidentData.contactsInformation}}</div>
+            </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>
+            <div class="row">
+              <div class="col">报修科室：{{incidentData.department?.dept}}</div>
+              <div class="col">报修人：{{incidentData.requester?.name}}</div>
+              <div class="col">受理人：{{incidentData.acceptUser?.name}}</div>
+            </div>
+            <div class="row">
+              <div class="col">登记时间：{{incidentData.acceptDate|date:'yyyy-MM-dd HH:mm:ss'}}</div>
+              <div class="col flex2">预约维修时间：{{incidentData.yyTime}}</div>
+            </div>
+          </div>
+          <!-- 处理信息 -->
+          <div class="handle" *ngIf="activeTabValue === 2">
+            <div class="row">
+              <div class="col">处理方式：{{incidentData.handleCategory?.name}}</div>
+              <div class="col">处理结果：{{incidentData.closecode?.name}}</div>
+              <div class="col">处理人：{{computedHandlerUser}}</div>
+            </div>
+            <div class="row">
+              <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>
+            <div class="row">
+              <div class="col thumbs">
+                <span class="colName">处理图片：</span>
+                <div class="thumbList">
+                  <div class="thumb" *ngFor="let item of handleImgs;let index = index;" (click)="previewImageHandler(handleImgs, index)"><img [src]="item.thumbFilePath" alt=""></div>
+                </div>
+              </div>
+              <div class="col">维修总价：{{incidentData.rsPrice === undefined ? '' : incidentData.rsPrice + '元'}}</div>
+              <div class="col">协同人：{{computedSynergeticUser}}</div>
+            </div>
+            <div class="row">
+              <div class="col files">
+                附件列表：
+                <div class="fileList">
+                  <div class="file" *ngFor="let item of handleAttachments;let index = index;" (click)="download(item.name,item.token)">{{item.name}}</div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <!-- 汇总单 -->
+          <div class="order" *ngIf="activeTabValue === 4">
+            <app-incident-handle-order [id]="id"></app-incident-handle-order>
+          </div>
+          <!-- 评价信息 -->
+          <div class="evaluation" *ngIf="activeTabValue === 5">
+            <div class="evaluationList">
+              <div class="title"><div class="dot"></div>用户评价</div>
+              <div class="body">
+                <div class="top" *ngIf="incidentData.wxdegree"><nz-rate [ngModel]="incidentData.wxdegree.value" nzDisabled></nz-rate></div>
+                <div class="bottom" *ngFor="let item of resolveLogs">{{item.remark}}</div>
+              </div>
+            </div>
+
+            <div class="evaluationList">
+              <div class="title"><div class="dot"></div>回访信息</div>
+              <div class="body">
+                <div class="top" *ngIf="incidentData.degree">{{incidentData.degree.name}}</div>
+                <div class="bottom" *ngFor="let item of callbackLogs">{{item.remark}}</div>
+              </div>
+            </div>
+          </div>
+        </overlay-scrollbars>
+      </div>
+      <overlay-scrollbars #osComponentRef2 class="process">
+        <div class="head">处理流程</div>
+        <div class="process_step" *ngFor="let item of incidentLogList;let index = index;let last = last;">
+          <div class="title"><i class="icon_transport transport-duigou1 num" *ngIf="last"></i><span class="num" *ngIf="!last">{{index + 1}}</span><span class="name">{{item.logType ? item.logType.name : ''}}<span class="remark" *ngIf="item.remark" [title]="item.remark">（{{item.remark}}）</span></span></div>
+          <div class="body">{{item.startTime | date: 'yyyy-MM-dd HH:mm:ss'}}  <span class="remark" *ngIf="item.appointorName">{{item.appointorName}}</span></div>
+        </div>
+      </overlay-scrollbars>
     </div>
     <div class="display_flex justify-content_flex-center">
-      <button nz-button nzType="primary" (click)="submitForm()"[nzLoading]="isLoading">确认</button>
-      <button nz-button nzType="default" class="btn cancel" (click)="hideModal()">取消</button>
+      <button nz-button nzType="primary" (click)="hideModal()">知道了</button>
     </div>
   </div>
 </div>
 
 <!-- 遮罩 -->
 <app-mask *ngIf="maskFlag"></app-mask>
+
+<!-- 图片预览 -->
+<app-image-viewer [imageUrl]="imgs" hidden *ngIf="isPreview" [isPreviewNow]="true" [initialViewIndex]="initialViewIndex"></app-image-viewer>

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

@@ -1,4 +1,9 @@
 @import "../../../../../src/theme.less";
+:host{
+  ::ng-deep .os-padding{
+    z-index: auto!important;
+  }
+}
 .save {
   position: fixed;
   left: 0;
@@ -21,7 +26,7 @@
       font-size: 18px;
       position: relative;
 
-      i {
+      .transport-guanbi {
         position: absolute;
         right: 0;
         top: 0;
@@ -42,8 +47,6 @@
       margin-top: 12px;
 
       div {
-        text-align: center;
-        margin: 0;
 
         &.icon {
           margin-top: 17px;
@@ -86,17 +89,19 @@
   // 新增
   &.add {
     .modalBody {
-      width: 480px;
+      width: 1300px;
       height: auto;
 
       .content {
         width: 100%;
-        height: auto;
-        padding: 19px 14px 0 14px;
-        max-height: 500px;
+        height: 600px;
         overflow-y: auto;
+        display: flex;
 
         .addForm {
+          width: 50%;
+          height: 100%;
+          padding: 16px;
           .ant-form-item {
             margin-bottom: 14px;
 
@@ -122,4 +127,198 @@
       }
     }
   }
+
+  .workingArea{
+    width: 75%;
+    height: 100%;
+    border-right: 1px solid #D9D9D9;
+    background-color: #fff;
+    .detail{
+      height: 506px;
+      margin: 16px;
+      background: #F9FAFB;
+      border-radius: 8px;
+      border: 1px solid #D9D9D9;
+      .repair,
+      .handle{
+        font-size: 14px;
+        display: flex;
+        flex-direction: column;
+        gap: 24px;
+        padding: 24px 16px;
+        .row{
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          .col{
+            flex: 1;
+            &.flex2{
+              flex: 2;
+            }
+            &.thumbs{
+              display: flex;
+              align-items: center;
+              .thumbList{
+                display: flex;
+                align-items: center;
+                flex-wrap: wrap;
+                gap: 8px;
+              }
+              .colName{
+                flex-shrink: 0;
+              }
+              .thumb{
+                width: 64px;
+                height: 64px;
+                padding: 4px;
+                border-radius: 4px;
+                border: 1px solid rgba(0,0,0,0.15);
+                img{
+                  width: 100%;
+                  height: 100%;
+                  object-fit: cover;
+                  object-position: center;
+                  cursor: pointer;
+                }
+              }
+            }
+            &.files{
+              display: flex;
+              .file{
+                margin-bottom: 4px;
+                padding-bottom: 6px;
+                border-bottom: 1px solid #1890FF;
+                font-size: 14px;
+                color: #1890FF;
+                position: relative;
+                cursor: pointer;
+                &:last-of-type{
+                  margin-bottom: 0;
+                }
+                &::after{
+                  content: '\e62b';
+                  font-family: 'icon_transport';
+                  position: absolute;
+                  left: 105%;
+                  top: 50%;
+                  transform: translateY(-50%);
+                  color: #000;
+                }
+              }
+            }
+          }
+        }
+      }
+      .evaluation{
+        .evaluationList{
+          .title{
+            height: 55px;
+            font-size: 16px;
+            font-weight: bold;
+            display: flex;
+            align-items: center;
+            border-bottom: 1px solid #E9E9E9;
+            padding: 0 16px;
+            .dot{
+              width: 10px;
+              height: 10px;
+              border-radius: 50%;
+              background-color: @primary-color;
+              margin-right: 4px;
+            }
+          }
+          .body{
+            padding: 16px;
+            .top{
+              font-weight: bold;
+            }
+            .bottom{
+              margin-top: 8px;
+              font-size: 14px;
+              line-height: 21px;
+            }
+          }
+        }
+      }
+    }
+    .tabs{
+      height: 60px;
+      border-bottom: 1px solid #D9D9D9;
+      display: flex;
+      align-items: center;
+      background-color: #fff;
+      .tab{
+        flex: 1;
+        display: flex;
+        height: 100%;
+        justify-content: center;
+        align-items: center;
+        border-right: 1px solid #D9D9D9;
+        font-size: #333;
+        cursor: pointer;
+        &:last-of-type{
+          border-right: none;
+        }
+        &.active{
+          background-color: #F0F6ED;
+        }
+      }
+    }
+  }
+
+  .process{
+    width: 25%;
+    height: 100%;
+    padding: 16px 8px;
+    background-color: #fff;
+    .head{
+      font-size: 16px;
+      color: #333333;
+      font-weight: bold;
+      margin-bottom: 16px;
+    }
+    .process_step{
+      &:last-of-type{
+        margin-bottom: 10px;
+        .body{
+          border-left: none;
+        }
+      }
+      .title{
+        display: flex;
+        align-items: center;
+        .num{
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          width: 32px;
+          height: 32px;
+          border-radius: 50%;
+          background-color: @primary-color;
+          color: #fff;
+          flex-shrink: 0;
+        }
+        .name{
+          color: @primary-color;
+          font-size: 16px;
+          margin-left: 16px;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+      }
+      .body{
+        border-left: 1px solid @primary-color;
+        padding-left: 32px;
+        font-size: 14px;
+        line-height: 22px;
+        margin: 6px 0 6px 16px;
+        word-break: break-all;
+      }
+    }
+  }
+  .audio{
+    width: 264px;
+    height: 1.5em;
+  }
 }

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

@@ -17,6 +17,11 @@ export class IncidentDetailComponent implements OnInit {
     static: false,
   })
   osComponentRef1: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef2", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef2: OverlayScrollbarsComponent;
   @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
   @Output() confirmModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
 
@@ -32,50 +37,46 @@ export class IncidentDetailComponent implements OnInit {
   ) { }
 
   isLoading = false;
+  hosId:any;
 
   ngOnInit() {
-    this.initForm();
+    this.hosId = this.tool.getCurrentHospital().id;
     this.getDetail();
-    this.getRepairTypeList();
-    this.getDeferralDayList();
+    this.getIncidentLogList();
   }
 
-  // 初始化新增form表单
-  validateForm: FormGroup; //新增/编辑表单
-  initForm() {
-    this.validateForm = this.fb.group({
-      repairTypeId: [null, [Validators.required]],//延期原因
-      deferralDayId: [null, [Validators.required]],//延期天数
-      deferralRemark: [null, [Validators.required]],//延期说明
-    });
-    console.log(this.validateForm.controls)
-  }
+  tabs:any[] = [
+    { name: '报修信息', value: 1 },
+    { name: '处理信息', value: 2 },
+    // { name: '质控', value: 3 },
+    // { name: '汇总单', value: 4 },
+    { name: '评价信息', value: 5 },
+  ]
 
-  // 获取延期原因
-  repairTypeList: any = [];
-  getRepairTypeList() {
-    this.mainService
-    .getDictionary('list', 'repair_type')
-    .subscribe((data) => {
-      this.repairTypeList = data || [];
-    });
-  }
+  // 点击tab
+  activeTabValue:any;
+  clickTbab(item){
+    this.activeTabValue = item.value;
+
+    if(this.activeTabValue == 1){
+      this.incidentData.callID && this.getCallrecord();
+      this.incidentData.reqAttachment && this.getRepairImgs();
+    }else if(this.activeTabValue == 2){
+      this.getHandleImgs();
+      this.getHandleAttachments();
+    }else if(this.activeTabValue == 3){
 
-  // 获取延期天数
-  deferralDayList: any = [];
-  getDeferralDayList() {
-    this.deferralDayList = this.tool.generateNumberArray(1, 15).map(v => ({
-      text: v + '天',
-      value: v,
-    }));
-		this.deferralDayList.unshift({
-			text: '0.5天',
-			value: 0.5,
-		})
+    }else if(this.activeTabValue == 4){
+
+    }else if(this.activeTabValue == 5){
+
+    }
   }
 
-  // 操作权限
-  incidentData:any = {};
+  // 事件详情
+  incidentData:any = {};//事件详情
+  resolveLogs:any = {};//评价信息
+  callbackLogs:any = {};//回访信息
   getDetail(){
     this.maskFlag = this.message.loading("正在加载中..", {
       nzDuration: 0,
@@ -86,52 +87,177 @@ export class IncidentDetailComponent implements OnInit {
         this.message.remove(this.maskFlag);
         this.maskFlag = false;
         this.incidentData = result.data || {};
+
+        this.clickTbab(this.tabs[0]);
+
+        let logs = this.incidentData.logs || [];
+        this.resolveLogs = logs.filter(v => v.logType.value == 'resolve').slice(0, 1);
+        this.callbackLogs = logs.filter(v => v.logType.value == 'callback').slice(0, 1);
+
+        this.getHospitalConfig();
       });
   }
 
+  // 获取报修图片
+  repairImgs:any[] = [];//报修图片
+  getRepairImgs() {
+    this.mainService
+      .getPreviewImage('wechatRequesterIncident', this.incidentData.id)
+      .subscribe((res:any) => {
+        res.data = res.data || [];
+        res.data.forEach(v => {
+          v.previewUrl = location.origin + "/file" + v.relativeFilePath;
+          v.thumbFilePath = location.origin + "/file" + v.thumbFilePath;
+        })
+        this.repairImgs = res.data;
+      });
+  }
+
+  // 获取处理图片
+  handleImgs:any[] = [];//处理图片
+  getHandleImgs() {
+    this.mainService
+      .getPreviewImage('incident', this.incidentData.id)
+      .subscribe((res:any) => {
+        res.data = res.data || [];
+        res.data.forEach(v => {
+          v.previewUrl = location.origin + "/file" + v.relativeFilePath;
+          v.thumbFilePath = location.origin + "/file" + v.thumbFilePath;
+        })
+        this.handleImgs = res.data;
+      });
+  }
+
+  // 获取处理附件
+  handleAttachments:any[] = [];//处理图片
+  getHandleAttachments() {
+    this.mainService
+      .getPreviewImage('handleAttachment', this.incidentData.id)
+      .subscribe((res:any) => {
+        this.handleAttachments = res.data || [];
+      });
+  }
+
+  // 下载
+  download(filename, token) {
+    //附件下载
+    let downUrl = this.mainService.downloadAttachment(token);
+    console.log(downUrl);
+    var a = document.createElement("a");
+    a.href = downUrl;
+    a.target = "_blank";
+    a.download = filename;
+    document.body.appendChild(a);
+    a.click();
+  };
+
+  // 预览图片
+  imgs = [];
+  isPreview = false;
+  initialViewIndex:number = 0;
+  previewImageHandler(data = [], index = 0) {
+    this.initialViewIndex = index;
+    console.log(index)
+    this.isPreview = false;
+    data = data || [];
+    this.imgs = data.map((v) => location.origin + '/file' + v.relativeFilePath);
+    setTimeout(() => {
+      this.isPreview = true;
+    }, 0)
+  }
+
   // 关闭弹窗
   hideModal() {
     this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
   }
 
-  // 表单提交
+  // 获取通话音频
+  audioSrc =  '';//音频
+  getCallrecord() {
+    let postData = {
+      idx: 0,
+      sum: 1,
+      callrecord: {callAccept: this.incidentData.callID},
+    };
+    this.mainService
+      .getFetchDataList('simple/data', 'callrecord', postData)
+      .subscribe((result) => {
+        if(result.status == 200){
+          result.list = result.list || [];
+          if(result.list.length){
+            this.audioSrc = location.origin + result.list[0].recordingFileName;
+          }else{
+            this.audioSrc = '';
+          }
+        }else{
+          this.message.error(result.msg || '请求数据失败！');
+        }
+      });
+  }
+
   maskFlag:any = false;
-  submitForm(): void {
-    for (const i in this.validateForm.controls) {
-      this.validateForm.controls[i].markAsDirty();
-      this.validateForm.controls[i].updateValueAndValidity();
+  // 获取处理流程
+  incidentLogList:any[] = [];
+  getIncidentLogList(){
+    let postData = {
+      "idx": 0,
+      "sum": 9999,
+      "incidentLog": {
+          "incidentId": this.id,
+      }
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "incidentLog", postData)
+      .subscribe((result) => {
+        this.incidentLogList = result.list || {};
+      });
+  }
+
+  // 处理人
+  get computedHandlerUser(){
+    if(this.incidentData.state.value == 'pending' && this.incidentData.currentLog){
+      return this.incidentData.currentLog.workerName;
     }
-    if (this.validateForm.invalid) {
-      return;
+    if(this.incidentData.state.value != 'pending' && this.incidentData.handlingPersonnelUser){
+      return this.incidentData.handlingPersonnelUser.name;
     }
+  }
 
-    this.maskFlag = this.message.loading("正在加载中..", {
-      nzDuration: 0,
-    }).messageId;
+  // 协同人
+  get computedSynergeticUser(){
+    return this.incidentData.synergetic && this.incidentData.synergetic.length ? this.incidentData.synergetic.map(v => v.name).join('，') : '';
+  }
 
-    let postData = {
-      incident: this.incidentData,
-    }
+  // 是否进入汇总单
+  isInSummaryOrder(){
+    return this.incidentData.duty && this.itsmSummarySheet.value == 1 && (this.incidentData.handlingPersonnelUser.id == this.tool.getCurrentUserId());
+  }
 
-    postData.incident.currentLog = {
-      remark: this.validateForm.value.deferralRemark,
-      extra1: this.validateForm.value.repairTypeId,
-      extra2: this.validateForm.value.deferralDayId,
+  // 获取院区配置信息
+  itsmSummarySheet:any = {};//是否需要填写汇总单
+  getHospitalConfig() {
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      hospitalConfig: {
+        model: "itsm",
+        hosId: this.hosId,
+      },
     }
-
     this.mainService
-    .flowPost("incident/task/overtime", postData)
-    .subscribe((result) => {
-      this.message.remove(this.maskFlag);
-      this.maskFlag = false;
-      this.confirmModelHs.emit();
-
-      if (result.state == 200) {
-        this.message.success('操作成功');
-      } else {
-        this.message.error('操作失败');
-      }
-    });
+      .getFetchDataList("simple/data", "hospitalConfig", postData)
+      .subscribe((result) => {
+        let list = result.list || [];
+        this.itsmSummarySheet = list.find(v => v.key == 'itsmSummarySheet') || {};
+        console.log(this.itsmSummarySheet)
+        if(this.isInSummaryOrder()){
+          // 维修汇总单
+          if(this.incidentData.state.value == 'close' && this.incidentData.summaryId){
+            let flag = this.tabs.some(v => v.value === 4);
+            !flag && this.tabs.splice(2, 0, {name: '汇总单', value: 4});
+          }
+        }
+      });
   }
 }
 

src/app/components/incidentManagement/incident-detail/incident-detail.module.ts

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

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

@@ -58,7 +58,7 @@
     <div class="add" (click)="addWorkHourManagement()"><i class="icon_transport transport-tag27fuben"></i></div>
   </div>
 
-  <div class="allTotalPrice">维修单总价：{{summaryObj.totalMaintenancePrice}}元</div>
+  <div class="allTotalPrice">汇总单总价：{{summaryObj.totalMaintenancePrice}}元</div>
 </div>
 <nz-spin nzSimple [nzSpinning]="summaryLoading" class="mt8 text_align_center"></nz-spin>
 

src/app/components/incidentManagement/incident-handle-order/incident-handle-order.module.ts

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

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

@@ -9,10 +9,10 @@
         <div class="tabs">
           <div class="tab" *ngFor="let item of tabs" (click)="clickTbab(item)" [ngClass]="{ active: activeTabValue === item.value }">{{ item.name }}</div>
         </div>
-        <ng-container *ngIf="activeTabValue === 1">
+        <div [hidden]="activeTabValue !== 1">
           <app-incident-handle-info [incidentData]="incidentData" (changeCategoryHs)="changeCategoryHs($event)" *ngIf="itsmSimpleHandle.value == 0"></app-incident-handle-info>
           <app-incident-handle-info-simple [incidentData]="incidentData" *ngIf="itsmSimpleHandle.value == 1"></app-incident-handle-info-simple>
-        </ng-container>
+        </div>
         <ng-container *ngIf="activeTabValue === 2">
           <app-incident-handle-order [id]="id"></app-incident-handle-order>
         </ng-container>
@@ -31,7 +31,7 @@
       </overlay-scrollbars>
     </div>
     <div class="display_flex justify-content_flex-center">
-      <button nz-button nzType="primary" (click)="submitForm()"[nzLoading]="isLoading">确认</button>
+      <button nz-button nzType="primary" (click)="submitForm()"[nzLoading]="isLoading" *ngIf="activeTabValue === 1">确认</button>
       <button nz-button nzType="default" class="btn cancel" (click)="hideModal()">取消</button>
     </div>
   </div>

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

@@ -85,7 +85,7 @@
       }
       .workingArea{
         flex: 1;
-        height: 100%;
+        height: 101%;
         .tabs{
           height: 60px;
           border-bottom: 1px solid #D9D9D9;

src/app/components/incidentManagement/incident-handle/incident-handle.component.ts

@@ -66,7 +66,6 @@ export class IncidentHandleComponent implements OnInit {
   ngOnInit() {
     this.hosId = this.tool.getCurrentHospital().id;
     this.getDetail();
-    this.getHospitalConfig();
   }
   // 关闭弹窗
   hideModal() {
@@ -96,7 +95,7 @@ export class IncidentHandleComponent implements OnInit {
         this.itsmSummarySheet = list.find(v => v.key == 'itsmSummarySheet') || {};
         this.itsmSimpleHandle = list.find(v => v.key == 'itsmSimpleHandle') || {};
         console.log(this.itsmSummarySheet)
-        if(this.isInSummaryOrder){
+        if(this.isInSummaryOrder()){
           let summary = this.tabs.some(v => v.value == 2);
           console.log(summary)
           !summary && this.tabs.push({ name: '汇总单', value: 2 });
@@ -119,6 +118,7 @@ export class IncidentHandleComponent implements OnInit {
         this.incidentData = result.data || {};
 
         this.getDictionaryList();
+        this.getHospitalConfig();
       });
   }
 
@@ -221,6 +221,7 @@ export class IncidentHandleComponent implements OnInit {
 
   // 表单提交
   submitForm() {
+    console.log(this.itsmSimpleHandle.value)
     if(this.itsmSimpleHandle.value == 0){
       // 详细处理
       console.log(this.incidentHandleInfoComponent)

src/app/components/incidentManagement/incident-handle/incident-handle.module.ts

@@ -5,9 +5,9 @@ import { IncidentHandleComponent } from './incident-handle.component';
 import { ShareModule } from 'src/app/share/share.module';
 import { IncidentHandleInfoComponent } from '../incident-handle-info/incident-handle-info.component';
 import { IncidentHandleInfoSimpleComponent } from '../incident-handle-info-simple/incident-handle-info-simple.component';
-import { IncidentHandleOrderComponent } from '../incident-handle-order/incident-handle-order.component';
 import { KnowledgeLookModule } from '../../knowledge-look/knowledge-look.module';
 import { IncidentHandleRepairModule } from '../incident-handle-repair/incident-handle-repair.module';
+import { IncidentHandleOrderModule } from '../incident-handle-order/incident-handle-order.module';
 
 
 @NgModule({
@@ -15,19 +15,18 @@ import { IncidentHandleRepairModule } from '../incident-handle-repair/incident-h
     IncidentHandleComponent,
     IncidentHandleInfoComponent,
     IncidentHandleInfoSimpleComponent,
-    IncidentHandleOrderComponent,
   ],
   imports: [
     CommonModule,
     ShareModule,
     KnowledgeLookModule,
     IncidentHandleRepairModule,
+    IncidentHandleOrderModule,
   ],
   exports: [
     IncidentHandleComponent,
     IncidentHandleInfoComponent,
     IncidentHandleInfoSimpleComponent,
-    IncidentHandleOrderComponent,
   ]
 })
 export class IncidentHandleModule { }

src/app/services/main.service.ts

@@ -911,4 +911,9 @@ export class MainService {
 	    headers: this.headers,
 	  });
 	}
+
+  // 下载附件
+	downloadAttachment(token): any {
+	  return host.host + "/common/common/downloadAttachment/" + token;
+	}
 }

src/app/share/detail-bx/detail-bx.component.html

@@ -75,7 +75,7 @@
     </div>
   </overlay-scrollbars>
   <div class="btns display_flex justify-content_flex-center">
-    <button nz-button nzType="primary" (click)="goToSummary()" *ngIf="orderInfo.duty && orderInfo.duty.addSummary == 1">维修单</button>
+    <button nz-button nzType="primary" (click)="goToSummary()" *ngIf="orderInfo.duty && orderInfo.duty.addSummary == 1">汇总单</button>
     <button class=" btn cancel" nz-button nzType="default" (click)="close()">取消</button>
   </div>
 </div>

src/app/share/detail-bx/detail-bx.component.ts

@@ -75,12 +75,12 @@ export class DetailBxComponent implements OnInit {
     });
   }
 
-  // 维修单
+  // 汇总单
   goToSummary(){
     this.isShowIncidentDetails = true;
   }
 
-  // 关闭维修单
+  // 关闭汇总单
   closeIncidentDetails(){
     this.isShowIncidentDetails = false;
   }

src/app/share/incident-details/incident-details.component.html

@@ -1,6 +1,6 @@
-<!-- 维修单信息 -->
+<!-- 汇总单信息 -->
 <div class="detail" *ngIf="!maskFlag">
-  <div class="title">维修单详情<i class="icon_transport transport-guanbi" (click)="closeHandler()"></i></div>
+  <div class="title">汇总单详情<i class="icon_transport transport-guanbi" (click)="closeHandler()"></i></div>
   <overlay-scrollbars #osComponentRef1 style="height: 90%; flex: 1">
     <div class="content">
       <div class="top">

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

@@ -12,8 +12,8 @@
         <thead>
           <tr class="thead">
             <th nzWidth="20%">表单名称</th>
-            <th nzWidth="20%">是否显示生成维修单</th>
-            <th nzWidth="20%">是否自动生成维修单</th>
+            <th nzWidth="20%">是否显示生成汇总单</th>
+            <th nzWidth="20%">是否自动生成汇总单</th>
             <th nzWidth="20%">状态</th>
             <th nzWidth="20%">操作</th>
           </tr>
@@ -59,8 +59,8 @@
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
-            <nz-form-label [nzSpan]="9" nzRequired nzFor="showOrder">是否显示生成维修单</nz-form-label>
-            <nz-form-control [nzSpan]="15" nzErrorTip="请选择是否显示生成维修单!">
+            <nz-form-label [nzSpan]="9" nzRequired nzFor="showOrder">是否显示生成汇总单</nz-form-label>
+            <nz-form-control [nzSpan]="15" nzErrorTip="请选择是否显示生成汇总单!">
               <nz-radio-group formControlName="showOrder">
                 <label nz-radio [nzValue]="1">是</label>
                 <label nz-radio [nzValue]="0">否</label>
@@ -68,8 +68,8 @@
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
-            <nz-form-label [nzSpan]="9" nzRequired nzFor="createOrder">是否自动生成维修单</nz-form-label>
-            <nz-form-control [nzSpan]="15" nzErrorTip="请选择是否自动生成维修单!">
+            <nz-form-label [nzSpan]="9" nzRequired nzFor="createOrder">是否自动生成汇总单</nz-form-label>
+            <nz-form-control [nzSpan]="15" nzErrorTip="请选择是否自动生成汇总单!">
               <nz-radio-group formControlName="createOrder">
                 <label nz-radio [nzValue]="1">是</label>
                 <label nz-radio [nzValue]="0">否</label>

src/assets/iconfont/demo_index.html

@@ -55,6 +55,48 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon icon_transport">&#xe62b;</span>
+                <div class="name">下载</div>
+                <div class="code-name">&amp;#xe62b;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe656;</span>
+                <div class="name">图例</div>
+                <div class="code-name">&amp;#xe656;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe649;</span>
+                <div class="name">身体</div>
+                <div class="code-name">&amp;#xe649;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe64c;</span>
+                <div class="name">iconPark-shopping-cart-add Copy</div>
+                <div class="code-name">&amp;#xe64c;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe64d;</span>
+                <div class="name">标本</div>
+                <div class="code-name">&amp;#xe64d;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe717;</span>
+                <div class="name">添加</div>
+                <div class="code-name">&amp;#xe717;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe952;</span>
+                <div class="name">条形码</div>
+                <div class="code-name">&amp;#xe952;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon icon_transport">&#xe62a;</span>
                 <div class="name">图片</div>
                 <div class="code-name">&amp;#xe62a;</div>
@@ -864,9 +906,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'icon_transport';
-  src: url('iconfont.woff2?t=1723428088159') format('woff2'),
-       url('iconfont.woff?t=1723428088159') format('woff'),
-       url('iconfont.ttf?t=1723428088159') format('truetype');
+  src: url('iconfont.woff2?t=1724726830485') format('woff2'),
+       url('iconfont.woff?t=1724726830485') format('woff'),
+       url('iconfont.ttf?t=1724726830485') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -893,6 +935,69 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon icon_transport transport-xiazai"></span>
+            <div class="name">
+              下载
+            </div>
+            <div class="code-name">.transport-xiazai
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-tuli"></span>
+            <div class="name">
+              图例
+            </div>
+            <div class="code-name">.transport-tuli
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-shenti"></span>
+            <div class="name">
+              身体
+            </div>
+            <div class="code-name">.transport-shenti
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-a-iconPark-shopping-cart-addCopy"></span>
+            <div class="name">
+              iconPark-shopping-cart-add Copy
+            </div>
+            <div class="code-name">.transport-a-iconPark-shopping-cart-addCopy
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-icon_biaoben"></span>
+            <div class="name">
+              标本
+            </div>
+            <div class="code-name">.transport-icon_biaoben
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-tianjia"></span>
+            <div class="name">
+              添加
+            </div>
+            <div class="code-name">.transport-tianjia
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-bar-code"></span>
+            <div class="name">
+              条形码
+            </div>
+            <div class="code-name">.transport-bar-code
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon icon_transport transport-a-11111"></span>
             <div class="name">
               图片
@@ -2109,6 +2214,62 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-xiazai"></use>
+                </svg>
+                <div class="name">下载</div>
+                <div class="code-name">#transport-xiazai</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-tuli"></use>
+                </svg>
+                <div class="name">图例</div>
+                <div class="code-name">#transport-tuli</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-shenti"></use>
+                </svg>
+                <div class="name">身体</div>
+                <div class="code-name">#transport-shenti</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-a-iconPark-shopping-cart-addCopy"></use>
+                </svg>
+                <div class="name">iconPark-shopping-cart-add Copy</div>
+                <div class="code-name">#transport-a-iconPark-shopping-cart-addCopy</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-icon_biaoben"></use>
+                </svg>
+                <div class="name">标本</div>
+                <div class="code-name">#transport-icon_biaoben</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-tianjia"></use>
+                </svg>
+                <div class="name">添加</div>
+                <div class="code-name">#transport-tianjia</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-bar-code"></use>
+                </svg>
+                <div class="name">条形码</div>
+                <div class="code-name">#transport-bar-code</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#transport-a-11111"></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=1723428088159') format('woff2'),
-       url('iconfont.woff?t=1723428088159') format('woff'),
-       url('iconfont.ttf?t=1723428088159') format('truetype');
+  src: url('iconfont.woff2?t=1724726830485') format('woff2'),
+       url('iconfont.woff?t=1724726830485') format('woff'),
+       url('iconfont.ttf?t=1724726830485') format('truetype');
 }
 
 .icon_transport {
@@ -13,6 +13,34 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.transport-xiazai:before {
+  content: "\e62b";
+}
+
+.transport-tuli:before {
+  content: "\e656";
+}
+
+.transport-shenti:before {
+  content: "\e649";
+}
+
+.transport-a-iconPark-shopping-cart-addCopy:before {
+  content: "\e64c";
+}
+
+.transport-icon_biaoben:before {
+  content: "\e64d";
+}
+
+.transport-tianjia:before {
+  content: "\e717";
+}
+
+.transport-bar-code:before {
+  content: "\e952";
+}
+
 .transport-a-11111:before {
   content: "\e62a";
 }

src/assets/iconfont/iconfont.json

@@ -6,6 +6,55 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "11833563",
+      "name": "下载",
+      "font_class": "xiazai",
+      "unicode": "e62b",
+      "unicode_decimal": 58923
+    },
+    {
+      "icon_id": "11501361",
+      "name": "图例",
+      "font_class": "tuli",
+      "unicode": "e656",
+      "unicode_decimal": 58966
+    },
+    {
+      "icon_id": "28217529",
+      "name": "身体",
+      "font_class": "shenti",
+      "unicode": "e649",
+      "unicode_decimal": 58953
+    },
+    {
+      "icon_id": "32835228",
+      "name": "iconPark-shopping-cart-add Copy",
+      "font_class": "a-iconPark-shopping-cart-addCopy",
+      "unicode": "e64c",
+      "unicode_decimal": 58956
+    },
+    {
+      "icon_id": "36613077",
+      "name": "标本",
+      "font_class": "icon_biaoben",
+      "unicode": "e64d",
+      "unicode_decimal": 58957
+    },
+    {
+      "icon_id": "9297319",
+      "name": "添加",
+      "font_class": "tianjia",
+      "unicode": "e717",
+      "unicode_decimal": 59159
+    },
+    {
+      "icon_id": "18169891",
+      "name": "条形码",
+      "font_class": "bar-code",
+      "unicode": "e952",
+      "unicode_decimal": 59730
+    },
+    {
       "icon_id": "39056749",
       "name": "图片",
       "font_class": "a-11111",