bug修复

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-		"target": "http://192.168.3.108",
+		"target": "http://192.168.4.105",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/share/inspection-address-department-prompt-modal/inspection-address-department-prompt-modal.component.html

@@ -1,6 +1,6 @@
 <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="title">批量关联科室<span class="red">（没有楼栋的科室无法查询到）</span><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>

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

@@ -144,6 +144,7 @@ export class InspectionAddressDepartmentPromptModalComponent implements OnInit {
         buildIds: this.searchDto.buildId ? this.searchDto.buildId.toString() : undefined,
         cascadeHosId: this.currentHospital.id,
         bussType: 'inspection',
+        noBuilding: '查询无楼栋科室',
       }
     }
     this.hsLoading = true;

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

@@ -36,9 +36,9 @@
         <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" (click)="showDelModal($event, 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 class="dropdownItem" *ngIf="coopBtns.reset" (click)="showDelModal($event, data,'您确认要重置二维码吗？','重置','resetList')">批量重置</div>
           </div>
         </div>
         <button nz-button class="btn default ml8" (click)='search()'>搜索</button>
@@ -104,7 +104,7 @@
           <nz-form-item>
             <nz-form-label [nzSpan]="5" nzRequired nzFor="deptId">关联科室</nz-form-label>
             <nz-form-control [nzSpan]="19" nzErrorTip="请选择关联科室!">
-              <nz-select (nzOnSearch)="changeInp('add', 'department', $event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear formControlName="deptId" nzPlaceHolder="请选择关联科室" (ngModelChange)="changeDepartment($event)" [nzDisabled]="!add">
+              <nz-select (nzOnSearch)="changeInp('add', 'department', $event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear formControlName="deptId" nzPlaceHolder="请选择关联科室" (ngModelChange)="changeDepartment($event)" [nzDisabled]="!add" (nzOpenChange)="changeInp('add', 'department', '')">
                 <ng-container *ngFor="let option of departmentAddList">
                   <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
                 </ng-container>

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

@@ -56,6 +56,7 @@ export class InspectionPlanComponent implements OnInit {
   add: boolean; //true:新增；false:编辑
   validateForm: FormGroup; //新增/编辑表单
   coopId: number; //当前操作列id
+  coopData: any = {}; //当前操作列
 
   hosId: any; //当前院区id
   btnLoading: boolean = false; //提交按钮loading状态
@@ -300,6 +301,8 @@ export class InspectionPlanComponent implements OnInit {
     } else {
       //编辑
       postData = {
+        // deleteFlag: this.coopData.deleteFlag,
+        ...this.coopData,
         id: this.coopId,
         name: this.validateForm.value.name,
         content: this.validateForm.value.content,
@@ -349,6 +352,7 @@ export class InspectionPlanComponent implements OnInit {
     this.add = false;
     this.modal = true;
     this.coopId = data.id;
+    this.coopData = data;
     this.validateForm.controls.name.setValue(data.name);
     this.validateForm.controls.content.setValue(data.content);
     this.validateForm.controls.planType.setValue(data.planType ? data.planType.value : null);