暂存

proxy.conf.json

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

src/app/components/configurationCenter/configuration-category/configuration-category.component.ts

@@ -462,6 +462,13 @@ export class ConfigurationCategoryComponent implements OnInit {
     }
   }
 
+  // 删除
+  deleteType; //删除类型
+  removeCategory(type, data) {
+    this.deleteType = type;
+    this.showDelModal(data,'您确认要删除吗？','删除','delCategory');
+  }
+
   // 新增/编辑表单提交
   btnLoading: boolean = false; //提交按钮loading状态
   submitCategoryForm(): void {
@@ -567,6 +574,21 @@ export class ConfigurationCategoryComponent implements OnInit {
             this.showPromptModal(this.tipsMsg2, false, data.msg);
           }
         });
+    } else if (this.confirmDelType === "delCategory") {
+      //删除-故障现象
+      this.mainService
+        .deleteIncidentCategory({categoryId: this.coopData.id})
+        .subscribe((data:any) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          if (data.status == 200) {
+            this['activeCategory' + this.deleteType] = {};
+            this.categoryConfigList = [];
+            this.showPromptModal(this.tipsMsg2, true, "");
+          } else {
+            this.showPromptModal(this.tipsMsg2, false, data.msg);
+          }
+        });
     } else if (this.confirmDelType === "copy") {
       //向下复制-关联
       let postData:any = {

src/app/components/configurationCenter/configuration-manHour/configuration-manHour.component.html

@@ -5,6 +5,7 @@
       <div class="contentHead">工时大类
 				<div>
 					<button nz-button class="mar-rig-10 btn cancel" nzType="default" nzSize="small" *ngIf="activeCategory1.id && categoryList1.length" (click)="delCategoryModal(1)">删除</button>
+          <button nz-button class="mar-rig-10 btn" nzType="primary" nzSize="small" *ngIf="activeCategory1.id && categoryList1.length" (click)="editCategoryModal(1)">修改</button>
 					<button nz-button nzType="primary" nzSize="small" (click)="addCategoryModal(1)">新增</button>
 				</div>
 			</div>
@@ -17,6 +18,7 @@
       <div class="contentHead">工时小类
 				<div>
 					<button nz-button class="mar-rig-10 btn cancel" *ngIf="activeCategory2.id && activeCategory1.id" nzType="default" nzSize="small" (click)="delCategoryModal(2)">删除</button>
+          <button nz-button class="mar-rig-10 btn" *ngIf="activeCategory2.id && activeCategory1.id" nzType="primary" nzSize="small" (click)="editCategoryModal(2)">修改</button>
 					<button nz-button nzType="primary" nzSize="small" *ngIf="activeCategory1.id" (click)="addCategoryModal(2)">新增</button>
 				</div>
 			</div>
@@ -35,8 +37,8 @@
     <div class="title">新增<i class="icon_transport transport-guanbi" (click)="hideCategoryModal()"></i></div>
     <div class="content">
       <form nz-form [formGroup]="validateCategoryForm" class="addForm">
-				<nz-form-item *ngIf="coopType === 2">
-				  <nz-form-label [nzSpan]="6" nzFor="workName">大类工时名称</nz-form-label>
+				<nz-form-item *ngIf="coopType === 2 && add">
+				  <nz-form-label [nzSpan]="6" nzFor="workName">工时大类名称</nz-form-label>
 				  <nz-form-control [nzSpan]="18">
 				    <nz-input-group>
 							<div>
@@ -45,6 +47,19 @@
 						</nz-input-group>
 				  </nz-form-control>
 				</nz-form-item>
+        <nz-form-item *ngIf="coopType === 2 && !add">
+          <nz-form-label [nzSpan]="5" nzRequired nzFor="parent">工时大类</nz-form-label>
+          <nz-form-control [nzSpan]="19" nzErrorTip="请选择工时大类!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzShowSearch nzAllowClear formControlName="parent" nzPlaceHolder="请选择工时大类">
+              <ng-container *ngFor="let option of categoryList1">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.workName" [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>
 
 				<nz-form-item>
 				  <nz-form-label [nzSpan]="5" nzRequired nzFor="workName">工时名称</nz-form-label>

src/app/components/configurationCenter/configuration-manHour/configuration-manHour.component.ts

@@ -62,7 +62,7 @@ export class ConfigurationManHourComponent implements OnInit {
     this.getScores();
   }
 
-	
+
 	// 监听单位输入
 	workUnitshow:boolean = false;
 	handleInput(event: KeyboardEvent){
@@ -73,7 +73,7 @@ export class ConfigurationManHourComponent implements OnInit {
 			this.workUnitshow = false
 		}
 	}
-	
+
   // 获取积分
   scoreList: any = [];
   getScores() {
@@ -124,12 +124,12 @@ export class ConfigurationManHourComponent implements OnInit {
         break;
     }
   }
-	
+
 	// 取消删除弹框
 	cancelDel(){
 		this.hideDelModal();
 	}
-	
+
 	// 确认删除
 	confirmDel() {
 	  let that = this;
@@ -156,7 +156,7 @@ export class ConfigurationManHourComponent implements OnInit {
 	      }
 	    });
 	}
-	
+
 	// 关闭删除模态框
 	hideDelModal() {
 	  this.delModal = false;
@@ -181,6 +181,7 @@ export class ConfigurationManHourComponent implements OnInit {
 			workHourManagement: {
 				hosId: this.hosId,
 				treeLevel: type,
+        quoteOther: 0,
 				parent: type === 1 ? null : { id: parentId }
 			}
     };
@@ -204,7 +205,38 @@ export class ConfigurationManHourComponent implements OnInit {
     this.modalCategory = true;
     this.initCategoryForm();
   }
-	
+  isLoading:boolean = false;
+  // 修改
+  editCategoryModal(type:number) {
+    this.coopType = type;
+    this.modelName = "修改";
+    this.add = false; //修改
+    this.modalCategory = true;
+    this.initCategoryForm();
+    if(type == 1){
+      this.('parent', false);
+    }else if(type == 2){
+      this.('parent', true);
+    }
+    console.log(this['activeCategory' + type])
+    this.validateCategoryForm.controls.parent.setValue(this['activeCategory' + type].parent ? this['activeCategory' + type].parent.id : null);
+    this.validateCategoryForm.controls.workName.setValue(this['activeCategory' + type].workName);
+    this.validateCategoryForm.controls.workUnit.setValue(this['activeCategory' + type].workUnit);
+    this.validateCategoryForm.controls.wage.setValue(this['activeCategory' + type].wage);
+    this.validateCategoryForm.controls.integral.setValue(this['activeCategory' + type].integral ? this['activeCategory' + type].integral.id : null);
+  }
+
+  requiredChange(field: string, required: boolean): void {
+    if (!required) {
+      this.validateCategoryForm.get(field)!.clearValidators();
+      this.validateCategoryForm.get(field)!.markAsPristine();
+    } else {
+      this.validateCategoryForm.get(field)!.setValidators(Validators.required);
+      this.validateCategoryForm.get(field)!.markAsDirty();
+    }
+    this.validateCategoryForm.get(field)!.updateValueAndValidity();
+  }
+
 	// 删除工时
 	delModal: boolean = false; //删除模态框
 	delContent: string = null; //删除模态框
@@ -217,7 +249,7 @@ export class ConfigurationManHourComponent implements OnInit {
 		this.coopType = type;
 		this.delModal = true
 	}
-	
+
   //关闭新增/编辑弹框
   hideCategoryModal() {
     this.modalCategory = false;
@@ -227,6 +259,7 @@ export class ConfigurationManHourComponent implements OnInit {
   validateCategoryForm: FormGroup; //新增/编辑表单
   initCategoryForm() {
     this.validateCategoryForm = this.fb.group({
+      parent: [null],//工时大类
       workName: [null, [Validators.required]],//名称
 			workUnit: [null, [Validators.required]],//单位
 			wage: [null, [Validators.required]],//工价
@@ -252,25 +285,39 @@ export class ConfigurationManHourComponent implements OnInit {
     console.log(this.validateCategoryForm.value);
     this.btnLoading = true;
     // -----------------------------------
-    let postData:any = {
-			...this.validateCategoryForm.value,
-			integral:{
-				id:this.validateCategoryForm.value.integral
-			},
-			hosId: this.hosId,
-			treeLevel: this.coopType,
-			parent: this.coopType === 1 ? undefined : this['activeCategory' + (this.coopType - 1)],
-    };
-			
+    let postData:any;
+    if(this.add){
+      postData = {
+        ...this.validateCategoryForm.value,
+        integral:{
+          id:this.validateCategoryForm.value.integral
+        },
+        hosId: this.hosId,
+        treeLevel: this.coopType,
+        parent: this.coopType === 1 ? undefined : this['activeCategory' + (this.coopType - 1)],
+      }
+    }else{
+      postData = {
+        ...this['activeCategory' + this.coopType],
+        ...this.validateCategoryForm.value,
+        integral:{
+          id:this.validateCategoryForm.value.integral
+        },
+        hosId: this.hosId,
+        treeLevel: this.coopType,
+        parent: this.coopType === 1 ? undefined : this['activeCategory' + (this.coopType - 1)],
+      }
+    }
+
 		this.mainService
-			.simplePost("addData", "workHourManagement", postData)
+			.simplePost(this.add ? "addData" : "updData", "workHourManagement", postData)
 			.subscribe((data) => {
 				this.btnLoading = false;
 				if (data.status == 200) {
 					this.modalCategory = false
-					this.showPromptModal("新增", true, "");
+					this.showPromptModal(this.add ? "新增" : "修改", true, "");
 				} else {
-					this.showPromptModal("新增", false, data.msg);
+					this.showPromptModal(this.add ? "新增" : "修改", false, data.msg);
 				}
 			});
     // -----------------------------------
@@ -290,7 +337,7 @@ export class ConfigurationManHourComponent implements OnInit {
     });
     console.log(this.validateConfigForm.controls)
   }
-	
+
 	// 获取当前选中的故障现象索引
 	get currentCategoryIndex(){
 	  if(this.activeCategory3.id){
@@ -303,7 +350,7 @@ export class ConfigurationManHourComponent implements OnInit {
 	    return 1;
 	  }
 	}
-	
+
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
   promptContent: string; //操作提示框提示信息
   ifSuccess: boolean; //操作成功/失败

src/app/services/main.service.ts

@@ -1043,11 +1043,19 @@ export class MainService {
 	  return this.http.post(host.host + `/user/data/findPhoneDept`, data, {
 	    headers: this.headers,
 	  });
-	}	// 获取细胞学标本
+	}
+  // 获取细胞学标本
 	getCellDictionary(data) {
 	  return this.http.post(host.host + `/common/common/getDictionary`,data, {
 	    headers: this.headers,
 	  });
 	}
 
+  // 删除故障现象
+	deleteIncidentCategory(data) {
+	  return this.http.post(host.host + `/incident/deleteIncidentCategory`, data, {
+	    headers: this.headers,
+	  });
+	}
+
 }

src/app/views/assets-consumable/assets-consumable.component.ts

@@ -84,6 +84,7 @@ export class AssetsConsumableComponent implements OnInit {
       sum: this.pageSize,
       consumable: {
         hosId: this.currentHospital.id,
+        quoteOther: 0,
         ...this.searchDto,
       },
     };