巡检执行

src/app/share/inspection-execute-assign-prompt-modal/inspection-execute-assign-prompt-modal.component.html

@@ -0,0 +1,28 @@
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="deptFlag">
+  <div class="modalBody">
+    <div class="title">指派<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    </div>
+    <div class="content">
+      <form nz-form [formGroup]="validateForm" class="addForm">
+        <nz-form-item>
+          <nz-form-label [nzSpan]="5" nzRequired nzFor="userId">处理人</nz-form-label>
+          <nz-form-control [nzSpan]="19" nzErrorTip="请选择处理人!">
+            <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+              (nzOnSearch)="changeInp('user', $event)" nzAllowClear nzPlaceHolder="请选择处理人" formControlName="userId">
+              <ng-container *ngFor="let option of userList">
+                <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>
+          </nz-form-control>
+        </nz-form-item>
+      </form>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitForm()">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>

src/app/share/inspection-execute-assign-prompt-modal/inspection-execute-assign-prompt-modal.component.less

@@ -0,0 +1,128 @@
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+
+  .modalBody {
+    width: 350px;
+    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%;
+      height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      .tips{
+        text-indent: 2em;
+      }
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 16px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 19px 14px 0 14px;
+        max-height: 500px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              text-align: left;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button:nth-child(1) {
+        margin-right: 20px;
+      }
+    }
+  }
+}

src/app/share/inspection-execute-assign-prompt-modal/inspection-execute-assign-prompt-modal.component.ts

@@ -0,0 +1,91 @@
+import { Component, OnInit, Output, Input } from '@angular/core';
+import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { EventEmitter } from '@angular/core';
+import { MainService } from '../../services/main.service';
+import { NzMessageService } from 'ng-zorro-antd';
+import { ToolService } from 'src/app/services/tool.service';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+
+@Component({
+  selector: 'app-inspection-execute-assign-prompt-modal',
+  templateUrl: './inspection-execute-assign-prompt-modal.component.html',
+  styleUrls: ['./inspection-execute-assign-prompt-modal.component.less']
+})
+export class InspectionExecuteAssignPromptModalComponent implements OnInit {
+  @Output() submitFormHand = new EventEmitter();
+  @Output() deptFlagHand = new EventEmitter();
+  @Input() deptFlag: boolean = false;//模态框
+  loading = false;//获取科室的loading
+  validateForm: FormGroup;//表单
+  currentHospital; //当前院区
+
+  changeInpSubject = new Subject(); //防抖
+  constructor(
+    private fb: FormBuilder,
+    private mainService: MainService,
+    private message: NzMessageService,
+    private tool: ToolService,
+  ) { }
+
+  ngOnInit() {
+    //防抖
+    this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+      if(v[0] === 'user'){
+        this.getUsers(v[1]);
+      }
+    });
+    this.currentHospital = this.tool.getCurrentHospital();
+    this.getUsers();
+    this.initForm()
+  }
+  // 隐藏模态框
+  hideModal() {
+    this.deptFlagHand.emit(false)
+    this.initForm()
+  }
+  // 初始化新增form表单
+  initForm() {
+    this.validateForm = this.fb.group({
+      userId: [null, [Validators.required]]
+    });
+  }
+  // 边输边搜节流阀
+  changeInp(model, e) {
+    this.isLoading = true;
+    this.changeInpSubject.next([model, e]);
+  }
+  // 获取处理人
+  isLoading = false;
+  userList: any = [];
+  getUsers(keyword = '') {
+    let postData = {
+      user: {
+        hospital: { id: this.currentHospital.id },
+        name: keyword,
+        simpleQuery: true,
+        menuId: 414,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "user", postData)
+      .subscribe((data) => {
+        this.userList = data.list;
+        this.isLoading = false;
+      });
+  }
+
+  // 表单提交
+  submitForm(): void {
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty({ onlySelf: true });
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateForm.invalid) return;
+
+    this.submitFormHand.emit(this.validateForm.value.userId);
+  }
+}
+

src/app/share/share.module.ts

@@ -15,6 +15,7 @@ import { InspectionConfigurationItemPromptModalComponent } from './inspection-co
 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 { InspectionExecuteAssignPromptModalComponent } from './inspection-execute-assign-prompt-modal/inspection-execute-assign-prompt-modal.component';
 import { DetailSampleComponent } from './detail-sample/detail-sample.component';
 import { DetailPatientsComponent } from './detail-patients/detail-patients.component';
 import { DetailDrugComponent } from './detail-drug/detail-drug.component';
@@ -70,6 +71,7 @@ import { OutgoingRecordDetailComponent } from './outgoing-record-detail/outgoing
     InspectionAddressDepartmentPromptModalComponent,
     InspectionTemplatePromptModalComponent,
     InspectionAddressTagPromptModalComponent,
+    InspectionExecuteAssignPromptModalComponent,
     BusinessDataDetailModalComponent,
     RelationTransDetailModalComponent,
     BxPromptModalComponent,
@@ -129,6 +131,7 @@ import { OutgoingRecordDetailComponent } from './outgoing-record-detail/outgoing
     InspectionAddressDepartmentPromptModalComponent,
     InspectionTemplatePromptModalComponent,
     InspectionAddressTagPromptModalComponent,
+    InspectionExecuteAssignPromptModalComponent,
     BusinessDataDetailModalComponent,
     RelationTransDetailModalComponent,
     BxPromptModalComponent,

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

@@ -43,18 +43,10 @@
         </div>
       </div>
       <div nz-col nzLg="8" class="list-template__btns">
-        <button nz-button *ngIf="coopBtns.add" class="btn default" (click)="showInspectionAddressDepartment()">批量关联科室</button>
-        <div class="dropdown">
-          <button [disabled]="!checkedDepIds.length" nz-button class="btn default ml8" *ngIf="coopBtns.del || coopBtns.print || coopBtns.reset" (mouseenter)="showDropdown = (checkedDepIds.length ? true : false)" (mouseleave)="showDropdown = false">批量操作</button>
-          <div class="dropdown-content" [hidden]="!showDropdown" (mouseenter)="showDropdown = true" (mouseleave)="showDropdown = false">
-            <div class="dropdownItem" (click)="showDelModal(data,'删除后您配置的相关巡检计划，下次执行时不在生成巡检任务，您确认要删除吗？','删除','delList')" *ngIf="coopBtns.del">批量删除</div>
-            <div class="dropdownItem" *ngIf="coopBtns.print" (click)="print($event,true)">批量打印</div>
-            <div class="dropdownItem" *ngIf="coopBtns.reset" (click)="showDelModal(data,'您确认要重置二维码吗？','重置','resetList')">批量重置</div>
-          </div>
-        </div>
+        <button nz-button *ngIf="coopBtns.del" class="btn default" (click)="showDelModal(data,'您确认要删除选中的巡检任务吗？','删除','delList')">批量删除</button>
+        <button nz-button *ngIf="coopBtns.designate" class="btn default ml8" (click)="showInspectionExecuteAssign()">批量指派</button>
         <button nz-button class="btn default ml8" (click)='search()'>搜索</button>
         <button nz-button class="btn default ml8" (click)='reset()'>重置</button>
-        <button nz-button *ngIf="coopBtns.add" class="btn default ml8" (click)="addModal()">新增</button>
       </div>
     </div>
     <div class="list-template__bottom">
@@ -87,8 +79,9 @@
             <td>{{data.status?.name}}</td>
             <td>
               <div class="coop">
-                <span *ngIf="coopBtns.edit" (click)="edit(data)">编辑</span>
-                <span *ngIf="coopBtns.del" (click)="showDelModal(data,'删除后您配置的相关巡检计划，下次执行时不在生成巡检任务，您确认要删除吗？','删除','del')">删除</span>
+                <span *ngIf="coopBtns.look" (click)="edit(data)">查看</span>
+                <span *ngIf="coopBtns.designate && data.status.value == 1" (click)="showInspectionExecuteAssign(data)">指派</span>
+                <span *ngIf="coopBtns.del" (click)="showDelModal(data,'您确认要删除选中的巡检任务吗？','删除','del')">删除</span>
               </div>
             </td>
           </tr>
@@ -109,29 +102,14 @@
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
   [info]="promptInfo">
 </app-prompt-modal>
-<!-- 二维码打印 -->
-<div id="report" style="display: none">
-  <div *ngFor="let img of codes" style="display: inline-block;">
-    <img style="width: 200px;height:200px;" [src]="img.base64" alt="">
-    <p style="margin: 0;text-align: center; font-size: 20px;width: 200px;">{{img.name}}</p>
-  </div>
-</div>
-<!-- 批量关联科室 -->
-<app-inspection-address-department-prompt-modal
-  *ngIf="inspectionAddressDepartmentPromptModalShow"
-  [show]="inspectionAddressDepartmentPromptModalShow"
-  (closeModelHs)="closeModelInspectionAddressDepartment($event)"
-  (confirmModelHs)="confirmModelInspectionAddressDepartment($event)"
-></app-inspection-address-department-prompt-modal>
 
-<!-- 批量关联科室-标签 -->
-<app-inspection-address-tag-prompt-modal
-  [deptFlag]="inspectionAddressTagPromptModalShow"
-  [checkedDepIdsModel]="checkedDepIdsModel"
-  (submitFormHand)="confirmModelInspectionAddressTag($event)"
-  (deptFlagHand)="closeModelInspectionAddressTag($event)"
-  *ngIf="inspectionAddressTagPromptModalShow"
-></app-inspection-address-tag-prompt-modal>
+<!-- 指派 -->
+<app-inspection-execute-assign-prompt-modal
+  [deptFlag]="inspectionExecuteAssignPromptModalShow"
+  (submitFormHand)="confirmModelInspectionExecuteAssign($event)"
+  (deptFlagHand)="closeModelInspectionExecuteAssign($event)"
+  *ngIf="inspectionExecuteAssignPromptModalShow"
+></app-inspection-execute-assign-prompt-modal>
 
 <!-- 遮罩 -->
 <app-mask *ngIf="maskFlag"></app-mask>

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

@@ -63,100 +63,54 @@ export class InspectionExecuteComponent implements OnInit {
   // 初始化增删改按钮
   coopBtns: any = {};
 
-  // 批量关联科室
-  inspectionAddressDepartmentPromptModalShow = false; //标本历史记录弹窗开关
-  showInspectionAddressDepartment() {
-    this.inspectionAddressDepartmentPromptModalShow = true;
-  }
-  // 关闭弹窗
-  closeModelInspectionAddressDepartment(e) {
-    this.inspectionAddressDepartmentPromptModalShow = JSON.parse(e).show;
-  }
-  // 确认弹窗
-  checkedDepIdsModel = [];
-  confirmModelInspectionAddressDepartment(checkedDepIds) {
-    this.inspectionAddressDepartmentPromptModalShow = true;
-    this.checkedDepIdsModel = checkedDepIds;
-    console.log(checkedDepIds)
-    this.showInspectionAddressTag();
-  }
-
-  // 批量关联科室-标签
-  inspectionAddressTagPromptModalShow = false; //标本历史记录弹窗开关
-  showInspectionAddressTag() {
-    this.inspectionAddressTagPromptModalShow = true;
+  // 派单给人
+  inspectionExecuteAssignPromptModalShow = false;
+  showInspectionExecuteAssign(data?) {
+    this.coopData = data;
+    this.inspectionExecuteAssignPromptModalShow = true;
   }
   // 关闭弹窗
-  closeModelInspectionAddressTag(e) {
-    this.inspectionAddressTagPromptModalShow = JSON.parse(e).show;
+  closeModelInspectionExecuteAssign(e) {
+    this.inspectionExecuteAssignPromptModalShow = JSON.parse(e).show;
   }
   // 确认弹窗
   maskFlag: any = false;
-  confirmModelInspectionAddressTag(tags) {
+  confirmModelInspectionExecuteAssign(userId) {
     this.maskFlag = this.message.loading("正在加载中..", {
       nzDuration: 0,
     }).messageId;
-    this.inspectionAddressTagPromptModalShow = true;
-    console.log(this.checkedDepIdsModel, tags);
+    this.inspectionExecuteAssignPromptModalShow = true;
+    console.log(userId);
     let postData:any = {
-      deptIds: this.checkedDepIdsModel.toString(),
-      hosId: this.currentHospital.id,
-      tagIds: tags.toString(),
+      taskIds: this.coopData ? this.coopData.id.toString() : this.checkedDepIds.toString(),
+      userId,
     };
     console.log(postData);
     this.btnLoading = true;
     this.mainService
-      .inspectionPost("batchBindFormNode", postData)
+      .inspectionPost("batchAssignTask", postData)
       .subscribe((result) => {
         this.message.remove(this.maskFlag);
         this.maskFlag = false;
         this.btnLoading = false;
         if (result.status == 200) {
-          this.inspectionAddressDepartmentPromptModalShow = false;
-          this.inspectionAddressTagPromptModalShow = false;
+          this.inspectionExecuteAssignPromptModalShow = false;
           this.showPromptModal('操作', true, '');
-        } else if (result.status == 501) {
-          this.inspectionAddressDepartmentPromptModalShow = false;
-          this.inspectionAddressTagPromptModalShow = false;
-          this.showPromptModal('操作', true, result.msg);
         } else {
           this.showPromptModal('操作', false, result.msg);
         }
       });
   }
 
-  // 打印
-  codes = []; //二维码
-  printLoading: boolean = false; //批量打印按钮loading状态
-  print(e, batch, id?) {
-    e.stopPropagation();
-    this.printLoading = true;
-    this.mainService
-      .inspectionPost("getNodeQrCode", batch ? { nodeIds: this.checkedDepIds.toString() } : [id])
-      .subscribe((data) => {
-        this.codes = data.data;
-        this.printLoading = false;
-        setTimeout(() => {
-          const printContent = document.getElementById("report");
-          const WindowPrt = window.open("", "", "width=700,height=900");
-          WindowPrt.document.write(printContent.innerHTML);
-          WindowPrt.document.close();
-          WindowPrt.focus();
-          WindowPrt.print();
-          WindowPrt.close();
-        }, 100);
-      });
-  }
-
   // 选中表格单列
   mapOfCheckedId: { [key: string]: boolean } = {};
-  checkedDepIds = []; //已选中单列id
+  checkedDepIds:any[] = []; //已选中单列id
   refreshStatus(): void {
     let listOfData = this.listOfData;
     this.isAllDisplayDataChecked = listOfData.every(
       (item) => this.mapOfCheckedId[item.id]
     );
-    let arr = [];
+    let arr:any[] = [];
     for (var k in this.mapOfCheckedId) {
       if (this.mapOfCheckedId[k]) {
         arr.push(Number(k));
@@ -348,22 +302,6 @@ export class InspectionExecuteComponent implements OnInit {
             this.showPromptModal(this.tipsMsg2, false, data.msg);
           }
         });
-    } else if (this.confirmDelType === "resetList") {
-      //批量重置
-      let postData = {
-        nodeIds: this.checkedDepIds.toString(),
-      }
-      this.mainService
-        .inspectionPost("batchResetNodeCode", postData)
-        .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);
-          }
-        });
     }
   }
 }