巡检计划

src/app/share/inspection-address-tag-prompt-modal/inspection-address-tag-prompt-modal.component.ts

@@ -49,6 +49,7 @@ export class InspectionAddressTagPromptModalComponent implements OnInit {
     let postData = {
       tag: {
         hosId: this.currentHospital.id,
+        modelType: { value: 'inspection' },
       },
       idx: 0,
       sum: 50,
@@ -88,7 +89,8 @@ export class InspectionAddressTagPromptModalComponent implements OnInit {
         this.isLoading = false;
         console.log(result);
         if(result.status == 200){
-
+          this.tagListCopy.unshift(result.data)
+          console.log(this.tagListCopy);
         } else if (result.status == 10001){
           // 名称重复
           this.tagListCopy.unshift(result.data)

src/app/share/inspection-template-prompt-modal/inspection-template-prompt-modal.component.html

@@ -0,0 +1,87 @@
+<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="list-template content">
+      <div class="list-template__content">
+        <!-- <div class="list-template__top" nz-row>
+          <div nz-col nzXl='19' class="list-template__searchBox">
+            <div class="list-template__searchItem">
+              <span class="label">科室名称</span>：
+              <input nz-input class="formItem" placeholder="请输入科室名称" [(ngModel)]="searchDto.dept" />
+            </div>
+            <div class="list-template__searchItem">
+              <span class="label">科室类型</span>：
+              <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch
+                nzAllowClear nzPlaceHolder="请选择科室类型" [(ngModel)]="searchDto.deptTypeId">
+                <ng-container *ngFor="let option of deptTypeList">
+                  <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 class="list-template__searchItem">
+              <span class="label">楼栋</span>：
+              <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+                (nzOnSearch)="changeInp('search', 'building', $event)" nzAllowClear nzPlaceHolder="请选择楼栋" [(ngModel)]="searchDto.buildId">
+                <ng-container *ngFor="let option of buildingSearchList">
+                  <nz-option *ngIf="!isLoading" [nzLabel]="option.buildingName" [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 nz-col nzLg="5" class="list-template__btns">
+            <button nz-button class="btn default mr8" (click)='search()'>搜索</button>
+            <button nz-button class="btn default mr8" (click)='reset()'>重置</button>
+          </div>
+        </div> -->
+        <div class="list-template__bottom">
+          <nz-table class="hospitalTable" [nzData]="historySpecimenList" nzSize="middle" [nzShowPagination]="false"
+            [nzLoading]="hsLoading" [nzScroll]="{ y: '506px' }">
+            <thead>
+              <tr class="thead">
+                <th nzWidth="20%">模板名称</th>
+                <th nzWidth="60%">操作时间</th>
+                <th nzWidth="20%">操作</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of historySpecimenList;let i = index;">
+                <td>{{ data.name }}</td>
+                <td>{{ data.addTime | date: 'yyyy-MM-dd HH:mm' }}</td>
+                <td>
+                  <div class="coop">
+                    <span (click)="bringIn(data)">引入</span>
+                    <span (click)="showDelModal(data,'您确认要删除此模板吗？','删除','del')">删除</span>
+                  </div>
+                </td>
+              </tr>
+            </tbody>
+          </nz-table>
+          <div class="list-template__pagination">
+            <nz-pagination [(nzPageIndex)]="historySpecimenPageIndex" [(nzTotal)]="historySpecimenListLength"
+              [(nzPageSize)]="historySpecimenPageSize" (nzPageIndexChange)="getList()"
+              (nzPageSizeChange)="getList()" nzShowSizeChanger [nzPageSizeOptions]="[10,100]">
+            </nz-pagination>
+          </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>
+<!-- 模态框 -->
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+(confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>

src/app/share/inspection-template-prompt-modal/inspection-template-prompt-modal.component.less

@@ -0,0 +1,190 @@
+@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;
+      }
+    }
+  }
+
+  .coop {
+    text-align: center;
+    button{
+      color: #333;
+    }
+    span,button {
+      display: inline-block;
+      padding: 0 8px;
+      cursor: pointer;
+      position: relative;
+
+      &::after {
+        content: "|";
+        position: absolute;
+        top: 0;
+        right: 0;
+      }
+
+      &:hover,
+      &:active {
+        color: @primary-color;
+      }
+
+      &:nth-last-child(1) {
+        &::after {
+          content: "";
+        }
+      }
+    }
+  }
+
+  .modalBody {
+    width: 950px;
+    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;
+      }
+    }
+
+    .list-template{
+      padding: 0!important;
+    }
+
+    .list-template__bottom{
+      border: none!important;
+    }
+
+    .content {
+      min-height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      // align-items: center;
+      &.content-search {
+        min-height: 147px;
+        justify-content: start;
+        .defeat-search {
+          width: 100%;
+          height: 52px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          border-bottom: solid 1px #e5e9ed;
+          em {
+            color: #666;
+            font-style: normal;
+          }
+        }
+        .form {
+          width: 100%;
+          padding: 0 16px;
+          .ant-form-item-label,
+          .ant-form-explain {
+            text-align: left !important;
+          }
+        }
+      }
+
+      div {
+        text-align: right;
+        margin: 0;
+      }
+      button{
+        margin-top: 0!important;
+        margin-left: 0!important;
+      }
+      .formItem{
+        text-align: left!important;
+      }
+    }
+
+    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/inspection-template-prompt-modal/inspection-template-prompt-modal.component.ts

@@ -0,0 +1,225 @@
+import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
+import { MainService } from '../../services/main.service';
+import { ToolService } from 'src/app/services/tool.service';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+import { NzMessageService } from 'ng-zorro-antd';
+
+@Component({
+  selector: 'app-inspection-template-prompt-modal',
+  templateUrl: './inspection-template-prompt-modal.component.html',
+  styleUrls: ['./inspection-template-prompt-modal.component.less']
+})
+export class InspectionTemplatePromptModalComponent implements OnInit {
+  // 切换科室，切换弹窗
+  hsLoading = false;
+  historySpecimenList: any = [];
+  historySpecimenPageIndex: number = 1;//表格当前页码
+  historySpecimenPageSize: number = 10;//表格每页展示条数
+  historySpecimenListLength: number = 0;//表格总数据量
+
+  currentHospital; //当前院区
+  searchDto: any = {};
+
+  changeInpSubject = new Subject(); //防抖
+
+  @Input() show: Boolean;
+
+  @Output() confirmModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) { }
+
+  ngOnInit() {
+    //防抖
+    this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+      if(v[1] === 'building'){
+        this.getBuildings(v[0], v[2]);
+      }
+    });
+    this.currentHospital = this.tool.getCurrentHospital();
+    this.getList();
+    // this.getBuildings('search', '');
+    // this.getDeptTypeList();
+  }
+
+  // 搜索
+  search() {
+    this.getList();
+  }
+  // 重置
+  reset() {
+    this.searchDto = {};
+    this.mapOfCheckedId = {};
+    this.checkedDepIds = [];
+    this.isAllDisplayDataChecked = false;
+    this.getList(1);
+  }
+
+  //获取科室类型
+  deptTypeList:any[] = [];
+  getDeptTypeList() {
+    this.mainService
+    .getDictionary('list', 'dept_type')
+    .subscribe((data) => {
+      this.deptTypeList = data || [];
+    });
+  }
+
+  // 边输边搜节流阀
+  isLoading = false;
+  changeInp(type, model, e) {
+    this.isLoading = true;
+    this.changeInpSubject.next([type, model, e]);
+  }
+
+  // 获取楼栋
+  buildingSearchList: any = [];
+  getBuildings(type, keyword, init = false) {
+    let postData = {
+      building: {
+        simpleQuery: true,
+        buildingName: keyword,
+        cascadeHosId: this.currentHospital.id,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "building", postData)
+      .subscribe((data) => {
+        this.buildingSearchList = data.list;
+        this.isLoading = false;
+      });
+  }
+
+  // 选中表格单列
+  mapOfCheckedId: { [key: string]: boolean } = {};
+  checkedDepIds = []; //已选中单列id
+  refreshStatus(): void {
+    let listOfData = this.historySpecimenList;
+    this.isAllDisplayDataChecked = listOfData.every(
+      (item) => this.mapOfCheckedId[item.id]
+    );
+    let arr = [];
+    for (var k in this.mapOfCheckedId) {
+      if (this.mapOfCheckedId[k]) {
+        arr.push(Number(k));
+      }
+    }
+    this.checkedDepIds = arr;
+  }
+  // 整行操作
+  selectedListData(data) {
+    this.mapOfCheckedId[data.id] = !this.mapOfCheckedId[data.id];
+    this.refreshStatus();
+  }
+  // 全选
+  isAllDisplayDataChecked = false; //当前页是否全选
+  checkAll(value: boolean): void {
+    this.historySpecimenList.forEach((item) => {
+      this.mapOfCheckedId[item.id] = value;
+    });
+    this.refreshStatus();
+  }
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+  }
+  // 获取列表数据
+  getList(idx?) {
+    if (idx) {
+      this.historySpecimenPageIndex = 1;
+    }
+    let postData = {
+      idx: this.historySpecimenPageIndex - 1,
+      sum: this.historySpecimenPageSize,
+      inspectionTemplate: {
+        hosId: this.currentHospital.id,
+      }
+    }
+    this.hsLoading = true;
+    this.mainService.getFetchDataList("simple/data", "inspectionTemplate", postData).subscribe(data => {
+      this.hsLoading = false;
+      this.historySpecimenList = data.list || [];
+      this.historySpecimenListLength = data.totalNum || 0;
+    })
+  }
+  // 添加表单提交
+  btnLoading: boolean = false; //提交按钮loading状态
+  submitForm(): void {
+    console.log(this.checkedDepIds);
+    if(this.checkedDepIds.length === 0){
+      this.message.warning('请选择科室');
+      return;
+    }
+    this.confirmModelHs.emit(this.checkedDepIds);//emits(向上弹射)事件
+  }
+
+  // 引入
+  bringIn(data){
+    this.confirmModelHs.emit(data.id);//emits(向上弹射)事件
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getList();
+  }
+
+  delModal: boolean = false; //删除模态框
+  tipsMsg1: string; //提示框信息
+  tipsMsg2: string; //操作后信息
+  confirmDelType: string; //确认的类型（启用/停用，删除）
+  coopData: any; //当前操作列
+  showDelModal(
+    data,
+    tipsMsg1: string,
+    tipsMsg2: string,
+    type: string,
+  ) {
+    this.confirmDelType = type;
+    this.delModal = true;
+    this.coopData = data;
+    this.tipsMsg1 = tipsMsg1;
+    this.tipsMsg2 = tipsMsg2;
+  }
+  // 隐藏删除框
+  hideDelModal() {
+    this.delModal = false;
+  }
+  // 确认删除
+  confirmDel() {
+    this.btnLoading = true;
+    if (this.confirmDelType === "del") {
+      //删除
+      this.mainService
+        .simplePost("rmvData", "inspectionTemplate", [this.coopData.id])
+        .subscribe((data) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          if (data.status == 200) {
+            this.showPromptModal(this.tipsMsg2, true, "");
+          } else {
+            this.showPromptModal(this.tipsMsg2, false, data.msg);
+          }
+        });
+    }
+  }
+}
+
+

src/app/share/share.module.ts

@@ -13,6 +13,7 @@ import { HsPromptModalComponent } from './hs-prompt-modal/hs-prompt-modal.compon
 import { HistoryPromptModalComponent } from './history-prompt-modal/history-prompt-modal.component';
 import { InspectionConfigurationItemPromptModalComponent } from './inspection-configuration-item-prompt-modal/inspection-configuration-item-prompt-modal.component';
 import { InspectionAddressDepartmentPromptModalComponent } from './inspection-address-department-prompt-modal/inspection-address-department-prompt-modal.component';
+import { InspectionTemplatePromptModalComponent } from './inspection-template-prompt-modal/inspection-template-prompt-modal.component';
 import { InspectionAddressTagPromptModalComponent } from './inspection-address-tag-prompt-modal/inspection-address-tag-prompt-modal.component';
 import { DetailSampleComponent } from './detail-sample/detail-sample.component';
 import { DetailPatientsComponent } from './detail-patients/detail-patients.component';
@@ -67,6 +68,7 @@ import { OutgoingRecordDetailComponent } from './outgoing-record-detail/outgoing
     HistoryPromptModalComponent,
     InspectionConfigurationItemPromptModalComponent,
     InspectionAddressDepartmentPromptModalComponent,
+    InspectionTemplatePromptModalComponent,
     InspectionAddressTagPromptModalComponent,
     BusinessDataDetailModalComponent,
     RelationTransDetailModalComponent,
@@ -125,6 +127,7 @@ import { OutgoingRecordDetailComponent } from './outgoing-record-detail/outgoing
     HistoryPromptModalComponent,
     InspectionConfigurationItemPromptModalComponent,
     InspectionAddressDepartmentPromptModalComponent,
+    InspectionTemplatePromptModalComponent,
     InspectionAddressTagPromptModalComponent,
     BusinessDataDetailModalComponent,
     RelationTransDetailModalComponent,

src/app/share/template-name/template-name.component.html

@@ -3,12 +3,13 @@
     <div class="title">保存并存为模板<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
     </div>
     <div class="content">
+      <div class="tips">您确认将本次相关配置存为模板吗？</div>
       <form nz-form [formGroup]="validateForm" class="addForm">
         <nz-form-item>
-          <nz-form-label class="line_height_normal" [nzSpan]="5" nzRequired nzFor="name">名&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;称</nz-form-label>
-          <nz-form-control [nzSpan]="19" nzErrorTip="请输入名称!">
+          <nz-form-label class="line_height_normal" [nzSpan]="5" nzRequired nzFor="name">模板名称</nz-form-label>
+          <nz-form-control [nzSpan]="19" nzErrorTip="请输入模板名称!">
             <nz-input-group>
-              <textarea formControlName="name" nz-input placeholder="请输入名称"></textarea>
+              <textarea formControlName="name" nz-input placeholder="请输入模板名称"></textarea>
             </nz-input-group>
           </nz-form-control>
         </nz-form-item>

src/app/share/template-name/template-name.component.less

@@ -39,6 +39,10 @@
       border-radius: 5px;
       overflow: hidden;
       margin-top: 12px;
+      
+      .tips{
+        margin-bottom: 19px;
+      }
 
       div {
         text-align: center;

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

@@ -301,6 +301,7 @@ export class InspectionAddressComponent implements OnInit {
     let postData = {
       tag: {
         hosId: this.currentHospital.id,
+        modelType: { value: 'inspection' },
       },
       idx: 0,
       sum: 50,
@@ -454,7 +455,8 @@ export class InspectionAddressComponent implements OnInit {
         this.isLoading = false;
         console.log(result);
         if(result.status == 200){
-
+          this.tagListCopy.unshift(result.data)
+          console.log(this.tagListCopy);
         } else if (result.status == 10001){
           // 名称重复
           this.tagListCopy.unshift(result.data)
@@ -586,6 +588,7 @@ export class InspectionAddressComponent implements OnInit {
       this.promptModalShow = true;
     }, 100);
     this.getList(0);
+    this.getTags('add', '');
   }
 
   delModal: boolean = false; //删除模态框

src/app/views/inspection-plan-config/inspection-plan-config.component.html

@@ -2,56 +2,10 @@
   <div class="tagsAndTemplete">
     <div class="tags">
       <i class="icon_transport transport-24gf-tags"></i>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
-      <span>数量核对</span>
+      <span *ngFor="let tag of tagList" (click)="clickTag(tag)">{{ tag.name }}</span>
     </div>
     <div class="template">
-      <button nz-button class="btn default">引入模板</button>
+      <button nz-button class="btn default" (click)="showInspectionTemplate()">引入模板</button>
     </div>
   </div>
 
@@ -133,5 +87,13 @@
 (submitFormHand)="submitFormHand($event)"
 (cancelFlagHand)="cancelFlagHand($event)"
 *ngIf="templateFlag"></app-template-name>
+
+<!-- 引入模板 -->
+<app-inspection-template-prompt-modal
+  *ngIf="inspectionTemplatePromptModalShow"
+  [show]="inspectionTemplatePromptModalShow"
+  (closeModelHs)="closeModelInspectionTemplate($event)"
+  (confirmModelHs)="confirmModelInspectionTemplate($event)"
+></app-inspection-template-prompt-modal>
 <!-- 遮罩 -->
 <app-mask *ngIf="maskFlag"></app-mask>

src/app/views/inspection-plan-config/inspection-plan-config.component.less

@@ -20,7 +20,6 @@
         flex: 1;
         padding: 16px 64px;
         display: flex;
-        justify-content: space-between;
         align-items: center;
         flex-wrap: wrap;
         gap: 16px;
@@ -62,6 +61,7 @@
       background: #F9FAFB;
       border: 1px solid #EEF3F9;
       border-radius: 16px;
+      margin-top: 16px;
       .contentInner{
         flex: 1;
         display: flex;

src/app/views/inspection-plan-config/inspection-plan-config.component.ts

@@ -6,7 +6,7 @@ import uniqBy from 'lodash-es/uniqBy'
 import cloneDeep from 'lodash-es/cloneDeep'
 import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
 import { Router, ActivatedRoute } from '@angular/router';
-import { Subject } from 'rxjs';
+import { Subject, forkJoin } from 'rxjs';
 import { debounceTime } from 'rxjs/operators';
 
 @Component({
@@ -52,10 +52,45 @@ export class InspectionPlanConfigComponent implements OnInit, AfterViewInit {
       }
     });
     this.currentHospital = this.tool.getCurrentHospital();
-    this.getPlanDetail();
-    this.getAddressList();
     this.getUsers();
     this.getGroups();
+    this.getInfo();
+  }
+
+  getInfo(){
+    let getPlanDetail$ = this.getPlanDetail();
+    let getAddressList$ = this.getAddressList();
+    let getTagList$ = this.getTagList();
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    forkJoin(getPlanDetail$, getAddressList$, getTagList$).subscribe((res:any) => {
+      this.message.remove(this.maskFlag);
+      this.maskFlag = false;
+      // getPlanDetail
+      {
+        this.planDetail = res[0].data || {};
+        let nodeList = res[0].data ? (res[0].data.nodeList || []) : [];
+        this.generateTree(nodeList);
+      }
+      // getAddressList
+      {
+        if (res[1].status == 200) {
+          let addressList = res[1].list || [];
+          let buildingAndAddressList = this.generateList(addressList);
+          this.buildingAndAddressList = this.tool.tranListToTreeData(buildingAndAddressList, undefined, "parentId", "key");
+          console.log(this.buildingAndAddressList);
+        }else{
+          this.message.error(res[1].msg || "请求数据失败");
+        }
+      }
+      // getTagList
+      {
+        if (res[2].status == 200) {
+          this.tagList = res[2].list || [];
+        }
+      }
+    });
   }
 
   // 表格数据
@@ -70,43 +105,8 @@ export class InspectionPlanConfigComponent implements OnInit, AfterViewInit {
         hosId: this.currentHospital.id,
       },
     };
-    this.isLoading = true;
-    this.mainService
-      .getFetchDataList("simple/data", "inspectionNode", data)
-      .subscribe((data) => {
-        this.isLoading = false;
-        if (data.status == 200) {
-          let addressList = data.list || [];
-          // 楼栋
-          let buildingList = addressList.map((item) => {
-            return {
-              title: item.buildingDTO.buildingName,
-              key: 'b-' + item.buildingDTO.id,
-              children: [],
-              selectable: false,
-              hosId: this.currentHospital.id,
-            }
-          })
-          buildingList = uniqBy(buildingList, "key");
-          // 巡检点
-          addressList = addressList.map((item) => {
-            return {
-              title: item.name,
-              key: item.id.toString(),
-              parentId: 'b-' + item.buildingDTO.id,
-              isLeaf: true,
-              selectable: false,
-              hosId: this.currentHospital.id,
-            }
-          })
-          let buildingAndAddressList = buildingList.concat(addressList);
-          console.log(buildingAndAddressList);
-          this.buildingAndAddressList = this.tool.tranListToTreeData(buildingAndAddressList, undefined, "parentId", "key");
-          console.log(this.buildingAndAddressList);
-        }else{
-          this.message.error(data.msg || "请求数据失败");
-        }
-      });
+
+    return this.mainService.getFetchDataList("simple/data", "inspectionNode", data)
   }
 
   nzCheck(event: NzFormatEmitEvent): void {
@@ -188,7 +188,7 @@ export class InspectionPlanConfigComponent implements OnInit, AfterViewInit {
         menuId: 414,
       },
       idx: 0,
-      sum: 20,
+      sum: 10,
     };
     this.mainService
       .getFetchDataList("data", "user", postData)
@@ -208,7 +208,7 @@ export class InspectionPlanConfigComponent implements OnInit, AfterViewInit {
         type: 1,
       },
       idx: 0,
-      sum: 20,
+      sum: 10,
     };
     this.mainService
       .getFetchDataList("data", "group2", postData)
@@ -226,36 +226,129 @@ export class InspectionPlanConfigComponent implements OnInit, AfterViewInit {
     this.activeAddress = event.node;
     this.activeAddressId = event.selectedKeys[0];
     this.activeAddress.origin.radioValue = event.node.origin.userId ? 1 : (event.node.origin.groupId ? 2 : undefined);
+    if(event.node.origin.userId){
+      let flag = this.userList.find(v => v.id === event.node.origin.userId);
+      if(!flag){
+        this.userList.unshift({ id: event.node.origin.userId, name: event.node.origin.userName })
+      }
+    }
+
+    if(event.node.origin.groupId){
+      let flag = this.groupList.find(v => v.id === event.node.origin.groupId);
+      if(!flag){
+        this.groupList.unshift({ id: event.node.origin.groupId, groupName: event.node.origin.groupName })
+      }
+    }
   }
 
   // 计划详情
   planDetail:any = {};
-  nodeList:any[] = [];
   getPlanDetail(){
+    return this.mainService.getFetchData("simple/data", "inspection", +this.route.snapshot.paramMap.get('id'));
+  }
+
+  // 标签
+  tagList:any = [];
+  getTagList(){
+    let postData = {
+      idx: 0,
+      sum: 99,
+      tag: {
+        hosId: this.currentHospital.id,
+        onlyBind: 1,
+        modelType: { value: 'inspection' },
+      }
+    }
+    return this.mainService.getFetchDataList("simple/data", "tag", postData)
+  }
+
+  // 点击标签
+  clickTag(tag){
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData = {
+      inspectionNode: {
+        hosId: this.currentHospital.id,
+        tagIds: tag.id.toString(),
+      },
+      idx: 0,
+      sum: 9999,
+    };
     this.mainService
-      .getFetchData("simple/data", "inspection", +this.route.snapshot.paramMap.get('id'))
-      .subscribe((data) => {
-        this.planDetail = data.data || {};
-        let nodeList = data.data ? (data.data.nodeList || []) : [];
-        this.generateTree(nodeList);
+      .getFetchDataList("simple/data", "inspectionNode", postData)
+      .subscribe((result) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        let addressList = result.list || [];
+        let buildingAndAddressListCopy = this.generateList(addressList, true);
+        console.log(buildingAndAddressListCopy);
+        this.defaultCheckedKeys = buildingAndAddressListCopy.map(v => v.key).filter(v => !(/b-/.test(v)));
+        this.buildingAndAddressListCopy = this.tool.tranListToTreeData(buildingAndAddressListCopy, undefined, "parentId", "key");
+        console.log(this.buildingAndAddressListCopy);
       });
   }
 
   // 回显树形结构
   generateTree(nodeList){
-    console.log('nodeList:' + nodeList);
+    console.log('nodeList:', nodeList);
     let buildingAndAddressList = nodeList.map(v => ({
       title: v.nodeId ? v.inspectionNodeDTO.name : v.buildingDTO.buildingName,
       key: v.nodeId ? `${v.nodeId}` : `b-${v.buildId}`,
-      parentId: v.buildId ? `b-${v.buildId}` : undefined,
+      parentId: v.nodeId ? `b-${v.buildId}` : undefined,
+      hosId: v.hosId,
+      children: [],
+      selectable: false,
+      isLeaf: Boolean(v.nodeId),
+      checked: false,
+    }));
+    this.defaultCheckedKeys = buildingAndAddressList.map(v => v.key).filter(v => !(/b-/.test(v)));
+    let buildingAndAddressListCopy = nodeList.map(v => ({
+      title: v.nodeId ? v.inspectionNodeDTO.name : v.buildingDTO.buildingName,
+      key: v.nodeId ? `${v.nodeId}` : `b-${v.buildId}`,
+      parentId: v.nodeId ? `b-${v.buildId}` : undefined,
       userId: v.userId,
+      userName: v.userDTO ? v.userDTO.name : undefined,
       groupId: v.groupId,
+      groupName: v.groupDTO ? v.groupDTO.name : undefined,
       hosId: v.hosId,
       children: [],
-      selectable: false,
+      selectable: true,
       isLeaf: Boolean(v.nodeId),
+      checked: false,
     }));
-    console.log('buildingAndAddressList:' + buildingAndAddressList);
+    console.log('buildingAndAddressList:', buildingAndAddressList);
+    this.buildingAndAddressListCopy = this.tool.tranListToTreeData(buildingAndAddressListCopy, undefined, "parentId", "key");
+    console.log('this.buildingAndAddressListCopy', this.buildingAndAddressListCopy);
+  }
+
+  // 处理巡检点数据
+  generateList(addressList, selectableFlag = false){
+    // 楼栋
+    let buildingList = addressList.map((item) => {
+      return {
+        title: item.buildingDTO.buildingName,
+        key: 'b-' + item.buildingDTO.id,
+        children: [],
+        selectable: selectableFlag,
+        hosId: this.currentHospital.id,
+      }
+    })
+    buildingList = uniqBy(buildingList, "key");
+    // 巡检点
+    addressList = addressList.map((item) => {
+      return {
+        title: item.name,
+        key: item.id.toString(),
+        parentId: 'b-' + item.buildingDTO.id,
+        isLeaf: true,
+        selectable: selectableFlag,
+        hosId: this.currentHospital.id,
+      }
+    })
+    let buildingAndAddressList = buildingList.concat(addressList);
+    console.log(buildingAndAddressList);
+    return buildingAndAddressList;
   }
 
   // 填写模板名称-确定
@@ -295,7 +388,7 @@ export class InspectionPlanConfigComponent implements OnInit, AfterViewInit {
           this.message.success("保存成功");
           this.router.navigateByUrl("/main/inspectionPlan");
         } else {
-          this.message.success(result.msg || '保存失败');
+          this.message.error(result.msg || '保存失败');
         }
       });
   }
@@ -324,7 +417,65 @@ export class InspectionPlanConfigComponent implements OnInit, AfterViewInit {
 
   // 保存
   save(){
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    let nodeList = this.tool.tranTreeToListData(this.buildingAndAddressListCopy).map(v => ({
+      nodeId: v.parentId ? Number(v.key) : undefined,
+      userId: v.userId,
+      groupId: v.groupId,
+      hosId: v.hosId,
+      buildId: v.parentId ? Number(v.parentId.replace(/b-/, '')): Number(v.key.replace(/b-/, '')),
+    }));
+    console.log(nodeList);
     console.log('保存');
+    let postData = {
+      ...this.planDetail,
+      nodeList,
+    };
+    console.log(postData);
+    this.mainService
+      .simplePost("addData", "inspection", postData)
+      .subscribe((result) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
+        if (result.status == 200) {
+          this.message.success("保存成功");
+          this.router.navigateByUrl("/main/inspectionPlan");
+        } else {
+          this.message.error(result.msg || '保存失败');
+        }
+      });
+  }
+
+  // 引入模板
+  inspectionTemplatePromptModalShow = false;
+  showInspectionTemplate() {
+    this.inspectionTemplatePromptModalShow = true;
+  }
+  // 关闭弹窗
+  closeModelInspectionTemplate(e) {
+    this.inspectionTemplatePromptModalShow = JSON.parse(e).show;
+  }
+  // 确认弹窗
+  confirmModelInspectionTemplate(tempId) {
+    this.inspectionTemplatePromptModalShow = false;
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      inspectionTempNodes: {
+        tempId,
+      }
+    }
+    this.mainService.getFetchDataList("simple/data", "inspectionTempNodes", postData).subscribe((result:any) => {
+      this.message.remove(this.maskFlag);
+      this.maskFlag = false;
+      let nodeList = result.list || [];
+      this.generateTree(nodeList);
+    })
   }
 
   ngAfterViewInit(): void {

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

@@ -63,7 +63,7 @@
                 <span *ngIf="coopBtns.edit" (click)="edit(data)">编辑</span>
                 <span *ngIf="coopBtns.edit" (click)="planConfig(data)">配置</span>
                 <span *ngIf="coopBtns.isStartUp && data.planType.value != 'none' && (data.status.value == '2' || data.status.value == '3')" (click)="showDelModal(data.id, data.status.value == 2 ? '您确认要停止巡检计划吗？' : '您确认要启动巡检计划吗？', data.status.value == 2 ? '停用' : '启用', 'switch', data.status.value == 2)">{{data.status.value == 2 ? '停用' : '启用'}}</span>
-                <span *ngIf="coopBtns.executeNow && data.status.value != '1'" (click)="openExecModal(data)">执行一次</span>
+                <span *ngIf="coopBtns.executeNow && data.status.value != '1'" (click)="showDelModal(data.id, '您确认立即执行计划一次吗？确认后会立即生成计划内配置的巡检任务', '执行一次', 'once')">执行一次</span>
               </div>
             </td>
           </tr>
@@ -209,8 +209,5 @@
 </app-prompt-modal>
 <!-- 查看详情 -->
 <router-outlet></router-outlet>
-<!-- 立即执行 -->
-<app-dialog-delete [delModal]="execModal" (hideDelModalEvent)="closeExecModal()" [btnLoading]="btnLoading"
-  (confirmDelEvent)="confirmExec()" content="您确认立即执行计划一次吗？确认后会立即生成计划内配置的巡检任务"></app-dialog-delete>
 <!-- 遮罩 -->
 <app-mask *ngIf="maskFlag"></app-mask>

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

@@ -397,7 +397,6 @@ export class InspectionPlanComponent implements OnInit {
     }
     //执行时间 end
   }
-  // 立即执行
   coopItem: any = {};
   execModal: boolean = false;
   // 打开立即执行模态框
@@ -488,9 +487,31 @@ export class InspectionPlanComponent implements OnInit {
     } else if (this.confirmDelType === "switch") {
       //启用/停用
       this.mainService
-        .switchRoundRobin(
-          this.confirmDelIsSwitch ? "stop" : "active",
-          this.coopId
+        .inspectionPost(
+          'inspectionPublish',
+          {
+            inspectionId: this.coopId,
+            type: this.confirmDelIsSwitch ? "disable" : "active",
+          }
+        )
+        .subscribe((data) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          if (data.status == 200) {
+            this.showPromptModal(this.tipsMsg2, true, "");
+          } else {
+            this.showPromptModal(this.tipsMsg2, false, data.msg);
+          }
+        });
+    } else if (this.confirmDelType === "once") {
+      //执行一次
+      this.mainService
+        .inspectionPost(
+          'inspectionPublish',
+          {
+            inspectionId: this.coopId,
+            type: "executeOnece",
+          }
         )
         .subscribe((data) => {
           this.btnLoading = false;