Merge branch 'master' of http://git.dashitech.com/seimin/zy-pc

src/app/services/tool.service.ts

@@ -246,7 +246,7 @@ export class ToolService {
   }
 
   /**
-   * @description: 扁平化结构转成树形结构-ng-zorro树形结构专用
+   * @description: 扁平化结构转成树形结构-ng-zorro级联组件专用
    * @param {*} list 扁平化的数组
    * @param {*} rootValue 顶级parentKeyName的值
    * @param {*} parentKeyName 父级字段名称
@@ -267,12 +267,10 @@ export class ToolService {
   }
 
   /**
-   * @description: 树形结构根据id回显-ng-zorro树形结构专用
-   * @param {*} list 扁平化的数组
-   * @param {*} rootValue 顶级parentKeyName的值
-   * @param {*} parentKeyName 父级字段名称
-   * @param {*} keyName 字段名称
-   * @return {*} 返回树形结构
+   * @description: 树形结构根据id回显-ng-zorro级联组件专用
+   * @param {*} tree 树形结构
+   * @param {*} id 要查询的id
+   * @return {*} 返回数组-用于回显
    * @author: seimin
    */
   tranListToTreeDataFindIdsLeaf(tree: Array<any>, id: number, arr = []):Array<number> {

src/app/share/assets-product-management-prompt-modal/assets-product-management-prompt-modal.component.html

@@ -24,7 +24,7 @@
             </thead>
             <tbody>
               <tr *ngFor="let data of historySpecimenList;let i = index;">
-                <td>{{ data.incidentCategoryDTO?.category }}</td>
+                <td>{{ data.incidentCategoryDTO?.mutiCategory }}</td>
                 <td>{{ data.alias }}</td>
                 <td>{{ data.status?.name }}</td>
                 <td>

src/app/share/assets-product-management-prompt-modal/assets-product-management-prompt-modal.component.ts

@@ -41,6 +41,7 @@ export class AssetsProductManagementPromptModalComponent implements OnInit {
       return;
     };
     let postData = {
+      hasThird: 'true',//只差有三级的故障现象列表
       category: {
         dutyIds: this.currentHospital.type.value === '6' ? this.currentHospital.id.toString()  : undefined,
       },

src/app/views/assets-info/assets-info.component.html

@@ -105,7 +105,7 @@
             <nz-form-control [nzSpan]="19" nzErrorTip="请选择关联产品!">
               <nz-select (nzOnSearch)="changeInp('add', 'assetProduct', $event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch formControlName="productId" nzPlaceHolder="请选择关联产品" (ngModelChange)="changeAssetProduct($event)" (nzOpenChange)="changeInp('add', 'assetProduct', '')">
                 <ng-container *ngFor="let option of assetProductList">
-                  <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+                  <nz-option *ngIf="!isLoading" [nzLabel]="option.name + '(' + option.brand + ')' + '(' + option.model + ')'" [nzValue]="option.id"></nz-option>
                 </ng-container>
                 <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
                   <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -203,7 +203,7 @@
           <nz-form-item>
             <nz-form-label [nzSpan]="5" nzRequired nzFor="dutyId">责任部门</nz-form-label>
             <nz-form-control [nzSpan]="19" nzErrorTip="请选择责任部门!">
-              <nz-select (nzOnSearch)="changeInp('add', 'hospital', $event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear formControlName="dutyId" nzPlaceHolder="请选择责任部门" (nzOpenChange)="changeInp('add', 'hospital', '')">
+              <nz-select [nzDisabled]="disableDutyId" (nzOnSearch)="changeInp('add', 'hospital', $event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear formControlName="dutyId" nzPlaceHolder="请选择责任部门" (nzOpenChange)="changeInp('add', 'hospital', '')">
                 <ng-container *ngFor="let option of dutyList">
                   <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
                 </ng-container>

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

@@ -114,11 +114,18 @@ export class AssetsInfoComponent implements OnInit {
   }
 
   // 新增弹框
+  disableDutyId:boolean = false;
   addModal() {
     this.modelName = "新增";
     this.add = true; //新增
     this.modal = true;
     this.initForm();
+    if(this.currentHospital.type && this.currentHospital.type.value === '6'){
+      this.disableDutyId = true;
+      this.validateForm.controls.dutyId.setValue(this.currentHospital.id);
+    }else{
+      this.disableDutyId = false;
+    }
   }
   //关闭新增/编辑弹框
   hideAddModal() {

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

@@ -332,12 +332,12 @@
             </nz-radio-group>
           </nz-form-control>
         </nz-form-item>
-        <nz-form-item *ngIf="validateConfigForm.value.userGroup === 1">
-          <nz-form-label [nzSpan]="5" nzRequired nzFor="userId">维修人</nz-form-label>
-          <nz-form-control [nzSpan]="19" nzErrorTip="请选择维修人!">
-            <nz-select (nzOnSearch)="changeInp('add', 'user', $event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear formControlName="userId" nzPlaceHolder="请选择维修人">
-              <ng-container *ngFor="let option of userList">
-                <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="5" nzRequired nzFor="groupId">维修组</nz-form-label>
+          <nz-form-control [nzSpan]="19" nzErrorTip="请选择维修组!">
+            <nz-select (nzOnSearch)="changeInp('group', $event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear formControlName="groupId" nzPlaceHolder="请选择维修组" (ngModelChange)="changeGroup($event)">
+              <ng-container *ngFor="let option of groupList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.groupName" [nzValue]="option.id"></nz-option>
               </ng-container>
               <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
                 <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -345,12 +345,12 @@
             </nz-select>
           </nz-form-control>
         </nz-form-item>
-        <nz-form-item *ngIf="validateConfigForm.value.userGroup === 2">
-          <nz-form-label [nzSpan]="5" nzRequired nzFor="groupId">维修组</nz-form-label>
-          <nz-form-control [nzSpan]="19" nzErrorTip="请选择维修组!">
-            <nz-select (nzOnSearch)="changeInp('add', 'group', $event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear formControlName="groupId" nzPlaceHolder="请选择维修组">
-              <ng-container *ngFor="let option of groupList">
-                <nz-option *ngIf="!isLoading" [nzLabel]="option.groupName" [nzValue]="option.id"></nz-option>
+        <nz-form-item *ngIf="validateConfigForm.value.userGroup === 1">
+          <nz-form-label [nzSpan]="5" nzRequired nzFor="userId">维修人</nz-form-label>
+          <nz-form-control [nzSpan]="19" nzErrorTip="请选择维修人!">
+            <nz-select (nzOnSearch)="changeInp('user', $event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear formControlName="userId" nzPlaceHolder="请选择维修人">
+              <ng-container *ngFor="let option of userList">
+                <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> 搜索中...

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

@@ -144,7 +144,6 @@ export class ConfigurationCenterComponent implements OnInit, AfterViewInit {
 
     this.userList = [];
     this.groupList = [];
-    this.getUsers();
     this.getGroups();
   }
 
@@ -415,7 +414,6 @@ export class ConfigurationCenterComponent implements OnInit, AfterViewInit {
     this.modalConfig = true;
     this.initConfigForm();
     this.requiredConfigChange('userId', true);
-    this.requiredConfigChange('groupId', false);
   }
   //关闭新增/编辑弹框
   hideConfigModal() {
@@ -432,7 +430,7 @@ export class ConfigurationCenterComponent implements OnInit, AfterViewInit {
       score: [null, [Validators.required]],//积分
       userGroup: [1, [Validators.required]],//分配方式
       userId: [null],//维修人
-      groupId: [null],//维修组
+      groupId: [null, [Validators.required]],//维修组
     });
     console.log(this.validateConfigForm.controls)
   }
@@ -441,14 +439,13 @@ export class ConfigurationCenterComponent implements OnInit, AfterViewInit {
   changeUserGroup(id){
     this.validateConfigForm.controls.userId.setValue(null);
     this.validateConfigForm.controls.groupId.setValue(null);
+    this.userList = [];
     if(id === 1){
       // 人
       this.requiredConfigChange('userId', true);
-      this.requiredConfigChange('groupId', false);
     }else if(id === 2){
       // 组
       this.requiredConfigChange('userId', false);
-      this.requiredConfigChange('groupId', true);
     }
   }
 
@@ -480,14 +477,18 @@ export class ConfigurationCenterComponent implements OnInit, AfterViewInit {
     this.validateConfigForm.controls.groupId.setValue(data.groupId);
     if(data.userGroup === 1){
       this.requiredConfigChange('userId', true);
-      this.requiredConfigChange('groupId', false);
     }else if(data.userGroup === 2){
       this.requiredConfigChange('userId', false);
-      this.requiredConfigChange('groupId', true);
     }
     data.hosId && this.getHospitals(2, data.hosId);
-    data.dutyId && this.getUsers();
-    data.dutyId && this.getGroups();
+    data.dutyId && this.getUsers('', true);
+    data.dutyId && this.getGroups('', true);
+  }
+
+  // 修改组
+  changeGroup(id){
+    this.validateConfigForm.controls.userId.setValue(null);
+    this.getUsers();
   }
 
   // 新增/编辑表单提交
@@ -514,7 +515,7 @@ export class ConfigurationCenterComponent implements OnInit, AfterViewInit {
           score: { id: this.validateConfigForm.value.score },
           dutyId: this.validateConfigForm.value.dutyId,
           userGroup: this.validateConfigForm.value.userGroup,
-          groupId: this.validateConfigForm.value.userGroup === 2 ? this.validateConfigForm.value.groupId : undefined,
+          groupId: this.validateConfigForm.value.groupId || undefined,
           userId: this.validateConfigForm.value.userGroup === 1 ? this.validateConfigForm.value.userId : undefined,
           hosId: this.currentHospital.id,
         }
@@ -528,11 +529,9 @@ export class ConfigurationCenterComponent implements OnInit, AfterViewInit {
             categoryId,
             priority: this.validateConfigForm.value.priority,
             score: { id: this.validateConfigForm.value.score },
-            // dutyId: this.validateConfigForm.value.dutyId,
             userGroup: this.validateConfigForm.value.userGroup,
-            groupId: this.validateConfigForm.value.userGroup === 2 ? this.validateConfigForm.value.groupId : undefined,
+            groupId: this.validateConfigForm.value.groupId || undefined,
             userId: this.validateConfigForm.value.userGroup === 1 ? this.validateConfigForm.value.userId : undefined,
-            // hosId: this.currentHospital.id,
           }
         }
       };
@@ -575,10 +574,10 @@ export class ConfigurationCenterComponent implements OnInit, AfterViewInit {
       if(this.coopType !== 0){
         this.getCategoryList(this.coopType, this.coopType === 1 ? undefined : this['activeCategory' + (this.coopType - 1)].id);
       }else{
-        this.getCategoryList(this.currentCategoryIndex, this.currentCategoryIndex === 1 ? undefined : this['activeCategory' + this.currentCategoryIndex].id);
+        this.getCategoryList(this.currentCategoryIndex, this.currentCategoryIndex === 1 ? undefined : this['activeCategory' + (this.currentCategoryIndex - 1)].id);
       }
-      if(this.activeCategory1.id || this.activeCategory2.id || this.activeCategory3.id){
-        this.getCategoryConfigList(this.activeCategory1.id || this.activeCategory2.id || this.activeCategory3.id);
+      if(this.activeCategory3.id || this.activeCategory2.id || this.activeCategory1.id){
+        this.getCategoryConfigList(this.activeCategory3.id || this.activeCategory2.id || this.activeCategory1.id);
       }
     } else if(this.activeTagId == 2){
       this.getPriorityList();
@@ -934,8 +933,8 @@ export class ConfigurationCenterComponent implements OnInit, AfterViewInit {
   // 搜索
   // 获取用户
   userList: any = [];
-  getUsers(keyword = '') {
-    if(!this.validateConfigForm.value.dutyId){
+  getUsers(keyword = '', isShowValue = false) {
+    if((!this.validateConfigForm.value.groupId && this.validateConfigForm.value.userGroup === 1) || this.validateConfigForm.value.userGroup === 2){
       this.userList = [];
       return;
     }
@@ -944,6 +943,7 @@ export class ConfigurationCenterComponent implements OnInit, AfterViewInit {
         hospital: { id: this.validateConfigForm.value.dutyId },
         name: keyword,
         simpleQuery: true,
+        groupdata: { id: this.validateConfigForm.value.groupId },
       },
       idx: 0,
       sum: 10,
@@ -952,13 +952,18 @@ export class ConfigurationCenterComponent implements OnInit, AfterViewInit {
       .getFetchDataList("data", "user", postData)
       .subscribe((data) => {
         this.isLoading = false;
-        this.userList = data.list || [];
+        let userList = data.list || [];
+        if(isShowValue && this.coopData && this.coopData.userId){
+          userList = userList.filter(v => v.id !== this.coopData.userId)
+          userList.unshift(this.coopData.userDTO);
+        }
+        this.userList = userList;
       });
   }
 
   // 获取组
   groupList: any = []; //所有所属科室(搜索)
-  getGroups(keyword = '') {
+  getGroups(keyword = '', isShowValue = false) {
     if(!this.validateConfigForm.value.dutyId){
       this.groupList = [];
       return;
@@ -976,7 +981,12 @@ export class ConfigurationCenterComponent implements OnInit, AfterViewInit {
       .getFetchDataList("data", "group2", postData)
       .subscribe((data) => {
         this.isLoading = false;
-        this.groupList = data.list || [];
+        let groupList = data.list || [];
+        if(isShowValue && this.coopData && this.coopData.groupId){
+          groupList = groupList.filter(v => v.id !== this.coopData.groupId)
+          groupList.unshift(this.coopData.groupDTO);
+        }
+        this.groupList = groupList;
       });
   }