Merge branch 'master' of http://git.dashitech.com/seimin/zy-pc

src/app/services/main.service.ts

@@ -510,7 +510,7 @@ export class MainService {
   }
   //查报修列表
   listWxIncident(data) {
-    return this.http.post(host.host + "/itsm/listWxIncident", data, {
+    return this.http.post(host.host + "/itsm/fetchDataList/incident", data, {
       headers: this.headers,
     });
   }
@@ -520,12 +520,6 @@ 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, {
@@ -544,9 +538,9 @@ export class MainService {
       headers: this.headers,
     });
   }
-  //获取微信报修ID
+  //获取工单单号
   wxbx(data) {
-    return this.http.post(host.host + "/itsm/restful/wxbx", data, {
+    return this.http.post(host.host + "/itsm/restful/sj", data, {
       headers: this.headers,
     });
   }
@@ -568,6 +562,12 @@ export class MainService {
       headers: this.headers,
     });
   }
+  //修改用户
+  saveUser(data) {
+    return this.http.post(host.host + "/itsm/user/saveUser", data, {
+      headers: this.headers,
+    });
+  }
   //复制院区
   copyHosTaskType(data) {
     return this.http.post(host.host + "/api/copyHosTaskType", data, {

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

@@ -5,258 +5,48 @@
     <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>
+          <span class="left">工单单号：{{orderInfo.incidentsign}}</span>
+          <span class="right">{{orderInfo.state?orderInfo.state.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.incidentDescription}}</div>
+          <div nz-col nzSpan="8">报修地址：<ng-container *ngIf="orderInfo.place">{{ orderInfo.place.area.area }} {{ orderInfo.place.place }} {{ orderInfo.houseNumber }}</ng-container></div>
+          <div nz-col nzSpan="24">报修内容：{{orderInfo.description}}</div>
           <div nz-col nzSpan="24">报修图片：
             <app-image-viewer [imageUrl]="imgs_wechatRequesterIncident" *ngIf="imgs_wechatRequesterIncident.length"></app-image-viewer>
           </div>
           <div nz-col nzSpan="24">处理图片：
             <app-image-viewer [imageUrl]="imgs_incident" *ngIf="imgs_incident.length"></app-image-viewer>
           </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="8" *ngIf="orderInfo.incident&&orderInfo.incident.repairSummaryDTO">维修总金额：{{ orderInfo.incident.repairSummaryDTO.totalMaintenancePrice }}元</div>
-          <div nz-col nzSpan="24" *ngIf="processData == '已撤回'">撤回原因：{{ orderInfo.retractReason }}</div>
-          <div nz-col nzSpan="24" *ngIf="processData == '不受理'">不受理原因：{{ orderInfo.rejectRemark }}</div>
+          <div nz-col nzSpan="8">维修人：<ng-container *ngIf="orderInfo.handlingPersonnelUser">{{ orderInfo.handlingPersonnelUser.name }}</ng-container></div>
+          <div nz-col nzSpan="8">维修人电话：<ng-container *ngIf="orderInfo.handlingPersonnelUser">{{ orderInfo.handlingPersonnelUser.phone }}</ng-container></div>
+          <div nz-col nzSpan="8">维修总金额：{{orderInfo.rsPrice === undefined ? '无' : orderInfo.rsPrice + '元'}}</div>
         </div>
       </div>
       <div class="center" *ngIf="amplificationShow">
         <div class="box">
           <!-- 流程图 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"
-                [innerHTML]="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"
-                [innerHTML]="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"
-                      *ngIf="!(processData == '处理' && i === 0)"
-                    ></i>
-                  </div>
-                  <div class="time">
-                    {{ item.opTime | date:"MM-dd HH:mm:ss"}}，{{ item.userName }}
-                  </div>
+            <ng-container *ngFor="let item of progressInfo;let last = last;">
+              <div class="process">
+                <div class="status">
+                  {{ item.logType ? item.logType.name : '' }}
                 </div>
-                <div
-                  class="processCont"
-                  *ngIf="
-                    processData == '处理' ||
-                      processData == '评价' ||
-                      (processData == '结束' && processData != '重复事件')
-                  "
-                >
-                  <div class="status"></div>
-                  <div class="conents"><span *ngIf="item.repairType && item.expectedDate">{{item.repairType.name}}{{item.expectedDate|date:'MM月dd日前完成'}}</span> {{ item.opValue }}</div>
+                <div class="ico">
+                  <i class="icon_transport transport-icon_liucheng last"></i>
+                </div>
+                <div class="time">
+                    {{ item.startTime | date:"MM-dd HH:mm:ss" }}
+                    <span *ngIf="item.appointorName">
+                      ，{{ item.appointorName }}
+                    </span>
                 </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"
-                [innerHTML]="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"
-                [innerHTML]="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 class="processCont">
+                <div class="status"></div>
+                <div class="conents" [ngClass]="{lastContent: last}" [innerHTML]="item.remark"></div>
               </div>
-            </div>
-            <div class="processCont">
-              <div class="status"></div>
-              <div
-                class="conents lastConents"
-                [innerHTML]="processMessage[0] ? processMessage[0].desc : ''"
-              ></div>
-            </div>
+            </ng-container>
           </div>
           <!-- 流程图 end -->
         </div>
@@ -285,7 +75,7 @@
     </div>
   </overlay-scrollbars>
   <div class="btns display_flex justify-content_flex-center">
-    <button nz-button nzType="primary" (click)="goToSummary()" *ngIf="orderInfo.incident.duty && orderInfo.incident.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>
@@ -326,6 +116,6 @@
   [info]="promptInfo" (closeModel)="close()">
   <!-- 2.父组件调用子组件时绑定到这个事件属性，并在事件发生时作出回应。(closeModel)="close()" -->
 </app-prompt-modal>
-<app-incident-details *ngIf="isShowIncidentDetails" (close)="closeIncidentDetails()" [incidentId]="orderInfo.incident.id"></app-incident-details>
+<app-incident-details *ngIf="isShowIncidentDetails" (close)="closeIncidentDetails()" [incidentId]="orderInfo.id"></app-incident-details>
 <!-- 遮罩 -->
 <app-mask *ngIf="maskFlag"></app-mask>

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

@@ -84,9 +84,11 @@
     padding: 4px 0;
     padding-left: 5%;
     border-left: 1px #999999 solid;
-    line-height: 15[x];
     word-break: break-all;
   }
+  .processCont .conents.lastContent {
+    border-left: none;
+  }
   .processCont .lastConents {
     border-left: none;
   }

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

@@ -24,9 +24,8 @@ export class DetailBxComponent implements OnInit {
     private tool: ToolService,
     private mainService: MainService
   ) {}
-  processTime = [];
+  progressInfo = [];
   processData = "";
-  processMessage = [];
   imgs_wechatRequesterIncident = [];
   imgs_incident = [];
 
@@ -70,33 +69,9 @@ export class DetailBxComponent implements OnInit {
       this.logList = res[0]["data"];
       // getDetail
       this.orderInfo = res[1]["data"];
-      this.getProcessTime();
-      this.getProcessMessageData();
+      this.getProgressInfo();
       this.getImgsData('wechatRequesterIncident');
       this.getImgsData('incident');
-      if(this.orderInfo.incident){
-        if (!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.incidentState.name == "不受理") {
-        this.processData = "不受理";
-      } else if (this.orderInfo.incidentState.name == "未受理") {
-        this.processData = "申请";
-      } else if (this.orderInfo.incidentState.name == "处理中") {
-        this.processData = "处理";
-      } else if (this.orderInfo.incidentState.name == "待评价") {
-        this.processData = "评价";
-      } else if (this.orderInfo.incidentState.name == "已解决") {
-        this.processData = "结束";
-      } else if (this.orderInfo.incidentState.name == "已撤回") {
-        this.processData = "已撤回";
-      }
     });
   }
 
@@ -112,17 +87,7 @@ export class DetailBxComponent implements OnInit {
 
   // 获取图片信息
   getImgsData(type) {
-    let id;
-    if(type === 'wechatRequesterIncident'){
-      id = this.orderInfo.id;
-    } else if(type === 'incident'){
-      if(this.orderInfo.incident){
-        id = this.orderInfo.incident.processInstanceId;
-      } else {
-        this['imgs_' + type] = [];
-        return;
-      }
-    }
+    let id = this.orderInfo.id;
     this.mainService
       .listAttachment(type, id)
       .subscribe((res:any)=> {
@@ -133,29 +98,19 @@ export class DetailBxComponent implements OnInit {
       });
   }
 
-  //获取流程节点时间
-  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;
-      });
+  //获取处理进度
+  getProgressInfo() {
+    this.mainService .fetchListBx("incidentLog", {
+      "idx": 0,
+      "sum": 9999,
+      "incidentLog": {
+          "incidentId": this.orderInfo.id
+      }
+    })
+    .subscribe((res: any) => {
+      console.log(res);
+      this.progressInfo = res.list || [];
+    });
   }
 
   // 放大
@@ -165,7 +120,7 @@ export class DetailBxComponent implements OnInit {
 
   // 获取工单详情
   getDetail() {
-    return this.mainService.fetchDataBx("wXIncident", this.id);
+    return this.mainService.fetchDataBx("incident", this.id);
   }
 
   // 确认加急

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

@@ -0,0 +1,37 @@
+<div class="detail" *ngIf="delModal">
+  <div class="modalBody">
+    <div class="title">提示<i class="icon_transport transport-guanbi" (click)="hideDelModal()"></i></div>
+    <div class="content">
+      <div class="top display_flex justify-content_flex-center align-items_center">
+        您是否将以下信息设置为常用信息
+      </div>
+      <div nz-row class="info">
+        <div class="left" nz-col nzSpan="12">
+          <div class="item display_flex  justify-content_space-between align-items_flex-start">
+            <span>联系人</span>
+            <span>{{validateBxForm.value.contacts || ''}}</span>
+          </div>
+          <div class="item display_flex  justify-content_space-between align-items_flex-start">
+            <span>联系电话</span>
+            <span>{{validateBxForm.value.contactsInformation || ''}}</span>
+          </div>
+        </div>
+        <div class="right" nz-col nzSpan="12">
+          <div class="item display_flex  justify-content_space-between align-items_flex-start">
+            <span>楼栋</span>
+            <span>{{extraData.place?.area?.area}}</span>
+          </div>
+          <div class="item display_flex  justify-content_space-between align-items_flex-start">
+            <span>楼层</span>
+            <span>{{extraData.place?.place}}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nz-button nzType="primary" (click)="confirmDel()" [nzLoading]="btnLoading">{{confirmTxt}}</button>
+      <button class="btn cancel ml8" nz-button nzType="default" (click)="cancel()" [nzLoading]="cancenlLoading">{{cancelTxt}}</button>
+    </div>
+  </div>
+</div>
+

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

@@ -0,0 +1,155 @@
+@import "../../../../src/theme.less";
+.detail {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background: rgba(0, 0, 0, .4);
+  z-index: 9999;
+
+  .modalBody {
+    width: 600px;
+    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: 100%;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+      padding: 9px 24px;
+
+      .top {
+        height: 35px;
+        border-bottom: 2px solid #eff2f4;
+        font-weight: bold;
+
+        span:nth-child(1) {
+          font-size: 14px;
+          color: @primary-color;
+        }
+
+        span:nth-child(2) {
+          font-size: 12px;
+          color: #999;
+        }
+      }
+
+      .info {
+        margin-top: 15px;
+        margin-bottom: 4px;
+
+        &>div {
+          &.left {
+            border-right: 2px dashed #eff2f4;
+            padding-right: 23px;
+          }
+
+          &.right {
+            padding-left: 23px;
+          }
+
+          .item {
+            // display: flex;
+            // // height: 28px;
+            // justify-content: space-between;
+            // align-items: flex-start;
+
+            span:nth-child(1) {
+              color: #666;
+              display: inline-block;
+              min-width: 80px;
+            }
+
+            span:nth-child(2) {
+              color: #333;
+            }
+          }
+
+        }
+      }
+
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 18px 14px 0 14px;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+
+    }
+  }
+
+}
+
+.txtC {
+  text-align: center;
+}

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

@@ -0,0 +1,43 @@
+import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
+@Component({
+  selector: "app-dialog-bx",
+  templateUrl: "./dialog-bx.component.html",
+  styleUrls: ["./dialog-bx.component.less"],
+})
+export class DialogBxComponent implements OnInit {
+  @Output() hideDelModalEvent = new EventEmitter<any>();
+  @Output() confirmDelEvent = new EventEmitter<any>();
+  @Output() cancelDelEvent = new EventEmitter<any>();
+  @Input() btnLoading: boolean = false;
+  @Input() cancenlLoading: boolean = false;
+  @Input() delModal: boolean = false;
+  @Input() confirmTxt: string = "是";
+  @Input() cancelTxt: string = "否";
+  @Input() deptDto: object = {};
+  @Input() validateBxForm: object = {};
+  @Input() extraData: object = {};
+  constructor() {}
+
+  officeInfo:any = {}
+
+  ngOnInit() {
+    console.log(this.extraData);
+    console.log(this.deptDto);
+    console.log(this.validateBxForm);
+  }
+
+  // 隐藏
+  hideDelModal(e: string) {
+    this.hideDelModalEvent.emit(e);
+  }
+
+  // 确认
+  confirmDel() {
+    this.confirmDelEvent.emit();
+  }
+
+  // 取消|否
+  cancel() {
+    this.cancelDelEvent.emit();
+  }
+}

src/app/share/mask/mask.component.less

@@ -5,5 +5,5 @@
   width: 100vw;
   height: 100vh;
   background-color: rgba(0, 0, 0, 0.4);
-  z-index: 99;
+  z-index: 9999;
 }

src/app/share/share.module.ts

@@ -19,6 +19,7 @@ import { DateTransformPipe } from '../pipes/date-transform.pipe';
 import { AppraiseDetailComponent } from './appraise-detail/appraise-detail.component';
 import { OrderDetailComponent } from './order-detail/order-detail.component';
 import { DialogDeleteComponent } from './dialog-delete/dialog-delete.component';
+import { DialogBxComponent } from './dialog-bx/dialog-bx.component';
 import { DialogSurgeryComponent } from './dialog-surgery/dialog-surgery.component';
 import { MaskComponent } from './mask/mask.component';
 import { GenerateFloorComponent } from './generate-floor/generate-floor.component';
@@ -66,6 +67,7 @@ import { OutgoingRecordDetailComponent } from './outgoing-record-detail/outgoing
     OutgoingRecordDetailComponent,
     DateTransformPipe,
     DialogDeleteComponent,
+    DialogBxComponent,
     DialogSurgeryComponent,
     MaskComponent,
     GenerateFloorComponent,
@@ -123,6 +125,7 @@ import { OutgoingRecordDetailComponent } from './outgoing-record-detail/outgoing
     OverlayscrollbarsModule,
     DateTransformPipe,
     DialogDeleteComponent,
+    DialogBxComponent,
     DialogSurgeryComponent,
     MaskComponent,
     GenerateFloorComponent,

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

@@ -250,7 +250,7 @@
                     nzTooltipPlacement="right"
                     [nzMouseEnterDelay]="1"
                     (mouseenter)="getRecentInfo(item.patientCode)"
-                    >{{ item.patientName }}({{ item.bedNum }})</span
+                    >{{ item.patientName }}({{ currentDept.typeValue == 'outpatientService' ? item.cardNo : item.bedNum }})</span
                   >
                 </div>
                 <div
@@ -279,10 +279,13 @@
                     "
                   ></span>
                   <span nz-col nzSpan="2"></span>
-                  <span nz-col nzSpan="12">{{ item.residenceNo }}</span>
-                  <span nz-col nzSpan="6" class="txtR"
-                    >待检 {{ item.watingCount }}</span
-                  >
+                  <ng-container *ngIf="currentDept.typeValue == 'outpatientService'">
+                    <span nz-col nzSpan="18">{{ item.identityCardNo }}</span>
+                  </ng-container>
+                  <ng-container *ngIf="!(currentDept.typeValue == 'outpatientService')">
+                    <span nz-col nzSpan="12">{{ item.residenceNo }}</span>
+                    <span nz-col nzSpan="6" class="txtR">待检 {{ item.watingCount }}</span>
+                  </ng-container>
                   <span nz-col nzSpan="2"></span>
                 </div>
                 <div
@@ -296,10 +299,13 @@
                   "
                 >
                   <span nz-col nzSpan="2"></span>
-                  <span nz-col nzSpan="12">{{ item.residenceNo }}</span>
-                  <span nz-col nzSpan="6" class="txtR"
-                    >待检 {{ item.watingCount }}</span
-                  >
+                  <ng-container *ngIf="currentDept.typeValue == 'outpatientService'">
+                    <span nz-col nzSpan="18">{{ item.identityCardNo }}</span>
+                  </ng-container>
+                  <ng-container *ngIf="!(currentDept.typeValue == 'outpatientService')">
+                    <span nz-col nzSpan="12">{{ item.residenceNo }}</span>
+                    <span nz-col nzSpan="6" class="txtR">待检 {{ item.watingCount }}</span>
+                  </ng-container>
                   <span nz-col nzSpan="2"></span>
                 </div>
                 <div class="btnNews">
@@ -1463,14 +1469,7 @@
                                       >
                                         <tbody>
                                           <tr
-                                            (click)="
-                                              showBxModal(
-                                                data,
-                                                '您的报修为“' +
-                                                  data.content +
-                                                  '” 是否确认报修？'
-                                              )
-                                            "
+                                            (click)="showBxModal(data)"
                                             *ngFor="
                                               let data of quickBxlbList;
                                               let i = index
@@ -1478,11 +1477,11 @@
                                           >
                                             <td>{{ data.content || "无" }}</td>
                                           </tr>
-                                          <tr (click)="checkTable('kjbx')">
+                                          <!-- <tr (click)="checkTable('kjbx')">
                                             <td class="moreBx">
                                               更多报修&gt;&gt;
                                             </td>
-                                          </tr>
+                                          </tr> -->
                                         </tbody>
                                       </nz-table>
                                     </ng-template>
@@ -1642,13 +1641,12 @@
                     >
                       <thead>
                         <tr class="thead">
-                          <th nzWidth="6%">序号</th>
+                          <th nzWidth="5%">#</th>
                           <th nzWidth="12%">患者姓名<br>住院号</th>
                           <th nzWidth="12%">手术时间</th>
                           <th nzWidth="20%">申请科室</th>
-                          <th>手术名称</th>
-                          <th nzWidth="15%">状态</th>
-                          <th nzWidth="20%" *ngIf="currentDept.typeValue == 'surgery'">操作</th>
+                          <th>手术名称<br>状态</th>
+                          <th nzWidth="30%" *ngIf="currentDept.typeValue == 'surgery'">操作</th>
                         </tr>
                       </thead>
                       <tbody>
@@ -1657,8 +1655,7 @@
                           <td>{{ item.patientDTO ? item.patientDTO.patientName : '' }}({{ item.patientDTO ? item.patientDTO.bedNum : '' }})<br>{{ item.patientDTO ? item.patientDTO.residenceNo : '' }}</td>
                           <td>{{ item.applyDate | date:'MM-dd HH:mm' }}</td>
                           <td>{{ item.areaDeptDTO ? (deptDisplay == 2 ? item.areaDeptDTO.deptalias : item.areaDeptDTO.dept) : '' }}</td>
-                          <td>{{ item.surgeryName }}</td>
-                          <td>{{ item.state?.name }}</td>
+                          <td>{{ item.surgeryName }}<br>{{ item.state?.name }}</td>
                           <td *ngIf="currentDept.typeValue == 'surgery'">
                             <!-- 手术状态是【手术安排】和【接患者中】，并且【是否开启手术即将开始通知】开启 -->
                             <button class="btn1 mr8 mb8 mt8" (click)="surgeryBegin($event, item)" *ngIf="item.state && (item.state.value == 3 || item.state.value == 7) && surgeryConfigs.surgeryBegin == 1">即将开始</button>
@@ -1668,6 +1665,7 @@
                             <button class="btn1 mr8 mb8 mt8" (click)="sendWard($event, item)" *ngIf="item.patientDTO && surgeryConfigs && surgeryConfigs.remandClinical == 1 && item.state && item.state.value == 8">送回病房</button>
                             <!-- 手术状态是【手术中】，并且【是否开通送回苏醒室】开启 -->
                             <button class="btn1 mr8 mb8 mt8" (click)="sendAwakeningRoom($event, item)" *ngIf="item.patientDTO && surgeryConfigs && surgeryConfigs.remandRecovery == 1 && item.state && item.state.value == 8">送回苏醒间</button>
+                            <button class="btn1 mr8 mb8 mt8" (click)="createOrder($event, item)">一键建单</button>
                           </td>
                         </tr>
                       </tbody>
@@ -2099,7 +2097,6 @@
                         class="formItem"
                         [nzDropdownMatchSelectWidth]="false"
                         [nzShowSearch]="false"
-                        nzAllowClear
                         nzPlaceHolder="请选择状态"
                         [(ngModel)]="incidentStateId"
                       >
@@ -2113,14 +2110,12 @@
                   </div>
 
                   <div class="btns">
-                    <button
-                      nz-button
-                      nzType="primary"
-                      nzGhost
-                      (click)="getBxlb(true)"
-                    >
+                    <button nz-button nzType="primary" nzGhost (click)="getBxlb(true)">
                       搜索
                     </button>
+                    <button nz-button nzType="primary" nzGhost (click)="showBxModal()">
+                      新增
+                    </button>
                   </div>
                 </div>
                 <div class="table">
@@ -2134,13 +2129,12 @@
                     >
                       <thead>
                         <tr class="thead">
-                          <th nzWidth="7%">序号</th>
-                          <th nzWidth="16%">报修内容</th>
-                          <th nzWidth="16%">报修时间</th>
-                          <th nzWidth="16%">报修科室</th>
-                          <th nzWidth="10%">状态</th>
-                          <th nzWidth="20%">维修人</th>
-                          <th nzWidth="15%"></th>
+                          <th nzWidth="5%">序号</th>
+                          <th nzWidth="19%">报修内容</th>
+                          <th nzWidth="19%">报修时间</th>
+                          <th nzWidth="19%">状态</th>
+                          <th nzWidth="19%">维修人</th>
+                          <th nzWidth="19%"></th>
                         </tr>
                       </thead>
                       <tbody>
@@ -2148,25 +2142,16 @@
                           <td>{{ i + 1 }}</td>
                           <td>{{ data.description || "无" }}</td>
                           <td>
-                            {{ data.createTime | date: "MM-dd HH:mm" }}
-                          </td>
-                          <td>
-                            {{ data.departmentDTO ? data.departmentDTO.dept : "无" }}
+                            {{ data.startDate | date: "yyyy-MM-dd HH:mm" }}
                           </td>
                           <td>{{ data.state?data.state.name:'无' }}</td>
                           <td>
-                            {{
-                              data.incident
-                                ? data.incident.handlingPersonnelUser
-                                  ? data.incident.handlingPersonnelUser.name + (data.incident.handlingPersonnelUser.phone?'('+ data.incident.handlingPersonnelUser.phone +')':'')
-                                  : "无"
-                                : "无"
-                            }}
+                            {{ data.handlingPersonnelUser ? data.handlingPersonnelUser.name + (data.handlingPersonnelUser.phone?'('+ data.handlingPersonnelUser.phone +')':'') : "无"}}
                           </td>
                           <td>
                             <!-- <button (click)="viewBx(data)">查看</button> -->
                             <button class="btn1 mr8 mb8 mt8" (click)="detailBx(data)">查看</button>
-                            <button class="btn1 mr8 mb8 mt8" (click)="showAppraiseBx(data.id)" *ngIf="data.state.name  == '待评价'">评价</button>
+                            <button class="btn1 mr8 mb8 mt8" (click)="showAppraiseBx(data.id)" *ngIf="data.state && data.state.value == 'close' && !data.wxdegree">评价</button>
                           </td>
                         </tr>
                       </tbody>
@@ -3678,6 +3663,19 @@
     ></i>
   </div>
 </div>
+<!-- 报修提示模态框 -->
+<app-dialog-bx
+  *ngIf="reqModal"
+  [delModal]="reqModal"
+  (hideDelModalEvent)="hideReqModal()"
+  [btnLoading]="btnLoading"
+  [cancenlLoading]="cancenlLoading"
+  [deptDto]="deptDto"
+  [extraData]="extraData"
+  [validateBxForm]="validateBxForm"
+  (confirmDelEvent)="confirmReq()"
+  (cancelDelEvent)="cancelReq()"
+></app-dialog-bx>
 <!-- 删除意见模态框 -->
 <app-dialog-delete
   [delModal]="delAdviceModal"
@@ -3729,21 +3727,67 @@
 >
   <div class="modalBody">
     <div class="title">
-      提示<i
+      一键报修<i
         class="icon_transport transport-guanbi"
         (click)="hideBxModal()"
       ></i>
     </div>
-    <div class="content">
-      <div class="icon"><i class="icon_transport transport-wenhao"></i></div>
-      <div class="defeat">{{ tipsMsg2 }}</div>
-    </div>
+    <overlay-scrollbars #osComponentRef5 class="content">
+      <form nz-form [formGroup]="validateBxForm" class="bxFormAdd" (ngSubmit)="confirmBx()">
+        <nz-form-item>
+          <nz-form-label [nzSm]="4" [nzXs]="4" nzRequired nzFor="description">故障描述</nz-form-label>
+          <nz-form-control>
+            <nz-input-group style="width:442px;">
+              <textarea nz-input formControlName="description" rows="4" placeholder="请输入故障描述"></textarea>
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSm]="4" [nzXs]="4" nzRequired nzFor="contacts">联系人</nz-form-label>
+          <nz-form-control style="display: inline-block;">
+            <nz-input-group>
+              <input style="width:168px;" class="mr8" nz-input formControlName="contacts" placeholder="请输入联系人" />
+            </nz-input-group>
+          </nz-form-control>
+
+          <nz-form-label nzRequired nzFor="contactsInformation">联系电话</nz-form-label>
+          <nz-form-control style="display: inline-block;">
+            <nz-input-group>
+              <input style="width:185px;" nz-input formControlName="contactsInformation" placeholder="请输入联系电话" />
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item style="display: inline-block;vertical-align:bottom;" class="last">
+          <nz-form-label [nzSm]="4" [nzXs]="4" nzRequired nzFor="building">详细地址</nz-form-label>
+          <nz-form-control style="display: inline-block;">
+            <nz-select [nzDropdownMatchSelectWidth]="false" style="width:120px;" class="mr8" type="building"
+              nzShowSearch formControlName="building" nzPlaceHolder="请选择楼栋"
+              (ngModelChange)="changeBuilding($event)">
+              <nz-option [nzLabel]="data.area" [nzValue]="data.id" *ngFor="let data of buildings">
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+          <nz-form-label [nzSm]="4" [nzXs]="4" nzRequired nzFor="floor" hidden></nz-form-label>
+          <nz-form-control style="display: inline-block;">
+            <nz-select [nzDropdownMatchSelectWidth]="false" style="width:120px;" class="mr8" type="floor" nzShowSearch
+             formControlName="floor" nzPlaceHolder="请选择楼层" [nzLoading]="floorLoading">
+              <nz-option [nzLabel]="data.place" [nzValue]="data.id" *ngFor="let data of floors"></nz-option>
+            </nz-select>
+          </nz-form-control>
+          <nz-form-label [nzSm]="4" [nzXs]="4" nzRequired nzFor="officeAddress" hidden></nz-form-label>
+          <nz-form-control style="display: inline-block;">
+            <nz-input-group>
+              <input style="width:185px;" nz-input formControlName="officeAddress" placeholder="请输入详细位置" />
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+      </form>
+    </overlay-scrollbars>
     <div class="display_flex justify-content_flex-center">
       <button
         nz-button
         nzType="primary"
         (click)="confirmBx()"
-        [nzLoading]="loading6"
       >
         确认
       </button>

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

@@ -1884,9 +1884,24 @@
   background: rgba(0, 0, 0, 0.4);
   z-index: 99;
 
+  .bxFormAdd{
+    padding: 8px 8px 4px;
+  }
+
+  ::ng-deep .ant-form-item{
+    margin-bottom: 8px!important;
+  }
+
+  ::ng-deep .ant-form-item.last{
+    margin-bottom: 0!important;
+  }
+
+  ::ng-deep .ant-form-item-label{
+    text-align: left!important;
+  }
+
   .modalBody {
-    width: 500px;
-    height: 250px;
+    width: 590px;
     background: #fff;
     border-radius: 5px;
     padding: 10px 20px;
@@ -1910,8 +1925,7 @@
     }
 
     .content {
-      width: 460px;
-      height: 147px;
+      width: 550px;
       background: #f9fafb;
       border: 1px solid @hs_border_color;
       border-radius: 5px;

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

@@ -74,6 +74,11 @@ export class HushijiandanComponent implements OnInit {
     static: false,
   })
   osComponentRef4: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef5", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef5: OverlayScrollbarsComponent;
   @ViewChild("osComponentRef6", {
     read: OverlayScrollbarsComponent,
     static: false,
@@ -1086,15 +1091,107 @@ export class HushijiandanComponent implements OnInit {
       }
     );
   }
+  // 初始化新增form表单
+  initBxForm(content) {
+    this.validateBxForm = this.fb.group({
+      description: [content || null, [Validators.required]],
+      building: [null, [Validators.required]],
+      floor: [null, [Validators.required]],
+      officeAddress: [null, [Validators.required]],
+      contacts: [this.loginUser.name, [Validators.required]],
+      contactsInformation: [this.loginUser.phone, [Validators.required]],
+    });
+    this.getDeptByCode(this.currentDept.pcode);
+  }
+  // 根据科室Code获取详情
+  deptDto:any = {};
+  getDeptByCode(code){
+    this.mainService
+      .fetchListBx("department", {
+        idx: 0,
+        sum: 1,
+        department: {
+          eqCode: code,
+        }
+      })
+      .subscribe((data:any) => {
+        let list = data.list || [];
+        this.deptDto = list.length > 0 ? list[0] : {};
+        console.log(this.deptDto);
+        this.changeHosp();
+        // 回显楼栋
+        if(this.deptDto.place){
+          this.validateBxForm.controls.building.setValue(this.deptDto.place.area.id);
+        }
+
+        // 回显楼层
+        if(this.deptDto.place){
+          this.validateBxForm.controls.floor.setValue(this.deptDto.place.id);
+        }
+      });
+  }
+  // 切换院区选项
+  buildings: any = []; //楼栋
+  changeHosp() {
+    this.validateBxForm.controls.building.setValue(null);
+    this.buildings = [];
+    let data = {
+      idx: 0,
+      sum: 9999,
+      area: {
+        branch: this.deptDto.branch,
+      }
+    };
+    this.mainService
+      .fetchListBx("area", data)
+      .subscribe((data:any) => {
+        this.buildings = data.list || [];
+        this.floors = [];
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+      });
+  }
+
+  // 切换楼栋信息
+  floors: Array<any> = []; //楼层
+  floorLoading: boolean = false;
+  changeBuilding(buildingId) {
+    if(!buildingId){
+      return;
+    }
+    this.validateBxForm.controls.floor.setValue(null);
+    this.validateBxForm.controls.officeAddress.setValue(null);
+    this.floors = [];
+
+    let data = {
+      idx: 0,
+      sum: 9999,
+      place: {
+        area: { id: buildingId },
+      }
+    };
+    this.floorLoading = true;
+    this.mainService
+      .fetchListBx("place", data)
+      .subscribe((data:any) => {
+        this.floorLoading = false;
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        this.floors = data.list || [];
+      });
+  }
   // 是否确定报修模态框
   bxModal: boolean = false; //模态框
   loading6 = false;
-  tipsMsg2: string; //提示框信息
   coopBx: any; //当前操作列
-  showBxModal(data: any, tipsMsg2: string) {
+  validateBxForm: FormGroup; //新增/编辑表单
+  showBxModal(data: any) {
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
     this.bxModal = true;
-    this.coopBx = data;
-    this.tipsMsg2 = tipsMsg2;
+    this.coopBx = data || {};
+    this.initBxForm(this.coopBx.content);
   }
   // 隐藏模态框
   hideBxModal() {
@@ -1102,46 +1199,114 @@ export class HushijiandanComponent implements OnInit {
   }
   // 确认
   confirmBx() {
-    this.loading6 = true;
-    this.mainService.wxbx({}).subscribe((result) => {
-      if ((result as any).status == 200) {
-        let bxcode = (result as any).data; //生成微信报修号
-        let postData: any = {
-          verification: "true",
-          incident: {
-            branch:this.loginUser.currentHospital.id,
-            deptId:this.loginUser.dept.id,
-            // contacts: this.loginUser.name,
-            // contactsInformation: this.loginUser.phone,
-            description: this.coopBx.content,
-            requester: { account: this.loginUser.account },
-            sourceType: "wechatUserIncident",
-            fileUrl: "url",
-            bxcode,
-          },
-          loginUser: {
-            account: this.loginUser.account,
-            id: this.loginUser.id,
-          },
-        };
-        if (this.coopBx.category) {
-          postData.incident.categoryId = this.coopBx.category.id;
-        }
-        this.mainService.addWxIncident(postData).subscribe((res) => {
-          this.loading6 = false;
-          this.bxModal = false;
-          if ((res as any).state == 200) {
-            this.showPromptModal("提交", true, "");
-            this.checkTable("bxlb");
-          } else {
-            this.showPromptModal("提交", false, (res as any).msg);
-          }
-        });
-      } else {
-        this.loading6 = false;
-        this.showPromptModal("提交", false, "");
+    for (const i in this.validateBxForm.controls) {
+      this.validateBxForm.controls[i].markAsDirty();
+      this.validateBxForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateBxForm.invalid){
+      this.message.error('请填写必填字段！');
+      return;
+    };
+    if (!this.deptDto.id){
+      this.message.error('数据异常，无法建单！');
+      return;
+    };
+    this.showReqModal();
+  }
+
+  // 报修
+  // type, 1是，0否
+  async confirmBxNext(type){
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    if(type == 1){
+      this.btnLoading = true;
+      let loginUser:any = {
+        account: this.loginUser.account,
+      };
+      if(this.deptDto.branch){
+        loginUser.branch = { id: this.deptDto.branch };
       }
-    });
+      if(this.deptDto){
+        loginUser.dept = {id: this.deptDto.id};
+      }
+      if(this.validateBxForm.value.contacts){
+        loginUser.name = this.validateBxForm.value.contacts;
+      }
+      if(this.validateBxForm.value.floor){
+        loginUser.place = {id: this.validateBxForm.value.floor, area: { id: this.validateBxForm.value.building }};
+      }
+      if(this.validateBxForm.value.officeAddress){
+        loginUser.houseNumber = this.validateBxForm.value.officeAddress;
+      }
+      if(this.validateBxForm.value.contactsInformation){
+        loginUser.phone = this.validateBxForm.value.contactsInformation;
+      }
+      let result:any = await this.mainService.saveUser({loginUser}).toPromise();
+      console.log(result);
+      if(result.state != 200){
+        this.hideReqModal();
+        this.btnLoading = false;
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        this.message.error(result.msg);
+        return;
+      }
+    }else{
+      this.cancenlLoading = true;
+    }
+    this.mainService.getDictionaryByITSM({key: "incident_source", type: "list"}).subscribe((source:any) => {
+      let incidentSourceList = source.data || [];
+      let im = incidentSourceList.find(v => v.value === 'im');
+      this.mainService.wxbx({}).subscribe((result) => {
+        if ((result as any).status == 200) {
+          let bxcode = (result as any).data; //生成微信报修号
+          let postData: any = {
+            incident: {
+              "incidentsign": bxcode,
+              "deleteFlag": 0,
+              "department": { id: this.deptDto.id },
+              "contactsInformation": this.validateBxForm.value.contactsInformation,
+              "contacts": this.validateBxForm.value.contacts,
+              "branch": this.deptDto.branch,
+              "area": { id: this.validateBxForm.value.building },
+              "place": { id: this.validateBxForm.value.floor },
+              "houseNumber": this.validateBxForm.value.officeAddress,
+              "source": im,
+              "description": this.validateBxForm.value.description,
+              "repairType": 2,
+              "requester": this.loginUser,
+              "acceptUser": this.loginUser,
+            },
+            loginUser: {
+              account: this.loginUser.account,
+              id: this.loginUser.id,
+            }
+          };
+          if (this.coopBx.category) {
+            postData.incident.category = this.coopBx.category;
+          }
+          this.mainService.addWxIncident(postData).subscribe((res) => {
+            this.btnLoading = false;
+            this.cancenlLoading = false;
+            this.message.remove(this.maskFlag);
+            this.maskFlag = false;
+            this.bxModal = false;
+            this.hideReqModal();
+            if ((res as any).state == 200) {
+              this.showPromptModal("提交", true, "");
+              this.checkTable("bxlb");
+            } else {
+              this.showPromptModal("提交", false, (res as any).msg);
+            }
+          });
+        } else {
+          this.btnLoading = false;
+          this.showPromptModal("提交", false, "");
+        }
+      });
+    })
   }
 
   // 获取星级
@@ -1448,11 +1613,11 @@ export class HushijiandanComponent implements OnInit {
   // 获取患者信息
   snum = 0;
   getPatient(e?) {
-    if ((this.currentDept.typeValue == "checkRoom2" || this.currentDept.typeValue == "outpatientDept" || this.currentDept.typeValue == "checkRoom" || this.currentDept.typeValue == "outpatientService") && !this.tabSearchCont) {
+    if ((this.currentDept.typeValue == "outpatientDept" || this.currentDept.typeValue == "checkRoom" || this.currentDept.typeValue == "outpatientService") && !this.tabSearchCont) {
       this.pLoading = false;
       this.patientList = [];
       this.infoLength = 0;
-      return; //护士端如果登录后如果科室类型为“检查科室”、“门诊科室”、“检验科室”、“门诊服务点”，默认不显示患者信息
+      return; //护士端如果登录后如果科室类型为“门诊科室”、“检验科室”、“门诊服务点”，默认不显示患者信息
     }
     this.pLoading = true;
     let postData = {
@@ -1481,6 +1646,19 @@ export class HushijiandanComponent implements OnInit {
       postData["patient"]["parentIdOnly"] = true;
       postData["patient"]["recoveryDept"] = this.loginUserDeptId;
       postData["patient"]["recoveryDeptDTO"] = {keyWord: '1'};
+    }else if(this.currentDept.typeValue == "checkRoom2"){
+      // 患者信息
+      postData["patient"] = {
+        keyWord: e ? e : this.tabSearchCont,
+      };
+      // 查询父级科室患者
+      postData["patient"]["parentIdOnly"] = true;
+      if (this.tabSearchCont) {
+        delete postData["patient"]["department"]; //搜索范围为全院在院患者
+        delete postData["patient"]["checkTempDept"];
+      } else {
+        postData["patient"]["checkTempDept"] = { id: this.loginUserDeptId };
+      }
     }else{
       // 患者信息
       postData["patient"] = {
@@ -1950,6 +2128,12 @@ export class HushijiandanComponent implements OnInit {
     this.sendAwakeningRoomInfo = `您是否确定将<span style="color:red;">${item.patientDTO ? item.patientDTO.patientName : ''}</span>患者送往<span style="color:red;">${this.surgeryConfigs.recoveryDeptDTO ? (this.deptDisplay == 2 ? this.surgeryConfigs.recoveryDeptDTO.deptalias : this.surgeryConfigs.recoveryDeptDTO.dept) : ''}</span>科室吗？`
   }
 
+  // 手术排程信息-一键建单
+  createOrder(e, item){
+    e.stopPropagation();
+    this.newPatientOrder(item.patientDTO);
+  }
+
   // 患者信息一键建单
   patientModal: boolean = false; //患者信息一键建单模态框
   patientMsg; //患者信息
@@ -3628,14 +3812,16 @@ export class HushijiandanComponent implements OnInit {
   bxlbLoading = false;
   getBxlb(idx, isInitState = false) {
     // 获取事件状态
-    let postData = { type: "list", key: "wxincident_state" };
+    let postData = { type: "list", key: "incident_status" };
     this.iLoading = true;
     this.mainService.getDictionaryByITSM(postData).subscribe((data: any) => {
       this.iLoading = false;
       if (data.status == 200) {
-        this.incidentStateList = data.data || [];
+        let incidentStateList = data.data || [];
+        incidentStateList.unshift({id: 0, name: '全部', value: 0});
+        this.incidentStateList = incidentStateList;
         if(isInitState){
-          let valueObj2 = this.incidentStateList.find(v => v.value == 2);
+          let valueObj2 = this.incidentStateList.find(v => v.value == 0);
           this.incidentStateId = valueObj2 ? valueObj2.id : undefined;
         }
 
@@ -3647,17 +3833,19 @@ export class HushijiandanComponent implements OnInit {
         this.bxlbLoading = true;
         this.mainService
           .listWxIncident({
-            deptId: current.user.dept.id,
-            // assignee: current.user.account,
-            state: this.incidentStateId ? this.incidentStateId : undefined,
             idx: this.bxlbPageIndex - 1,
             sum: this.bxlbPageSize,
+            incident: {
+              // assignee: current.user.account,
+              statusId: this.incidentStateId || undefined,
+              department: { pcode: current.user.dept.pcode },
+            }
           })
           .subscribe((data: any) => {
             this.bxlbLoading = false;
-            this.bxlbList = data.data || [];
-            this.bxlbListLength = data.resultCount || 0;
-            this.processing = data.resultCount || 0;
+            this.bxlbList = data.list || [];
+            this.bxlbListLength = data.totalNum || 0;
+            this.processing = data.totalNum || 0;
           });
       }
     });
@@ -3821,6 +4009,23 @@ export class HushijiandanComponent implements OnInit {
   hideDelAdviceModal() {
     this.delAdviceModal = false;
   }
+  // 报修提示框
+  reqModal: boolean = false;
+  extraData:any = {};
+  showReqModal() {
+    this.extraData.place = this.floors.find(v => v.id == this.validateBxForm.value.floor);
+    // this.reqModal = true;
+    this.confirmBxNext(0);
+  }
+  confirmReq() {
+    this.confirmBxNext(1);
+  }
+  cancelReq() {
+    this.confirmBxNext(0);
+  }
+  hideReqModal() {
+    this.reqModal = false;
+  }
   // 工单列表下拉筛选
   selectedType: null;
   changeOrderSel(e) {

src/app/views/quilt-washing-trend-analysis/quilt-washing-trend-analysis.component.html

@@ -28,6 +28,18 @@
             <nz-option [nzLabel]="item.name" [nzValue]="item.value" *ngFor="let item of quarterList"></nz-option>
           </nz-select>
         </div>
+        <div class="searchItem">
+          <span class="label">被服种类</span>：
+          <nz-select style="width: 135px;" class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+            (nzOnSearch)="changeClothesTypeId($event)" nzAllowClear nzPlaceHolder="请选择被服" [(ngModel)]="searchDto.clothesTypeId">
+            <ng-container *ngFor="let option of allClothesType">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
       </div>
       <div class="btns">
         <button nz-button nzType="primary" (click)='search()'>搜索</button>

src/app/views/quilt-washing-trend-analysis/quilt-washing-trend-analysis.component.ts

@@ -6,6 +6,8 @@ import { MainService } from "../../services/main.service";
 import { DateService } from "../../services/date.service";
 import { MyServiceService } from "../../services/my-service.service";
 import { ToolService } from "../../services/tool.service";
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
 
 @Component({
   selector: "app-quilt-washing-trend-analysis",
@@ -21,10 +23,16 @@ export class QuiltWashingTrendAnalysisComponent implements OnInit {
     private myService: MyServiceService,
     private tool: ToolService
   ) {}
-
+  allClothesType:any[] = [];
+  searchTimerSubject = new Subject();
   ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
     this.coopBtns = this.tool.initCoopBtns(this.route);
     this.getAllHos();
+    this.getAllClothesType();
     this.changeDateType();
   }
 
@@ -34,6 +42,7 @@ export class QuiltWashingTrendAnalysisComponent implements OnInit {
     year: +format(new Date(), "yyyy"),//季度-年
     quarter: getQuarter(new Date()),//季度
     tabType: 'YoY',//YoY/同比，MoM/环比
+    clothesTypeId: undefined, //选择被服
   }
 
   tabTypes = [
@@ -291,6 +300,38 @@ export class QuiltWashingTrendAnalysisComponent implements OnInit {
   search() {
     this.getData();
   }
+  // 用户输入搜索被服
+  isLoading = false;
+  changeClothesTypeId(e) {
+    this.searchTimer(this.getAllClothesType, e);
+  }
+  // 边输入边搜索节流阀
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+  // 获取被服
+  getAllClothesType(e?, those?) {
+    let that = those || this;
+    let postData: any = {
+      idx: 0,
+      sum: 10,
+      dictionaryTree: {
+        name: e || "",
+        hosId: that.hospital,
+        level: 2,
+        key: 'clothes_type',
+        deleted: 0,
+      },
+    };
+    that.isLoading = true;
+    that.mainService
+      .getFetchDataList("simple/data", "dictionaryTree", postData)
+      .subscribe((data) => {
+        that.allClothesType = data.list;
+        that.isLoading = false;
+      });
+  }
   // 重置
   reset() {
     this.searchDto = {
@@ -299,6 +340,7 @@ export class QuiltWashingTrendAnalysisComponent implements OnInit {
       year: +format(new Date(), "yyyy"),//季度-年
       quarter: getQuarter(new Date()),//季度
       tabType: 'YoY',//YoY/同比，MoM/环比
+      clothesTypeId: undefined, //选择被服
     }
     this.search();
   }
@@ -317,6 +359,7 @@ export class QuiltWashingTrendAnalysisComponent implements OnInit {
       tabType: this.searchDto.tabType,
       hosId: this.hospital,
       type: this.searchDto.dateType,
+      clothesTypeId: this.searchDto.clothesTypeId || undefined,
     };
     switch (postData.type) {
       case "day":

src/app/views/washing-batch-view/washing-batch-view-routing.module.ts

@@ -4,7 +4,7 @@ import { WashingBatchViewComponent } from "./washing-batch-view.component";
 
 const routes: Routes = [
   {
-    path: ":id",
+    path: ":id/:createTime",
     component: WashingBatchViewComponent,
   },
 ];

src/app/views/washing-batch-view/washing-batch-view.component.html

@@ -3,7 +3,7 @@
   <div class="head">
     <div class="head_logo">
       <div class="logo"><img [src]="tool.logoUrl" [alt]="tool.logoTitle"></div>
-      <div class="title">被服洗涤</div>
+      <div class="title">被服洗涤<span class="createTime">{{createTime|date:'yyyy-MM-dd HH:mm'}}</span></div>
     </div>
     <div class="red">请选择被服科室绑定分类和父级被服分类后进行搜索</div>
   </div>

src/app/views/washing-batch-view/washing-batch-view.component.less

@@ -43,6 +43,9 @@
         font-weight: bold;
         color: @primary-color;
         margin-left: 30px;
+        .createTime{
+          margin-left: 24px;
+        }
       }
     }
 

src/app/views/washing-batch-view/washing-batch-view.component.ts

@@ -64,6 +64,8 @@ export class WashingBatchViewComponent implements OnInit, AfterViewInit {
   rows:any[] = [['id', 'clothesState', ''], [], ['','件数', '费用/元']];
   totalData:any = {};
 
+  createTime = this.route.snapshot.paramMap.get("createTime");
+
   //搜索
   changeInpSubject = new Subject(); //防抖
   changeInp(e, type) {

src/app/views/washing-batch/washing-batch.component.ts

@@ -131,7 +131,7 @@ export class WashingBatchComponent implements OnInit {
     if(data.batchState.value == 1){
       this.recallOrderShow = true;
     }else{
-      this.router.navigateByUrl("/washingBatchView/" + this.coopData.id);
+      this.router.navigateByUrl(`/washingBatchView/${this.coopData.id}/${this.coopData.createTime}`);
     }
   }
   // 设置为洗涤中
@@ -155,7 +155,7 @@ export class WashingBatchComponent implements OnInit {
   }
   // 立即查看
   recAndDel() {
-    this.router.navigateByUrl("/washingBatchView/" + this.coopData.id);
+    this.router.navigateByUrl(`/washingBatchView/${this.coopData.id}/${this.coopData.createTime}`);
   }
   // 取消
   closeRecallOrderModal() {

upload/production.js

@@ -1,11 +1,11 @@
 const shell = require('shelljs')
 const path = require('path');
 const config = {
-  ip: "118.190.89.49", // ssh地址
+  ip: "47.113.226.223", // ssh地址
   username: "root", // ssh 用户名
   port: 22,      //端口
-  password: "dstech@123", // ssh 密码
-  path: '/home/itsm_v2_/web/pc', // 上传地址,删除地址
+  password: "DStech@123", // ssh 密码
+  path: '/home/itsm/project/html2/pc', // 上传地址,删除地址
   buildPath: '../dist/pc' // 本地打包后文件地址
 }
 let Client = require('ssh2-sftp-client');
@@ -38,13 +38,13 @@ function runTask() {
   const isNodeVersionLt17 = parseInt(process.version) < 17;
   const execStr = isNodeVersionLt17 ? 'npm run build' : 'npm run build:17';
   if (shell.exec(execStr).code == 0) {
-    if (shell.exec(`find dist -name '*.js' -print0 | xargs -0 gzip -k`).code == 0) {
-      if (shell.exec(`find dist -name '*.css' -print0 | xargs -0 gzip -k`).code == 0) {
+    // if (shell.exec(`find dist -name '*.js' -print0 | xargs -0 gzip -k`).code == 0) {
+      // if (shell.exec(`find dist -name '*.css' -print0 | xargs -0 gzip -k`).code == 0) {
         console.log("-----打包成功-----");
         //提交上传
         connectSSh();
-      }
-    }
+      // }
+    // }
   }
 }
 runTask()