增加用户类型三方人员，增加三方公司

src/app/views/configuration-center/configuration-center.component.html

@@ -171,17 +171,10 @@
                   <nz-form-item>
                     <nz-form-control [nzSpan]="24" nzErrorTip="请输入值!">
                       <nz-input-group>
-                        <nz-input-number [formControlName]="'value_' + data.id" class="valueInput"></nz-input-number>
+                        <input [formControlName]="'value_' + data.id" nz-input class="valueInput">
                       </nz-input-group>
                     </nz-form-control>
                   </nz-form-item>
-                  <!-- <nz-form-item class="ml8">
-                    <nz-form-control [nzSpan]="24" nzErrorTip="请输入排序号!">
-                      <nz-input-group>
-                        <nz-input-number [formControlName]="'orders_' + data.id" class="nameInput"></nz-input-number>
-                      </nz-input-group>
-                    </nz-form-control>
-                  </nz-form-item> -->
                   <i class="icon_transport transport-tag27fuben ml8" (click)="addField(i)"></i>
                   <i class="icon_transport transport-shanchu1 ml8" *ngIf="dictionaryList.length > 1 && !data.system" (click)="removeField(data, i)"></i>
                 </div>

src/app/views/configuration-center/configuration-center.component.ts

@@ -1,9 +1,8 @@
 import { Component, OnInit, ViewChild, AfterViewInit } from "@angular/core";
 import { Location } from '@angular/common';
-import { NzFormatEmitEvent, NzTreeNodeOptions, NzTreeComponent, NzMessageService } from 'ng-zorro-antd';
+import { NzTreeNodeOptions, NzTreeComponent, NzMessageService } from 'ng-zorro-antd';
 import { ToolService } from 'src/app/services/tool.service';
 import { MainService } from 'src/app/services/main.service';
-import cloneDeep from 'lodash-es/cloneDeep'
 import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
 import { Router, ActivatedRoute } from '@angular/router';
 import { Subject } from 'rxjs';
@@ -692,7 +691,7 @@ export class ConfigurationCenterComponent implements OnInit, AfterViewInit {
       idx: 0,
       sum: 9999,
       dictionary: {
-        key: "incident_category_score"
+        key: this.activeDictionaryKey.key,
       }
     }
     this.maskFlag = this.message.loading("正在加载中..", {
@@ -729,7 +728,7 @@ export class ConfigurationCenterComponent implements OnInit, AfterViewInit {
       this.dictionaryList.forEach((obj, i) => {
         for (const key in obj) {
           if(key !== 'id' && key !== 'system'){
-            this.validateDictionaryForm.addControl(key + '_' + obj.id, new FormControl(obj[key], [Validators.required]))
+            this.validateDictionaryForm.addControl(key + '_' + obj.id, new FormControl({value: obj[key], disabled: key === 'value' ? obj.system : false}, [Validators.required]))
           }
         }
       })
@@ -743,12 +742,13 @@ export class ConfigurationCenterComponent implements OnInit, AfterViewInit {
       name: null,
       value: null,
       orders: null,
+      system: false,
     };
 
     // 动态添加表单
     for (const key in obj) {
       console.log(key + '_' + obj.id)
-      if(key !== 'id'){
+      if(key !== 'id' && key !== 'system'){
         this.validateDictionaryForm.addControl(key + '_' + obj.id, new FormControl(null, [Validators.required]))
       }
     }
@@ -791,8 +791,8 @@ export class ConfigurationCenterComponent implements OnInit, AfterViewInit {
         name: this.validateDictionaryForm.value['name_' + this.dictionaryList[i].id],
         value: this.validateDictionaryForm.value['value_' + this.dictionaryList[i].id],
         orders: this.validateDictionaryForm.value['orders_' + this.dictionaryList[i].id],
-        system: !uuidValidate(this.dictionaryList[i].id),
-        key: 'incident_category_score',
+        system: uuidValidate(this.dictionaryList[i].id) ? false : this.dictionaryList[i].system,
+        key: this.activeDictionaryKey.key,
       })
     }
     console.log(postData);
@@ -884,13 +884,20 @@ export class ConfigurationCenterComponent implements OnInit, AfterViewInit {
 
   // 数据字典key列表
   dictionaryKeyList: any[] = [
-    { id: 1, name: '积分配置',},
+    { id: 1, name: '积分配置', key: "incident_category_score"},
+    { id: 2, name: '事件来源', key: "incident_source"},
+    { id: 3, name: '处理结果', key: "incident_closecode"},
+    { id: 4, name: '处理方式', key: "incident_handle_type"},
+    { id: 5, name: '状态', key: "incident_status"},
+    { id: 6, name: '维修记录', key: "repair_type"},
+    { id: 7, name: '满意度评价', key: "incident_degree"},
   ];
 
   // 点击数据字典key
   activeDictionaryKey:any = this.dictionaryKeyList[0];
   clickDictionaryKey(item){
     this.activeDictionaryKey = item;
+    this.getDictionaryList();
   }
 
   // 点击故障现象

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

@@ -138,8 +138,22 @@
           <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="usertype">用户类型</nz-form-label>
           <nz-form-control nzErrorTip="请选择用户类型!">
             <nz-select [nzDropdownMatchSelectWidth]="false" type="usertype" nzShowSearch nzAllowClear
-              formControlName="usertype" nzPlaceHolder="请选择用户类型" (ngModelChange)="usertypeChange()">
-              <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}" *ngFor="let data of userTypes">
+              formControlName="usertype" nzPlaceHolder="请选择用户类型" (ngModelChange)="usertypeChange($event)">
+              <nz-option nzLabel="{{data.name}}" nzValue="{{data.value}}" *ngFor="let data of userTypes">
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item *ngIf="validateForm.value.usertype == 4">
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="companyId">所属公司</nz-form-label>
+          <nz-form-control nzErrorTip="请选择所属公司!">
+            <nz-select (nzOnSearch)="changeCompanyInp(hosId,'add',$event)" [nzDropdownMatchSelectWidth]="false"
+              nzServerSearch nzShowSearch nzAllowClear formControlName="companyId" nzPlaceHolder="请选择所属公司">
+              <ng-container *ngFor="let option of allcompany">
+                <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>
@@ -149,8 +163,6 @@
           <nz-form-control nzErrorTip="请选择所属科室!">
             <nz-select (nzOnSearch)="changeInp(hosId,'add',$event)" [nzDropdownMatchSelectWidth]="false" type="dept"
               nzServerSearch nzShowSearch nzAllowClear formControlName="dept" nzPlaceHolder="请选择所属科室">
-              <!-- <nz-option nzLabel="{{data.dept}}" nzValue="{{data.id}}" *ngFor="let data of alldepart">
-              </nz-option> -->
               <ng-container *ngFor="let option of alldepart">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
               </ng-container>
@@ -169,7 +181,7 @@
           </nz-form-control>
         </nz-form-item>
         <nz-form-item>
-          <nz-form-label style="line-height:40px;" [nzSm]="6" [nzXs]="24" nzRequired nzFor="gender">性别</nz-form-label>
+          <nz-form-label style="line-height:40px;" [nzSm]="3" [nzXs]="24" nzRequired nzFor="gender">性别</nz-form-label>
           <nz-form-control nzErrorTip="请选择性别!">
             <nz-radio-group type="gender" formControlName="gender">
               <label nz-radio nzValue="{{data.id}}" *ngFor="let data of genders">{{data.name}}</label>

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

@@ -49,6 +49,7 @@ export class UsersManagementComponent implements OnInit {
   userTypes: Array<any> = []; //所有用户类型
   alldepart: any = []; //所有所属科室
   alldepart1: any = []; //所有所属科室(搜索)
+  allcompany: any = []; //所有所属公司
   allUserGroup: Array<any>; //所有用户组
   allUserGroup1: Array<any>; //用户组(搜索)
   allUserRole: Array<any>; //所有角色
@@ -64,14 +65,18 @@ export class UsersManagementComponent implements OnInit {
   btnLoading: boolean = false; //提交按钮loading状态
   wxRequired = false; //新增或编辑用户的时候，微信号是否必填
   changeInpSubject = new Subject(); //防抖
+  changeInpCompanySubject = new Subject(); //防抖
 
   ngOnInit() {
     //防抖
     this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
       this.getDeparts(v[0], v[1], v[2]);
     });
+    //防抖
+    this.changeInpCompanySubject.pipe(debounceTime(500)).subscribe((v) => {
+      this.getCompany(v[0], v[1], v[2]);
+    });
     this.coopBtns = this.tool.initCoopBtns(this.route);
-    this.initForm();
     this.getAllRole();
     this.getUserTypes();
     this.getGender();
@@ -257,6 +262,14 @@ export class UsersManagementComponent implements OnInit {
       idx: 0,
       sum: 9999,
     };
+    let companyData = {
+      company: {
+        busiType: {key: "company_busi_type", value: "2"},
+        hosId: hid,
+      },
+      idx: 0,
+      sum: 20,
+    };
     this.maskFlag = this.message.loading("正在加载中..", {
       nzDuration: 0,
     }).messageId;
@@ -266,12 +279,14 @@ export class UsersManagementComponent implements OnInit {
       data
     );
     let group$ = this.mainService.getFetchDataList("data", "group2", groupData);
-    forkJoin(department$, group$).subscribe((res) => {
+    let company$ = this.mainService.getFetchDataList("simple/data", "company", companyData);
+    forkJoin(department$, group$, company$).subscribe((res) => {
       this.message.remove(this.maskFlag);
       this.maskFlag = false;
       this.modal = true;
       this.alldepart = res[0]["list"];
       this.allUserGroup = res[1]["list"];
+      this.allcompany = res[2]["list"];
     });
   }
   // 切换院区选项获取对应科室列表(搜索)seimin
@@ -318,23 +333,25 @@ export class UsersManagementComponent implements OnInit {
   showModal() {
     this.add = true;
     this.initForm();
+    this.requiredConfigChange('companyId', false);
     this.changeHosp();
   }
   hideModal() {
     this.modal = false;
-    this.initForm();
   }
 
   // 初始化新增form表单
   initForm() {
     if (this.add) {
       this.alldepart = [];
+      this.allcompany = [];
       this.allUserGroup = [];
     }
     this.validateForm = this.fb.group({
       name: [null, [Validators.required]],
       account: [null, [Validators.required]],
       usertype: [null, [Validators.required]],
+      companyId: [null],
       dept: [null, [Validators.required]],
       deptPhone: [null, [Validators.required]],
       gender: [null, [Validators.required]],
@@ -344,7 +361,7 @@ export class UsersManagementComponent implements OnInit {
     });
   }
   // 选择用户类型
-  usertypeChange() {
+  usertypeChange(value) {
     // if (this.validateForm.value.usertype == 106) {
     //   //配送人员
     //   this.wxRequired = true;
@@ -360,6 +377,14 @@ export class UsersManagementComponent implements OnInit {
     this.validateForm.get("weixin")!.markAsPristine();
 
     this.validateForm.get("weixin")!.updateValueAndValidity();
+
+    this.validateForm.controls.companyId.setValue(null);
+    if(value == 4){
+      // 三方人员
+      this.requiredConfigChange('companyId', true);
+    }else{
+      this.requiredConfigChange('companyId', false);
+    }
   }
   // 表单提交
   submitForm(): void {
@@ -385,13 +410,14 @@ export class UsersManagementComponent implements OnInit {
         name: that.validateForm.value.name,
         account: that.validateForm.value.account,
         gender: { id: that.validateForm.value.gender, key: "user_gender" },
-        usertype: { id: that.validateForm.value.usertype },
+        usertype: this.userTypes.find(v => v.value == that.validateForm.value.usertype),
         dept: { id: that.validateForm.value.dept },
         group: groups,
         role: roles,
         phone: that.validateForm.value.deptPhone,
         hospital: { id: that.hosId },
         weixin: that.validateForm.value.weixin,
+        companyId: that.validateForm.value.companyId || undefined,
       },
     };
     if (!that.validateForm.value.userGroup) {
@@ -416,9 +442,21 @@ export class UsersManagementComponent implements OnInit {
       });
   }
 
+  requiredConfigChange(name: string, required: boolean): void {
+    if (!required) {
+      this.validateForm.get(name)!.clearValidators();
+      this.validateForm.get(name)!.markAsPristine();
+    } else {
+      this.validateForm.get(name)!.setValidators(Validators.required);
+      this.validateForm.get(name)!.markAsDirty();
+    }
+    this.validateForm.get(name)!.updateValueAndValidity();
+  }
+
   // 编辑
   maskFlag: any = false;
   edit(data) {
+    this.initForm();
     // ----------------
     var hid = data.hospital.id;
     let departmentData = {
@@ -436,6 +474,14 @@ export class UsersManagementComponent implements OnInit {
       idx: 0,
       sum: 9999,
     };
+    let companyData = {
+      company: {
+        busiType: {key: "company_busi_type", value: "2"},
+        hosId: hid,
+      },
+      idx: 0,
+      sum: 20,
+    };
     this.maskFlag = this.message.loading("正在加载中..", {
       nzDuration: 0,
     }).messageId;
@@ -446,9 +492,6 @@ export class UsersManagementComponent implements OnInit {
         this.mainService
           .getFetchDataList("data", "department", departmentData)
           .subscribe((item2) => {
-            this.message.remove(this.maskFlag);
-            this.maskFlag = false;
-            this.modal = true;
             this.alldepart = item2.list;
             if (data.dept) {
               let has = item2.list.some((d) => d.id == data.dept.id);
@@ -456,39 +499,56 @@ export class UsersManagementComponent implements OnInit {
                 this.alldepart = [data.dept, ...item2.list];
               }
             }
-            this.isLoading = false;
-            // ------------------------
-            this.add = false;
-            this.coopId = data.id;
-            let groups = [],
-              roles = [];
-            if (data.group) {
-              data.group.forEach((element) => {
-                groups.push(element["id"] + "");
-              });
-            }
-            if (data.role) {
-              data.role.forEach((element) => {
-                roles.push(element["id"] + "");
-              });
-            }
-            this.validateForm.controls.name.setValue(data.name);
-            this.validateForm.controls.account.setValue(data.account);
-            this.validateForm.controls.usertype.setValue(data.usertype.id + "");
-            if (data.dept) {
-              this.validateForm.controls.dept.setValue(data.dept.id);
-            }
-            this.validateForm.controls.deptPhone.setValue(data.phone);
-            this.validateForm.controls.gender.setValue(data.gender.id + "");
-            this.validateForm.controls.userGroup.setValue(
-              groups.length ? groups : null
-            );
-            this.validateForm.controls.role.setValue(
-              roles.length ? roles : null
-            );
-            this.validateForm.controls.gender.setValue(data.gender.id + "");
-            this.validateForm.controls.weixin.setValue(data.weixin);
-            this.usertypeChange();
+            this.mainService
+            .getFetchDataList("simple/data", "company", companyData)
+            .subscribe((item3) => {
+              this.message.remove(this.maskFlag);
+              this.maskFlag = false;
+              this.modal = true;
+              this.allcompany = item3.list;
+              if (data.companyDTO) {
+                let has = item3.list.some((d) => d.id == data.companyDTO.id);
+                if (!has) {
+                  this.allcompany = [data.companyDTO, ...item3.list];
+                }
+              }
+              this.isLoading = false;
+              // ------------------------
+              this.add = false;
+              this.coopId = data.id;
+              let groups = [],
+                roles = [];
+              if (data.group) {
+                data.group.forEach((element) => {
+                  groups.push(element["id"] + "");
+                });
+              }
+              if (data.role) {
+                data.role.forEach((element) => {
+                  roles.push(element["id"] + "");
+                });
+              }
+              this.validateForm.controls.name.setValue(data.name);
+              this.validateForm.controls.account.setValue(data.account);
+              this.validateForm.controls.usertype.setValue(data.usertype.value);
+              if (data.dept) {
+                this.validateForm.controls.dept.setValue(data.dept.id);
+              }
+              this.validateForm.controls.deptPhone.setValue(data.phone);
+              this.validateForm.controls.gender.setValue(data.gender.id + "");
+              this.validateForm.controls.userGroup.setValue(
+                groups.length ? groups : null
+              );
+              this.validateForm.controls.role.setValue(
+                roles.length ? roles : null
+              );
+              this.validateForm.controls.gender.setValue(data.gender.id + "");
+              this.validateForm.controls.weixin.setValue(data.weixin);
+              this.usertypeChange(data.usertype.value);
+              if (data.companyDTO) {
+                this.validateForm.controls.companyId.setValue(data.companyDTO.id);
+              }
+            });
           });
       });
     // ----------------
@@ -603,8 +663,8 @@ export class UsersManagementComponent implements OnInit {
   }
   // 边输边搜节流阀
   isLoading = false;
-  changeInp(deptId, type, e) {
-    if (!deptId) {
+  changeInp(hosId, type, e) {
+    if (!hosId) {
       if (type == "search") {
         this.alldepart1 = [];
       } else if (type == "add") {
@@ -613,17 +673,30 @@ export class UsersManagementComponent implements OnInit {
       return;
     }
     this.isLoading = true;
-    this.changeInpSubject.next([deptId, type, e]);
+    this.changeInpSubject.next([hosId, type, e]);
+  }
+
+  changeCompanyInp(hosId, type, e) {
+    if (!hosId) {
+      if (type == "search") {
+
+      } else if (type == "add") {
+        this.allcompany = [];
+      }
+      return;
+    }
+    this.isLoading = true;
+    this.changeInpCompanySubject.next([hosId, type, e]);
   }
   // 获取所有科室
   snum = 0;
-  getDeparts(deptId, type, dept) {
+  getDeparts(hosId, type, dept) {
     var that = this;
     let data = {
       department: {
         dept,
         hospital: {
-          id: deptId,
+          id: hosId,
         },
       },
       idx: 0,
@@ -644,4 +717,33 @@ export class UsersManagementComponent implements OnInit {
         }
       });
   }
+
+  // 获取所有科室
+  cnum = 0;
+  getCompany(hosId, type, keyword) {
+    var that = this;
+    let data = {
+      company: {
+        name: keyword,
+        busiType: {key: "company_busi_type", value: "2"},
+        hosId,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.cnum++;
+    that.mainService
+      .getFetchDataList("simple/data", "company", data)
+      .subscribe((data) => {
+        this.cnum--;
+        if (type == "search") {
+
+        } else if (type == "add") {
+          that.allcompany = data.list;
+        }
+        if (this.cnum === 0) {
+          that.isLoading = false;
+        }
+      });
+  }
 }