暂提代码

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-    "target": "http://192.168.3.108",
+    "target": "http://weixintest15.ngser.dashitech.com",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/services/main.service.ts

@@ -492,12 +492,24 @@ export class MainService {
       headers: this.headers,
     });
   }
-  //查区域地点接口
+  //查报修流程时间
+  getProcessTime(data,processInstanceId) {
+    return this.http.post(host.host + "/itsm/bpm/flowTracing/"+processInstanceId, data, {
+      headers: this.headers,
+    });
+  }
+  //查列表
   fetchListBx(type, data) {
     return this.http.post(host.host + "/itsm/fetchDataList/" + type, data, {
       headers: this.headers,
     });
   }
+  //查单个
+  fetchDataBx(target, id) {
+    return this.http.post(host.host + "/itsm/fetchData/" + target + "/" + id,{}, {
+      headers: this.headers,
+    });
+  }
   //提交报修
   addWxIncident(data) {
     return this.http.post(host.host + "/itsm/addWxIncident", data, {
@@ -510,6 +522,12 @@ export class MainService {
       headers: this.headers,
     });
   }
+  //获取ITSM字典
+  getDictionaryByITSM(data) {
+    return this.http.post(host.host + "/itsm/common/getDictionary", data, {
+      headers: this.headers,
+    });
+  }
   //复制院区
   copyHosTaskType(data) {
     return this.http.post(host.host + "/api/copyHosTaskType", data, {

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

@@ -0,0 +1,345 @@
+<!-- 报修信息 -->
+<div class="detail" *ngIf="!maskFlag">
+    <div class="title">报修信息<i class="icon_transport transport-guanbi" (click)="close()"></i></div>
+    <overlay-scrollbars #osComponentRef1 style="height: 90%; flex: 1">
+      <div class="content">
+        <div class="top" *ngIf="amplificationShow">
+          <div class="num">
+            <span class="left">报修编号：{{orderInfo.bxcode}}</span>
+            <span class="right">{{orderInfo.incidentState?orderInfo.incidentState.name:''}}</span>
+          </div>
+          <div class="info" nz-row>
+            <div nz-col nzSpan="8">报修类别：{{orderInfo.category?orderInfo.category.category:''}}</div>
+            <div nz-col nzSpan="8">报修地址：<ng-container *ngIf="orderInfo.place">{{ orderInfo.place.area.area }} {{ orderInfo.place.place }} {{ orderInfo.address }}</ng-container></div>
+            <div nz-col nzSpan="24">报修内容：{{orderInfo.description}}</div>
+            <div nz-col nzSpan="24">报修图片：{{orderInfo.description}}</div>
+            <div nz-col nzSpan="8">维修人：<ng-container *ngIf="orderInfo.incident&&orderInfo.incident.handlingPersonnelUser">{{ orderInfo.incident.handlingPersonnelUser.name }}</ng-container></div>
+            <div nz-col nzSpan="8">维修人电话：<ng-container *ngIf="orderInfo.incident&&orderInfo.incident.handlingPersonnelUser">{{ orderInfo.incident.handlingPersonnelUser.phone }}</ng-container></div>
+            <div nz-col nzSpan="24" *ngIf="processData == '已撤回'">撤回原因：{{ orderInfo.retractReason }}</div>
+            <div nz-col nzSpan="24" *ngIf="processData == '不受理'">不受理原因：{{ orderInfo.rejectRemark }}</div>
+          </div>
+        </div>
+        <div class="center" *ngIf="amplificationShow">
+          <div class="box">
+            <!-- <div class="steps" *ngFor="let step of logList;let i = index;">
+              <div class="step">
+                <div class="info">
+                  <i
+                    [ngClass]="{'icon_transport':true, 'transport-icon_liucheng':true,'green':(step.record&&step.record[0]&&step.record[0].operationTime)}"></i>
+                  <p>{{step.operationName}}</p>
+                  <p>{{step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):''}}</p>
+                  <p *ngIf="step.record[0]&&step.record[0].dept">
+                    <span *ngFor="let dept of step.record">{{!showCoop&&deptDisplay==2?dept.deptalias:dept.dept}},</span>
+                  </p>
+                  <p *ngIf="i!=0&&step.record&&step.record.length">耗时{{filterTime(step.record)}}</p>
+                </div>
+                <div class="line"></div>
+              </div>
+            </div> -->
+            <!-- 流程图 start -->
+            <div class="processBox">
+              <div
+                class="process"
+                *ngIf="
+                  processData == '不受理' ||
+                    processData == '结束' ||
+                    processData == '已撤回' ||
+                    processData == '重复事件'
+                "
+              >
+                <div class="status">
+                  {{ processMessage[4] ? processMessage[4].name : "" }}
+                </div>
+                <div class="ico">
+                  <i class="icon_transport transport-icon_liucheng last"></i>
+                </div>
+                <div class="time">
+                  <ng-container *ngIf="processTime[4]">
+                    {{processTime[4].startTime | date:"MM-dd HH:mm:ss"}}
+                  </ng-container>
+                </div>
+              </div>
+              <div
+                class="processCont"
+                *ngIf="
+                  processData == '不受理' ||
+                    processData == '结束' ||
+                    processData == '已撤回' ||
+                    processData == '重复事件'
+                "
+              >
+                <div class="status"></div>
+                <div
+                  class="conents"
+                  v-html="processMessage[4] ? processMessage[4].desc : ''"
+                ></div>
+              </div>
+              <div
+                class="process"
+                *ngIf="
+                  processData == '评价' ||
+                    (processData == '结束' && processData != '重复事件')
+                "
+              >
+                <div class="status">
+                  {{ processMessage[3] ? processMessage[3].name : "" }}
+                </div>
+                <div class="ico">
+                  <i
+                    class="icon_transport transport-icon_liucheng green now"
+                    *ngIf="processData == '评价'"
+                  ></i>
+                  <i
+                    class="icon_transport transport-icon_liucheng last"
+                    *ngIf="processData != '评价'"
+                  ></i>
+                </div>
+                <div class="time">
+                  <ng-container *ngIf="processTime[3]">
+                    {{processTime[3].startTime | date:"MM-dd HH:mm:ss"}}
+                  </ng-container>
+                </div>
+              </div>
+              <div
+                class="processCont"
+                *ngIf="
+                  processData == '评价' ||
+                    (processData == '结束' && processData != '重复事件')
+                "
+              >
+                <div class="status"></div>
+                <div
+                  class="conents"
+                  v-html="processMessage[3] ? processMessage[3].desc : ''"
+                ></div>
+              </div>
+              <!-- 处理日志 start -->
+              <ng-container *ngIf="orderInfo.incident">
+                <div *ngFor="let item of orderInfo.incident.handlerLogs;let i = index;">
+                  <div
+                    class="process"
+                    *ngIf="
+                      processData == '处理' ||
+                        processData == '评价' ||
+                        (processData == '结束' && processData != '重复事件')
+                    "
+                  >
+                    <div class="status">
+                      {{ processMessage[2] ? processMessage[2].name : "" }}
+                    </div>
+                    <div class="ico">
+                      <i
+                        class="icon_transport transport-icon_liucheng green now"
+                        *ngIf="processData == '处理' && i === 0"
+                      ></i>
+                      <i
+                        class="icon_transport transport-icon_liucheng last"
+                        v-else
+                      ></i>
+                    </div>
+                    <div class="time">
+                      {{ item.opTime | date:"MM-dd HH:mm:ss"}}，{{ item.userName }}
+                    </div>
+                  </div>
+                  <div
+                    class="processCont"
+                    *ngIf="
+                      processData == '处理' ||
+                        processData == '评价' ||
+                        (processData == '结束' && processData != '重复事件')
+                    "
+                  >
+                    <div class="status"></div>
+                    <div class="conents">{{ item.opValue }}</div>
+                  </div>
+                </div>
+              </ng-container>
+              <!-- 处理日志 end -->
+              <div
+                class="process"
+                *ngIf="
+                  processData == '处理' ||
+                    processData == '评价' ||
+                    (processData == '结束' && processData != '重复事件')
+                "
+              >
+                <div class="status">
+                  {{ processMessage[2] ? processMessage[2].name : "" }}
+                </div>
+                <div class="ico">
+                  <i
+                    class="icon_transport transport-icon_liucheng green now"
+                    *ngIf="processData == '处理' && orderInfo.incident && !orderInfo.incident.handlerLogs"
+                  ></i>
+                  <i
+                    class="icon_transport transport-icon_liucheng last"
+                    v-else
+                  ></i>
+                </div>
+                <div class="time">
+                  <ng-container *ngIf="processTime[2]">
+                    {{processTime[2].startTime | date:"MM-dd HH:mm:ss"}}
+                  </ng-container>
+                </div>
+              </div>
+              <div
+                class="processCont"
+                *ngIf="
+                  processData == '处理' ||
+                    processData == '评价' ||
+                    (processData == '结束' && processData != '重复事件')
+                "
+              >
+                <div class="status"></div>
+                <div
+                  class="conents"
+                  v-html="processMessage[2] ? processMessage[2].desc : ''"
+                ></div>
+              </div>
+              <div
+                class="process"
+                *ngIf="
+                  processData == '受理' ||
+                    processData == '处理' ||
+                    processData == '评价' ||
+                    (processData == '结束' && processData != '重复事件')
+                "
+              >
+                <div class="status">
+                  {{ processMessage[1] ? processMessage[1].name : "" }}
+                </div>
+                <div class="ico">
+                  <i
+                    class="icon_transport transport-icon_liucheng green now"
+                    *ngIf="processData == '受理'"
+                  ></i>
+                  <i
+                    class="icon_transport transport-icon_liucheng last"
+                    *ngIf="processData != '受理'"
+                  ></i>
+                </div>
+                <div class="time">
+                  <ng-container *ngIf="processTime[1]">
+                    {{processTime[1].startTime | date:'MM-dd HH:mm:ss'}}
+                  </ng-container>
+                </div>
+              </div>
+              <div
+                class="processCont"
+                *ngIf="
+                  processData == '受理' ||
+                    processData == '处理' ||
+                    processData == '评价' ||
+                    (processData == '结束' && processData != '重复事件')
+                "
+              >
+                <div class="status"></div>
+                <div
+                  class="conents"
+                  v-html="processMessage[1] ? processMessage[1].desc : ''"
+                ></div>
+              </div>
+              <div class="process">
+                <div class="status">
+                  {{ processMessage[0] ? processMessage[0].name : "" }}
+                </div>
+                <div class="ico">
+                  <i
+                    class="icon_transport transport-icon_liucheng green now"
+                    *ngIf="processData == '申请'"
+                  ></i>
+                  <i
+                    class="icon_transport transport-icon_liucheng last"
+                    *ngIf="processData != '申请'"
+                  ></i>
+                </div>
+                <div class="time">
+                  <ng-container *ngIf="processTime[0]">
+                    {{processTime[0].startTime | date:"MM-dd HH:mm:ss"}}
+                  </ng-container>
+                </div>
+              </div>
+              <div class="processCont">
+                <div class="status"></div>
+                <div
+                  class="conents lastConents"
+                  v-html="processMessage[0] ? processMessage[0].desc : ''"
+                ></div>
+              </div>
+            </div>
+            <!-- 流程图 end -->
+          </div>
+        </div>
+        <div class="bottom" *ngIf="orderInfo.urgentDetails&&showCoop">
+          <div class="urgent">
+            <div>
+              <ng-container *ngIf="amplificationShow&&orderInfo.urgentDetails&&showCoop">
+                  加急原因：{{orderInfo.urgentDetails.urgentReason}}
+                <button *ngIf="orderInfo.urgentDetails.checkStatus.id==329" class=" btn default" nz-button nzType="primary"
+                  [nzLoading]="urgentLoading" nzGhost (click)="urgent()">确认加急</button>
+              </ng-container>
+            </div>
+            <div class="amplification">
+              <button
+                nz-button
+                nzType="primary"
+                class="btn default"
+                (click)="amplification()"
+              >
+                {{ amplificationShow ? "放大" : "还原" }}
+              </button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </overlay-scrollbars>
+    <div class="btns display_flex justify-content_flex-center">
+      <!-- <button *ngIf="showCoop&&orderInfo.gdState.id==69" nz-button nzType="primary" [nzLoading]="isOkLoading"
+        (click)='allotWorker()'>派单</button>
+      <button *ngIf="showCoop&&(orderInfo.gdState.id==70||orderInfo.gdState.id==71)" nz-button nzType="primary" nzGhost
+        (click)="openRecallModal()">撤回</button>
+      <button *ngIf="showCoop&&(orderInfo.gdState.id==69||orderInfo.gdState.id==70||orderInfo.gdState.id==71)" nz-button
+        nzType="danger" (click)="openDelModal()">删除</button> -->
+      <button class=" btn cancel" nz-button nzType="default" (click)="close()">取消</button>
+    </div>
+  </div>
+  
+  <!-- 撤回工单 -->
+  <div class="recallOrder" *ngIf="recallOrderShow">
+    <div class="modalBody">
+      <div class="title">提示<i class="icon_transport transport-guanbi" (click)="closeRecallOrderModal()"></i></div>
+      <div class="content">
+        <div class="icon"><i class="icon_transport transport-wenhao"></i></div>
+        <div class="defeat">您确认要撤回此工单吗？</div>
+      </div>
+      <div class="btns display_flex justify-content_flex-center">
+        <button nz-button nzType="primary" [nzLoading]='btnLoading' (click)="confirmRec()">确认</button>
+        <button nz-button nzType="primary" [nzLoading]='recLoading' nzGhost (click)="recAndDel()">撤回并删除</button>
+        <button class=" btn cancel" nz-button nzType="default" (click)="closeRecallOrderModal()">取消</button>
+      </div>
+    </div>
+  </div>
+  
+  <!-- 删除工单 -->
+  <div class="recallOrder delModel" *ngIf="delOrderShow">
+    <div class="modalBody">
+      <div class="title">提示<i class="icon_transport transport-guanbi" (click)="closeDelOrderModal()"></i></div>
+      <div class="content">
+        <div class="icon"><i class="icon_transport transport-wenhao"></i></div>
+        <div class="defeat">您确认要删除此工单吗？</div>
+      </div>
+      <div class="btns display_flex justify-content_flex-center">
+        <button nz-button nzType="primary" [nzLoading]='btnLoading' (click)="confirmDel()">确认</button>
+        <button class="btn cancel" nz-button nzType="default" (click)="closeDelOrderModal()">关闭</button>
+      </div>
+    </div>
+  </div>
+  
+  <!-- 操作成功/失败提示框 -->
+  <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+    [info]="promptInfo" (closeModel)="close()">
+    <!-- 2.父组件调用子组件时绑定到这个事件属性，并在事件发生时作出回应。(closeModel)="close()" -->
+  </app-prompt-modal>
+  <!-- 遮罩 -->
+  <app-mask *ngIf="maskFlag"></app-mask>
+  

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

@@ -0,0 +1,358 @@
+@import "../../../../src/theme.less";
+:host {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  left: 0;
+  top: 0;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 9;
+
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.detail {
+  width: 1000px;
+  height: calc(100vh - 100px);
+  min-height: 530px;
+  border-radius: 5px;
+  background: #fff;
+  color: #333;
+  font-size: 14px;
+  padding: 12px 20px;
+  position: relative;
+  padding-bottom: 70px;
+
+  // 流程 start
+  .processBox {
+    margin-top: 0.24rem;
+  }
+  .process {
+    padding: 0 0.24rem;
+    display: flex;
+  }
+  .process .status {
+    width: 12%;
+    font-size: 0.28rem;
+    text-align: center;
+  }
+  .process .ico {
+    width: 6%;
+    text-align: center;
+  }
+  .process .ico i {
+    font-size: 0.28rem;
+  }
+  .process .last {
+    color: #005359;
+  }
+  .process .now {
+    color: #48a843;
+  }
+  .process .time {
+    width: 80%;
+    font-size: 0.25rem;
+    color: #999999;
+    padding-left: 2%;
+  }
+  .processCont {
+    padding: 0 0.24rem;
+    display: flex;
+    margin: 0.07rem 0;
+  }
+  .processCont .status {
+    width: 12%;
+  }
+  .processCont .conents {
+    width: 80%;
+    margin-left: 3%;
+    font-size: 0.25rem;
+    color: #666666;
+    padding: 0.07rem 0;
+    padding-left: 5%;
+    border-left: 0.01rem #999999 solid;
+    line-height: 0.3rem;
+    word-break: break-all;
+  }
+  .processCont .lastConents {
+    border-left: 0ch;
+  }
+  // 流程 end
+
+  .title {
+    font-size: 18px;
+    text-align: center;
+    line-height: 24px;
+    margin: 0;
+    margin-bottom: 12px;
+    position: relative;
+
+    i {
+      position: absolute;
+      right: 0;
+      top: 0;
+      font-size: 20px;
+      color: #666;
+      cursor: pointer;
+      padding: 0 5px;
+    }
+  }
+
+  .content {
+    width: 960px;
+    min-height: 400px;
+    border: 1px solid #e5e9ed;
+    border-radius: 5px;
+    overflow: hidden;
+
+    & > .top {
+      padding: 10px 32px;
+      border-bottom: 1px solid #e5e9ed;
+
+      .num {
+        font-size: 16px;
+        overflow: hidden;
+        margin-bottom: 6px;
+
+        .left {
+          float: left;
+          font-weight: 600;
+        }
+
+        .right {
+          float: right;
+        }
+      }
+
+      .info {
+        color: #666;
+
+        & > div {
+          margin: 4px 0;
+        }
+      }
+    }
+
+    & > .center {
+      padding: 27px 0 17px 0;
+      border-bottom: 1px solid #e5e9ed;
+      font-size: 12px;
+
+      .box {
+        display: flex;
+        justify-content: center;
+
+        .steps {
+          &:nth-last-child(1) {
+            .line {
+              display: none !important;
+            }
+          }
+
+          .step {
+            .info {
+              width: 90px;
+              text-align: center;
+              display: inline-block;
+              vertical-align: top;
+
+              i {
+                color: #e5e9ed;
+
+                &.green {
+                  color: @primary-color;
+                }
+              }
+            }
+
+            p {
+              margin: 0;
+            }
+
+            .line {
+              display: inline-block;
+              width: 60px;
+              height: 2px;
+              background: #e5e9ed;
+            }
+          }
+        }
+      }
+    }
+
+    & > .bottom {
+      padding: 28px 32px;
+      background: #f9fafb;
+
+      .urgent {
+        display: flex;
+        justify-content: space-between;
+        margin-bottom: 8px;
+        input {
+          width: 600px;
+        }
+
+        .candelBtn {
+          margin-left: 20px;
+        }
+      }
+
+      .table {
+        width: 100%;
+        height: 160px;
+        // padding: 6px;
+        background: #fff;
+        // border: 1px solid #e5e9ed;
+        border-radius: 5px;
+        margin-top: 16px;
+
+        .thead {
+          background: linear-gradient(to right, @bg-start, @bg-end) !important;
+
+          th {
+            color: #fff !important;
+            text-align: center;
+            font-size: 12px;
+            border: none;
+          }
+        }
+
+        .ant-table-tbody {
+          tr {
+            text-align: center;
+            font-size: 12px;
+            border: none;
+
+            td {
+              border: none;
+              position: relative;
+            }
+          }
+
+          tr:nth-child(2n) {
+            background: #f9fafb;
+          }
+        }
+      }
+    }
+  }
+
+  .btns {
+    width: 100%;
+    position: absolute;
+    left: 0;
+    bottom: 20px;
+
+    button {
+      margin: 9px;
+      margin-bottom: 0;
+    }
+  }
+
+  .ant-table {
+    border: none !important;
+  }
+}
+
+// 撤回工单
+.recallOrder {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .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: #ff3b53;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 18px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+
+      .conditions {
+        padding: 16px 20px;
+
+        div {
+          text-align: left;
+        }
+      }
+    }
+
+    .btns {
+      button {
+        margin-top: 10px;
+
+        &.btn {
+          margin-left: 8px;
+        }
+      }
+    }
+  }
+}
+
+.txtC {
+  text-align: center;
+}

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

@@ -0,0 +1,286 @@
+import { Component, OnInit, ViewChild } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { MainService } from "../../services/main.service";
+import { forkJoin } from "rxjs";
+import { NzMessageService } from "ng-zorro-antd";
+import { ToolService } from "src/app/services/tool.service";
+import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
+
+@Component({
+  selector: "app-detail-bx",
+  templateUrl: "./detail-bx.component.html",
+  styleUrls: ["./detail-bx.component.less"],
+})
+export class DetailBxComponent implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  constructor(
+    private message: NzMessageService,
+    private route: ActivatedRoute,
+    private router: Router,
+    private tool: ToolService,
+    private mainService: MainService
+  ) {}
+  processTime = [];
+  processData = "";
+  processMessage = [];
+
+  id: number; //工单id
+  orderInfo: any; //工单详情信息
+  showCoop: boolean = true; //是否展示详情页操作按钮
+
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //是否展示提示框
+
+  urgentLoading: boolean = false; //确认加急按钮loading状态
+  recLoading: boolean = false; //撤回并删除按钮loading状态
+  btnLoading: boolean = false; //确认按钮loading状态
+  maskFlag: any = false;
+  deptDisplay; //护士端是否显示可以别名，1是显示科室名称，2是显示科室别名
+  amplificationShow = true;
+
+  ngOnInit() {
+    this.tool.getDeptDisplay().subscribe((result) => {
+      if (result.status == 200) {
+        this.deptDisplay = result.list[0].valueconfig;
+      }
+    });
+    if (this.route.snapshot.parent.parent.routeConfig.path == "nurse") {
+      this.showCoop = false;
+    }
+    this.id = +this.route.snapshot.paramMap.get("id");
+    let log$ = this.getLog();
+    let detail$ = this.getDetail();
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    forkJoin(log$, detail$).subscribe((res) => {
+      this.message.remove(this.maskFlag);
+      this.maskFlag = false;
+      // getLog
+      this.logList = res[0]["data"];
+      // getDetail
+      this.orderInfo = res[1]["data"];
+      this.getProcessTime();
+      this.getProcessMessageData();
+      if (this.orderInfo.incident && !this.orderInfo.incident.handlerLogs) {
+        this.orderInfo.incident.handlerLogs = [];
+      } else {
+        this.orderInfo.incident.handlerLogs.reverse();
+      }
+      if (this.orderInfo.incident && this.orderInfo.incident.repeat) {
+        this.processData = "重复事件";
+      } else if (this.orderInfo.state.name == "不受理") {
+        this.processData = "不受理";
+      } else if (this.orderInfo.state.name == "未受理") {
+        this.processData = "申请";
+      } else if (this.orderInfo.state.name == "处理中") {
+        this.processData = "处理";
+      } else if (this.orderInfo.state.name == "待评价") {
+        this.processData = "评价";
+      } else if (this.orderInfo.state.name == "已解决") {
+        this.processData = "结束";
+      } else if (this.orderInfo.state.name == "已撤回") {
+        this.processData = "已撤回";
+      }
+    });
+  }
+  //获取流程节点时间
+  getProcessTime() {
+    if (this.orderInfo.incident && this.orderInfo.incident.processInstanceId) {
+      this.mainService
+        .getProcessTime({}, this.orderInfo.incident.processInstanceId)
+        .subscribe((res: any) => {
+          this.processTime = res.data;
+        });
+    }
+  }
+
+  getProcessMessageData() {
+    this.mainService
+      .fetchListBx("dictionary", {
+        idx: 0,
+        sum: 10,
+        dictionary: {
+          key: "wxincident_task_default",
+        },
+      })
+      .subscribe((res: any) => {
+        this.processMessage = res.list;
+      });
+  }
+
+  // 放大
+  amplification() {
+    this.amplificationShow = !this.amplificationShow;
+  }
+
+  // 获取工单详情
+  getDetail() {
+    return this.mainService.fetchDataBx("wXIncident", this.id);
+  }
+
+  // 确认加急
+  urgent() {
+    let that = this;
+    that.urgentLoading = true;
+    let postData = {
+      urgentDetails: {
+        workerOrder: this.orderInfo["id"],
+        checkStatus: {
+          id: 330,
+        },
+        urgentReason: this.orderInfo["urgentDetails"].urgentReason,
+        id: this.orderInfo["urgentDetails"].id,
+      },
+    };
+    that.mainService.coopWorkerOrder("urge", postData).subscribe((data) => {
+      that.urgentLoading = false;
+      if (data.status == 200) {
+        that.showPromptModal("加急", true, "");
+      } else {
+        that.showPromptModal("加急", false, data.msg);
+      }
+    });
+  }
+
+  // 关闭弹框
+  close() {
+    // this.router.navigateByUrl('dispatchingDesk');
+    history.go(-1);
+  }
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+  }
+  // 获取工单历史记录
+  logList = []; //工单历史记录
+  getLog() {
+    // return this.mainService.getWorkOrderLog(this.id);
+    return Promise.resolve(111);
+  }
+
+  // 派单
+  allotWorker() {
+    this.router.navigateByUrl(
+      "dispatchingDesk/allotWorker/" +
+        this.id +
+        "/" +
+        this.orderInfo["gdState"]["id"]
+    );
+  }
+
+  // 撤回
+  recallOrderShow: boolean = false;
+  openRecallModal(): void {
+    this.recallOrderShow = true;
+  }
+  // 撤回并删除
+  recAndDel() {
+    let that = this;
+    that.recLoading = true;
+    that.mainService.delOrder(that.id).subscribe((data) => {
+      console.log(data);
+      that.recLoading = false;
+      that.closeDelOrderModal();
+      if (data.status == 200) {
+        that.showPromptModal("删除", true, "");
+      } else {
+        that.showPromptModal("删除", false, data.msg);
+      }
+    });
+  }
+  // 确认撤回
+  confirmRec() {
+    let that = this;
+    that.btnLoading = true;
+    let postData = {
+      workOrder: {
+        id: that.id,
+      },
+    };
+    that.mainService
+      .coopWorkerOrder("excuteWorkOrder/recall", postData)
+      .subscribe((data) => {
+        that.btnLoading = false;
+        that.closeRecallOrderModal();
+        if (data.status == 200) {
+          that.showPromptModal("撤回", true, "");
+        } else {
+          that.showPromptModal("撤回", false, data.msg);
+        }
+      });
+  }
+  // 关闭撤回弹框
+  closeRecallOrderModal() {
+    this.recallOrderShow = false;
+  }
+
+  // 删除
+  // 打开模态框
+  delOrderShow: boolean = false;
+  openDelModal() {
+    this.delOrderShow = true;
+  }
+  // 确认删除
+  confirmDel() {
+    let that = this;
+    that.btnLoading = true;
+    that.mainService.delOrder(that.id).subscribe((data) => {
+      that.btnLoading = false;
+      that.closeDelOrderModal();
+      if (data.status == 200) {
+        that.showPromptModal("删除", true, "");
+      } else {
+        that.showPromptModal("删除", false, data.msg);
+      }
+    });
+  }
+
+  // 关闭模态框
+  closeDelOrderModal() {
+    this.delOrderShow = false;
+  }
+
+  // 格式化时分秒
+  // （时间小于一分钟则显示秒，时间大于一分钟则显示分钟数，如超出一小时则显示小时和分钟。）time单位:秒
+  formatTime(time) {
+    let timeStr = "";
+    if (time >= 0 && time < 60) {
+      // 秒
+      timeStr = time + "秒";
+    } else if (time >= 60 && time < 3600) {
+      // 分钟
+      timeStr = Math.floor(time / 60) + "分钟";
+    } else if (time >= 3600) {
+      // 时 + 分
+      let h = "";
+      let m = "";
+      h = Math.floor(time / 3600) + "小时";
+      m = time % 3600 >= 60 ? Math.floor((time % 3600) / 60) + "分钟" : "";
+      timeStr = h + m;
+    }
+    return timeStr;
+  }
+
+  // 计算历史记录耗时
+  filterTime(step) {
+    // step = [{ difTime: 2 }, { difTime: 6 }]
+    let num = 0;
+    step.forEach((e) => {
+      num += e.difTime;
+    });
+    return this.formatTime(num / 1000);
+  }
+}

src/app/share/share.module.ts

@@ -31,6 +31,7 @@ import { BxPromptModalComponent } from './bx-prompt-modal/bx-prompt-modal.compon
 import { ExcelExportComponent } from './excel-export/excel-export.component';
 import { FilterSelfPipe } from '../pipes/filter-self.pipe';
 import { LogPromptModalComponent } from './log-prompt-modal/log-prompt-modal.component';
+import { DetailBxComponent } from './detail-bx/detail-bx.component';
 
 @NgModule({
   declarations: [
@@ -60,6 +61,7 @@ import { LogPromptModalComponent } from './log-prompt-modal/log-prompt-modal.com
     FilterSelfPipe,
     ExcelExportComponent,
     LogPromptModalComponent,
+    DetailBxComponent,
   ],
   imports: [
     CommonModule,
@@ -104,6 +106,7 @@ import { LogPromptModalComponent } from './log-prompt-modal/log-prompt-modal.com
     FilterSelfPipe,
     ExcelExportComponent,
     LogPromptModalComponent,
+    DetailBxComponent,
   ]
 })
 export class ShareModule { }

src/app/views/hushijiandan/hushijiandan-routing.module.ts

@@ -6,6 +6,7 @@ import { DetailPatientsComponent } from '../../share/detail-patients/detail-pati
 import { DetailDrugComponent } from '../../share/detail-drug/detail-drug.component';
 import { DetailOthersComponent } from '../../share/detail-others/detail-others.component';
 import { AllocationWorkerComponent } from '../../share/allocation-worker/allocation-worker.component';
+import { DetailBxComponent } from 'src/app/share/detail-bx/detail-bx.component';
 
 
 const routes: Routes = [
@@ -34,6 +35,11 @@ const routes: Routes = [
         component: DetailOthersComponent
       },
       {
+        // 报修详情
+        path: 'detailBx/:id',
+        component: DetailBxComponent
+      },
+      {
         path: 'allotWorker/:id/:stateId',
         component: AllocationWorkerComponent
       }

src/app/views/hushijiandan/hushijiandan.component.html

@@ -195,7 +195,11 @@
           <div
             class="nurseTitle display_flex justify-content_space-between align-items_center"
           >
-            <span>护士端<span class="todayNum">当日建单数：{{todayNum}}</span></span>
+            <span
+              >护士端<span class="todayNum"
+                >当日建单数：{{ todayNum }}</span
+              ></span
+            >
             <p class="updateTipsForNurses red">{{ updateTipsForNurses }}</p>
             <div class="nurseCode" (click)="showNurseCode()">
               <i class="nurseCodeIcon icon_transport transport-erweima"></i
@@ -548,29 +552,51 @@
                   >
                     <div class="text">历史药单查询</div>
                   </div>
-                  <div *ngIf="isShowBx" nz-col nzSpan="3" [ngClass]="{
+                  <div
+                    *ngIf="isShowBx"
+                    nz-col
+                    nzSpan="3"
+                    [ngClass]="{
                       txtC: true,
                       cur: true,
                       checked: checkedTableType == 'kjbx'
-                    }" (click)="checkTable('kjbx')">
+                    }"
+                    (click)="checkTable('kjbx')"
+                  >
                     <div class="text">快捷报修</div>
                   </div>
-                  <div *ngIf="isShowBx" nz-col nzSpan="3" [ngClass]="{
+                  <div
+                    *ngIf="isShowBx"
+                    nz-col
+                    nzSpan="3"
+                    [ngClass]="{
                       txtC: true,
                       cur: true,
                       checked: checkedTableType == 'bxlb'
-                    }" (click)="checkTable('bxlb')">
-                    <div class="text">报修列表</div>
+                    }"
+                    (click)="checkTable('bxlb')"
+                  >
+                    <div class="text">
+                      报修列表<strong class="red">&nbsp;({{processing}})</strong>
+                    </div>
                   </div>
                   <div
                     nz-col
-                    nzSpan="{{isShowBx?6:12}}"
+                    nzSpan="{{ isShowBx ? 6 : 12 }}"
                     class="txtC h100p alignR display_flex justify-content_flex-end align-items_center"
                   >
-                    <div class="btn txtC" *ngIf="mainRole&&loginUser.usertype.value != 1" (click)="toMain()">
+                    <div
+                      class="btn txtC"
+                      *ngIf="mainRole && loginUser.usertype.value != 1"
+                      (click)="toMain()"
+                    >
                       回到系统管理
                     </div>
-                    <div class="btn txtC" *ngIf="mainRole&&loginUser.usertype.value == 1" (click)="toOrder()">
+                    <div
+                      class="btn txtC"
+                      *ngIf="mainRole && loginUser.usertype.value == 1"
+                      (click)="toOrder()"
+                    >
                       查看工单
                     </div>
                   </div>
@@ -1085,25 +1111,79 @@
                             </div>
                             <div class="modalBody_right">
                               <div class="modalBody_right_head">
-                                综合日志<span>{{ logTime }}秒后自动刷新</span>
+                                <div class="smallTab">
+                                  <div
+                                    class="s_tab"
+                                    *ngFor="let stab of smallTabs"
+                                    (click)="changeSmallTab(stab.id)"
+                                    [ngClass]="{
+                                      active: smallTabId == stab.id
+                                    }"
+                                  >
+                                    {{ stab.name }}
+                                  </div>
+                                </div>
+                                <span>{{ logTime }}秒后自动刷新</span>
                               </div>
                               <overlay-scrollbars
                                 class="modalBody_right_box"
                                 #osComponentRef9
                                 style="height: 100%"
-                                *ngIf="!rLoading && listDeptOrderRecords.length"
+                                *ngIf="
+                                  (smallTabId == 1 &&
+                                    !rLoading &&
+                                    listDeptOrderRecords.length) ||
+                                  smallTabId == 2
+                                "
                               >
                                 <div class="modalBody_right_box">
-                                  <div
-                                    class="modalBody_right_list"
-                                    *ngFor="let item of listDeptOrderRecords"
-                                    [innerHTML]="item.msg | htmlTransform"
-                                  ></div>
+                                  <ng-container
+                                    *ngIf="smallTabId == 1; else elseSmall"
+                                  >
+                                    <div
+                                      class="modalBody_right_list"
+                                      *ngFor="let item of listDeptOrderRecords"
+                                      [innerHTML]="item.msg | htmlTransform"
+                                    ></div>
+                                  </ng-container>
+                                  <ng-template #elseSmall>
+                                    <nz-table
+                                      class="bxFlex bxTable"
+                                      [nzData]="quickBxlbList"
+                                      nzSize="small"
+                                      [nzShowPagination]="false"
+                                      [nzLoading]="quickBxlbLoading"
+                                    >
+                                      <tbody>
+                                        <tr
+                                          (click)="
+                                            showBxModal(
+                                              data,
+                                              '您的报修为“' +
+                                                data.content +
+                                                '” 是否确认报修？'
+                                            )
+                                          "
+                                          *ngFor="
+                                            let data of quickBxlbList;
+                                            let i = index
+                                          "
+                                        >
+                                          <td>{{ data.content || "无" }}</td>
+                                        </tr>
+                                        <tr (click)="checkTable('kjbx')">
+                                          <td class="moreBx">
+                                            更多报修&gt;&gt;
+                                          </td>
+                                        </tr>
+                                      </tbody>
+                                    </nz-table>
+                                  </ng-template>
                                 </div>
                               </overlay-scrollbars>
                               <div
                                 class="modalBody_left nLoading w100"
-                                *ngIf="rLoading"
+                                *ngIf="smallTabId == 1 && rLoading"
                               >
                                 <img
                                   src="../../../assets/images/loading.gif"
@@ -1114,7 +1194,9 @@
                               <div
                                 class="modalBody_left noData w100"
                                 *ngIf="
-                                  !rLoading && !listDeptOrderRecords.length
+                                  smallTabId == 1 &&
+                                  !rLoading &&
+                                  !listDeptOrderRecords.length
                                 "
                               >
                                 暂无数据
@@ -1439,57 +1521,182 @@
                 </div>
               </div>
               <!-- 快捷报修 -->
-              <div *ngIf="checkedTableType == 'kjbx'&&isShowBx" style="flex: 1; height: 100%;display:flex;">
-                <form nz-form [formGroup]="bxForm" (ngSubmit)="submitBxForm()" class="bxForm bxFlex">
-                  <nz-form-item>
-                    <nz-form-label [nzSpan]="8" nzRequired nzFor="name">联系人</nz-form-label>
-                    <nz-form-control [nzSpan]="12" nzErrorTip="请填写联系人">
-                      <input type="text" nz-input formControlName="name" placeholder="请填写联系人" />
-                    </nz-form-control>
-                  </nz-form-item>
-                  <nz-form-item>
-                    <nz-form-label [nzSpan]="8" nzRequired nzFor="phone">联系人电话</nz-form-label>
-                    <nz-form-control [nzSpan]="12" nzErrorTip="请填写联系人电话">
-                      <input type="text" nz-input formControlName="phone" placeholder="请填写联系人电话" />
-                    </nz-form-control>
-                  </nz-form-item>
-                  <nz-form-item>
-                    <nz-form-label [nzSpan]="8" nzFor="hospital" nzRequired>所属院区</nz-form-label>
-                    <nz-form-control [nzSpan]="12" nzErrorTip="请选择所属院区!">
-                      <nz-select formControlName="hospital" nzPlaceHolder="请选择所属院区" (ngModelChange)="getPlace($event)">
-                        <nz-option [nzValue]="area.id" [nzLabel]="area.area" *ngFor="let area of areas"></nz-option>
-                      </nz-select>
-                    </nz-form-control>
-                  </nz-form-item>
-                  <nz-form-item>
-                    <nz-form-label [nzSpan]="8" nzFor="building" nzRequired>楼栋</nz-form-label>
-                    <nz-form-control [nzSpan]="12" nzErrorTip="请选择楼栋!">
-                      <nz-select formControlName="building" nzPlaceHolder="请选择楼栋">
-                        <nz-option [nzValue]="place.id" [nzLabel]="place.place" *ngFor="let place of places">
-                        </nz-option>
-                      </nz-select>
-                    </nz-form-control>
-                  </nz-form-item>
-                  <nz-form-item>
-                    <nz-form-label [nzSpan]="8" nzRequired>详细地址</nz-form-label>
-                    <nz-form-control [nzSpan]="12" nzErrorTip="请填写详细地址">
-                      <textarea formControlName="address" nz-input rows="2" placeholder="请填写详细地址"></textarea>
-                    </nz-form-control>
-                  </nz-form-item>
-                  <nz-form-item>
-                    <nz-form-label [nzSpan]="8" nzRequired>报修内容</nz-form-label>
-                    <nz-form-control [nzSpan]="12" nzErrorTip="请填写报修内容">
-                      <textarea formControlName="content" nz-input rows="2" placeholder="请填写报修内容"></textarea>
-                    </nz-form-control>
-                  </nz-form-item>
-                  <nz-form-item>
-                    <nz-form-label [nzSpan]="8" style="visibility: hidden;"></nz-form-label>
-                    <nz-form-control [nzSpan]="12">
-                      <button nz-button nzType="primary" [nzLoading]="bxLoading">提交</button>
-                    </nz-form-control>
-                  </nz-form-item>
-                </form>
-                <nz-table class="bxFlex bxTable" [nzData]="quickBxlbList" nzSize="small" [nzShowPagination]="false"
+              <div
+                *ngIf="checkedTableType == 'kjbx' && isShowBx"
+                style="flex: 1; height: 100%; display: flex"
+              >
+                <div class="otherBox">
+                  <div class="otherBoxInner">
+                    <!-- 故障现象查询 -->
+                    <div class="otherBox-nav" style="width: 30%">
+                      <div class="otherBox-nav__head">
+                        <input
+                          nz-input
+                          placeholder="请输入关键字"
+                          [(ngModel)]="incidentSearch"
+                          (ngModelChange)="incidentSearchChange()"
+                        />
+                      </div>
+                      <overlay-scrollbars
+                        #osComponentRef10
+                        class="otherBox-nav__main"
+                        [ngStyle]="{ height: '100%' }"
+                      >
+                        <div
+                          class="otherBox-nav__mainInner"
+                          *ngIf="!iLoading && incidentList.length > 0"
+                        >
+                          <div class="w100">
+                            <div
+                              class="otherBox-nav__mainItem"
+                              *ngFor="let item of incidentList"
+                              (click)="incidentClick(item)"
+                              [ngClass]="{
+                                active: selectIncidentId == item.id
+                              }"
+                              [title]="item.mutiCategory"
+                            >
+                              {{ item.mutiCategory }}
+                            </div>
+                          </div>
+                        </div>
+                        <div
+                          class="otherBox-nav__mainInner noData"
+                          *ngIf="!iLoading && incidentList.length == 0"
+                        >
+                          暂无数据
+                        </div>
+                        <div
+                          class="otherBox-nav__mainInner oLoading"
+                          *ngIf="iLoading"
+                        >
+                          <img
+                            src="../../../assets/images/loading.gif"
+                            alt=""
+                          />
+                          <div>加载中...</div>
+                        </div>
+                      </overlay-scrollbars>
+                    </div>
+                    <form
+                      nz-form
+                      [formGroup]="bxForm"
+                      (ngSubmit)="submitBxForm()"
+                      class="bxForm bxFlex"
+                    >
+                      <!-- <nz-form-item>
+                        <nz-form-label [nzSpan]="8" nzRequired nzFor="name"
+                          >联系人</nz-form-label
+                        >
+                        <nz-form-control [nzSpan]="12" nzErrorTip="请填写联系人">
+                          <input
+                            type="text"
+                            nz-input
+                            formControlName="name"
+                            placeholder="请填写联系人"
+                          />
+                        </nz-form-control>
+                      </nz-form-item>
+                      <nz-form-item>
+                        <nz-form-label [nzSpan]="8" nzRequired nzFor="phone"
+                          >联系人电话</nz-form-label
+                        >
+                        <nz-form-control
+                          [nzSpan]="12"
+                          nzErrorTip="请填写联系人电话"
+                        >
+                          <input
+                            type="text"
+                            nz-input
+                            formControlName="phone"
+                            placeholder="请填写联系人电话"
+                          />
+                        </nz-form-control>
+                      </nz-form-item>
+                      <nz-form-item>
+                        <nz-form-label [nzSpan]="8" nzFor="hospital" nzRequired
+                          >所属院区</nz-form-label
+                        >
+                        <nz-form-control [nzSpan]="12" nzErrorTip="请选择所属院区!">
+                          <nz-select
+                            formControlName="hospital"
+                            nzPlaceHolder="请选择所属院区"
+                            (ngModelChange)="getPlace($event)"
+                          >
+                            <nz-option
+                              [nzValue]="area.id"
+                              [nzLabel]="area.area"
+                              *ngFor="let area of areas"
+                            ></nz-option>
+                          </nz-select>
+                        </nz-form-control>
+                      </nz-form-item>
+                      <nz-form-item>
+                        <nz-form-label [nzSpan]="8" nzFor="building" nzRequired
+                          >楼栋</nz-form-label
+                        >
+                        <nz-form-control [nzSpan]="12" nzErrorTip="请选择楼栋!">
+                          <nz-select
+                            formControlName="building"
+                            nzPlaceHolder="请选择楼栋"
+                          >
+                            <nz-option
+                              [nzValue]="place.id"
+                              [nzLabel]="place.place"
+                              *ngFor="let place of places"
+                            >
+                            </nz-option>
+                          </nz-select>
+                        </nz-form-control>
+                      </nz-form-item>
+                      <nz-form-item>
+                        <nz-form-label [nzSpan]="8" nzRequired
+                          >详细地址</nz-form-label
+                        >
+                        <nz-form-control [nzSpan]="12" nzErrorTip="请填写详细地址">
+                          <textarea
+                            formControlName="address"
+                            nz-input
+                            rows="2"
+                            placeholder="请填写详细地址"
+                          ></textarea>
+                        </nz-form-control>
+                      </nz-form-item> -->
+                      <nz-form-item>
+                        <nz-form-label [nzSpan]="8" nzRequired
+                          >报修内容</nz-form-label
+                        >
+                        <nz-form-control
+                          [nzSpan]="12"
+                          nzErrorTip="请填写报修内容"
+                        >
+                          <textarea
+                            formControlName="content"
+                            nz-input
+                            rows="2"
+                            placeholder="请填写报修内容"
+                          ></textarea>
+                        </nz-form-control>
+                      </nz-form-item>
+                      <nz-form-item>
+                        <nz-form-label
+                          [nzSpan]="8"
+                          style="visibility: hidden"
+                        ></nz-form-label>
+                        <nz-form-control [nzSpan]="12">
+                          <button
+                            nz-button
+                            nzType="primary"
+                            [nzLoading]="bxLoading"
+                          >
+                            提交
+                          </button>
+                        </nz-form-control>
+                      </nz-form-item>
+                    </form>
+                  </div>
+                </div>
+                <!-- <nz-table class="bxFlex bxTable" [nzData]="quickBxlbList" nzSize="small" [nzShowPagination]="false"
                   [nzLoading]="quickBxlbLoading">
                   <tbody>
                     <tr (click)="showBxModal(data,'您的报修为“'+data.content+'” 是否确认报修？')" *ngFor="
@@ -1499,35 +1706,59 @@
                       <td>{{ data.content||'无' }}</td>
                     </tr>
                   </tbody>
-                </nz-table>
+                </nz-table> -->
               </div>
               <!-- 报修列表 -->
-              <div *ngIf="checkedTableType == 'bxlb'&&isShowBx" style="flex: 1; height: 100%">
-                <div class="
-                    searchBox
-                    display_flex
-                    align-items_center
-                    justify-content_space-between
-                  ">
-                  <div class="
-                      left
-                      alignC
-                      display_flex
-                      justify-content_flex-center
-                      align-items_center
-                    ">
+              <div
+                *ngIf="checkedTableType == 'bxlb' && isShowBx"
+                style="flex: 1; height: 100%"
+              >
+                <div
+                  class="searchBox display_flex align-items_center justify-content_space-between"
+                >
+                  <div
+                    class="left alignC display_flex justify-content_flex-center align-items_center"
+                  >
+                    <div>状态：</div>
+                    <div>
+                      <nz-select 
+                        style="width: 160px;"
+                        class="formItem"
+                        [nzDropdownMatchSelectWidth]="false"
+                        [nzShowSearch]="false"
+                        nzAllowClear
+                        nzPlaceHolder="请选择状态"
+                        [(ngModel)]="incidentStateId"
+                      >
+                        <nz-option
+                          nzLabel="{{ data.name }}"
+                          nzValue="{{ data.id }}"
+                          *ngFor="let data of incidentStateList"
+                        ></nz-option>
+                      </nz-select>
+                    </div>
                   </div>
 
                   <div class="btns">
-                    <button nz-button nzType="primary" nzGhost (click)="getBxlb(true)">
+                    <button
+                      nz-button
+                      nzType="primary"
+                      nzGhost
+                      (click)="getBxlb(true)"
+                    >
                       搜索
                     </button>
                   </div>
                 </div>
                 <div class="table">
                   <div class="box">
-                    <nz-table class="hospitalTable" [nzData]="bxlbList" nzSize="middle" [nzShowPagination]="false"
-                      [nzLoading]="bxlbLoading">
+                    <nz-table
+                      class="hospitalTable"
+                      [nzData]="bxlbList"
+                      nzSize="middle"
+                      [nzShowPagination]="false"
+                      [nzLoading]="bxlbLoading"
+                    >
                       <thead>
                         <tr class="thead">
                           <th nzWidth="7%">序号</th>
@@ -1540,29 +1771,41 @@
                         </tr>
                       </thead>
                       <tbody>
-                        <tr *ngFor="
-                            let data of bxlbList;
-                            let i = index
-                          ">
+                        <tr *ngFor="let data of bxlbList; let i = index">
                           <td>{{ i + 1 }}</td>
-                          <td>{{ data.description||'无' }}</td>
+                          <td>{{ data.description || "无" }}</td>
                           <td>
-                            {{ data.createTime|date:'MM-dd HH:mm' }}
+                            {{ data.createTime | date: "MM-dd HH:mm" }}
                           </td>
-                          <td>{{ data.requester?data.requester.name:'无' }}</td>
-                          <td>{{ data.state.name }}</td>
-                          <td>{{ data.incident?(data.incident.contacts?data.incident.contacts:'无'):'无' }}</td>
                           <td>
-                            <button (click)="viewBx(data)">
-                              查看
-                            </button>
+                            {{ data.requester ? data.requester.name : "无" }}
+                          </td>
+                          <td>{{ data.serviceState?data.serviceState.name:'无' }}</td>
+                          <td>
+                            {{
+                              data.incident
+                                ? data.incident.contacts
+                                  ? data.incident.contacts
+                                  : "无"
+                                : "无"
+                            }}
+                          </td>
+                          <td>
+                            <!-- <button (click)="viewBx(data)">查看</button> -->
+                            <button (click)="detailBx(data)" class="mr8">查看</button>
+                            <button (click)="detailBx(data)">评价</button>
                           </td>
                         </tr>
                       </tbody>
                     </nz-table>
                     <div class="pagination">
-                      <nz-pagination [(nzPageIndex)]="bxlbPageIndex" [(nzTotal)]="bxlbListLength"
-                        [(nzPageSize)]="bxlbPageSize" (nzPageIndexChange)="getBxlb()" (nzPageSizeChange)="getBxlb()">
+                      <nz-pagination
+                        [(nzPageIndex)]="bxlbPageIndex"
+                        [(nzTotal)]="bxlbListLength"
+                        [(nzPageSize)]="bxlbPageSize"
+                        (nzPageIndexChange)="getBxlb()"
+                        (nzPageSizeChange)="getBxlb()"
+                      >
                       </nz-pagination>
                     </div>
                   </div>
@@ -1648,10 +1891,17 @@
                                   ? "半程陪检"
                                   : item.taskType.taskName
                               }}
-                              <ng-container *ngIf="item.taskType.associationType.value == 'drugsBag' && item.drugs">
-                                ({{item.drugs.packid}})
+                              <ng-container
+                                *ngIf="
+                                  item.taskType.associationType.value ==
+                                    'drugsBag' && item.drugs
+                                "
+                              >
+                                ({{ item.drugs.packid }})
                               </ng-container>
-                              <ng-container *ngIf="item.goodsRemark">-{{item.goodsRemark}}</ng-container>
+                              <ng-container *ngIf="item.goodsRemark"
+                                >-{{ item.goodsRemark }}</ng-container
+                              >
                               <span
                                 *ngIf="
                                   item.patient &&
@@ -1670,13 +1920,18 @@
                           </div>
                           <div class="row" nz-row>
                             <!-- <div nz-col nzSpan="12" class="col txtL"></div> -->
-                            <div
-                              nz-col
-                              nzSpan="12"
-                              class="col txtL"
-                            >
-                              <ng-container *ngIf="item.taskType.associationType.value == 'drugsBag' && item.startDept">
-                                {{deptDisplay == 2 ? item.startDept.deptalias:item.startDept.dept}}
+                            <div nz-col nzSpan="12" class="col txtL">
+                              <ng-container
+                                *ngIf="
+                                  item.taskType.associationType.value ==
+                                    'drugsBag' && item.startDept
+                                "
+                              >
+                                {{
+                                  deptDisplay == 2
+                                    ? item.startDept.deptalias
+                                    : item.startDept.dept
+                                }}
                               </ng-container>
                             </div>
                             <div
@@ -1693,7 +1948,7 @@
                               nzSpan="12"
                               class="col txtR"
                             >
-                              {{item.yyjdTime | date: "MM-dd HH:mm"}}
+                              {{ item.yyjdTime | date: "MM-dd HH:mm" }}
                             </div>
                           </div>
                           <div class="row" nz-row>

src/app/views/hushijiandan/hushijiandan.component.less

@@ -6,7 +6,7 @@
   display: flex;
 
   .bxForm {
-    margin-top: 16px;
+    margin-top: 32px;
   }
 
   .bxFlex {
@@ -14,6 +14,9 @@
   }
 
   .bxTable {
+    .moreBx{
+      color: @primary-color;
+    }
     margin-top: 16px;
     ::ng-deep .ant-table-body {
       margin: 0 !important;
@@ -29,9 +32,7 @@
     }
 
     .thead {
-      background-image: linear-gradient(to right,
-          @bg-start,
-          @bg-end );
+      background-image: linear-gradient(to right, @bg-start, @bg-end);
       padding: 10px 0;
 
       th {
@@ -54,7 +55,6 @@
   }
 
   .yyTimeError {
-
     ::ng-deep .ant-time-picker-input,
     ::ng-deep .ant-calendar-picker-input {
       border: 1px solid red !important;
@@ -276,9 +276,11 @@
             width: 100%;
             height: 40px;
             line-height: 40px;
-            background-image: linear-gradient(90deg,
-                @bg-end 0%,
-                @bg-start 100%);
+            background-image: linear-gradient(
+              90deg,
+              @bg-end 0%,
+              @bg-start 100%
+            );
 
             tr {
               height: 40px;
@@ -308,7 +310,8 @@
                   top: -3px;
                   width: 41px;
                   height: 42px;
-                  background: url(./../../../assets/images/icon_ji.png) no-repeat 3px 0;
+                  background: url(./../../../assets/images/icon_ji.png)
+                    no-repeat 3px 0;
                 }
               }
             }
@@ -340,6 +343,68 @@
 }
 
 // 查看标本详情 end
+.otherBox-nav {
+  width: 20%;
+  border-right: 1px solid #dde1e5;
+  display: flex;
+  flex-direction: column;
+
+  .otherBox-nav__head {
+    height: 50px;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-end;
+    align-items: center;
+    padding-left: 8px;
+    padding-right: 8px;
+
+    input {
+      height: 36px;
+    }
+  }
+
+  .otherBox-nav__main {
+    flex: 1;
+    position: relative;
+
+    ::ng-deep .os-content {
+      height: 100% !important;
+    }
+
+    .otherBox-nav__mainInner {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      margin-top: 16px;
+
+      &.noData,
+      &.oLoading {
+        position: absolute;
+        width: 100%;
+        justify-content: center;
+        height: 100%;
+        margin-top: 0;
+      }
+
+      .otherBox-nav__mainItem {
+        line-height: 26px;
+        color: #333;
+        padding-left: 8px;
+        margin-bottom: 8px;
+        border-radius: 4px;
+        cursor: pointer;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+
+        &.active {
+          color: @primary-color;
+          background-color: #f0f6ed;
+        }
+      }
+    }
+  }
+}
 
 .nurse {
   width: 100%;
@@ -471,9 +536,24 @@
             font-size: 16px;
             font-weight: bold;
             border-bottom: 1px solid #dde1e5;
-            padding-bottom: 8px;
             display: flex;
             justify-content: space-between;
+            align-items: center;
+            .smallTab{
+              display: flex;
+              .s_tab {
+                cursor: pointer;
+                padding: 8px;
+                border-right: 1px solid #e5e9ed;
+                &:first-of-type{
+                  border-left: 1px solid #e5e9ed;
+                }
+                &.active{
+                  color: #fff;
+                  background-color: @primary-color;
+                }
+              }
+            }
 
             span {
               font-weight: normal;
@@ -495,9 +575,9 @@
             height: 100%;
             display: flex;
             flex-direction: column;
-            justify-content: center;
+            // justify-content: center;
             border-left: 1px solid #dde1e5;
-            padding: 8px;
+            padding: 0 8px 8px;
 
             .modalBody_right_list {
               text-align: justify;
@@ -525,7 +605,7 @@
               justify-content: center;
               align-items: center;
 
-              &>div {
+              & > div {
                 width: 100%;
               }
 
@@ -707,9 +787,11 @@
             }
 
             .btn {
-              background-image: linear-gradient(90deg,
-                  @bg-start 0%,
-                  @bg-end 100%);
+              background-image: linear-gradient(
+                90deg,
+                @bg-start 0%,
+                @bg-end 100%
+              );
               line-height: 28px;
               text-align: center;
               border-radius: 4px;
@@ -770,7 +852,7 @@
           font-size: 22px;
           color: #333;
           flex: 1;
-          .todayNum{
+          .todayNum {
             font-size: 16px;
             margin-left: 16px;
           }
@@ -847,7 +929,7 @@
     .inner-content {
       background: #fff;
       height: 100% !important;
-      border-bottom: 1px solid #e5e9ed;
+      // border-bottom: 1px solid #e5e9ed;
 
       .launch {
         width: 90px;
@@ -886,7 +968,8 @@
               width: 56px;
               height: 56px;
               margin-top: 6px;
-              background: url(../../../assets/images/icon_hushebei2.png) center no-repeat;
+              background: url(../../../assets/images/icon_hushebei2.png) center
+                no-repeat;
             }
 
             &:nth-child(2n) {
@@ -920,7 +1003,7 @@
         width: 100%;
         height: 100%;
 
-        &>div {
+        & > div {
           height: 100%;
 
           &:nth-child(1) {
@@ -967,9 +1050,11 @@
 
                   .btn {
                     height: 48%;
-                    background-image: linear-gradient(90deg,
-                        @bg-start 0%,
-                        @bg-end 100%);
+                    background-image: linear-gradient(
+                      90deg,
+                      @bg-start 0%,
+                      @bg-end 100%
+                    );
                     border-radius: 4px;
                     color: #fff;
                     padding: 0;
@@ -1080,7 +1165,7 @@
                 }
               }
 
-              &>div {
+              & > div {
                 padding: 0 8px;
               }
 
@@ -1093,9 +1178,11 @@
                 width: 104px;
                 height: 34px;
                 line-height: 34px;
-                background-image: linear-gradient(90deg,
-                    @bg-start 0%,
-                    @bg-end 100%);
+                background-image: linear-gradient(
+                  90deg,
+                  @bg-start 0%,
+                  @bg-end 100%
+                );
                 border-radius: 4px;
                 color: #fff;
                 border: none;
@@ -1121,9 +1208,11 @@
                 }
 
                 &:nth-child(2) {
-                  background-image: linear-gradient(135deg,
-                      @bg-start 0%,
-                      @bg-end 100%);
+                  background-image: linear-gradient(
+                    135deg,
+                    @bg-start 0%,
+                    @bg-end 100%
+                  );
                   border: solid 1px @primary-color;
                   margin-left: 8px;
                 }
@@ -1162,9 +1251,11 @@
                 }
 
                 .thead {
-                  background-image: linear-gradient(to right,
-                      @bg-start,
-                      @bg-end );
+                  background-image: linear-gradient(
+                    to right,
+                    @bg-start,
+                    @bg-end
+                  );
                   padding: 10px 0;
 
                   th {
@@ -1252,7 +1343,7 @@
             z-index: 9;
             background: #fff;
 
-            &>span {
+            & > span {
               font-size: 16px;
               color: #666;
               font-weight: 500;
@@ -1626,7 +1717,7 @@
         }
       }
 
-      &>div {
+      & > div {
         margin: 0;
 
         &.title {
@@ -1755,7 +1846,7 @@
       overflow: hidden;
       margin-top: 12px;
 
-      &>div {
+      & > div {
         text-align: center;
         margin: 0;
 
@@ -1847,7 +1938,7 @@
     z-index: 88;
   }
 
-  &>.left {
+  & > .left {
     width: 480px;
     float: left;
     background: #fff;
@@ -1876,7 +1967,7 @@
               padding: 15px 6px;
               text-align: center;
 
-              &>.tdiv {
+              & > .tdiv {
                 overflow: hidden;
 
                 .name {
@@ -1913,7 +2004,7 @@
       }
 
       .conditions {
-        &>.ant-row {
+        & > .ant-row {
           margin: 8px 0;
 
           .ant-row {

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -90,10 +90,16 @@ export class HushijiandanComponent implements OnInit {
     static: false,
   })
   osComponentRef9: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef10", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef10: OverlayScrollbarsComponent;
   othersListOptions: any;
   sortableTimer = null;
   searchTabInpSubject = new Subject(); //左侧查患者信息和检查信息防抖
   otherSearchChangeSubject = new Subject(); //其他建单搜索防抖
+  incidentSearchChangeSubject = new Subject(); //故障现象搜索防抖
   isYyInspect = false; //需要预约检查
   constructor(
     private message: NzMessageService,
@@ -140,6 +146,7 @@ export class HushijiandanComponent implements OnInit {
   orderListTime = 0; //工单列表自动刷新秒数
   orderListTimeConst = 60; //工单列表自动刷新秒数
   deptDisplay; //护士端是否显示可以别名，1是显示科室名称，2是显示科室别名
+
   ngOnInit() {
     this.tool.getDeptDisplay().subscribe((result) => {
       if (result.status == 200) {
@@ -150,6 +157,7 @@ export class HushijiandanComponent implements OnInit {
     this.getUpdateTipsForNurses();
     this.getSpecimenButton();
     this.getCloseTimeFlag();
+    this.getBxlb();
     this.currentUser = this.tool.getCurrentUserDept();
     console.log(this.currentUser, this.tabSearchCont);
     //防抖
@@ -159,6 +167,11 @@ export class HushijiandanComponent implements OnInit {
     this.otherSearchChangeSubject.pipe(debounceTime(500)).subscribe((v) => {
       this.getDeptTaskType(v);
     });
+    this.incidentSearchChangeSubject
+      .pipe(debounceTime(500))
+      .subscribe((v: string) => {
+        this.getIncidentcategory(v);
+      });
     this.currentHospital = this.tool.getCurrentHospital();
 
     this.getTodayNum();
@@ -171,7 +184,7 @@ export class HushijiandanComponent implements OnInit {
     this.refreshSpecimenWorkOrderMsg();
     this.initRole();
     this.getWebsocket();
-    this.listDeptOrderRecord();
+
     // 综合日志倒计时 start
     this.logTime = this.logTimeConst;
     clearInterval(this.logTimer);
@@ -179,8 +192,12 @@ export class HushijiandanComponent implements OnInit {
       this.logTime--;
       if (this.logTime === 0) {
         this.logTime = this.logTimeConst;
-        this.listDeptOrderRecord();
-        this.getTodayNum();//当日工单数量
+        if (this.smallTabId == 1) {
+          this.listDeptOrderRecord();
+        } else if (this.smallTabId == 2) {
+          this.getQuickBxlb();
+        }
+        this.getTodayNum(); //当日工单数量
       }
     }, 1000);
     // 综合日志倒计时 end
@@ -235,17 +252,28 @@ export class HushijiandanComponent implements OnInit {
   specimenWorkOrderMsg: any = {}; //急标普标数量&信息
   jpDrugsWKOMsg: any = {}; //药品静配提示信息
 
+  // 切换综合日志和一键报修
+  smallTabs = [];
+  smallTabId = 2; //默认显示一键报修
+  changeSmallTab(id) {
+    this.smallTabId = id;
+    if (id == 1) {
+      this.listDeptOrderRecord();
+    } else if (id == 2) {
+      this.getQuickBxlb();
+    }
+  }
   // 获取当日建单总数
-  todayNum = ''; //当日建单总数
+  todayNum = ""; //当日建单总数
   getTodayNum() {
     this.mainService
       .getFetchDataList("nurse", "workOrder", {
         idx: 0,
         sum: 1,
-        workOrder: { 
+        workOrder: {
           createDept: this.loginUser.dept.id,
-          startTime1:format(startOfDay(new Date()),'yyyy-MM-dd HH:mm:ss'),
-          endTime1:format(endOfDay(new Date()),'yyyy-MM-dd HH:mm:ss'),
+          startTime1: format(startOfDay(new Date()), "yyyy-MM-dd HH:mm:ss"),
+          endTime1: format(endOfDay(new Date()), "yyyy-MM-dd HH:mm:ss"),
         },
       })
       .subscribe((data) => {
@@ -256,22 +284,22 @@ export class HushijiandanComponent implements OnInit {
   }
 
   // 获取报修区域（所属院区）
-  areas: any = []; //区域（所属院区）列表
-  getArea() {
-    this.areas = [];
-    this.mainService
-      .fetchListBx("area", { idx: 0, sum: 1000 })
-      .subscribe((result: any) => {
-        if (result.status == 200) {
-          this.areas = result.list;
-          if (this.areas.length) {
-            this.bxForm.controls.hospital.setValue(this.areas[0].id);
-          } else {
-            this.bxForm.controls.hospital.setValue(null);
-          }
-        }
-      });
-  }
+  // areas: any = []; //区域（所属院区）列表
+  // getArea() {
+  //   this.areas = [];
+  //   this.mainService
+  //     .fetchListBx("area", { idx: 0, sum: 1000 })
+  //     .subscribe((result: any) => {
+  //       if (result.status == 200) {
+  //         this.areas = result.list;
+  //         if (this.areas.length) {
+  //           this.bxForm.controls.hospital.setValue(this.areas[0].id);
+  //         } else {
+  //           this.bxForm.controls.hospital.setValue(null);
+  //         }
+  //       }
+  //     });
+  // }
   //根据区域(所属院区)获取地点(楼栋)
   places: any = []; //地点（楼栋）列表
   getPlace(buildingId) {
@@ -380,6 +408,18 @@ export class HushijiandanComponent implements OnInit {
       .subscribe((result) => {
         if (result.status == 200) {
           this.isShowBx = result.list[0].valueconfig == 1;
+          if (this.isShowBx) {
+            this.smallTabs = [
+              { id: 1, name: "综合日志" },
+              { id: 2, name: "一键报修" },
+            ];
+            this.smallTabId = 2;
+            this.getQuickBxlb();
+          } else {
+            this.smallTabs = [{ id: 1, name: "综合日志" }];
+            this.smallTabId = 1;
+            this.listDeptOrderRecord();
+          }
         }
       });
   }
@@ -470,6 +510,10 @@ export class HushijiandanComponent implements OnInit {
   closeModelHistoryDrugsbag(e) {
     this.historyDPromptModalShow = JSON.parse(e).show;
   }
+  // 查看报修信息
+  detailBx(data){
+    this.router.navigateByUrl("nurse/detailBx/" + data.id);
+  }
   // 查看报修信息弹窗
   bxPromptModalShow = false; //弹窗开关
   bData = ""; //查看详情携带所有数据
@@ -590,11 +634,23 @@ export class HushijiandanComponent implements OnInit {
     this.selectOtherId = item.id;
     this.newShortcutOrder(item, "other");
   }
+  selectIncidentId; //选中的id
+  incidentClick(item) {
+    this.positionY = this.osComponentRef10.osInstance().scroll().position.y; //内容滚动的距离
+    this.selectIncidentId = item.id;
+    this.bxForm.controls.content.setValue(item.mutiCategory);
+  }
   //搜索
   otherNum = 0;
   otherSearchChange() {
     this.otherSearchChangeSubject.next(this.otherSearch);
   }
+  //搜索
+  incidentSearch = ""; //搜索的关键词
+  incidentNum = 0;
+  incidentSearchChange() {
+    this.incidentSearchChangeSubject.next(this.incidentSearch);
+  }
   // 切换科室
   changeKs() {
     this.hsPromptModalShow = true;
@@ -859,7 +915,42 @@ export class HushijiandanComponent implements OnInit {
       }
     });
   }
-
+  // 获取事件状态liaomingming
+  incidentStateList = [];
+  incidentStateId = undefined;
+  getIncidentState() {
+    let postData = { type: "list", key: "service_state" };
+    this.iLoading = true;
+    this.mainService.getDictionaryByITSM(postData).subscribe((data: any) => {
+      this.iLoading = false;
+      if (data.status == 200) {
+        this.incidentStateList = data.data || [];
+      }
+    });
+  }
+  // 获取故障现象（三级）liaoming
+  incidentList = [];
+  iLoading = false;
+  getIncidentcategory(key = "") {
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      incidentcategory: {
+        category: key,
+        selectType: "pinyin_qs",
+        hierarchyQuery: "three",
+      },
+    };
+    this.iLoading = true;
+    this.mainService
+      .fetchListBx("incidentcategory", postData)
+      .subscribe((data: any) => {
+        this.iLoading = false;
+        if (data.status == 200) {
+          this.incidentList = data.list || [];
+        }
+      });
+  }
   // 获取当前登录人科室任务类型信息
   othersList: any = []; // 其他一键建单列表
   bbMsg: any = {}; //标本一键建单
@@ -1229,11 +1320,11 @@ export class HushijiandanComponent implements OnInit {
     });
     //新增报修
     this.bxForm = this.fb.group({
-      name: [null, [Validators.required]],
-      phone: [null, [Validators.required]],
-      hospital: [null, [Validators.required]],
-      building: [null, [Validators.required]],
-      address: [null, [Validators.required]],
+      // name: [null, [Validators.required]],
+      // phone: [null, [Validators.required]],
+      // hospital: [null, [Validators.required]],
+      // building: [null, [Validators.required]],
+      // address: [null, [Validators.required]],
       content: [null, [Validators.required]],
     });
   }
@@ -1965,13 +2056,13 @@ export class HushijiandanComponent implements OnInit {
     //   }
     // };
     if (e == 0) {
-      this.patientForm.get('urgentReason')!.clearValidators();
-      this.patientForm.get('urgentReason')!.markAsPristine();
+      this.patientForm.get("urgentReason")!.clearValidators();
+      this.patientForm.get("urgentReason")!.markAsPristine();
     } else {
-      this.patientForm.get('urgentReason')!.setValidators(Validators.required);
-      this.patientForm.get('urgentReason')!.markAsDirty();
+      this.patientForm.get("urgentReason")!.setValidators(Validators.required);
+      this.patientForm.get("urgentReason")!.markAsDirty();
     }
-    this.patientForm.get('urgentReason')!.updateValueAndValidity();
+    this.patientForm.get("urgentReason")!.updateValueAndValidity();
     if (this.isYyInspect) {
       this.isYyInspect = e == 0;
       if (!this.isYyInspect) {
@@ -2447,15 +2538,17 @@ export class HushijiandanComponent implements OnInit {
       this.getHistorySpecimen();
     } else if (type === "historyDrugsbag") {
       this.getHistoryDrugsbag();
-    }else if (type === "bxlb" && this.isShowBx) {
+    } else if (type === "bxlb" && this.isShowBx) {
       this.getBxlb();
+      this.getIncidentState();
     } else if (type === "kjbx" && this.isShowBx) {
-      this.getQuickBxlb();
+      // this.getQuickBxlb();
+      this.getIncidentcategory();
       // 获取报修的区域(所属院区)
-      this.getArea();
-      this.bxForm.controls.name.setValue(this.loginUser.name);
-      this.bxForm.controls.phone.setValue(this.loginUser.phone);
-      this.bxForm.controls.address.setValue(null);
+      // this.getArea();
+      // this.bxForm.controls.name.setValue(this.loginUser.name);
+      // this.bxForm.controls.phone.setValue(this.loginUser.phone);
+      // this.bxForm.controls.address.setValue(null);
       this.bxForm.controls.content.setValue(null);
     }
   }
@@ -2474,12 +2567,15 @@ export class HushijiandanComponent implements OnInit {
         let postData = {
           verification: "true",
           incident: {
-            address: this.bxForm.controls.address.value,
-            areaId: this.bxForm.controls.hospital.value,
-            contacts: this.bxForm.controls.name.value,
-            contactsInformation: this.bxForm.controls.phone.value,
+            contacts: this.loginUser.name,
+            contactsInformation: this.loginUser.phone,
+            // address: this.bxForm.controls.address.value,
+            // areaId: this.bxForm.controls.hospital.value,
+            // contacts: this.bxForm.controls.name.value,
+            // contactsInformation: this.bxForm.controls.phone.value,
             description: this.bxForm.controls.content.value,
-            placeId: this.bxForm.controls.building.value,
+            categoryId: this.selectIncidentId,
+            // placeId: this.bxForm.controls.building.value,
             requester: { account: this.loginUser.account },
             sourceType: "wechatUserIncident",
             fileUrl: "url",
@@ -2620,6 +2716,7 @@ export class HushijiandanComponent implements OnInit {
   bxlbListLength: number = 10; //表格总数据量
   bxlbCodeSearchInp: string = ""; //标本编码搜索
   bxlbParentSearchInp: string = ""; //患者信息搜索
+  processing: number = 0; //处理中的数量
   bxlbLoading = false;
   getBxlb(idx?) {
     if (idx) {
@@ -2629,15 +2726,16 @@ export class HushijiandanComponent implements OnInit {
     this.bxlbLoading = true;
     this.mainService
       .listWxIncident({
-        "assignee": current.user.account,
-        "state": 0,
-        "idx": this.bxlbPageIndex - 1,
-        "sum": this.bxlbPageSize
+        assignee: current.user.account,
+        service_state: this.incidentStateId?parseInt(this.incidentStateId):undefined,
+        idx: this.bxlbPageIndex - 1,
+        sum: this.bxlbPageSize,
       })
       .subscribe((data: any) => {
         this.bxlbLoading = false;
         this.bxlbList = data.data || [];
         this.bxlbListLength = data.resultCount || 0;
+        this.processing = data.resultCount || 0;
       });
   }
 

src/app/views/sys-config/sys-config.component.html

@@ -113,15 +113,21 @@
           </nz-form-control>
         </nz-form-item>
         <nz-form-item class="formItem">
-          <nz-form-label [nzSpan]="12" nzFor="itsmIncident" nzRequired class="label">护士端是否显示报修
+          <nz-form-label [nzSpan]="9" nzFor="itsmIncident" nzRequired class="label">护士端是否显示报修
           </nz-form-label>
-          <nz-form-control [nzSpan]="12" nzErrorTip="护士端是否显示报修是必填项!">
+          <nz-form-control [nzSpan]="15" nzErrorTip="护士端是否显示报修是必填项!">
             <nz-radio-group formControlName="itsmIncident">
               <label nz-radio nzValue="1">是</label>
               <label nz-radio nzValue="0">否</label>
             </nz-radio-group>
           </nz-form-control>
         </nz-form-item>
+        <nz-form-item class="formItem" *ngIf="validateForm.controls.itsmIncident.value == 1">
+          <nz-form-label [nzSpan]="24" nzFor="itsmIP" nzRequired class="label">链接地址</nz-form-label>
+          <nz-form-control [nzSpan]="24" nzErrorTip="请输入链接地址!">
+            <input nz-input formControlName="itsmIP" id="itsmIP" placeholder="请输入链接地址">
+          </nz-form-control>
+        </nz-form-item>
       </div>
     </form>
   </overlay-scrollbars>

src/app/views/sys-config/sys-config.component.ts

@@ -38,6 +38,7 @@ export class SysConfigComponent implements OnInit {
   ngOnInit() {
     this.validateForm = this.fb.group({
       defaultPwd: [null, [Validators.required]],
+      itsmIP: [null, [Validators.required]],
       effectiveDuration: [null, [Validators.required]],
       specimenButton: [null, [Validators.required]],
       deptDisplay: [null, [Validators.required]],
@@ -100,6 +101,7 @@ export class SysConfigComponent implements OnInit {
     let filterData = this.initConfig.filter(
       (item) =>
         item.keyconfig === "pwd" ||
+        item.keyconfig === "itsmIP" ||
         item.keyconfig === "conversationSeconds" ||
         item.keyconfig === "specimenButton" ||
         item.keyconfig === "deptDisplay" ||
@@ -114,6 +116,8 @@ export class SysConfigComponent implements OnInit {
     filterData.forEach((item) => {
       if (item.keyconfig === "pwd") {
         item.valueconfig = this.validateForm.controls.defaultPwd.value;
+      }else if (item.keyconfig === "itsmIP") {
+        item.valueconfig = this.validateForm.controls.itsmIP.value;
       } else if (item.keyconfig === "conversationSeconds") {
         item.valueconfig = this.validateForm.controls.effectiveDuration.value;
       } else if (item.keyconfig === "specimenButton") {
@@ -185,6 +189,9 @@ export class SysConfigComponent implements OnInit {
                 case "pwd":
                   this.validateForm.controls.defaultPwd.setValue(c[1]);
                   break;
+                case "itsmIP":
+                  this.validateForm.controls.itsmIP.setValue(c[1]);
+                  break;
                 case "conversationSeconds":
                   this.validateForm.controls.effectiveDuration.setValue(c[1]);
                   break;