增加报修与展示

src/app/services/main.service.ts

@@ -481,4 +481,28 @@ export class MainService {
       headers: this.headers,
     });
   }
+  //查报修列表
+  listWxIncident(data) {
+    return this.http.post(host.host + "/api/listWxIncident", data, {
+      headers: this.headers,
+    });
+  }
+  //查区域地点接口
+  fetchListBx(type,data) {
+    return this.http.post(host.host + "/api/fetchDataList/" + type, data, {
+      headers: this.headers,
+    });
+  }
+  //提交报修
+  addWxIncident(data) {
+    return this.http.post(host.host + "/api/addWxIncident", data, {
+      headers: this.headers,
+    });
+  }
+  //获取微信报修ID
+  wxbx(data) {
+    return this.http.post(host.host + "/api/restful/wxbx", data, {
+      headers: this.headers,
+    });
+  }
 }

src/app/share/bx-prompt-modal/bx-prompt-modal.component.html

@@ -0,0 +1,48 @@
+<div class="modal display_flex justify-content_flex-center align-items_center" *ngIf="show">
+  <div class="modalBody">
+    <div class="title">报修详情查看<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="content">
+      <div class="info">
+        <div nz-row>
+          <div class="left" nz-col nzSpan="12">
+            <div class="item display_flex  justify-content_space-between align-items_flex-start">
+              <span>报修内容</span>
+              <span>{{ bData.description||'无' }}</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>{{ bData.createTime|date:'MM-dd HH:mm' }}</span>
+            </div>
+          </div>
+        </div>
+        <div nz-row>
+          <div class="left" nz-col nzSpan="12">
+            <div class="item display_flex  justify-content_space-between align-items_flex-start">
+              <span>报修人</span>
+              <span>{{ bData.requester?bData.requester.name:'无' }}</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>{{ bData.state.name }}</span>
+            </div>
+          </div>
+        </div>
+        <div nz-row>
+          <div class="left" nz-col nzSpan="12">
+            <div class="item display_flex  justify-content_space-between align-items_flex-start">
+              <span>处理人</span>
+              <span>{{ bData.incident?(bData.incident.contacts?bData.incident.contacts:'无'):'无' }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button class="btn know" nz-button nzType="primary" (click)="hideModal()">知道了</button>
+    </div>
+  </div>
+</div>

src/app/share/bx-prompt-modal/bx-prompt-modal.component.less

@@ -0,0 +1,160 @@
+@import "../../../../src/theme.less";
+.modal {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+  .hospitalTable {
+    width: 100%;
+    td {
+      text-align: center !important;
+    }
+    .thead {
+      background-image: linear-gradient(to right, @bg-start, @bg-end);
+      th {
+        text-align: center !important;
+        color: #fff;
+        background: transparent;
+      }
+    }
+  }
+
+  .modalBody {
+    width: 700px;
+    min-height: 220px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+    &.modalBody-search {
+      width: 480px;
+      min-height: 250px;
+    }
+
+    .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;
+
+        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;
+
+        .left {
+          border-right: 2px dashed #eff2f4;
+          padding-right: 23px;
+        }
+
+        .right {
+          padding-left: 23px;
+        }
+
+        .item {
+          // display: flex;
+          // justify-content: space-between;
+          // align-items: flex-start;
+          margin-bottom: 5px;
+
+          &>span:nth-child(1) {
+            color: #666;
+            min-width: 70px;
+          }
+
+          &>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: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}

src/app/share/bx-prompt-modal/bx-prompt-modal.component.ts

@@ -0,0 +1,25 @@
+import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
+
+@Component({
+  selector: 'app-bx-prompt-modal',
+  templateUrl: './bx-prompt-modal.component.html',
+  styleUrls: ['./bx-prompt-modal.component.less']
+})
+export class BxPromptModalComponent implements OnInit {
+  // 切换科室，切换弹窗
+  hsLoading = false;
+  @Input() show: Boolean;
+  @Input() bData: Object = {};
+
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  constructor() { }
+
+  ngOnInit() {}
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+  }
+}
+
+

src/app/share/share.module.ts

@@ -27,6 +27,7 @@ import { BatchOrdersComponent } from './batch-orders/batch-orders.component';
 import { CollapseComponent } from './collapse/collapse.component';
 import { CollapsePanelComponent } from './collapse-panel/collapse-panel.component';
 import { HtmlTransformPipe } from '../pipes/html-transform.pipe';
+import { BxPromptModalComponent } from './bx-prompt-modal/bx-prompt-modal.component';
 
 @NgModule({
   declarations: [
@@ -41,6 +42,7 @@ import { HtmlTransformPipe } from '../pipes/html-transform.pipe';
     ReplicationSchemeComponent,
     HsPromptModalComponent,
     HistoryPromptModalComponent,
+    BxPromptModalComponent,
     AppraiseDetailComponent,
     OrderDetailComponent,
     DateTransformPipe,
@@ -74,6 +76,7 @@ import { HtmlTransformPipe } from '../pipes/html-transform.pipe';
     ReplicationSchemeComponent,
     HsPromptModalComponent,
     HistoryPromptModalComponent,
+    BxPromptModalComponent,
     AppraiseDetailComponent,
     OrderDetailComponent,
     CommonModule,

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

@@ -3,6 +3,9 @@
   width: 100%;
   height: 100%;
   display: flex;
+  .bxForm{
+    margin-top: 16px;
+  }
   .yyTime {
     display: flex;
     align-items: center;
@@ -933,6 +936,7 @@
                 color: #333;
                 border: 1px solid #e5e9ed;
                 .text {
+                  width: 100%;
                   text-align: center;
                   position: absolute;
                   left: 50%;

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

@@ -119,7 +119,7 @@ export class HushijiandanComponent implements OnInit {
           });
           this.mainService
             .coopConfig("setOrders", postData)
-            .subscribe((result) => {});
+            .subscribe((result) => { });
         }, 500);
       },
     };
@@ -230,6 +230,27 @@ export class HushijiandanComponent implements OnInit {
   specimenWorkOrderMsg: any = {}; //急标普标数量&信息
   jpDrugsWKOMsg: any = {}; //药品静配提示信息
 
+  // 获取报修区域（所属院区）
+  areas: any = [];//区域（所属院区）列表
+  getArea() {
+    this.areas = [];
+    this.mainService.fetchListBx('area', { idx: 0, sum: 1000 }).subscribe((result: any) => {
+      if (result.status == 200) {
+        this.areas = result.list;
+      }
+    });
+  }
+  //根据区域(所属院区)获取地点(楼栋)
+  places: any = [];//地点（楼栋）列表
+  getPlace(buildingId) {
+    this.places = [];
+    this.mainService.fetchListBx('place', { idx: 0, sum: 1000, place: { area: { id: buildingId } } }).subscribe((result: any) => {
+      if (result.status == 200) {
+        this.places = result.list;
+      }
+    });
+  }
+
   btnLoading: boolean = false; //确认按钮loading状态
   workOrderRemark = ""; //备注
   workOrderRemark1 = ""; //备注
@@ -379,6 +400,17 @@ export class HushijiandanComponent implements OnInit {
   closeModelHistory(e) {
     this.historyPromptModalShow = JSON.parse(e).show;
   }
+  // 查看报修信息弹窗
+  bxPromptModalShow = false; //弹窗开关
+  bData = ""; //查看详情携带所有数据
+  viewBx(data) {
+    this.bData = data;
+    this.bxPromptModalShow = true;
+  }
+  // 关闭报修信息弹窗
+  closeModelBx(e) {
+    this.bxPromptModalShow = JSON.parse(e).show;
+  }
   // 护士端患者信息列表，鼠标移入姓名展示最近一条检查信息
   recentInfo = "";
   recentInfoTimer = null;
@@ -647,11 +679,11 @@ export class HushijiandanComponent implements OnInit {
       data,
       data.focusPatient === 0
         ? "您将设置患者【" +
-            data.patientName +
-            "】为重点关注，后期此患者的相关检查将会自动建单通知支助中心"
+        data.patientName +
+        "】为重点关注，后期此患者的相关检查将会自动建单通知支助中心"
         : "您将取消设置患者【" +
-            data.patientName +
-            "】为重点关注，后期此患者的相关检查将不会自动建单通知支助中心"
+        data.patientName +
+        "】为重点关注，后期此患者的相关检查将不会自动建单通知支助中心"
     );
   }
   // 通用提示模态框
@@ -1066,6 +1098,15 @@ export class HushijiandanComponent implements OnInit {
       targetOffice: [null, [this.targetOfficeShortCutValidator1]],
       originOffice: [null, [this.originOfficeShortCutValidator1]],
     });
+    //新增报修
+    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]],
+      content: [null, [Validators.required]],
+    });
   }
   //创建自定义校验规则dateValidator，用于复选框组校验时调用。
   // 起点科室校验
@@ -1871,6 +1912,7 @@ export class HushijiandanComponent implements OnInit {
       });
   }
   shortcutForm: FormGroup; //一键发起建单表单
+  bxForm: FormGroup; //报修表单
   // 一键建单校验
   // 起点科室校验
   originOfficeShortCutValidator = (
@@ -2232,7 +2274,63 @@ export class HushijiandanComponent implements OnInit {
     this.checkedTableType = type;
     if (type === "historySpecimen") {
       this.getHistorySpecimen();
-    }
+    } else if (type === "bxlb") {
+      this.getBxlb();
+    } else if (type === "kjbx") {
+      // 获取报修的区域(所属院区)
+      this.getArea();
+      this.bxForm.controls.name.setValue(this.loginUser.name);
+      this.bxForm.controls.phone.setValue(this.loginUser.phone);
+      this.bxForm.controls.hospital.setValue(null);
+      this.bxForm.controls.building.setValue(null);
+      this.bxForm.controls.address.setValue(null);
+      this.bxForm.controls.content.setValue(null);
+    }
+  }
+  //提交报修
+  bxLoading = false;
+  submitBxForm() {
+    for (const i in this.bxForm.controls) {
+      this.bxForm.controls[i].markAsDirty();
+      this.bxForm.controls[i].updateValueAndValidity();
+    }
+    this.bxLoading = true;
+    this.mainService.wxbx({}).subscribe(result => {
+      if ((result as any).status = 200) {
+        let bxcode = (result as any).data;//生成微信报修号
+        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,
+            description: this.bxForm.controls.content.value,
+            placeId: this.bxForm.controls.building.value,
+            requester: { account: this.loginUser.account },
+            sourceType: "wechatUserIncident",
+            fileUrl: "url",
+            bxcode
+          },
+          loginUser: {
+            account: this.loginUser.account,
+            id: this.loginUser.id
+          }
+        };
+        this.mainService.addWxIncident(postData).subscribe(res => {
+          this.bxLoading = false;
+          if ((res as any).state = 200) {
+            this.showPromptModal("提交", true, "");
+            this.checkTable('bxlb');
+          }else{
+            this.showPromptModal("提交", false, "");
+          }
+        })
+      }else{
+        this.bxLoading = false;
+        this.showPromptModal("提交", false, "");
+      }
+    })
   }
 
   // 意见箱表格数据
@@ -2306,6 +2404,33 @@ export class HushijiandanComponent implements OnInit {
         this.historySpecimenListLength = data.totalNum || 0;
       });
   }
+  // 报修列表查询表格数据
+  bxlbList: any = [];
+  bxlbPageIndex: number = 1; //表格当前页码
+  bxlbPageSize: number = 10; //表格每页展示条数
+  bxlbListLength: number = 10; //表格总数据量
+  bxlbCodeSearchInp: string = ""; //标本编码搜索
+  bxlbParentSearchInp: string = ""; //患者信息搜索
+  bxlbLoading = false;
+  getBxlb(idx?) {
+    if (idx) {
+      this.bxlbPageIndex = 1;
+    }
+    let current = JSON.parse(localStorage.getItem("user"));
+    this.bxlbLoading = true;
+    this.mainService
+      .listWxIncident({
+        "assignee": current.user.account,
+        "state": 0,
+        "idx": this.bxlbPageIndex - 1,
+        "sum": this.bxlbPageSize
+      })
+      .subscribe((data: any) => {
+        this.bxlbLoading = false;
+        this.bxlbList = data.data || [];
+        this.bxlbListLength = data.resultCount || 0;
+      });
+  }
 
   // 意见箱-查看模态框
   adviceModal: boolean = false;
@@ -2433,7 +2558,7 @@ export class HushijiandanComponent implements OnInit {
           if (
             that.adviceList.length == 1 &&
             that.advicePageIndex ==
-              Math.ceil(that.adviceListLength / that.advicePageSize)
+            Math.ceil(that.adviceListLength / that.advicePageSize)
           ) {
             that.adviceListLength--;
             that.advicePageIndex = Math.ceil(