Merge branch 'lmm' into develop

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

@@ -169,9 +169,11 @@ export class HsPromptModalComponent implements OnInit {
         idx: 0,
         sum: 10,
         department: {
+          searchType: 1,// 简单查询
           hospital: { id: hosId },
           keyWord: keywords,
           nurseSign: 1,
+          flag: 1,
         },
       }
     }else if(this.deptType === 'pharmacy'){
@@ -179,6 +181,7 @@ export class HsPromptModalComponent implements OnInit {
         idx: 0,
         sum: 10,
         department: {
+          searchType: 1,// 简单查询
           hospital: { id: hosId },
           dept: keywords,
           type: {id: "386"},

src/app/views/fuwutai/fuwutai.component.ts

@@ -1491,8 +1491,10 @@ export class FuwutaiComponent implements OnInit {
       idx: 0,
       sum: 20,
       department: {
+        searchType: 1,// 简单查询
         cascadeHosId: this.checkedHos,
         keyWord: keyWord,
+        flag: 0,
       },
     };
     this.WSNum++;

src/app/views/office-management/office-management.component.html

@@ -89,6 +89,7 @@
                 <span *ngIf="coopBtns.edit" (click)="edit($event,data)">编辑</span>
                 <span *ngIf="coopBtns.del" (click)="showDelModal($event,false,data.id)">删除</span>
                 <span *ngIf="coopBtns.print" (click)="print($event,false,data.id)">打印</span>
+                <span *ngIf="coopBtns.isStartUp" (click)="addDateModal(data)">{{data.flag == 1?'停用':'启用'}}</span>
               </div>
             </td>
           </tr>
@@ -253,6 +254,10 @@
   <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
     (confirmDelEvent)="confirmDel()" content="您确认要删除科室吗？"></app-dialog-delete>
 
+  <!-- 启用停用模态框 -->
+  <app-dialog-delete [delModal]="delModal1" (hideDelModalEvent)="hideDelModal1()" [btnLoading]="btnLoading"
+    (confirmDelEvent)="confirmDel1()" [content]="coopData.flag == 1 ? '您确认要停用科室吗？' : '您确认要启用吗？'"></app-dialog-delete>
+
   <!-- 二维码打印 -->
   <div id="report" style="display: none">
     <div *ngFor="let img of codes" style="display: inline-block;">

src/app/views/office-management/office-management.component.ts

@@ -97,6 +97,35 @@ export class OfficeManagementComponent implements OnInit {
       });
     }
   }
+  // 启用/停用弹框
+  coopData:any = {};
+  addDateModal(data) {
+    this.coopData = data;
+    this.showDelModal1();
+  }
+  delModal1: boolean = false; //删除模态框
+
+  showDelModal1() {
+    this.delModal1 = true;
+  }
+  hideDelModal1() {
+    this.delModal1 = false;
+  }
+  // 确认
+  confirmDel1() {
+    this.btnLoading = true;
+    this.mainService
+      .coopData("updData", "department", {department:{...this.coopData, ...{flag: this.coopData.flag == 1 ? 0 : 1}}})
+      .subscribe((data) => {
+        this.btnLoading = false;
+        this.delModal1 = false;
+        if (data.status == 200) {
+          this.showPromptModal(this.coopData.flag == 1 ? "停用" : "启用", true, "");
+        } else {
+          this.showPromptModal(this.coopData.flag == 1 ? "停用" : "启用", false, data.msg);
+        }
+      });
+  }
   //获取所有的父级科室列表
   getAllParentdepart(keyWord = "") {
     let postData: any = {