修复bug

package-lock.json

@@ -39,6 +39,7 @@
         "sortablejs": "^1.14.0",
         "swiper": "^6.8.4",
         "tslib": "^1.9.0",
+        "uuid": "^10.0.0",
         "viewerjs": "^0.10.0",
         "zone.js": "^0.9.1"
       },
@@ -302,6 +303,16 @@
         "npm": ">= 6.2.0"
       }
     },
+    "node_modules/@angular/cli/node_modules/uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmmirror.com/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "dev": true,
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
     "node_modules/@angular/common": {
       "version": "8.1.3",
       "resolved": "https://registry.npmmirror.com/@angular/common/-/common-8.1.3.tgz",
@@ -13659,6 +13670,16 @@
         "node": ">=0.6"
       }
     },
+    "node_modules/request/node_modules/uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmmirror.com/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "dev": true,
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmmirror.com/require-directory/-/require-directory-2.1.1.tgz",
@@ -14648,6 +14669,16 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/sockjs/node_modules/uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmmirror.com/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "dev": true,
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
     "node_modules/socks": {
       "version": "2.3.3",
       "resolved": "https://registry.npmmirror.com/socks/-/socks-2.3.3.tgz",
@@ -15955,6 +15986,16 @@
         "uuid": "^3.0.0"
       }
     },
+    "node_modules/universal-analytics/node_modules/uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmmirror.com/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "dev": true,
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
     "node_modules/universalify": {
       "version": "0.1.2",
       "resolved": "https://registry.npmmirror.com/universalify/-/universalify-0.1.2.tgz",
@@ -16159,13 +16200,15 @@
       }
     },
     "node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmmirror.com/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-      "dev": true,
+      "version": "10.0.0",
+      "resolved": "https://registry.npmmirror.com/uuid/-/uuid-10.0.0.tgz",
+      "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
       "bin": {
-        "uuid": "bin/uuid"
+        "uuid": "dist/bin/uuid"
       }
     },
     "node_modules/validate-npm-package-license": {
@@ -16884,6 +16927,16 @@
         "node": ">=6"
       }
     },
+    "node_modules/webpack-log/node_modules/uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmmirror.com/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "dev": true,
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
     "node_modules/webpack-merge": {
       "version": "4.2.1",
       "resolved": "https://registry.npmmirror.com/webpack-merge/-/webpack-merge-4.2.1.tgz",
@@ -17314,7 +17367,8 @@
     "node_modules/zone.js": {
       "version": "0.9.1",
       "resolved": "https://registry.npmmirror.com/zone.js/-/zone.js-0.9.1.tgz",
-      "integrity": "sha512-GkPiJL8jifSrKReKaTZ5jkhrMEgXbXYC+IPo1iquBjayRa0q86w3Dipjn8b415jpitMExe9lV8iTsv8tk3DGag=="
+      "integrity": "sha512-GkPiJL8jifSrKReKaTZ5jkhrMEgXbXYC+IPo1iquBjayRa0q86w3Dipjn8b415jpitMExe9lV8iTsv8tk3DGag==",
+      "dev": true
     },
     "node_modules/zrender": {
       "version": "4.3.2",

package.json

@@ -47,6 +47,7 @@
     "sortablejs": "^1.14.0",
     "swiper": "^6.8.4",
     "tslib": "^1.9.0",
+    "uuid": "^10.0.0",
     "viewerjs": "^0.10.0",
     "zone.js": "^0.9.1"
   },

proxy.conf.json

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

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

@@ -143,6 +143,7 @@ export class InspectionAddressDepartmentPromptModalComponent implements OnInit {
         type: this.searchDto.deptTypeId ? { id: this.searchDto.deptTypeId } : undefined,
         buildIds: this.searchDto.buildId ? this.searchDto.buildId.toString() : undefined,
         cascadeHosId: this.currentHospital.id,
+        bussType: 'inspection',
       }
     }
     this.hsLoading = true;

src/app/share/inspection-configuration-item-prompt-modal/inspection-configuration-item-prompt-modal.component.html

@@ -26,7 +26,7 @@
                 <nz-form-item>
                   <nz-form-control [nzSpan]="24" nzErrorTip="请输入选项名称!">
                     <nz-input-group>
-                      <input [formControlName]="'name_' + i" nz-input placeholder="请输入选项名称">
+                      <input [formControlName]="'name_' + data.id" nz-input placeholder="请输入选项名称">
                     </nz-input-group>
                   </nz-form-control>
                 </nz-form-item>
@@ -35,7 +35,7 @@
                 <nz-form-item>
                   <nz-form-control [nzSpan]="24" nzErrorTip="请输入排序号!">
                     <nz-input-group>
-                      <nz-input-number [formControlName]="'orders_' + i" nzPlaceHolder="排序号"></nz-input-number>
+                      <nz-input-number [formControlName]="'orders_' + data.id" nzPlaceHolder="排序号"></nz-input-number>
                     </nz-input-group>
                   </nz-form-control>
                 </nz-form-item>
@@ -43,14 +43,14 @@
               <td>
                 <nz-form-item>
                   <nz-form-control [nzSpan]="24">
-                    <label nz-checkbox [formControlName]="'checkDefault_' + i"></label>
+                    <label nz-checkbox [formControlName]="'checkDefault_' + data.id"></label>
                   </nz-form-control>
                 </nz-form-item>
               </td>
               <td>
                 <nz-form-item>
                   <nz-form-control [nzSpan]="24" nzErrorTip="请选择异常标记!">
-                    <nz-radio-group [formControlName]="'exception_' + i">
+                    <nz-radio-group [formControlName]="'exception_' + data.id">
                       <label style="width: 130px;text-align: left;" nz-radio [nzValue]="1">选中标记异常</label>
                       <label nz-radio [nzValue]="0">未选中标记异常</label>
                     </nz-radio-group>

src/app/share/inspection-configuration-item-prompt-modal/inspection-configuration-item-prompt-modal.component.ts

@@ -4,6 +4,7 @@ import { ToolService } from 'src/app/services/tool.service';
 import { FormGroup, Validators, FormBuilder, FormControl } from '@angular/forms';
 import { NzMessageService } from 'ng-zorro-antd';
 import countBy from 'lodash-es/countBy';
+import { v4 as uuidv4 } from 'uuid';
 
 @Component({
   selector: 'app-inspection-configuration-item-prompt-modal',
@@ -73,15 +74,14 @@ export class InspectionConfigurationItemPromptModalComponent implements OnInit {
       itemId: this.coopData.id,
       configList: [],
     };
-    const configNum = Object.keys(this.validateForm.value).length / 4;
-    for (let i = 0; i < configNum; i++) {
+    for (let i = 0; i < this.historySpecimenList.length; i++) {
       postData.configList.push({
-        name: this.validateForm.value['name_' + i],
-        valuex: this.validateForm.value['name_' + i],
-        orders: this.validateForm.value['orders_' + i],
-        checkDefault: this.validateForm.value['checkDefault_' + i] ? 1 : 0,
-        checkException: this.validateForm.value['exception_' + i],
-        uncheckException: this.validateForm.value['exception_' + i] === 1 ? 0 : 1,
+        name: this.validateForm.value['name_' + this.historySpecimenList[i].id],
+        valuex: this.validateForm.value['name_' + this.historySpecimenList[i].id],
+        orders: this.validateForm.value['orders_' + this.historySpecimenList[i].id],
+        checkDefault: this.validateForm.value['checkDefault_' + this.historySpecimenList[i].id] ? 1 : 0,
+        checkException: this.validateForm.value['exception_' + this.historySpecimenList[i].id],
+        uncheckException: this.validateForm.value['exception_' + this.historySpecimenList[i].id] === 1 ? 0 : 1,
       })
     }
     // 下拉框只允许勾选一个默认选中
@@ -114,6 +114,7 @@ export class InspectionConfigurationItemPromptModalComponent implements OnInit {
   // 添加
   addField(): void {
     let obj = {
+      id: uuidv4(),
       name: null,
       orders: null,
       checkDefault: false,
@@ -122,11 +123,11 @@ export class InspectionConfigurationItemPromptModalComponent implements OnInit {
 
     // 动态添加表单
     for (const key in obj) {
-      console.log(key + '_' + this.historySpecimenList.length)
+      console.log(key + '_' + obj.id)
       if(key === 'checkDefault'){
-        this.validateForm.addControl(key + '_' + this.historySpecimenList.length, new FormControl(false))
-      }else{
-        this.validateForm.addControl(key + '_' + this.historySpecimenList.length, new FormControl(null, [Validators.required]))
+        this.validateForm.addControl(key + '_' + obj.id, new FormControl(false))
+      }else if(key !== 'id'){
+        this.validateForm.addControl(key + '_' + obj.id, new FormControl(null, [Validators.required]))
       }
     }
 
@@ -143,7 +144,7 @@ export class InspectionConfigurationItemPromptModalComponent implements OnInit {
     this.historySpecimenList = [...this.historySpecimenList];
     // 动态删除表单
     for (const key in obj) {
-      this.validateForm.removeControl(key + '_' + i);
+      this.validateForm.removeControl(key + '_' + obj.id);
     }
   }
 
@@ -166,6 +167,7 @@ export class InspectionConfigurationItemPromptModalComponent implements OnInit {
       let list = data.list || [];
       this.historySpecimenList = list.map(v => {
         return {
+          id: uuidv4(),
           name: v.name || null,
           orders: v.orders || null,
           checkDefault: v.checkDefault || false,
@@ -177,9 +179,9 @@ export class InspectionConfigurationItemPromptModalComponent implements OnInit {
       this.historySpecimenList.forEach((obj, i) => {
         for (const key in obj) {
           if(key === 'checkDefault'){
-            this.validateForm.addControl(key + '_' + i, new FormControl(obj[key]))
-          }else{
-            this.validateForm.addControl(key + '_' + i, new FormControl(obj[key], [Validators.required]))
+            this.validateForm.addControl(key + '_' + obj.id, new FormControl(obj[key]))
+          }else if(key !== 'id'){
+            this.validateForm.addControl(key + '_' + obj.id, new FormControl(obj[key], [Validators.required]))
           }
         }
       })

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

@@ -72,8 +72,8 @@
             <td>{{data.signType?.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.edit" (click)="edit($event, data)">编辑</span>
+                <span *ngIf="coopBtns.del" (click)="showDelModal($event, data,'删除后您配置的相关巡检计划，下次执行时不在生成巡检任务，您确认要删除吗？','删除','del')">删除</span>
               </div>
             </td>
           </tr>

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

@@ -186,7 +186,7 @@ export class InspectionAddressComponent implements OnInit {
 
   // 搜索
   search() {
-    this.getList(0);
+    this.getList(1);
   }
   // 重置
   reset() {
@@ -263,7 +263,7 @@ export class InspectionAddressComponent implements OnInit {
   departmentAddList: any = []; //所有所属科室
   departmentSearchList: any = []; //所有所属科室(搜索)
   getDeparts(type, keyword, init = false) {
-    let postData = {
+    let postData:any = {
       department: {
         // searchType: 1,// 简单查询
         dept: keyword,
@@ -272,6 +272,9 @@ export class InspectionAddressComponent implements OnInit {
       idx: 0,
       sum: 20,
     };
+    if(type === 'add'){
+      postData.department.bussType = 'inspection';
+    }
     this.mainService
       .getFetchDataList("data", "department", postData)
       .subscribe((data) => {
@@ -338,20 +341,20 @@ export class InspectionAddressComponent implements OnInit {
         }
         this.isLoading = false;
 
-        if(init && this.deptDto && this.deptDto.building && !this.validateForm.value.buildId){
-          let buildId = this.deptDto.building.id;
-          let flag = this.buildingAddList.some(v => v.id == buildId);
-          if(!flag){
-            this.buildingAddList.unshift(this.deptDto.building)
-          }
-          this.validateForm.controls.buildId.setValue(this.deptDto.building.id);
-        } else if(init && this.coopData && this.coopData.buildingDTO){
+        if(init && this.coopData && this.coopData.buildingDTO){
           let buildId = this.coopData.buildingDTO.id;
           let flag = this.buildingAddList.some(v => v.id == buildId);
           if(!flag){
             this.buildingAddList.unshift(this.coopData.buildingDTO)
           }
           this.validateForm.controls.buildId.setValue(this.coopData.buildingDTO.id);
+        } else if (this.deptDto && this.deptDto.building){
+          let buildId = this.deptDto.building.id;
+          let flag = this.buildingAddList.some(v => v.id == buildId);
+          if(!flag){
+            this.buildingAddList.unshift(this.deptDto.building)
+          }
+          this.validateForm.controls.buildId.setValue(this.deptDto.building.id);
         }
       });
   }
@@ -367,13 +370,13 @@ export class InspectionAddressComponent implements OnInit {
         this.validateForm.controls.name.setValue(this.deptDto.dept);
       }
 
-      if(this.deptDto && this.deptDto.building && !this.validateForm.value.buildId){
-        this.getBuildings('add', '', true);
+      if(this.deptDto && this.deptDto.building){
+        this.getBuildings('add', '');
       }
 
-      if(this.deptDto && this.deptDto.floor && !this.validateForm.value.floorId){
+      if(this.deptDto && this.deptDto.floor){
         this.noChangeBuilding = true;
-        this.getFloors('add', '', this.deptDto.building.id, true);
+        this.getFloors('add', '', this.deptDto.building.id);
       }
     }
   }
@@ -411,20 +414,20 @@ export class InspectionAddressComponent implements OnInit {
         this.floorList = data.list;
         this.isLoading = false;
 
-        if(init && this.deptDto && this.deptDto.floor && !this.validateForm.value.floorId){
-          let floorId = this.deptDto.floor.id;
-          let flag = this.floorList.some(v => v.id == floorId);
-          if(!flag){
-            this.floorList.unshift(this.deptDto.floor)
-          }
-          this.validateForm.controls.floorId.setValue(this.deptDto.floor.id);
-        } else if(init && this.coopData && this.coopData.floorDTO){
+        if(init && this.coopData && this.coopData.floorDTO){
           let floorId = this.coopData.floorDTO.id;
           let flag = this.floorList.some(v => v.id == floorId);
           if(!flag){
             this.floorList.unshift(this.coopData.floorDTO)
           }
           this.validateForm.controls.floorId.setValue(this.coopData.floorDTO.id);
+        } else if (this.deptDto && this.deptDto.floor){
+          let floorId = this.deptDto.floor.id;
+          let flag = this.floorList.some(v => v.id == floorId);
+          if(!flag){
+            this.floorList.unshift(this.deptDto.floor)
+          }
+          this.validateForm.controls.floorId.setValue(this.deptDto.floor.id);
         }
       });
   }
@@ -552,7 +555,8 @@ export class InspectionAddressComponent implements OnInit {
   }
 
   // 编辑
-  edit(data) {
+  edit(e, data) {
+    e.stopPropagation();
     console.log(data);
     this.initForm();
     this.modelName = "编辑";
@@ -596,11 +600,13 @@ export class InspectionAddressComponent implements OnInit {
   tipsMsg2: string; //操作后信息
   confirmDelType: string; //确认的类型（启用/停用，删除）
   showDelModal(
+    e,
     data,
     tipsMsg1: string,
     tipsMsg2: string,
     type: string,
   ) {
+    e.stopPropagation();
     this.confirmDelType = type;
     this.delModal = true;
     this.coopData = data;

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

@@ -126,7 +126,7 @@ export class InspectionBatchComponent implements OnInit {
 
   // 搜索
   search() {
-    this.getList(0);
+    this.getList(1);
   }
   // 重置
   reset() {

src/app/views/inspection-configuration-item/inspection-configuration-item.component.html

@@ -33,7 +33,7 @@
               <td>{{data.showError === 1 ? '是' : (data.showError === 0 ? '否' : '')}}</td>
               <td>
                 <div class="coop">
-                  <span (click)="showDelModal(data,'您确认要删除吗？','删除','del')">删除</span>
+                  <span (click)="showDelModal(data,'您确认要删除吗？','删除','del')" *ngIf="inspectionConfigurationDetail.status.value === '0'">删除</span>
                   <span (click)="edit(data)">编辑</span>
                   <span (click)="showModelInspectionConfigurationItem(data)" *ngIf="data.type.value === '1' || data.type.value === '2' || data.type.value === '3'">选择项配置</span>
                   <span (click)="showDelModal(data,'您确认要隐藏吗？','隐藏','hidden')" *ngIf="inspectionConfigurationDetail.status.value === '1' && data.display === 1">隐藏</span>
@@ -72,7 +72,7 @@
               <nz-form-label [nzSpan]="6" nzRequired nzFor="type">填&nbsp;写&nbsp;方&nbsp;式</nz-form-label>
               <nz-form-control [nzSpan]="18" nzErrorTip="请选择填写方式!">
                 <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="type" nzShowSearch
-                  nzPlaceHolder="请选择填写方式" nzServerSearch (ngModelChange)="changeType($event)">
+                  nzPlaceHolder="请选择填写方式" nzServerSearch (ngModelChange)="changeType($event)" [nzDisabled]="inspectionConfigurationDetail.status.value !== '0'">
                   <ng-container *ngFor="let data of dispatchMethods">
                     <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.value"></nz-option>
                   </ng-container>

src/app/views/inspection-configuration-item/inspection-configuration-item.component.ts

@@ -55,8 +55,10 @@ export class InspectionConfigurationItemComponent implements OnInit, AfterViewIn
   }
 
   ngAfterViewInit(){
-    this.pageHeight = document.querySelector('.list-template__bottom').clientHeight - document.querySelector('.list-template__top').clientHeight - 8;
-    this.tableHeight = this.pageHeight - document.querySelector('.thead').clientHeight;
+    setTimeout(() => {
+      this.pageHeight = document.querySelector('.list-template__bottom').clientHeight - document.querySelector('.list-template__top').clientHeight - 8;
+      this.tableHeight = this.pageHeight - document.querySelector('.thead').clientHeight;
+    }, 0)
   }
 
   // 初始化增删改按钮

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

@@ -147,7 +147,7 @@ export class InspectionExecuteComponent implements OnInit {
 
   // 搜索
   search() {
-    this.getList(0);
+    this.getList(1);
   }
   // 重置
   reset() {

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

@@ -151,6 +151,7 @@ export class InspectionPlanComponent implements OnInit {
       inspectionForm: {
         hosId: this.hosId,
         name: keyWord,
+        status: { value: '1' },
       },
     };
     this.mainService