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

src/app/components/bind-extension-number/bind-extension-number.component.ts

@@ -126,6 +126,7 @@ export class BindExtensionNumberComponent implements OnInit {
 
   // 修改选项卡-是否启动
   changeFlag(flag, item){
+    this.activeScopeTab = item;
     if(flag){
       this.scopeTabs.forEach(v => {
         if(v.value != item.value){

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

@@ -7,21 +7,21 @@
 <div class="content">
   <div class="contentInner">
     <div class="address">
-      <div class="contentHead">一级故障现象<button nz-button nzType="primary" nzSize="small" (click)="addCategoryModal(1)">新增</button></div>
+      <div class="contentHead">一级故障现象<div><button nz-button nzType="primary" nzSize="small" (click)="editCategory(1, activeCategory1)" class="mr8" *ngIf="activeCategory1.id && hospitalConfig === 2">编辑</button><button nz-button nzType="primary" nzSize="small" (click)="addCategoryModal(1)">新增</button></div></div>
       <overlay-scrollbars #osComponentRef1 class="contentBody">
         <nz-spin nzSimple [nzSpinning]="categoryLoading1" class="mt8 text_align_center"></nz-spin>
         <div [hidden]="categoryLoading1" class="contentItem" [title]="item.category" [ngClass]="{ active: item.id === activeCategory1.id }" (click)="clickCategory(item, 1)" *ngFor="let item of categoryList1">{{ item.category }}</div>
       </overlay-scrollbars>
     </div>
     <div class="address">
-      <div class="contentHead">二级故障现象<button nz-button nzType="primary" nzSize="small" *ngIf="activeCategory1.id" (click)="addCategoryModal(2)">新增</button></div>
+      <div class="contentHead">二级故障现象<div><button nz-button nzType="primary" nzSize="small" *ngIf="activeCategory2.id && hospitalConfig === 2" (click)="editCategory(2, activeCategory2)" class="mr8">编辑</button><button nz-button nzType="primary" nzSize="small" *ngIf="activeCategory1.id" (click)="addCategoryModal(2)">新增</button></div></div>
       <overlay-scrollbars #osComponentRef2 class="contentBody">
         <nz-spin nzSimple [nzSpinning]="categoryLoading2" class="mt8 text_align_center"></nz-spin>
         <div [hidden]="categoryLoading2" class="contentItem" [title]="item.category" [ngClass]="{ active: item.id === activeCategory2.id }" (click)="clickCategory(item, 2)" *ngFor="let item of categoryList2">{{ item.category }}</div>
       </overlay-scrollbars>
     </div>
     <div class="address">
-      <div class="contentHead">三级故障现象<button nz-button nzType="primary" nzSize="small" *ngIf="activeCategory2.id" (click)="addCategoryModal(3)">新增</button></div>
+      <div class="contentHead">三级故障现象<div><button nz-button nzType="primary" nzSize="small" *ngIf="activeCategory3.id && hospitalConfig === 2" (click)="editCategory(3, activeCategory3)" class="mr8">编辑</button><button nz-button nzType="primary" nzSize="small" *ngIf="activeCategory2.id" (click)="addCategoryModal(3)">新增</button></div></div>
       <overlay-scrollbars #osComponentRef3 class="contentBody">
         <nz-spin nzSimple [nzSpinning]="categoryLoading3" class="mt8 text_align_center"></nz-spin>
         <div [hidden]="categoryLoading3" class="contentItem" [title]="item.category" [ngClass]="{ active: item.id === activeCategory3.id }" (click)="clickCategory(item, 3)" *ngFor="let item of categoryList3">{{ item.category }}</div>
@@ -186,11 +186,38 @@
   <div class="modalBody">
     <div class="title">{{modelName}}<i class="icon_transport transport-guanbi" (click)="hideCategoryModal()"></i></div>
     <div class="content">
-      <div class="tips" *ngIf="coopType === 1">您将添加一级故障现象，请输入故障现象</div>
-      <div class="tips" *ngIf="coopType === 2">您将在“<span class="red">{{activeCategory1.category}}</span>”下新增故障现象，请输入故障现象</div>
-      <div class="tips" *ngIf="coopType === 3">您将在“<span class="red">{{activeCategory1.category}}{{activeCategory2.category ? ' - ' + activeCategory2.category : ''}}</span>”下新增故障现象，请输入故障现象</div>
+      <div class="tips" *ngIf="coopType === 1 && add">您将添加一级故障现象，请输入故障现象</div>
+      <div class="tips" *ngIf="coopType === 2 && add">您将在“<span class="red">{{activeCategory1.category}}</span>”下新增故障现象，请输入故障现象</div>
+      <div class="tips" *ngIf="coopType === 3 && add">您将在“<span class="red">{{activeCategory1.category}}{{activeCategory2.category ? ' - ' + activeCategory2.category : ''}}</span>”下新增故障现象，请输入故障现象</div>
       <form nz-form [formGroup]="validateCategoryForm" class="addForm">
+        <nz-form-item *ngIf="!add && (coopType === 2 || coopType === 3)">
+          <nz-form-label nzFor="category1" nzRequired [nzSpan]="6">一级故障现象</nz-form-label>
+          <nz-form-control [nzSpan]="24" nzErrorTip="请选择一级故障现象!">
+						<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择一级故障现象" formControlName="category1" (ngModelChange)="changeOneCategory($event)">
+						  <ng-container *ngFor="let option of categoryListP1">
+						    <nz-option *ngIf="!isLoading" [nzLabel]="option.category" [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 *ngIf="!add && coopType === 3">
+          <nz-form-label nzFor="category2" nzRequired [nzSpan]="6">二级故障现象</nz-form-label>
+          <nz-form-control [nzSpan]="24" nzErrorTip="请选择二级故障现象!">
+						<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择二级故障现象" formControlName="category2">
+						  <ng-container *ngFor="let option of categoryListP2">
+						    <nz-option *ngIf="!isLoading" [nzLabel]="option.category" [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 nzFor="category" nzRequired [nzSpan]="6" *ngIf="!add">故障现象名称</nz-form-label>
           <nz-form-control [nzSpan]="24" nzErrorTip="请输入故障现象名称!">
             <nz-input-group>
               <textarea formControlName="name" nz-input placeholder="请输入故障现象名称" [nzAutosize]="{minRows: 3}"></textarea>

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

@@ -6,6 +6,7 @@ import { MainService } from "../../../services/main.service";
 import { Validators, FormGroup, FormBuilder } from '@angular/forms';
 import { ToolService } from 'src/app/services/tool.service';
 import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
+import cloneDeep from 'lodash-es/cloneDeep'
 
 @Component({
   selector: "app-configuration-category",
@@ -349,7 +350,7 @@ export class ConfigurationCategoryComponent implements OnInit {
   categoryLoading1:boolean = false;
   categoryLoading2:boolean = false;
   categoryLoading3:boolean = false;
-  getCategoryList(type:number, parentId = 0) {
+  getCategoryList(type:number, parentId = 0, isEdit = false, isOnly = false) {
     setTimeout(() => {
       this['categoryLoading' + type] = true;
     }, 0)
@@ -363,6 +364,33 @@ export class ConfigurationCategoryComponent implements OnInit {
     this.mainService.incidentPost("listIncidentCategory", postData).subscribe(res => {
       this['categoryLoading' + type] = false;
       this['categoryList' + type] = res.data || [];
+      this['categoryListP' + type] = cloneDeep(this['categoryList' + type]);
+      if(isEdit){
+        this['activeCategory' + type] = this['categoryList' + type].find(v => v.id == this['activeCategory' + type].id);
+      }
+
+      if(isOnly){
+        this['activeCategory' + type] = this['categoryList' + type].find(v => v.id == this.validateCategoryForm.value['category' + type]);
+      }
+    })
+  }
+
+  // 弹窗-故障现象查询
+  categoryListP1: any[] = [];
+  categoryListP2: any[] = [];
+  categoryListP3: any[] = [];
+  getCategoryListP(type:number, parentId = 0) {
+    this.isLoading = true;
+    let postData = {
+      category: {
+        hierarchy: type === 1 ? 1 : undefined,
+        dutyIds: this.hospitalConfig === 1 ? this.currentHospital.id.toString()  : undefined,
+        parent: type === 1 ? undefined : { id: parentId },
+      },
+    };
+    this.mainService.incidentPost("listIncidentCategory", postData).subscribe(res => {
+      this.isLoading = false;
+      this['categoryListP' + type] = res.data || [];
     })
   }
 
@@ -385,23 +413,54 @@ export class ConfigurationCategoryComponent implements OnInit {
 
   // 初始化新增form表单
   validateCategoryForm: FormGroup; //新增/编辑表单
-  initCategoryForm() {
-    this.validateCategoryForm = this.fb.group({
-      name: [null, [Validators.required]],//名称
-    });
+  initCategoryForm(isEdit = false) {
+    if(isEdit){
+      if(this.coopType === 1){
+        this.validateCategoryForm = this.fb.group({
+          name: [null, [Validators.required]],//名称
+        });
+      }else if(this.coopType === 2){
+        this.validateCategoryForm = this.fb.group({
+          category1: [null, [Validators.required]],//一级故障现象
+          name: [null, [Validators.required]],//名称
+        });
+      }else if(this.coopType === 3){
+        this.validateCategoryForm = this.fb.group({
+          category1: [null, [Validators.required]],//一级故障现象
+          category2: [null, [Validators.required]],//二级故障现象
+          name: [null, [Validators.required]],//名称
+        });
+      }
+    }else{
+      this.validateCategoryForm = this.fb.group({
+        name: [null, [Validators.required]],//名称
+      });
+    }
+
     console.log(this.validateCategoryForm.controls)
   }
 
   // 编辑
-  // editCategory(data) {
-  //   console.log(data);
-  //   this.modelName = "编辑";
-  //   this.add = false;
-  //   this.modalCategory = true;
-  //   this.initCategoryForm();
-  //   this.coopData = data;
-  //   this.validateCategoryForm.controls.name.setValue(data.name);
-  // }
+  editCategory(type, data) {
+    console.log(data);
+    this.coopType = type;
+    this.modelName = "编辑";
+    this.add = false;
+    this.modalCategory = true;
+    this.initCategoryForm(true);
+    this.coopData = data;
+
+    this.validateCategoryForm.controls.name.setValue(data.category);
+    if(type === 2){
+      this.categoryListP1 = cloneDeep(this.categoryList1);
+      this.validateCategoryForm.controls.category1.setValue(this.activeCategory1.id);
+    }else if(type === 3){
+      this.categoryListP1 = cloneDeep(this.categoryList1);
+      this.categoryListP2 = cloneDeep(this.categoryList2);
+      this.validateCategoryForm.controls.category1.setValue(this.activeCategory1.id);
+      this.validateCategoryForm.controls.category2.setValue(this.activeCategory2.id);
+    }
+  }
 
   // 新增/编辑表单提交
   btnLoading: boolean = false; //提交按钮loading状态
@@ -416,34 +475,54 @@ export class ConfigurationCategoryComponent implements OnInit {
     console.log(this.validateCategoryForm.value);
     this.btnLoading = true;
     // -----------------------------------
-    let postData:any = {
-      category: {
-        hosId: this.currentHospital.id,
-        parent: this.coopType === 1 ? undefined : this['activeCategory' + (this.coopType - 1)],
-        category: this.validateCategoryForm.value.name,
-        hierarchy: this.coopType,
-        dutyIds: this.hospitalConfig === 1 ? this.currentHospital.id.toString() : undefined,
-      },
-    };
-    this.mainService
-      .incidentPost("checkIncidentCategory", postData)
-      .subscribe((result) => {
-        let msg = "";
-        if (this.add) {
-          msg = "新增";
-        } else {
-          msg = "修改";
+    if(this.add){
+      // 新增
+      let postData:any = {
+        category: {
+          hosId: this.currentHospital.id,
+          parent: this.coopType === 1 ? undefined : this['activeCategory' + (this.coopType - 1)],
+          category: this.validateCategoryForm.value.name,
+          hierarchy: this.coopType,
+          dutyIds: this.hospitalConfig === 1 ? this.currentHospital.id.toString() : undefined,
+        },
+      };
+      this.mainService
+        .incidentPost("checkIncidentCategory", postData)
+        .subscribe((result) => {
+          if (result.status == 200) {
+            this.submitCategoryAddForm();
+          } else if(result.status == 502) {
+            this.btnLoading = false;
+            this.showDelModal(null, result.msg, '', 'relevance');
+          } else {
+            this.btnLoading = false;
+            this.showPromptModal('新增', false, result.msg);
+          }
+        });
+    }else{
+      // 编辑
+      console.log(this['activeCategory' + this.coopType])
+      //编辑
+      let postData = {
+        incidentCategory: {
+          ...this.coopData,
+          parent: this.coopType === 1 ? undefined : (this.coopType === 2 ? { id: this.validateCategoryForm.value.category1 } : { id: this.validateCategoryForm.value.category2 }),
+          category: this.validateCategoryForm.value.name,
         }
-        if (result.status == 200) {
-          this.submitCategoryAddForm();
-        } else if(result.status == 502) {
-          this.btnLoading = false;
-          this.showDelModal(null, result.msg, '', 'relevance');
-        } else {
+      };
+      console.log(postData);
+      this.mainService
+        .coopData("updData", "incidentCategory", postData)
+        .subscribe((result) => {
           this.btnLoading = false;
-          this.showPromptModal(msg, false, result.msg);
-        }
-      });
+          this.hideCategoryModal();
+          if (result.status == 200) {
+            this.showPromptModal('编辑', true, '');
+          } else {
+            this.showPromptModal('编辑', false, result.msg);
+          }
+        });
+    }
     // -----------------------------------
   }
 
@@ -704,6 +783,12 @@ export class ConfigurationCategoryComponent implements OnInit {
     this.validateConfigForm.get(name)!.updateValueAndValidity();
   }
 
+  // 修改故障现象
+  changeOneCategory(id){
+    this.validateCategoryForm.controls.category2.setValue(null);
+    this.getCategoryListP(2, id);
+  }
+
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
   promptContent: string; //操作提示框提示信息
   ifSuccess: boolean; //操作成功/失败
@@ -717,13 +802,28 @@ export class ConfigurationCategoryComponent implements OnInit {
     setTimeout(() => {
       this.promptModalShow = true;
     }, 100);
-    if(this.coopType !== 0){
-      this.getCategoryList(this.coopType, this.coopType === 1 ? undefined : this['activeCategory' + (this.coopType - 1)].id);
+    if(con === '编辑'){
+      if(success){
+        if(this.coopType === 1){
+          this.getCategoryList(1, 0, true);
+        }else if(this.coopType === 2){
+          this.getCategoryList(1, 0, false, true);
+          this.getCategoryList(2, this.validateCategoryForm.value.category1, true);
+        }else if(this.coopType === 3){
+          this.getCategoryList(1, 0, false, true);
+          this.getCategoryList(2, this.validateCategoryForm.value.category1, false, true);
+          this.getCategoryList(3, this.validateCategoryForm.value.category2, true);
+        }
+      }
     }else{
-      this.getCategoryList(this.currentCategoryIndex, this.currentCategoryIndex === 1 ? undefined : this['activeCategory' + (this.currentCategoryIndex - 1)].id);
-    }
-    if(this.activeCategory3.id || this.activeCategory2.id || this.activeCategory1.id){
-      this.getCategoryConfigList(this.activeCategory3.id || this.activeCategory2.id || this.activeCategory1.id);
+      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 - 1)].id);
+      }
+      if(this.activeCategory3.id || this.activeCategory2.id || this.activeCategory1.id){
+        this.getCategoryConfigList(this.activeCategory3.id || this.activeCategory2.id || this.activeCategory1.id);
+      }
     }
   }
 }

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

@@ -0,0 +1,92 @@
+<div class="content priority">
+  <div class="contentInner">
+    <div class="list-template" id="priorityTable">
+      <div class="list-template__content">
+        <div class="list-template__bottom">
+         <div class="list-template__top" nz-row>
+            <div nz-col nzLg="24" class="list-template__btns">
+              <button nz-button class="btn default" (click)="addPriorityModal()">新增</button>
+            </div>
+          </div>
+          <nz-table class="list-template__nzTable" [nzData]="commonFaultsList" nzSize="middle" [nzShowPagination]="false"
+            [nzLoading]="loading1" [nzScroll]="{ y: tablePriorityHeight + 'px' }">
+            <thead>
+              <tr class="thead">
+                <th nzWidth="25%">排序号</th>
+                <th nzWidth="25%">故障现象</th>
+                <th nzWidth="25%">别名</th>
+                <th nzWidth="25%">操作</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of commonFaultsList;let i = index">
+                <td>{{data.orders}}</td>
+                <td>{{data.categoryDTO?.mutiCategory}}</td>
+                <td>{{data.content}}</td>
+                <td>
+                  <div class="coop">
+                    <span (click)="showDelModal(data,'您确认要删除吗？','删除','delPriority')">删除</span>
+                    <span (click)="editPriority(data)">编辑</span>
+                  </div>
+                </td>
+              </tr>
+            </tbody>
+          </nz-table>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>
+
+<!-- 删除模态框 -->
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+(confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>
+
+<!-- 新增/编辑模态框 -->
+<div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="modalPriority">
+  <div class="modalBody">
+    <div class="title">{{modelName}}<i class="icon_transport transport-guanbi" (click)="hidePriorityModal()"></i></div>
+    <div class="content">
+      <form nz-form [formGroup]="validatePriorityForm" class="addForm">
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="orders">排序号</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请输入排序号!">
+            <nz-input-group>
+              <nz-input-number class="w100" formControlName="orders" nzPlaceHolder="请输入排序号" [nzMin]="0" [nzStep]="1" [nzPrecision]="0"></nz-input-number>
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="content">别名</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请输入别名!">
+            <nz-input-group>
+              <input formControlName="content" nz-input placeholder="请输入别名">
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label nzFor="category" nzRequired [nzSpan]="6">故障现象</nz-form-label>
+          <nz-form-control [nzSpan]="18">
+						<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择故障现象" formControlName="category" (nzOnSearch)="changeCommonInp('category', $event)">
+						  <ng-container *ngFor="let option of malfunctionData">
+						    <nz-option *ngIf="!isLoading" [nzLabel]="option.mutiCategory" [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>
+      </form>
+    </div>
+    <div class=" display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitPriorityForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hidePriorityModal()">取消</button>
+    </div>
+  </div>
+</div>

src/app/components/configurationCenter/configuration-commonFaults/configuration-commonFaults.component.less

@@ -0,0 +1,290 @@
+@import "../../../../../src/theme.less";
+:host {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  background-color: #F0F2F5;
+  .list-template__nzTable,
+  .list-template__bottom{
+    padding: 0!important;
+    border: none!important;
+    background: #fff!important;
+  }
+  .list-template{
+    width: 100%!important;
+    height: 100%!important;
+  }
+  .content{
+    flex: 1;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    border: 1px solid #EEF3F9;
+    &.priority{
+      margin: 20px;
+      background-color: #fff;
+      .contentInner{
+        border: 1px solid #E8EBEF;
+      }
+    }
+    .contentItem{
+      padding: 4px 16px;
+      cursor: pointer;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      &.active{
+        color: @primary-color;
+        background-color: #F0F6ED;
+        border-radius: 4px;
+      }
+    }
+    .contentInner{
+      flex: 1;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 0 16px;
+      gap: 16px;
+      .contentHead{
+        height: 45px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        gap: 16px;
+        padding: 0 16px;
+        font-size: 16px;
+        font-weight: bold;
+        border-bottom: 1px solid #D9D9D9;
+        .title{
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+        .btns{
+          flex-shrink: 0;
+        }
+      }
+      .contentBody{
+        padding: 0 8px;
+        margin: 4px 0;
+        flex: 1;
+      }
+      .address{
+        flex: 1;
+        height: 100%;
+        background: #FFFFFF;
+        border: 1px solid #E8EBEF;
+        display: flex;
+        flex-direction: column;
+        width: 0;
+      }
+      .addressAssign{
+        flex: 3;
+        height: 100%;
+        background: #FFFFFF;
+        border: 1px solid #E8EBEF;
+        display: flex;
+        flex-direction: column;
+        width: 0;
+      }
+      .list-template__searchItem {
+        margin-bottom: 16px;
+        .label {
+          color: #333;
+          display: inline-block;
+          width: 70px;
+          text-align-last: justify;
+          text-align: justify;
+          &.label--big {
+            width: 100px;
+          }
+        }
+        .formItem {
+          width: 135px;
+        }
+      }
+    }
+    .contentBtns{
+      margin-bottom: 16px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+  }
+
+  .save {
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.4);
+    z-index: 99;
+
+    .tips{
+      margin-bottom: 16px!important;
+    }
+
+    .modalBody {
+      width: 350px;
+      background: #fff;
+      border-radius: 5px;
+      padding: 10px 20px;
+      color: #333;
+
+      .title {
+        width: 100%;
+        text-align: center;
+        font-size: 18px;
+        position: relative;
+
+        i {
+          position: absolute;
+          right: 0;
+          top: 0;
+          font-size: 20px;
+          color: #666;
+          cursor: pointer;
+          padding: 0 5px;
+        }
+      }
+
+      .content {
+        width: 310px;
+        background: #f9fafb;
+        border: 1px solid #e5e9ed;
+        border-radius: 5px;
+        overflow: hidden;
+        margin-top: 12px;
+        padding: 16px 0;
+
+        .busyList{
+          display: flex;
+          margin-bottom: 8px;
+          .busyContent{
+            margin-right: 8px;
+            flex: 1;
+          }
+        }
+
+        & > div {
+          text-align: center;
+          margin: 0;
+
+          &.icon {
+            // margin-top: 17px;
+
+            i {
+              color: #34b349;
+              font-size: 30px !important;
+
+              &.transport-wenhao {
+                color: #f5a523;
+              }
+
+              &.transport-shibai {
+                color: #ff3a52;
+              }
+            }
+          }
+
+          &.defeat {
+            color: #333;
+            font-size: 14px;
+          }
+
+          &:nth-child(3) {
+            font-size: 14px;
+            color: #666;
+          }
+        }
+        .workAssignmentTips {
+          font-size: 12px;
+        }
+      }
+
+      button {
+        margin-top: 10px;
+
+        &.btn {
+          margin-left: 8px;
+        }
+      }
+    }
+
+    // 新增
+    &.add {
+      .modalBody {
+        width: 480px;
+        height: auto;
+
+        .content {
+          width: 100%;
+          height: auto;
+          padding: 16px;
+          max-height: 497px;
+          overflow-y: auto;
+
+          .addForm {
+            .ant-form-item {
+              margin-bottom: 0;
+							.ant-select{
+								width: 100% !important;
+							}
+              .ant-form-item-label {
+                text-align: left;
+              }
+
+              .desc {
+                margin-top: 5px;
+              }
+            }
+
+            .datesControl {
+              margin-top: -16px;
+
+              .ant-form-item-label {
+                line-height: 40px;
+              }
+            }
+
+            .timer {
+              .ant-form-item-label {
+                width: 100%;
+                text-align: left;
+              }
+
+              .numInp {
+                margin-right: 5px;
+              }
+
+              .line {
+                margin-right: 5px;
+              }
+            }
+
+            .timer2 {
+              .ant-form-item-label {
+                line-height: 20px;
+              }
+            }
+          }
+
+          .editForm {
+            .ant-form-item {
+              margin-bottom: 15px;
+
+              .ant-form-item-label {
+                line-height: 14px;
+                text-align: left;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,235 @@
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+import { MainService } from "../../../services/main.service";
+import { Validators, FormGroup, FormBuilder } from '@angular/forms';
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from 'ng-zorro-antd';
+
+@Component({
+  selector: "app-configuration-commonFaults",
+  templateUrl: "./configuration-commonFaults.component.html",
+  styleUrls: ["./configuration-commonFaults.component.less"],
+})
+export class ConfigurationCommonFaultsComponent implements OnInit {
+  constructor(
+    private route: ActivatedRoute,
+    private mainService: MainService,
+    private fb: FormBuilder,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) {}
+
+  coopData: any = {}; //当前操作列
+	hosId:any;
+	hospitals:any = [];
+	isDeptLoading: boolean = false;
+
+	currentHospital:any;
+	malfunctionData:any = [];
+	allUserGroup:any = [];
+	userData:any = [];
+
+  changeCommonInpSubject = new Subject();
+
+  ngOnInit() {
+		this.changeCommonInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+      if(v[0] === 'category'){
+        this.searchApplicationCategory(v[1]);
+      }
+    });
+
+    // 优先级
+    setTimeout(() => {
+      this.tablePriorityHeight = document.querySelector('#priorityTable').clientHeight - document.querySelector('#priorityTable .list-template__top').clientHeight - 8 - document.querySelector('#priorityTable .thead').clientHeight;
+    }, 100)
+		this.hosId = this.tool.getCurrentHospital().id;
+		this.currentHospital = this.tool.getCurrentHospital();
+    this.getCommonFaultsList();
+		this.searchApplicationCategory()
+  }
+
+  // 新增优先级弹框
+  modelName = ""; //模态框名称
+  modalPriority: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  addPriorityModal() {
+    this.modelName = "新增";
+    this.add = true; //新增
+    this.modalPriority = true;
+    this.initForm();
+  }
+  //关闭新增/编辑弹框
+  hidePriorityModal() {
+    this.modalPriority = false;
+  }
+
+  changeCommonInp(type, e) {
+    this.changeCommonInpSubject.next([type, e]);
+  }
+
+	// 获取故障现象数据
+  isLoading:boolean = false;
+	searchApplicationCategory(keyWord?){
+		let postData = {
+		  category: {
+        category: keyWord,
+        selectType: "mutlQuery",
+		    hierarchy: 3,
+		  },
+		};
+    this.isLoading = true;
+		this.mainService.incidentPost("listIncidentCategory", postData).subscribe(data => {
+		  this.isLoading = false;
+      if (data.status == 200) {
+        this.malfunctionData = data.data || [];
+      }
+		})
+	}
+
+  // 编辑
+  editPriority(data) {
+    console.log(data);
+    this.modelName = "编辑";
+    this.add = false;
+    this.modalPriority = true;
+    this.initForm();
+    this.coopData = data;
+    this.validatePriorityForm.controls.orders.setValue(data.orders);
+    this.validatePriorityForm.controls.content.setValue(data.content);
+    this.validatePriorityForm.controls.category.setValue(data.category);
+  }
+
+  // 新增/编辑表单提交
+  btnLoading: boolean = false; //提交按钮loading状态
+  submitPriorityForm(): void {
+    for (const i in this.validatePriorityForm.controls) {
+      this.validatePriorityForm.controls[i].markAsDirty();
+      this.validatePriorityForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validatePriorityForm.invalid) {
+      return;
+    }
+    console.log(this.validatePriorityForm.value);
+    this.btnLoading = true;
+    let postData:any = {};
+    if (this.add) {
+      //增加
+      postData = {
+        orders: this.validatePriorityForm.value.orders,
+        content: this.validatePriorityForm.value.content,
+        category: this.validatePriorityForm.value.category,
+      };
+    } else {
+      //编辑
+      postData = {
+				...this.coopData,
+				orders: this.validatePriorityForm.value.orders,
+        content: this.validatePriorityForm.value.content,
+        category: this.validatePriorityForm.value.category,
+      };
+    }
+    this.mainService
+      .simplePost("addData", "incidentCategoryContent", postData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        this.hidePriorityModal();
+        let msg = "";
+        if (this.add) {
+          msg = "新增";
+        } else {
+          msg = "修改";
+        }
+        if (result.status == 200) {
+          this.showPromptModal(msg, true, '');
+        } else {
+          this.showPromptModal(msg, false, result.msg);
+        }
+      });
+  }
+
+  // 初始化新增form表单
+  validatePriorityForm: FormGroup; //新增/编辑表单
+  initForm() {
+    this.validatePriorityForm = this.fb.group({
+      orders: [0, [Validators.required]],//排序号
+      content: [null, [Validators.required]],//别名
+      category: [null, [Validators.required]],//故障现象
+    });
+    console.log(this.validatePriorityForm.controls)
+  }
+
+  // 获取列表
+  loading1:boolean = false;
+  commonFaultsList: any[] = []; //表格数据
+  tablePriorityHeight:number = 0;
+  getCommonFaultsList() {
+    let data = {
+			idx: 0,
+			sum: 99999,
+			incidentCategoryContent: {},
+		};
+		this.loading1 = true;
+		this.mainService
+			.getFetchDataList("simple/data", "incidentCategoryContent", data)
+			.subscribe((data) => {
+				this.loading1 = false;
+				this.commonFaultsList = data.list || [];
+			});
+  }
+
+  delModal: boolean = false; //删除模态框
+  tipsMsg1: string; //提示框信息
+  tipsMsg2: string; //操作后信息
+  confirmDelType: string; //确认的类型（启用/停用，删除）
+  showDelModal(
+    data,
+    tipsMsg1: string,
+    tipsMsg2: string,
+    type: string,
+  ) {
+    this.confirmDelType = type;
+    this.delModal = true;
+    this.coopData = data;
+    console.log(this.coopData);
+    this.tipsMsg1 = tipsMsg1;
+    this.tipsMsg2 = tipsMsg2;
+  }
+  // 隐藏删除框
+  hideDelModal() {
+    this.delModal = false;
+  }
+  // 确认删除
+  confirmDel() {
+    this.btnLoading = true;
+		//删除-优先级
+		this.mainService
+			.simplePost("rmvData", "incidentCategoryContent", [this.coopData.id])
+			.subscribe((data) => {
+				this.btnLoading = false;
+				this.delModal = false;
+				if (data.status == 200) {
+					this.showPromptModal(this.tipsMsg2, true, "");
+				} else {
+					this.showPromptModal(this.tipsMsg2, false, data.msg);
+				}
+			});
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getCommonFaultsList();
+  }
+}

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

@@ -158,6 +158,7 @@ export class ConfigurationMessageComponent implements OnInit {
 
   //checkbox选中或者取消
   selectThis(e, index) {
+    this.selectTab(index);
     //遮罩切换
     this.tabs[index].disable = !this.tabs[index].checkboxFlag;
     //所有checkbox有一个选中，总开关开启

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

@@ -39,12 +39,41 @@
                   <nz-form-label class="label">收取时需扫描二维码</nz-form-label>
                   <nz-checkbox-group [(ngModel)]="arriveScanCode" (ngModelChange)="changeArriveScanCode($event)"></nz-checkbox-group>
                 </div>
-
                 <!-- 必须扫描动态二维码 -->
                 <div class="display_flex align-items_center mb8" *ngIf="arriveScanCode[0].checked">
                   <nz-form-label class="label">必须扫描动态二维码</nz-form-label>
                   <nz-checkbox-group [(ngModel)]="arriveScanDynamicCode"></nz-checkbox-group>
                 </div>
+
+                <!-- 退回标本是否填写交接人 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">退回标本是否填写交接人</nz-form-label>
+                  <nz-checkbox-group [(ngModel)]="returnSpecimenWhetherHandover"></nz-checkbox-group>
+                </div>
+
+                <!-- 显示接单签到按钮 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">显示接单签到按钮</nz-form-label>
+                  <nz-checkbox-group [(ngModel)]="bigScanShowSignBtn"></nz-checkbox-group>
+                </div>
+
+                <!-- 支持待到达非本人 -->
+                <!-- <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">支持待到达非本人</nz-form-label>
+                  <nz-checkbox-group [(ngModel)]="bigScanArriveNotOwner"></nz-checkbox-group>
+                </div> -->
+
+                <!-- 显示建单并签到按钮 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">显示建单并签到按钮</nz-form-label>
+                  <nz-checkbox-group [(ngModel)]="bigScanShowCreateBtn"></nz-checkbox-group>
+                </div>
+
+                <!-- 默认扫描标本进入标本扫描页 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">默认扫描标本进入标本扫描页</nz-form-label>
+                  <nz-checkbox-group [(ngModel)]="defaultScanSpe"></nz-checkbox-group>
+                </div>
               </div>
               <!-- 自动建单配置 -->
               <div *ngIf="tabModalName=='automaticOrderCreation'">

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

@@ -31,6 +31,31 @@ export class ConfigurationSpecimenComponent implements OnInit {
     {label:'是否开启',value: 0}
   ];
 
+  // 退回标本是否填写交接人
+  returnSpecimenWhetherHandover:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+
+  // 显示接单签到按钮
+  bigScanShowSignBtn:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+
+  // 支持待到达非本人
+  bigScanArriveNotOwner:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+
+  // 显示建单并签到按钮
+  bigScanShowCreateBtn:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+
+  // 默认扫描标本进入标本扫描页
+  defaultScanSpe:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+
   // 配置
   configs:any = {};
   // 任务类型
@@ -121,6 +146,11 @@ export class ConfigurationSpecimenComponent implements OnInit {
       deptNotAlert: this.deptNotAlert[0].checked ? 1 : 0,
       arriveScanCode: this.arriveScanCode[0].checked ? 1 : 0,
       arriveScanDynamicCode: this.arriveScanDynamicCode[0].checked ? 1 : 0,
+      returnSpecimenWhetherHandover: this.returnSpecimenWhetherHandover[0].checked ? 1 : 0,
+      bigScanShowSignBtn: this.bigScanShowSignBtn[0].checked ? 1 : 0,
+      bigScanArriveNotOwner: this.bigScanArriveNotOwner[0].checked ? 1 : 0,
+      bigScanShowCreateBtn: this.bigScanShowCreateBtn[0].checked ? 1 : 0,
+      defaultScanSpe: this.defaultScanSpe[0].checked ? 1 : 0,
       deptNotAlertIds: this.deptNotAlertIds.length ? this.deptNotAlertIds.toString() : undefined,
     };
     this.btnLoading = true;
@@ -184,6 +214,11 @@ export class ConfigurationSpecimenComponent implements OnInit {
           this.deptNotAlert[0].checked = this.configs.deptNotAlert == 1;
           this.arriveScanCode[0].checked = this.configs.arriveScanCode == 1;
           this.arriveScanDynamicCode[0].checked = this.configs.arriveScanDynamicCode == 1;
+          this.returnSpecimenWhetherHandover[0].checked = this.configs.returnSpecimenWhetherHandover == 1;
+          this.bigScanShowSignBtn[0].checked = this.configs.bigScanShowSignBtn == 1;
+          this.bigScanArriveNotOwner[0].checked = this.configs.bigScanArriveNotOwner == 1;
+          this.bigScanShowCreateBtn[0].checked = this.configs.bigScanShowCreateBtn == 1;
+          this.defaultScanSpe[0].checked = this.configs.defaultScanSpe == 1;
           this.deptNotAlertIds = this.configs.deptNotAlertIds ? this.configs.deptNotAlertIds.split(',').map(v => +v) : [];
           this.deptList = this.configs.deptNotAlertList || [];
         }

src/app/components/incidentManagement/incident-create/incident-create.component.html

@@ -0,0 +1,343 @@
+<!--
+ * @Author: seimin
+ * @Date: 2024-10-24 13:47:40
+ * @LastEditors: seimin
+ * @LastEditTime: 2024-10-25 15:47:50
+ * @Description: 创建
+-->
+<!-- 新建工单 -->
+<div class="newOrder display_flex justify-content_flex-center align-items_center">
+  <div class="modalBody">
+    <div class="title" *ngIf="currentTabIndex === '99999'">
+      <div class="newTop">
+        <div class="name">故障工单编辑</div>
+        <div class="newTopItem">
+          <span class="grayFont required">院区：</span>
+          <nz-select style="width: 160px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzPlaceHolder="请选择院区" [(ngModel)]="incidentModel.hosId" (ngModelChange)="changeApplyHospital($event)" nzAllowClear [nzDisabled]="buildType === '编辑事件'">
+            <ng-container *ngFor="let option of applicationHospitalList">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName" [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>
+        </div>
+        <div class="newTopItem">
+          <span class="grayFont required">申请科室：</span>
+          <nz-select style="width: 160px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeInp('itsm', $event)" nzPlaceHolder="请选择申请科室" [(ngModel)]="incidentModel.department" (ngModelChange)="changeApplyDept($event)" nzAllowClear (nzOpenChange)="openChangeApplyDept($event)">
+            <ng-container *ngFor="let option of applicationDeptList">
+              <nz-option *ngIf="!isLoadingApply" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoadingApply" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
+        <div class="newTopItem">
+          <span class="grayFont">申请人：</span>
+          <ng-container *ngIf="buildType === '报修转事件'">{{incidentMsg.requesterName}}</ng-container>
+          <ng-container *ngIf="buildType !== '报修转事件'">
+            <nz-select style="width: 160px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('requester', $event)" nzPlaceHolder="请选择申请人" [(ngModel)]="incidentModel.requester" (ngModelChange)="changeApplyRequester($event)" nzAllowClear (nzOpenChange)="openChangeApplyRequester($event)">
+              <ng-container *ngFor="let option of applicationRequesterList">
+                <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>
+            <label nz-checkbox [(ngModel)]="isRelatedDepartment" (ngModelChange)="changeApplyRelatedDepartment($event)" class="ml8">关联查</label>
+          </ng-container>
+        </div>
+      </div>
+    </div>
+    <div nz-row class="content">
+      <div nz-col nzSpan="15" class="col left">
+        <div class="tabs">
+          <div class="tabs__inner" #tab>
+            <div class="tabs__wrap" [style.transform]="'translateX(' + disX + 'px)'">
+              <ng-container *ngFor="let item of workTypesArrange | keyvalue">
+                <div [ngClass]="{ tab: true, checked: currentTabIndex == item.key}" (click)="tabClick(item.key)">
+                  {{ item.value[0].associationTypeName }}
+                </div>
+              </ng-container>
+            </div>
+          </div>
+          <div class="tabs__operate" *ngIf="workTypesFlag && incidentModel.department">
+            <i
+              class="tabs__Icon--right icon_transport transport-xiangzuo"
+              (click)="toLeft()"
+            ></i>
+            <i
+              class="tabs__Icon--left icon_transport transport-xiangzuo"
+              (click)="toRight()"
+            ></i>
+          </div>
+        </div>
+        <!-- 底部tab页 -->
+        <div class="bottomWrap">
+          <ng-container *ngFor="let item of workTypesArrange | keyvalue">
+            <!-- 故障报修 -->
+            <overlay-scrollbars #osComponentRef15 class="bottom_req" *ngIf="currentTabIndex === '99999'">
+              <div class="req">
+                <div class="row">
+                  <div class="col flex4">
+                    <span class="name">详细地址：</span>
+                    <nz-select class="w100" [(ngModel)]="incidentModel.area" (ngModelChange)="changeApplyBuilding($event)" nzAllowClear nzPlaceHolder="请选择楼栋">
+                      <nz-option [nzValue]="item.id" [nzLabel]="item.buildingName" *ngFor="let item of applicationBuildingList"></nz-option>
+                    </nz-select>
+                  </div>
+                  <div class="col flex3">
+                    <nz-select class="w100" [(ngModel)]="incidentModel.place" nzAllowClear nzPlaceHolder="请选择楼层">
+                      <nz-option [nzValue]="item.id" [nzLabel]="item.floorName" *ngFor="let item of applicationFloorList"></nz-option>
+                    </nz-select>
+                  </div>
+                  <div class="col flex7">
+                    <input nz-input placeholder="请填写详细地址" [(ngModel)]="incidentModel.houseNumber" />
+                  </div>
+                </div>
+
+                <div class="row gap8">
+                  <div class="col">
+                    <span class="name">科室电话：</span>
+                    <ng-container *ngIf="incidentMsg.deptManyPhone">{{incidentMsg.deptManyPhone|stringToFirstValue}}<em (click)="importPhone(incidentMsg.deptManyPhone, true)">引入</em></ng-container>
+                  </div>
+                  <div class="col">
+                    <span class="name">报修人电话：</span>
+                    <ng-container *ngIf="incidentMsg.requesterPhone">{{incidentMsg.requesterPhone}}<em (click)="importPhone(incidentMsg.requesterPhone)">引入</em></ng-container>
+                  </div>
+                  <div class="col">
+
+                  </div>
+                </div>
+
+                <div class="row gap8">
+                  <div class="col">
+                    <span class="name">联系人：</span>
+                    <input class="w100" nz-input placeholder="请填写联系人" [(ngModel)]="incidentModel.contacts" />
+                  </div>
+                  <div class="col">
+                    <span class="name required">联系电话：</span>
+                    <input class="w100" nz-input placeholder="请填写联系电话" [(ngModel)]="incidentModel.contactsInformation" />
+                  </div>
+                  <div class="col">
+                    <span class="name">责任部门：</span>
+                    {{incidentModel.duty ? incidentModel.duty.hosName : ''}}
+                  </div>
+                </div>
+
+                <div class="row gap8">
+                  <div class="col">
+                    <span class="name required">故障现象：</span>
+                    <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('category', $event)" nzPlaceHolder="请选择故障现象" [(ngModel)]="incidentModel.category" (ngModelChange)="changeApplyCategory($event)" (nzOpenChange)="openChangeApplyCategory($event)">
+                      <ng-container *ngFor="let option of applicationCategoryList">
+                        <nz-option *ngIf="!isLoading" [nzLabel]="option.mutiCategory" [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>
+                  </div>
+                </div>
+
+                <div class="row gap8">
+                  <div class="col alignItemsStart">
+                    <span class="name required">故障描述：</span>
+                    <nz-input-group [nzSuffix]="suffixTemplate">
+                      <textarea class="w100" nz-input rows="4" placeholder="请填写故障描述" [(ngModel)]="incidentModel.description"></textarea>
+                    </nz-input-group>
+                    <span #suffixTemplate class="ant-input-clear-icon ml8" *ngIf="incidentModel.description" (click)="incidentModel.description = null">清空</span>
+                  </div>
+                </div>
+
+                <div class="row gap8">
+                  <div class="col">
+                    <span class="name required">优先级：</span>
+                    <nz-select class="w100" [(ngModel)]="incidentModel.priorityId" nzAllowClear nzPlaceHolder="请选择优先级" [nzDisabled]="buildType === '编辑事件'">
+                      <nz-option [nzValue]="item.id" [nzLabel]="item.name" *ngFor="let item of applicationPriorityList"></nz-option>
+                    </nz-select>
+                  </div>
+                  <div class="col">
+                    <span class="name">事件来源：</span>
+                    <nz-select class="w100" [(ngModel)]="incidentModel.source" nzAllowClear nzPlaceHolder="请选择事件来源">
+                      <nz-option [nzValue]="item.id" [nzLabel]="item.name" *ngFor="let item of applicationSourceList"></nz-option>
+                    </nz-select>
+                  </div>
+                  <div class="col">
+                    <span class="name">预约时间：</span>
+                    <nz-date-picker style="width: 150px;" [(ngModel)]="incidentModel.yyTime" nzShowTime></nz-date-picker>
+                  </div>
+                </div>
+
+                <div class="row gap8">
+                  <div class="col">
+                    <span class="name">报修图片：</span>
+                    <div class="value w100 upload">
+                      <ng-container *ngIf="repairImgs.length === 0">
+                        <nz-upload nzListType="picture-card" [(nzFileList)]="fileList" [nzShowUploadList]="showUploadList" [nzPreview]="handlePreview" nzFileType="image/jpeg,image/png" nzAccept="image/jpeg,image/png" [nzShowButton]="fileList.length < 3" [nzBeforeUpload]="beforeUpload" [nzAction]="temporarilyUrl" [nzSize]="10240">
+                          <i nz-icon nzType="plus"></i>
+                          <div class="ant-upload-text">上传照片</div>
+                        </nz-upload>
+                        <nz-modal [nzVisible]="previewVisible" [nzContent]="modalContent" [nzFooter]="null" (nzOnCancel)="previewVisible = false">
+                          <ng-template #modalContent>
+                            <img [src]="previewImage" [ngStyle]="{ width: '100%' }" />
+                          </ng-template>
+                        </nz-modal>
+                        <div class="tips">(支持JPG/PNG格式图片，单张大小10M以内)</div>
+                      </ng-container>
+                      <div class="thumbList" *ngIf="repairImgs.length > 0">
+                        <div class="thumb" *ngFor="let item of repairImgs;let index = index;" (click)="previewImageHandler(repairImgs, index)"><img [src]="item.thumbFilePath" alt=""></div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+
+                <div class="row gap8" *ngIf="buildType !== '编辑事件'">
+                  <div class="col">
+                    <span class="name required">处理组：</span>
+                    <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('group', $event)" nzPlaceHolder="请选择处理组" [(ngModel)]="incidentModel.group" (ngModelChange)="changeApplyGroup($event)" (nzOpenChange)="openChangeApplyGroup($event)">
+                      <ng-container *ngFor="let option of applicationGroupList">
+                        <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> 搜索中...
+                      </nz-option>
+                    </nz-select>
+                  </div>
+                  <div class="col">
+                    <span class="name">处理人：</span>
+                    <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('user', $event)" nzPlaceHolder="请选择处理人" [(ngModel)]="incidentModel.user" (nzOpenChange)="openChangeApplyUser($event)" nzAllowClear>
+                      <ng-container *ngFor="let option of applicationUserList">
+                        <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>
+                  </div>
+                  <div class="col"></div>
+                </div>
+              </div>
+            </overlay-scrollbars>
+          </ng-container>
+        </div>
+      </div>
+      <div nz-col nzSpan="9" class="col right">
+        <div class="rightTitle">
+          <div class="rightTitle_tab" [class.active]="currentRTab == tab.id" *ngFor="let tab of rightTitle_tab;" (click)="rightTitleHandler(tab.id)">{{ tab.name }}</div>
+        </div>
+        <!-- 近期维修 start -->
+        <div class="cots_body weifenpai top185" *ngIf="currentRTab == 2">
+          <overlay-scrollbars #osComponentRef16 [ngStyle]="{ height: '100%' }">
+            <div *ngIf="itsmOrders.length && !loading6">
+              <div class="list listsTypeColor" *ngFor="let data of itsmOrders">
+                <div class="left_cots" style="width: 96%;">
+                  <!-- 工单 -->
+                  <div class="gongdan">
+                    <span class="left">{{ data.incidentsign }}</span>
+                    <span class="right">
+                      <span>{{ data.state?.name }}</span>
+                    </span>
+                  </div>
+                  <!-- 描述 -->
+                  <div class="didian">
+                    <span class="left">
+                      {{ data.description }}
+                    </span>
+                  </div>
+                  <!-- 时间 -->
+                  <div class="shijian">
+                    <span class="left"></span>
+                    <span class="right">
+                      {{ data.acceptDate | date: "MM-dd HH:mm" }}
+                    </span>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="no_data" *ngIf="itsmOrders.length == 0 && !loading6">
+              暂无数据
+            </div>
+            <div class="no_data" *ngIf="loading6">
+              <div class="loadingFull display_flex justify-content_flex-center align-items_center">
+                <div class="loadingFullInner">
+                  <img src="../../../assets/images/loading.gif" alt="" />
+                  <div>加载中...</div>
+                </div>
+              </div>
+            </div>
+          </overlay-scrollbars>
+        </div>
+        <!-- 近期维修 end -->
+        <!-- 知识库 start -->
+        <div class="cots_body weifenpai top185" *ngIf="currentRTab == 3">
+          <overlay-scrollbars #osComponentRef17 [ngStyle]="{ height: '100%' }">
+            <div *ngIf="knowageList.length && !loading7">
+              <div class="list listsTypeColor" *ngFor="let data of knowageList" style="height: auto;overflow: hidden;">
+                <div class="left_cots" style="width: 96%;height: auto;">
+                  <!-- 工单 -->
+                  <div class="gongdan" style="font-size: 16px;">
+                    <span class="left ellipsis-oneline w100" nz-tooltip [nzTooltipTitle]="data.title">{{data.title}}</span>
+                  </div>
+                  <!-- 描述 -->
+                  <div class="didian" style="font-size: 12px;height: auto;">
+                    <span class="left noEllipsis">{{data.content | stripHtml}}</span>
+                  </div>
+                  <!-- 时间 -->
+                  <div class="shijian" style="height: auto;line-height: normal;overflow: hidden;padding-bottom: 16px;">
+                    <span class="right">
+                      <button nz-button nzType="primary" (click)="importKnowage(data)">引用</button>
+                      <button class="ml8" nz-button nzType="primary" (click)="showKnowledgeModal(data)">查看</button>
+                    </span>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="no_data" *ngIf="knowageList.length == 0 && !loading7">
+              暂无数据
+            </div>
+            <div class="no_data" *ngIf="loading7">
+              <div class="loadingFull display_flex justify-content_flex-center align-items_center">
+                <div class="loadingFullInner">
+                  <img src="../../../assets/images/loading.gif" alt="" />
+                  <div>加载中...</div>
+                </div>
+              </div>
+            </div>
+          </overlay-scrollbars>
+        </div>
+        <!-- 知识库 end -->
+      </div>
+    </div>
+    <div class="btns display_flex justify-content_flex-center align-items_center">
+      <ng-container *ngIf="currentTabIndex === '99999' && buildType !== '编辑事件'">
+        <label nz-checkbox [(ngModel)]="isBuildOrderAgagin" *ngIf="buildType !== '报修转事件' && buildType !== '留言转事件'">是否连续建单</label>
+        <button nz-button class="btn" nzType="primary" (click)="directOrder()">
+          直接解决
+        </button>
+        <button nz-button class="btn" nzType="primary" (click)="assignOrder()">
+          建单并派单
+        </button>
+        <button nz-button class="btn" nzType="primary" (click)="temporaryStorage()">
+          暂存
+        </button>
+      </ng-container>
+      <ng-container *ngIf="currentTabIndex === '99999' && buildType === '编辑事件'">
+        <button nz-button class="btn" nzType="primary" (click)="saveOrder()">
+          保存
+        </button>
+      </ng-container>
+      <button class="btn cancel" nz-button nzType="default" (click)="newOrderCancel()">
+        取消
+      </button>
+    </div>
+  </div>
+</div>
+
+<!-- 遮罩 -->
+<app-mask *ngIf="maskFlag"></app-mask>
+
+<!-- 图片预览 -->
+<app-image-viewer [imageUrl]="imgs" hidden *ngIf="isPreview" [isPreviewNow]="true" [initialViewIndex]="initialViewIndex"></app-image-viewer>
+
+<!-- 知识库查看 -->
+<app-knowledge-look (cancelKnowledgeModal)="cancelKnowledgeModal()" *ngIf="isShowKnowledge" [knowledgeData]="coopData"></app-knowledge-look>

src/app/components/incidentManagement/incident-create/incident-create.module.ts

@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { IncidentCreateComponent } from './incident-create.component';
+import { ShareModule } from 'src/app/share/share.module';
+import { KnowledgeLookModule } from '../../knowledge-look/knowledge-look.module';
+
+
+@NgModule({
+  declarations: [
+    IncidentCreateComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+    KnowledgeLookModule,
+  ],
+  exports: [
+    IncidentCreateComponent,
+  ]
+})
+export class IncidentCreateModule { }

src/app/components/incidentManagement/incident-substitutio-assign/incident-substitution-assign.component.ts

@@ -94,7 +94,7 @@ export class IncidentSubstitutionAssignComponent implements OnInit {
     if(id === 1){
       // 人
       this.requiredConfigChange('userId', true);
-    }else if(id === 2){
+    }else{
       // 组
       this.requiredConfigChange('userId', false);
     }

src/app/components/incidentManagement/incident-substitution/incident-substitution.component.ts

@@ -136,8 +136,11 @@ export class IncidentSubstitutionComponent implements OnInit {
       } else {
         // 派组
         postData.incident.candidateGroups = this.redeploy.validateForm.value.groupId;
+        delete postData.incident.assignee;
       }
 
+      postData.incident.candidateGroupId = this.redeploy.validateForm.value.groupId;
+
       this.mainService
       .flowPost("incident/task/redeploy", postData)
       .subscribe((result) => {
@@ -175,8 +178,10 @@ export class IncidentSubstitutionComponent implements OnInit {
       } else {
         // 派组
         postData.incident.candidateGroups = this.assign.validateForm.value.groupId;
+        delete postData.incident.assignee;
       }
 
+      postData.incident.candidateGroupId = this.assign.validateForm.value.groupId;
       postData.incident.duty = { id: this.assign.validateForm.value.dutyId };
 
       this.mainService

src/app/components/order-scope/order-scope.component.html

@@ -7,7 +7,7 @@
     <div class="content">
       <div class="scopeTab">
         <div class="scopeTabItem" [ngClass]="{ active: item.value == activeScopeTab.value }" *ngFor="let item of scopeTabs" (click)="activeScopeTab = item">
-          <label nz-checkbox [(ngModel)]="item.checked">{{item.name}}</label>
+          <label nz-checkbox [(ngModel)]="item.checked" (ngModelChange)="activeScopeTab = item">{{item.name}}</label>
         </div>
       </div>
       <!-- 运维 -->

src/app/share/detail-bx/detail-bx.component.html

@@ -10,13 +10,17 @@
         </div>
         <div class="info" nz-row>
           <div nz-col nzSpan="8">报修类别：{{orderInfo.category?orderInfo.category.category:''}}</div>
-          <div nz-col nzSpan="8">报修地址：<ng-container *ngIf="orderInfo.place">{{ orderInfo.place.area.area }} {{ orderInfo.place.place }} {{ orderInfo.houseNumber }}</ng-container></div>
+          <div nz-col nzSpan="8">报修地址：<ng-container *ngIf="orderInfo.place">{{ orderInfo.place.building.buildingName }} {{ orderInfo.place.floorName }}层 {{ orderInfo.houseNumber }}</ng-container></div>
           <div nz-col nzSpan="24">报修内容：{{orderInfo.description}}</div>
           <div nz-col nzSpan="24">报修图片：
-            <app-image-viewer [imageUrl]="imgs_wechatRequesterIncident" *ngIf="imgs_wechatRequesterIncident.length"></app-image-viewer>
+            <div class="thumbList" *ngIf="imgs_wechatRequesterIncident.length > 0">
+              <div class="thumb" *ngFor="let item of imgs_wechatRequesterIncident;let index = index;" (click)="previewImageHandler(imgs_wechatRequesterIncident, index)"><img [src]="item.thumbFilePath" alt=""></div>
+            </div>
           </div>
           <div nz-col nzSpan="24">处理图片：
-            <app-image-viewer [imageUrl]="imgs_incident" *ngIf="imgs_incident.length"></app-image-viewer>
+            <div class="thumbList" *ngIf="imgs_incident.length > 0">
+              <div class="thumb" *ngFor="let item of imgs_incident;let index = index;" (click)="previewImageHandler(imgs_incident, index)"><img [src]="item.thumbFilePath" alt=""></div>
+            </div>
           </div>
           <div nz-col nzSpan="8">维修人：<ng-container *ngIf="orderInfo.handlingPersonnelUser">{{ orderInfo.handlingPersonnelUser.name }}</ng-container></div>
           <div nz-col nzSpan="8">维修人电话：<ng-container *ngIf="orderInfo.handlingPersonnelUser">{{ orderInfo.handlingPersonnelUser.phone }}</ng-container></div>
@@ -51,66 +55,14 @@
           <!-- 流程图 end -->
         </div>
       </div>
-      <div class="bottom" *ngIf="orderInfo.urgentDetails&&showCoop">
-        <div class="urgent">
-          <div>
-            <ng-container *ngIf="amplificationShow&&orderInfo.urgentDetails&&showCoop">
-                加急原因：{{orderInfo.urgentDetails.urgentReason}}
-              <button *ngIf="orderInfo.urgentDetails.checkStatus.id==329" class=" btn default" nz-button nzType="primary"
-                [nzLoading]="urgentLoading" nzGhost (click)="urgent()">确认加急</button>
-            </ng-container>
-          </div>
-          <div class="amplification">
-            <button
-              nz-button
-              nzType="primary"
-              class="btn default"
-              (click)="amplification()"
-            >
-              {{ amplificationShow ? "放大" : "还原" }}
-            </button>
-          </div>
-        </div>
-      </div>
     </div>
   </overlay-scrollbars>
   <div class="btns display_flex justify-content_flex-center">
-    <button nz-button nzType="primary" (click)="goToSummary()" *ngIf="orderInfo.duty && orderInfo.duty.addSummary == 1">汇总单</button>
+    <button nz-button nzType="primary" (click)="goToSummary()" *ngIf="orderInfo.state.value == 'close' && itsmSummarySheet.value == 1 && orderInfo.summaryId">汇总单</button>
     <button class=" btn cancel" nz-button nzType="default" (click)="close()">取消</button>
   </div>
 </div>
 
-<!-- 撤回工单 -->
-<div class="recallOrder" *ngIf="recallOrderShow">
-  <div class="modalBody">
-    <div class="title">提示<i class="icon_transport transport-guanbi" (click)="closeRecallOrderModal()"></i></div>
-    <div class="content">
-      <div class="icon"><i class="icon_transport transport-wenhao"></i></div>
-      <div class="defeat">您确认要撤回此工单吗？</div>
-    </div>
-    <div class="btns display_flex justify-content_flex-center">
-      <button nz-button nzType="primary" [nzLoading]='btnLoading' (click)="confirmRec()">确认</button>
-      <button nz-button nzType="primary" [nzLoading]='recLoading' nzGhost (click)="recAndDel()">撤回并删除</button>
-      <button class=" btn cancel" nz-button nzType="default" (click)="closeRecallOrderModal()">取消</button>
-    </div>
-  </div>
-</div>
-
-<!-- 删除工单 -->
-<div class="recallOrder delModel" *ngIf="delOrderShow">
-  <div class="modalBody">
-    <div class="title">提示<i class="icon_transport transport-guanbi" (click)="closeDelOrderModal()"></i></div>
-    <div class="content">
-      <div class="icon"><i class="icon_transport transport-wenhao"></i></div>
-      <div class="defeat">您确认要删除此工单吗？</div>
-    </div>
-    <div class="btns display_flex justify-content_flex-center">
-      <button nz-button nzType="primary" [nzLoading]='btnLoading' (click)="confirmDel()">确认</button>
-      <button class="btn cancel" nz-button nzType="default" (click)="closeDelOrderModal()">关闭</button>
-    </div>
-  </div>
-</div>
-
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
   [info]="promptInfo" (closeModel)="close()">
@@ -119,3 +71,6 @@
 <app-incident-details *ngIf="isShowIncidentDetails" (close)="closeIncidentDetails()" [incidentId]="orderInfo.id"></app-incident-details>
 <!-- 遮罩 -->
 <app-mask *ngIf="maskFlag"></app-mask>
+
+<!-- 图片预览 -->
+<app-image-viewer [imageUrl]="imgs" hidden *ngIf="isPreview" [isPreviewNow]="true" [initialViewIndex]="initialViewIndex"></app-image-viewer>

src/app/share/detail-bx/detail-bx.component.less

@@ -13,6 +13,27 @@
   align-items: center;
 }
 
+.thumbList{
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 8px;
+  .thumb{
+    width: 64px;
+    height: 64px;
+    padding: 4px;
+    border-radius: 4px;
+    border: 1px solid rgba(0,0,0,0.15);
+    img{
+      width: 100%;
+      height: 100%;
+      object-fit: cover;
+      object-position: center;
+      cursor: pointer;
+    }
+  }
+}
+
 .detail {
   width: 1000px;
   height: calc(100vh - 100px);
@@ -81,7 +102,7 @@
     margin-left: 3%;
     font-size: 12px;
     color: #666666;
-    padding: 4px 0;
+    padding: 4px 0 20px 0;
     padding-left: 5%;
     border-left: 1px #999999 solid;
     word-break: break-all;

src/app/share/detail-bx/detail-bx.component.ts

@@ -47,7 +47,11 @@ export class DetailBxComponent implements OnInit {
 
   isShowIncidentDetails:boolean = false;
 
+  hosId:any;
+
   ngOnInit() {
+    this.hosId = this.tool.getCurrentHospital().id;
+    this.getHospitalConfig();
     this.tool.getDeptDisplay().subscribe((result) => {
       if (result.status == 200) {
         this.deptDisplay = result.list[0].valueconfig;
@@ -85,22 +89,58 @@ export class DetailBxComponent implements OnInit {
     this.isShowIncidentDetails = false;
   }
 
+  // 获取院区配置信息
+  itsmSummarySheet:any = {};//是否需要填写汇总单
+  getHospitalConfig() {
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      hospitalConfig: {
+        model: "itsm",
+        hosId: this.hosId,
+      },
+    }
+    this.mainService
+      .getFetchDataList("simple/data", "hospitalConfig", postData)
+      .subscribe((result) => {
+        let list = result.list || [];
+        this.itsmSummarySheet = list.find(v => v.key == 'itsmSummarySheet') || {};
+      });
+  }
+
   // 获取图片信息
   getImgsData(type) {
     let id = this.orderInfo.id;
     this.mainService
-      .listAttachment(type, id)
+      .getPreviewImage(type, id)
       .subscribe((res:any)=> {
         // this.imgs = ['https://img2.woyaogexing.com/2022/08/19/1f5e056b1d076920!400x400.jpg','https://img2.woyaogexing.com/2022/08/19/359346943c3c489f!400x400.jpg']
-        for (var i = 0; i < res.data.length; i++) {
-          this['imgs_' + type].push(location.origin + '/file' + res.data[i].relativeFilePath);
-        }
+        res.data.forEach(v => {
+          v.previewUrl = location.origin + "/file" + v.relativeFilePath;
+          v.thumbFilePath = location.origin + "/file" + v.thumbFilePath;
+        })
+        this['imgs_' + type] = res.data;
       });
   }
 
+  // 预览图片
+  imgs = [];
+  isPreview = false;
+  initialViewIndex:number = 0;
+  previewImageHandler(data = [], index = 0) {
+    this.initialViewIndex = index;
+    console.log(index)
+    this.isPreview = false;
+    data = data || [];
+    this.imgs = data.map((v) => location.origin + '/file' + v.relativeFilePath);
+    setTimeout(() => {
+      this.isPreview = true;
+    }, 0)
+  }
+
   //获取处理进度
   getProgressInfo() {
-    this.mainService .fetchListBx("incidentLog", {
+    this.mainService.getFetchDataList("simple/data", "incidentLog", {
       "idx": 0,
       "sum": 9999,
       "incidentLog": {
@@ -120,31 +160,7 @@ export class DetailBxComponent implements OnInit {
 
   // 获取工单详情
   getDetail() {
-    return this.mainService.fetchDataBx("incident", this.id);
-  }
-
-  // 确认加急
-  urgent() {
-    let that = this;
-    that.urgentLoading = true;
-    let postData = {
-      urgentDetails: {
-        workerOrder: this.orderInfo["id"],
-        checkStatus: {
-          id: 330,
-        },
-        urgentReason: this.orderInfo["urgentDetails"].urgentReason,
-        id: this.orderInfo["urgentDetails"].id,
-      },
-    };
-    that.mainService.coopWorkerOrder("urge", postData).subscribe((data) => {
-      that.urgentLoading = false;
-      if (data.status == 200) {
-        that.showPromptModal("加急", true, "");
-      } else {
-        that.showPromptModal("加急", false, data.msg);
-      }
-    });
+    return this.mainService.getFetchData("simple/data", "incident", this.id);
   }
 
   // 关闭弹框
@@ -168,117 +184,4 @@ export class DetailBxComponent implements OnInit {
     // return this.mainService.getWorkOrderLog(this.id);
     return Promise.resolve(111);
   }
-
-  // 派单
-  allotWorker() {
-    this.router.navigateByUrl(
-      "dispatchingDesk/allotWorker/" +
-        this.id +
-        "/" +
-        this.orderInfo["gdState"]["id"]
-    );
-  }
-
-  // 撤回
-  recallOrderShow: boolean = false;
-  openRecallModal(): void {
-    this.recallOrderShow = true;
-  }
-  // 撤回并删除
-  recAndDel() {
-    let that = this;
-    that.recLoading = true;
-    that.mainService.delOrder(that.id).subscribe((data) => {
-      console.log(data);
-      that.recLoading = false;
-      that.closeDelOrderModal();
-      if (data.status == 200) {
-        that.showPromptModal("删除", true, "");
-      } else {
-        that.showPromptModal("删除", false, data.msg);
-      }
-    });
-  }
-  // 确认撤回
-  confirmRec() {
-    let that = this;
-    that.btnLoading = true;
-    let postData = {
-      workOrder: {
-        id: that.id,
-      },
-    };
-    that.mainService
-      .coopWorkerOrder("excuteWorkOrder/recall", postData)
-      .subscribe((data) => {
-        that.btnLoading = false;
-        that.closeRecallOrderModal();
-        if (data.status == 200) {
-          that.showPromptModal("撤回", true, "");
-        } else {
-          that.showPromptModal("撤回", false, data.msg);
-        }
-      });
-  }
-  // 关闭撤回弹框
-  closeRecallOrderModal() {
-    this.recallOrderShow = false;
-  }
-
-  // 删除
-  // 打开模态框
-  delOrderShow: boolean = false;
-  openDelModal() {
-    this.delOrderShow = true;
-  }
-  // 确认删除
-  confirmDel() {
-    let that = this;
-    that.btnLoading = true;
-    that.mainService.delOrder(that.id).subscribe((data) => {
-      that.btnLoading = false;
-      that.closeDelOrderModal();
-      if (data.status == 200) {
-        that.showPromptModal("删除", true, "");
-      } else {
-        that.showPromptModal("删除", false, data.msg);
-      }
-    });
-  }
-
-  // 关闭模态框
-  closeDelOrderModal() {
-    this.delOrderShow = false;
-  }
-
-  // 格式化时分秒
-  // （时间小于一分钟则显示秒，时间大于一分钟则显示分钟数，如超出一小时则显示小时和分钟。）time单位:秒
-  formatTime(time) {
-    let timeStr = "";
-    if (time >= 0 && time < 60) {
-      // 秒
-      timeStr = time + "秒";
-    } else if (time >= 60 && time < 3600) {
-      // 分钟
-      timeStr = Math.floor(time / 60) + "分钟";
-    } else if (time >= 3600) {
-      // 时 + 分
-      let h = "";
-      let m = "";
-      h = Math.floor(time / 3600) + "小时";
-      m = time % 3600 >= 60 ? Math.floor((time % 3600) / 60) + "分钟" : "";
-      timeStr = h + m;
-    }
-    return timeStr;
-  }
-
-  // 计算历史记录耗时
-  filterTime(step) {
-    // step = [{ difTime: 2 }, { difTime: 6 }]
-    let num = 0;
-    step.forEach((e) => {
-      num += e.difTime;
-    });
-    return this.formatTime(num / 1000);
-  }
 }

src/app/share/dialog-bx/dialog-bx.component.html

@@ -19,11 +19,11 @@
         <div class="right" nz-col nzSpan="12">
           <div class="item display_flex  justify-content_space-between align-items_flex-start">
             <span>楼栋</span>
-            <span>{{extraData.place?.area?.area}}</span>
+            <span>{{extraData.floor?.building?.buildingName}}</span>
           </div>
           <div class="item display_flex  justify-content_space-between align-items_flex-start">
             <span>楼层</span>
-            <span>{{extraData.place?.place}}</span>
+            <span>{{extraData.floor?.floorName}}</span>
           </div>
         </div>
       </div>

src/app/share/image-viewer/image-viewer.component.less

@@ -1,5 +1,7 @@
 .imgViewHelp {
   img {
     margin-right: 8px;
+    width: 64px;
+    height: 64px;
   }
 }

src/app/share/incident-details/incident-details.component.ts

@@ -36,7 +36,7 @@ export class IncidentDetailsComponent implements OnInit {
     this.maskFlag = this.message.loading("正在加载中..", {
       nzDuration: 0,
     }).messageId;
-    this.mainService.querySummaryDoc({incidentId: this.incidentId}).subscribe((res:any) => {
+    this.mainService.querySummaryDocNew({incidentId: this.incidentId}).subscribe((res:any) => {
       this.message.remove(this.maskFlag);
       this.maskFlag = false;
       if(res.status == 200){

src/app/views/fuwutai/fuwutai.component.html

@@ -454,8 +454,9 @@
                   </div>
                 </div>
                 <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center gap8">
+                  <input type="button" *ngIf="data.computedEditFlag" class="top_bot" value="编辑" (click)="edit(data.data)" />
                   <input type="button" *ngIf="data.computedSubstitutionFlag" class="top_bot" value="换人处理" (click)="substitution(data.data)" />
-                  <input type="button" *ngIf="data.computedReceiveFlag" class="top_bot" value="接单" (click)="showDelModal($event, data.data,'您确认要接单吗？','接单','receive')" />
+                  <!-- <input type="button" *ngIf="data.computedReceiveFlag" class="top_bot" value="接单" (click)="showDelModal($event, data.data,'您确认要接单吗？','接单','receive')" /> -->
                   <input type="button" *ngIf="coopBtns.del" class="btm_bot" value="删除" (click)="openDelModal(data.data.id, 'itsm')" />
                 </div>
                 <div *ngIf="data.data.overtimePercent <= 100" class="slider sgreen" [ngStyle]="{ width: data.data.overtimePercent + '%' }"></div>
@@ -658,8 +659,9 @@
                   </div>
                 </div>
                 <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center gap8">
+                  <input type="button" *ngIf="data.computedEditFlag" class="top_bot" value="编辑" (click)="edit(data.data)" />
                   <input type="button" *ngIf="data.computedSubstitutionFlag" class="top_bot" value="换人处理" (click)="substitution(data.data)" />
-                  <input type="button" *ngIf="data.computedHandleFlag" class="top_bot" value="处理" (click)="handle(data.data)" />
+                  <!-- <input type="button" *ngIf="data.computedHandleFlag" class="top_bot" value="处理" (click)="handle(data.data)" /> -->
                   <input type="button" *ngIf="coopBtns.del" class="btm_bot" value="删除" (click)="openDelModal(data.data.id, 'itsm')" />
                 </div>
                 <div *ngIf="data.data.overtimePercent <= 100" class="slider sgreen" [ngStyle]="{ width: data.data.overtimePercent + '%' }"></div>
@@ -1166,7 +1168,7 @@
           <div class="name">来电咨询</div>
           <div class="newTopItem">
             <span class="grayFont required">院区：</span>
-            <nz-select style="width: 160px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzPlaceHolder="请选择院区" [(ngModel)]="incidentModel.hosId" (ngModelChange)="changeApplyHospital($event)" nzAllowClear>
+            <nz-select style="width: 160px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzPlaceHolder="请选择院区" [(ngModel)]="incidentModel.hosId" (ngModelChange)="changeApplyHospital($event)" nzAllowClear [nzDisabled]="buildType === '编辑事件'">
               <ng-container *ngFor="let option of applicationHospitalList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
               </ng-container>
@@ -1201,7 +1203,7 @@
               <label nz-checkbox [(ngModel)]="isRelatedDepartment" (ngModelChange)="changeApplyRelatedDepartment($event)" class="ml8">关联查</label>
             </ng-container>
           </div>
-          <div class="newTopItem">
+          <div class="newTopItem" *ngIf="buildType !== '编辑事件'">
             <span class="grayFont">来电电话：{{incidentModel.incomingPhone}}</span>
           </div>
         </div>
@@ -1212,7 +1214,7 @@
             <div class="tabs__inner" #tab>
               <div class="tabs__wrap" [style.transform]="'translateX(' + disX + 'px)'">
                 <ng-container *ngFor="let item of workTypesArrange | keyvalue">
-                  <div [ngClass]="{ tab: true, checked: currentTabIndex == item.key}" (click)="tabClick(item.key)">
+                  <div [ngClass]="{ tab: true, checked: currentTabIndex == item.key}" (click)="tabClick(item.key)" *ngIf="buildType !== '编辑事件' || (buildType === '编辑事件' && item.key == 99999)">
                     {{ item.value[0].associationTypeName }}
                   </div>
                 </ng-container>
@@ -1261,26 +1263,10 @@
                               nzErrorTip="请选择类型！"
                             >
                               <div class="radios">
-                                <overlay-scrollbars
-                                  #osComponentRef10
-                                  [ngStyle]="{ height: '100%' }"
-                                >
-                                  <nz-radio-group
-                                    formControlName="taskType"
-                                    nz-row
-                                    [(ngModel)]="radioValueZy"
-                                    (ngModelChange)="radioChangeZy(radioValueZy)"
-                                  >
+                                <overlay-scrollbars #osComponentRef10 [ngStyle]="{ height: '100%' }">
+                                  <nz-radio-group formControlName="taskType" nz-row [(ngModel)]="radioValueZy" (ngModelChange)="radioChangeZy(radioValueZy)">
                                     <div nz-row>
-                                      <label
-                                        nz-col
-                                        nz-radio
-                                        [nzValue]="item1.id"
-                                        *ngFor="
-                                          let item1 of workTypesArrange[item.key]
-                                        "
-                                        >{{ item1.taskTypeName }}</label
-                                      >
+                                      <label [title]="item1.taskTypeName" nz-col nz-radio [nzValue]="item1.id" *ngFor="let item1 of workTypesArrange[item.key]">{{ item1.taskTypeName }}</label>
                                     </div>
                                   </nz-radio-group>
                                 </overlay-scrollbars>
@@ -1594,26 +1580,10 @@
                               nzErrorTip="请选择类型！"
                             >
                               <div class="radios" style="height: 225px">
-                                <overlay-scrollbars
-                                  #osComponentRef11
-                                  [ngStyle]="{ height: '100%' }"
-                                >
-                                  <nz-radio-group
-                                    formControlName="taskTypeQt"
-                                    nz-row
-                                    [(ngModel)]="radioValueQt"
-                                    (ngModelChange)="radioChangeQt(radioValueQt)"
-                                  >
+                                <overlay-scrollbars #osComponentRef11 [ngStyle]="{ height: '100%' }">
+                                  <nz-radio-group formControlName="taskTypeQt" nz-row [(ngModel)]="radioValueQt" (ngModelChange)="radioChangeQt(radioValueQt)">
                                     <div nz-row>
-                                      <label
-                                        nz-col
-                                        nz-radio
-                                        [nzValue]="item1.id"
-                                        *ngFor="
-                                          let item1 of workTypesArrange[item.key]
-                                        "
-                                        >{{ item1.taskTypeName }}</label
-                                      >
+                                      <label [title]="item1.taskTypeName" nz-col nz-radio [nzValue]="item1.id" *ngFor="let item1 of workTypesArrange[item.key]">{{ item1.taskTypeName }}</label>
                                     </div>
                                   </nz-radio-group>
                                 </overlay-scrollbars>
@@ -1891,8 +1861,10 @@
                       <ng-container *ngIf="incidentMsg.requesterPhone">{{incidentMsg.requesterPhone}}<em (click)="importPhone(incidentMsg.requesterPhone)">引入</em></ng-container>
                     </div>
                     <div class="col">
-                      <span class="name">来电电话：</span>
-                      <ng-container *ngIf="incidentModel.incomingPhone">{{incidentModel.incomingPhone}}<em (click)="importPhone(incidentModel.incomingPhone)">引入</em></ng-container>
+                      <ng-container *ngIf="buildType !== '编辑事件'">
+                        <span class="name">来电电话：</span>
+                        <ng-container *ngIf="incidentModel.incomingPhone">{{incidentModel.incomingPhone}}<em (click)="importPhone(incidentModel.incomingPhone)">引入</em></ng-container>
+                      </ng-container>
                     </div>
                   </div>
 
@@ -1914,7 +1886,7 @@
                   <div class="row gap8">
                     <div class="col">
                       <span class="name required">故障现象：</span>
-                      <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('category', $event)" nzPlaceHolder="请选择故障现象" [(ngModel)]="incidentModel.category" (ngModelChange)="changeApplyCategory($event)" (nzOpenChange)="openChangeApplyCategory($event)">>
+                      <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('category', $event)" nzPlaceHolder="请选择故障现象" [(ngModel)]="incidentModel.category" (ngModelChange)="changeApplyCategory($event)" (nzOpenChange)="openChangeApplyCategory($event)">
                         <ng-container *ngFor="let option of applicationCategoryList">
                           <nz-option *ngIf="!isLoading" [nzLabel]="option.mutiCategory" [nzValue]="option.id"></nz-option>
                         </ng-container>
@@ -1938,7 +1910,7 @@
                   <div class="row gap8">
                     <div class="col">
                       <span class="name required">优先级：</span>
-                      <nz-select class="w100" [(ngModel)]="incidentModel.priorityId" nzAllowClear nzPlaceHolder="请选择优先级">
+                      <nz-select class="w100" [(ngModel)]="incidentModel.priorityId" nzAllowClear nzPlaceHolder="请选择优先级" [nzDisabled]="buildType === '编辑事件'">
                         <nz-option [nzValue]="item.id" [nzLabel]="item.name" *ngFor="let item of applicationPriorityList"></nz-option>
                       </nz-select>
                     </div>
@@ -1977,7 +1949,7 @@
                     </div>
                   </div>
 
-                  <div class="row gap8">
+                  <div class="row gap8" *ngIf="buildType !== '编辑事件'">
                     <div class="col">
                       <span class="name required">处理组：</span>
                       <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('group', $event)" nzPlaceHolder="请选择处理组" [(ngModel)]="incidentModel.group" (ngModelChange)="changeApplyGroup($event)" (nzOpenChange)="openChangeApplyGroup($event)">
@@ -2211,7 +2183,7 @@
                   <div class="left_cots" style="width: 96%;height: auto;">
                     <!-- 工单 -->
                     <div class="gongdan" style="font-size: 16px;">
-                      <span class="left noEllipsis">{{data.title}}</span>
+                      <span class="left ellipsis-oneline w100" nz-tooltip [nzTooltipTitle]="data.title">{{data.title}}</span>
                     </div>
                     <!-- 描述 -->
                     <div class="didian" style="font-size: 12px;height: auto;">
@@ -2252,8 +2224,8 @@
             {{isYyInspect ? '预约建单' :'直接建单'}}
           </button>
         </ng-container>
-        <ng-container *ngIf="currentTabIndex === '99999'">
-          <label nz-checkbox [(ngModel)]="isBuildOrderAgagin" *ngIf="buildType !== '报修转事件' && buildType !== '留言转事件'">是否连续建单</label>
+        <ng-container *ngIf="currentTabIndex === '99999' && buildType !== '编辑事件'">
+          <label nz-checkbox [(ngModel)]="isBuildOrderAgagin" *ngIf="buildType !== '报修转事件' && buildType !== '留言转事件' && buildType !== '继续建单'">是否连续建单</label>
           <button nz-button class="btn" nzType="primary" (click)="directOrder()">
             直接解决
           </button>
@@ -2264,6 +2236,11 @@
             暂存
           </button>
         </ng-container>
+        <ng-container *ngIf="currentTabIndex === '99999' && buildType === '编辑事件'">
+          <button nz-button class="btn" nzType="primary" (click)="saveOrder()">
+            保存
+          </button>
+        </ng-container>
         <button class="btn cancel" nz-button nzType="default" (click)="newOrderCancel()">
           取消
         </button>

src/app/views/fuwutai/fuwutai.component.less

@@ -2374,7 +2374,7 @@
                   height: 267px;
                   width: 100%;
                   overflow-y: auto;
-                  padding: 10px 18px;
+                  padding: 8px;
                   background: #fff;
                   border: 1px solid #e6dede;
                   border-radius: 5px;
@@ -2383,19 +2383,14 @@
                     display: flex;
                     flex-wrap: wrap;
                     .ant-radio-wrapper {
-                      // flex: 1;
-                      // max-width: 100%;
-                      // width: 160px;
+                      width: 16.66%;
                       display: flex;
                       align-items: center;
+                      margin-right: 0;
                       ::ng-deep span.ant-radio + * {
-                        // min-width: 110px;
-                        white-space: normal;
-                        float: left;
-                        padding-right: 0;
-                      }
-                      ::ng-deep span.ant-radio {
-                        float: left;
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                        white-space: inherit;
                       }
                     }
                   }

src/app/views/fuwutai/fuwutai.component.ts

@@ -831,14 +831,16 @@ export class FuwutaiComponent implements OnInit {
     let timer = null;
     TLWSA.onClosed = () => {
       _this.getState(0);
-      console.log('与服务器网络连接中断-----seimin');
-      _this.msg.info('与服务器网络连接中断,2分钟后重连')
-      console.log('2分钟后自动重连-----seimin')
       clearTimeout(timer);
-      timer = setTimeout(function () {
-        //连接
-        tlwsa.tlaOpen(_this.incomingService.getSocketUrl());
-      }, 120000)
+      if(location.hash === '#/dispatchingDesk'){
+        console.log('与服务器网络连接中断-----seimin');
+        _this.msg.info('与服务器网络连接中断,2分钟后重连')
+        console.log('2分钟后自动重连-----seimin')
+        timer = setTimeout(function () {
+          //连接
+          tlwsa.tlaOpen(_this.incomingService.getSocketUrl());
+        }, 120000)
+      }
     }
     //签入回调函数
     TLWSA.onLoginreturn = function (err) {
@@ -1955,7 +1957,7 @@ export class FuwutaiComponent implements OnInit {
       if(stateId == 1){
         postData.incidentQuery.incident = {
           // "groupIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.scopeGroups.map(v => v.id).toString() || undefined),
-          "dutyIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.checkedHos.map(v => v.id).toString() || undefined),
+          "acceptDutyIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.checkedHos.map(v => v.id).toString() || undefined),
           "urgentType": +this.itsmData.orderScopeRadio + 1,
           "queryTask": "storageAccept",
           "assignee": this.tool.getCurrentUserId(),
@@ -2013,6 +2015,7 @@ export class FuwutaiComponent implements OnInit {
             if(item.type === 'mdv2'){
               item.computedSubstitutionFlag = this.computedSubstitution(item.data)
               item.computedReceiveFlag = this.computedReceive(item.data)
+              item.computedEditFlag = this.computedEdit(item.data)
             }
           });
           this.arriveList = arriveList;
@@ -2027,6 +2030,7 @@ export class FuwutaiComponent implements OnInit {
             if(item.type === 'mdv2'){
               item.computedSubstitutionFlag = this.computedSubstitution(item.data)
               item.computedHandleFlag = this.computedHandle(item.data)
+              item.computedEditFlag = this.computedEdit(item.data)
             }
           });
           this.executionList = executionList;
@@ -2287,6 +2291,12 @@ export class FuwutaiComponent implements OnInit {
     this.isRelatedDepartment = true;
     this.solutionId = undefined;
   }
+  // 重置新建工单数据-继续建单-编辑-报修转事件
+  resetOrderData2(){
+    this.fileList = [];
+    this.repairImgs = [];
+    this.isRelatedDepartment = true;
+  }
   // 打开新建工单
   deathTasktypeId; //获取这个写死的任务类型的id,送病人回病房
   deathTasktypeIdPatient; //获取这个写死的任务类型的id,转出院记录
@@ -2299,7 +2309,11 @@ export class FuwutaiComponent implements OnInit {
     }
     this.buildType = buildType;
     if(this.itsmData.mdv2Switch){
-      this.buildType !== '继续建单' && this.resetOrderData();
+      if(this.buildType !== '继续建单' && this.buildType !== '编辑事件' && this.buildType !== '报修转事件'){
+        this.resetOrderData();
+      }else{
+        this.resetOrderData2();
+      }
       this.searchApplicationHospital();
       this.searchApplicationCategory();
       this.searchApplicationPriority();
@@ -2557,7 +2571,7 @@ export class FuwutaiComponent implements OnInit {
     this.incidentModel.duty = undefined;
 
     // 根据院区和故障现象带出责任部门，优先级，维修人/组
-    if(this.incidentModel.category && e){
+    if(this.incidentModel.category && e && this.buildType !== '编辑事件'){
       let postData = {
         idx: 0,
         sum: 9999,
@@ -2643,12 +2657,18 @@ export class FuwutaiComponent implements OnInit {
   // 故障现象列表
   applicationCategoryList:any[] = [];
   searchApplicationCategory(keyWord?) {
+    let dutyIds;
+    if(this.buildType === '编辑事件'){
+      dutyIds = this.incidentModel.duty.id.toString();
+    }else{
+      dutyIds = this.itsmData.checkedHos.length ? (this.itsmData.checkedHos.map(v => v.id).toString() || undefined) : undefined;
+    }
     let postData = {
       category: {
         category: keyWord,
         selectType: 'mutlQuery',
         hierarchy: 3,//只差有三级的故障现象列表
-        dutyIds: this.itsmData.checkedHos.length ? (this.itsmData.checkedHos.map(v => v.id).toString() || undefined) : undefined,
+        dutyIds,
       },
     };
     console.log(postData);
@@ -2665,11 +2685,11 @@ export class FuwutaiComponent implements OnInit {
   }
   // 修改故障现象
   incidentCategoryConfig:any = {};//当前匹配的故障现象规则
-  changeApplyCategory(e){
+  changeApplyCategory(e, isCoverage = false){
     console.log(e)
     // 知识库
     this.getKnowageList();
-    if(e){
+    if(e && !isCoverage){
       // 根据故障现象带出故障描述
       if(this.incidentModel.description){
         this.incidentModel.description = this.incidentModel.description + '；' + this.applicationCategoryList.find(v => v.id == e).mutiCategory;
@@ -2678,7 +2698,7 @@ export class FuwutaiComponent implements OnInit {
       }
     }
     // 根据院区和故障现象带出责任部门，优先级，维修人/组
-    if(this.incidentModel.hosId && e){
+    if(this.incidentModel.hosId && e && this.buildType !== '编辑事件'){
       let postData = {
         idx: 0,
         sum: 9999,
@@ -2773,7 +2793,11 @@ export class FuwutaiComponent implements OnInit {
       if(this.buildType === '报修转事件'){
         postData.incident.fromWx = true;
       }
-      postData.incident = Object.assign({}, this.editOrder, postData.incident);
+      if(this.buildType !== '继续建单' && this.buildType !== '编辑事件' && this.buildType !== '报修转事件'){
+        postData.incident = Object.assign({}, postData.incident);
+      }else{
+        postData.incident = Object.assign({}, this.editOrder, postData.incident);
+      }
     }
 
     this.mainService
@@ -3034,7 +3058,11 @@ export class FuwutaiComponent implements OnInit {
           this.applicationBuildingList = data.list;
           if(buildingId){
             let hasBuildingId = this.applicationBuildingList.some(v => v.id == buildingId);
-            hasBuildingId && (this.incidentModel.area = buildingId);
+            if(hasBuildingId){
+              this.incidentModel.area = buildingId;
+            }else{
+              this.incidentModel.area = undefined;
+            }
           }
         }
       });
@@ -3047,12 +3075,12 @@ export class FuwutaiComponent implements OnInit {
   }
   // 楼层列表
   applicationFloorList:any[] = [];
-  searchApplicationFloor(keyWord?, floorId?) {
+  searchApplicationFloor(keyWord?, floorId?, buildingId?) {
     let postData = {
       idx: 0,
       sum: 9999,
       floor: {
-        buildId: this.incidentModel.area || undefined,
+        buildId: buildingId || this.incidentModel.area || undefined,
         hosId: this.incidentModel.hosId,
       },
     };
@@ -3065,7 +3093,11 @@ export class FuwutaiComponent implements OnInit {
           this.applicationFloorList = data.list;
           if(floorId){
             let hasFloorId = this.applicationFloorList.some(v => v.id == floorId);
-            hasFloorId && (this.incidentModel.place = floorId);
+            if(hasFloorId){
+              this.incidentModel.place = floorId;
+            }else{
+              this.incidentModel.place = undefined;
+            }
           }
         }
       });
@@ -3235,7 +3267,7 @@ export class FuwutaiComponent implements OnInit {
       let buildingId = deptObj.building ? deptObj.building.id : undefined;
       buildingId && this.searchApplicationBuilding('', buildingId);
       let floorId = deptObj.floor ? deptObj.floor.id : undefined;
-      floorId && this.searchApplicationFloor('', floorId);
+      buildingId && floorId && this.searchApplicationFloor('', floorId, buildingId);
       this.incidentModel.houseNumber = deptObj.address;
     }
 
@@ -3246,7 +3278,7 @@ export class FuwutaiComponent implements OnInit {
     this.searchApplicationRequester();
 
     // 根据院区和故障现象带出责任部门，优先级，维修人/组
-    if(this.incidentModel.category && this.incidentModel.hosId){
+    if(this.incidentModel.category && this.incidentModel.hosId && this.buildType !== '编辑事件'){
       let postData = {
         idx: 0,
         sum: 9999,
@@ -3458,7 +3490,7 @@ export class FuwutaiComponent implements OnInit {
       return;
     }
 
-    if(!this.incidentModel.group){
+    if(!this.incidentModel.group && this.buildType !== '编辑事件'){
       this.msg.warning('请选择处理组!');
       return;
     }
@@ -3499,7 +3531,11 @@ export class FuwutaiComponent implements OnInit {
       if(this.buildType === '报修转事件'){
         postData.incident.fromWx = true;
       }
-      postData.incident = Object.assign({}, this.editOrder, postData.incident);
+      if(this.buildType !== '继续建单' && this.buildType !== '编辑事件' && this.buildType !== '报修转事件'){
+        postData.incident = Object.assign({}, postData.incident);
+      }else{
+        postData.incident = Object.assign({}, this.editOrder, postData.incident);
+      }
     }
     console.log(postData);
     // return;
@@ -3569,7 +3605,12 @@ export class FuwutaiComponent implements OnInit {
       if(this.buildType === '报修转事件'){
         postData.incident.fromWx = true;
       }
-      postData.incident = Object.assign({}, this.editOrder, postData.incident);
+
+      if(this.buildType !== '继续建单' && this.buildType !== '编辑事件' && this.buildType !== '报修转事件'){
+        postData.incident = Object.assign({}, postData.incident);
+      }else{
+        postData.incident = Object.assign({}, this.editOrder, postData.incident);
+      }
     }
     console.log(postData);
     // return;
@@ -3596,6 +3637,96 @@ export class FuwutaiComponent implements OnInit {
       });
   }
 
+  // 运维-保存
+  saveOrder(){
+    if(!this.incidentModel.category){
+      this.msg.warning('请选择故障现象!');
+      return;
+    }
+
+    let category = this.applicationCategoryList.find(v => v.id == this.incidentModel.category);
+    if(!this.incidentModel.duty){
+      this.msg.warning(`故障现象【${category.mutiCategory}】没有设置责任部门!`);
+      return;
+    }
+
+    if(!this.incidentModel.department){
+      this.msg.warning('请选择申请科室!');
+      return;
+    }
+
+    if(!this.incidentModel.contactsInformation){
+      this.msg.warning('请填写联系电话!');
+      return;
+    }
+
+    if(!this.incidentModel.priorityId){
+      this.msg.warning('请选择优先级!');
+      return;
+    }
+
+    if(!this.incidentModel.description){
+      this.msg.warning('请选择故障描述!');
+      return;
+    }
+    this.maskFlag = this.msg.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+
+    let postData:any = {
+      solutionId: this.solutionId,
+      "incident": {
+        "id": this.incidentModel.id || undefined,
+        "deleteFlag": 0,
+        "duty": this.incidentModel.duty ? { id: this.incidentModel.duty.id } : undefined,
+        "department": this.incidentModel.department ? { id: this.incidentModel.department } : undefined,
+        "contactsInformation": this.incidentModel.contactsInformation,
+        "contacts": this.incidentModel.contacts,
+        "hosId": this.incidentModel.hosId || undefined,
+        "area": this.incidentModel.area ? { id: this.incidentModel.area } : undefined,
+        "place": this.incidentModel.place ? { id: this.incidentModel.place } : undefined,
+        "houseNumber": this.incidentModel.houseNumber,
+        "category": this.incidentModel.category ? { id: this.incidentModel.category } : undefined,
+        "priorityId": this.incidentModel.priorityId || undefined,
+        "source": this.incidentModel.source ? { id: this.incidentModel.source } : undefined,
+        "title": category ? category.mutiCategory : '',
+        "description": this.incidentModel.description,
+        "yyTime": this.incidentModel.yyTime ? format(new Date(this.incidentModel.yyTime), 'yyyy-MM-dd HH:mm:ss') : undefined,
+        "requester": this.incidentModel.requester ? { id: this.incidentModel.requester } : undefined,
+        "acceptUser": { id: this.tool.getCurrentUserId() },
+        "callID": this.incidentModel.callID || undefined,
+        "incomingPhone": this.incidentModel.incomingPhone || undefined,
+        "hjzxRecordId": this.incidentModel.hjzxRecordId || undefined,
+      }
+    };
+    if(this.buildType){
+      postData.incident = Object.assign({}, this.editOrder, postData.incident);
+    }
+    console.log(postData);
+    // return;
+
+    this.mainService
+      .flowPost("incident/task/edit", postData)
+      .subscribe((result) => {
+        this.msg.remove(this.maskFlag);
+        this.maskFlag = false;
+
+        if (result.state == 200) {
+          // 图片上传
+          if(this.fileList.length){
+            console.log(this.fileList.map(v => v.originFileObj));
+            this.fileList.map(v => v.originFileObj).forEach(async file => {
+              await this.uploadImages(file, result.data.id);
+            })
+          }
+          // this.msg.success('编辑成功');
+          this.isBuildOrderAgaginFn();
+        } else {
+          this.msg.error('编辑失败');
+        }
+      });
+  }
+
   // 是否连续建单
   isBuildOrderAgaginFn(){
     if(this.isBuildOrderAgagin){
@@ -4625,8 +4756,11 @@ export class FuwutaiComponent implements OnInit {
     incidentModel.source && (incidentModel.source = incidentModel.source.id);
     incidentModel.area && (incidentModel.area = incidentModel.area.id);
     incidentModel.place && (incidentModel.place = incidentModel.place.id);
+    incidentModel.category && (this.applicationCategoryList = [cloneDeep(incidentModel.category)]);
+    incidentModel.category && (incidentModel.category = incidentModel.category.id);
     this.incidentModel = incidentModel;
     this.incidentMsg = incidentMsg;
+    this.incidentModel.category && this.changeApplyCategory(this.incidentModel.category, true);
     console.log('this.applicationDeptList:', this.applicationDeptList)
     console.log('incidentModel:', incidentModel)
     this.showNewOrder('', '', true, '报修转事件');
@@ -4734,6 +4868,35 @@ export class FuwutaiComponent implements OnInit {
     });
   }
 
+  // 编辑-弹窗
+  edit(data){
+    this.editOrder = cloneDeep(data);
+    let incidentModel = cloneDeep(data);
+    let incidentMsg:any = {};
+    console.log('data:', data)
+    incidentModel.department && (incidentMsg.deptManyPhone = incidentModel.department.manyPhone);
+    incidentModel.department && (incidentMsg.deptName = incidentModel.department.dept);
+    incidentModel.department && (incidentModel.department = incidentModel.department.id);
+    incidentModel.requester && (this.applicationRequesterList = [cloneDeep(incidentModel.requester)]);
+    incidentModel.requester && (incidentMsg.requesterPhone = incidentModel.requester.phone);
+    incidentModel.requester && (incidentMsg.requesterName = incidentModel.requester.name);
+    incidentModel.requester && (incidentModel.requester = incidentModel.requester.id);
+    incidentModel.source && (incidentModel.source = incidentModel.source.id);
+    incidentModel.area && (incidentModel.area = incidentModel.area.id);
+    incidentModel.place && (incidentModel.place = incidentModel.place.id);
+    incidentModel.category && (this.applicationCategoryList = [cloneDeep(incidentModel.category)]);
+    incidentModel.category && (incidentModel.category = incidentModel.category.id);
+    this.incidentModel = incidentModel;
+    this.incidentMsg = incidentMsg;
+    console.log('this.applicationRequesterList:', this.applicationRequesterList)
+    console.log('this.applicationDeptList:', this.applicationDeptList)
+    console.log('incidentModel:', incidentModel)
+    this.showNewOrder('', '', true, '编辑事件');
+
+    // 查询报修图片
+    this.getRepairImgs(data.id);
+  }
+
   // 换人处理-弹窗
   substitutionModalShow = false; //弹窗开关
   substitution(data) {
@@ -4771,6 +4934,11 @@ export class FuwutaiComponent implements OnInit {
     return (data.state.value === 'pending' || data.state.value === 'handler' || (data.state.value === 'reassign' && this.coopBtns.assign)) && data.deleteFlag !== 1;
   }
 
+  // 是否显示编辑按钮
+  computedEdit(data){
+    return (data.state.value === 'pending' || data.state.value === 'reassign' || data.state.value === 'handler' || data.state.value === 'close') && this.coopBtns.edit && data.deleteFlag !== 1;
+  }
+
   // 是否显示处理按钮
   computedHandle(data){
     return this.coopBtns.handle && data.state.value === 'handler' && data.handlingPersonnelUser && data.handlingPersonnelUser.id == this.tool.getCurrentUserId() && data.deleteFlag !== 1;

src/app/views/hospital-config/hospital-config.component.html

@@ -334,46 +334,6 @@
                 </nz-form-control>
               </ng-container>
             </ng-container>
-            <ng-container *ngSwitchCase="'scanCodeSpecimenOrderSign'">
-              <nz-form-label
-                [nzSpan]="24"
-                [nzFor]="config.key"
-                class="label"
-                [nzRequired]="config.required"
-                >{{config.desc}}</nz-form-label
-              >
-              <nz-form-control
-                [nzSpan]="24"
-                [nzErrorTip]="'请选择!'"
-              >
-                <nz-radio-group
-                  [formControlName]="config.key"
-                >
-                  <label nz-radio nzValue="1">是</label>
-                  <label nz-radio nzValue="0">否</label>
-                </nz-radio-group>
-              </nz-form-control>
-            </ng-container>
-            <ng-container *ngSwitchCase="'returnSpecimenWhetherHandover'">
-              <nz-form-label
-                [nzSpan]="24"
-                [nzFor]="config.key"
-                class="label"
-                [nzRequired]="config.required"
-                >{{config.desc}}</nz-form-label
-              >
-              <nz-form-control
-                [nzSpan]="24"
-                [nzErrorTip]="'请选择!'"
-              >
-                <nz-radio-group
-                  [formControlName]="config.key"
-                >
-                  <label nz-radio nzValue="1">是</label>
-                  <label nz-radio nzValue="0">否</label>
-                </nz-radio-group>
-              </nz-form-control>
-            </ng-container>
             <ng-container *ngSwitchCase="'allowNucleicAcidPrinting'">
               <nz-form-label
                 [nzSpan]="24"

src/app/views/hushijiandan/hushijiandan.component.html

@@ -425,7 +425,7 @@
             </div>
           </div>
           <div class="userInfo">
-            <div class="wel">欢迎您：</div>
+            <div class="wel">欢迎您<strong>{{tool.getCurrentUserInfo().name}}</strong>：</div>
             <div class="user">
               <img src="../../assets/images/icon_keshi.png" alt="" />
               <span *ngIf="deptDisplay" [title]="deptDisplay == 2 ? loginUser.dept.deptalias : loginUser.dept.dept">{{deptDisplay == 2 ? loginUser.dept.deptalias : loginUser.dept.dept}}</span>
@@ -883,9 +883,6 @@
                         <div *ngIf="coopBtns.historicalMedicineListInquiry && currentDept.typeValue != 'outpatientService'" nz-col nzSpan="3" [ngClass]="{txtC: true, cur: true, checked: checkedTableType == 'historyDrugsbag'}" (click)="checkTable('historyDrugsbag')">
                           <div class="text">历史药单查询</div>
                         </div>
-                        <div *ngIf="coopBtns.quickReportForRepair && isShowBx" nz-col nzSpan="3" [ngClass]="{txtC: true, cur: true, checked: checkedTableType == 'kjbx'}" (click)="checkTable('kjbx')">
-                          <div class="text">快捷报修</div>
-                        </div>
                         <div *ngIf="coopBtns.repairList && isShowBx" nz-col nzSpan="3" [ngClass]="{txtC: true, cur: true, checked: checkedTableType == 'bxlb'}" (click)="checkTable('bxlb')">
                           <div class="text">
                             报修列表<strong class="red">&nbsp;({{processing}})</strong>
@@ -1429,56 +1426,21 @@
                               <div class="modalBody_right">
                                 <div class="modalBody_right_head">
                                   <div class="smallTab">
-                                    <div
-                                      class="s_tab"
-                                      *ngFor="let stab of smallTabs"
-                                      (click)="changeSmallTab(stab.id)"
-                                      [ngClass]="{
-                                        active: smallTabId == stab.id
-                                      }"
-                                    >
+                                    <div class="s_tab" *ngFor="let stab of smallTabs" (click)="changeSmallTab(stab.id)" [ngClass]="{ active: smallTabId == stab.id }">
                                       {{ stab.name }}
                                     </div>
                                   </div>
                                   <span>{{ logTime }}秒后自动刷新</span>
                                 </div>
-                                <overlay-scrollbars
-                                  class="modalBody_right_box"
-                                  #osComponentRef9
-                                  style="height: 100%"
-                                  *ngIf="
-                                    (smallTabId == 1 &&
-                                      !rLoading &&
-                                      listDeptOrderRecords.length) ||
-                                    smallTabId == 2
-                                  "
-                                >
+                                <overlay-scrollbars class="modalBody_right_box" #osComponentRef9 style="height: 100%" *ngIf="(smallTabId == 1 && !rLoading && listDeptOrderRecords.length) || smallTabId == 2">
                                   <div class="modalBody_right_box">
-                                    <ng-container
-                                      *ngIf="smallTabId == 1; else elseSmall"
-                                    >
-                                      <div
-                                        class="modalBody_right_list"
-                                        *ngFor="let item of listDeptOrderRecords"
-                                        [innerHTML]="item.msg | htmlTransform"
-                                      ></div>
+                                    <ng-container *ngIf="smallTabId == 1; else elseSmall">
+                                      <div class="modalBody_right_list" *ngFor="let item of listDeptOrderRecords" [innerHTML]="item.msg | htmlTransform"></div>
                                     </ng-container>
                                     <ng-template #elseSmall>
-                                      <nz-table
-                                        class="bxFlex bxTable"
-                                        [nzData]="quickBxlbList"
-                                        nzSize="small"
-                                        [nzShowPagination]="false"
-                                        [nzLoading]="quickBxlbLoading"
-                                      >
+                                      <nz-table class="bxFlex bxTable" [nzData]="quickBxlbList" nzSize="small" [nzShowPagination]="false" [nzLoading]="quickBxlbLoading">
                                         <tbody>
-                                          <tr
-                                            (click)="showBxModal(data)"
-                                            *ngFor="
-                                              let data of quickBxlbList;
-                                              let i = index
-                                            "
-                                          >
+                                          <tr (click)="showBxModal(data)" *ngFor="let data of quickBxlbList;let i = index">
                                             <td>{{ data.content || "无" }}</td>
                                           </tr>
                                           <!-- <tr (click)="checkTable('kjbx')">
@@ -1491,24 +1453,11 @@
                                     </ng-template>
                                   </div>
                                 </overlay-scrollbars>
-                                <div
-                                  class="modalBody_left nLoading w100"
-                                  *ngIf="smallTabId == 1 && rLoading"
-                                >
-                                  <img
-                                    src="../../../assets/images/loading.gif"
-                                    alt=""
-                                  />
+                                <div class="modalBody_left nLoading w100" *ngIf="smallTabId == 1 && rLoading">
+                                  <img src="../../../assets/images/loading.gif" alt="" />
                                   <div>加载中...</div>
                                 </div>
-                                <div
-                                  class="modalBody_left noData w100"
-                                  *ngIf="
-                                    smallTabId == 1 &&
-                                    !rLoading &&
-                                    !listDeptOrderRecords.length
-                                  "
-                                >
+                                <div class="modalBody_left noData w100" *ngIf="smallTabId == 1 && !rLoading && !listDeptOrderRecords.length">
                                   暂无数据
                                 </div>
                               </div>
@@ -1962,194 +1911,6 @@
                   </div>
                 </div>
               </div>
-              <!-- 快捷报修 -->
-              <div
-                *ngIf="checkedTableType == 'kjbx' && isShowBx && coopBtns.quickReportForRepair"
-                style="flex: 1; height: 100%; display: flex"
-              >
-                <div class="otherBox">
-                  <div class="otherBoxInner">
-                    <!-- 故障现象查询 -->
-                    <div class="otherBox-nav" style="width: 30%">
-                      <div class="otherBox-nav__head">
-                        <input
-                          nz-input
-                          placeholder="请输入关键字"
-                          [(ngModel)]="incidentSearch"
-                          (ngModelChange)="incidentSearchChange()"
-                        />
-                      </div>
-                      <overlay-scrollbars
-                        #osComponentRef10
-                        class="otherBox-nav__main"
-                        [ngStyle]="{ height: '100%' }"
-                      >
-                        <div
-                          class="otherBox-nav__mainInner"
-                          *ngIf="!iLoading && incidentList.length > 0"
-                        >
-                          <div class="w100">
-                            <div
-                              class="otherBox-nav__mainItem"
-                              *ngFor="let item of incidentList"
-                              (click)="incidentClick(item)"
-                              [ngClass]="{
-                                active: selectIncidentId == item.id
-                              }"
-                              [title]="item.mutiCategory"
-                            >
-                              {{ item.mutiCategory }}
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="otherBox-nav__mainInner noData"
-                          *ngIf="!iLoading && incidentList.length == 0"
-                        >
-                          暂无数据
-                        </div>
-                        <div
-                          class="otherBox-nav__mainInner oLoading"
-                          *ngIf="iLoading"
-                        >
-                          <img
-                            src="../../../assets/images/loading.gif"
-                            alt=""
-                          />
-                          <div>加载中...</div>
-                        </div>
-                      </overlay-scrollbars>
-                    </div>
-                    <form
-                      nz-form
-                      [formGroup]="bxForm"
-                      (ngSubmit)="submitBxForm()"
-                      class="bxForm bxFlex"
-                    >
-                      <!-- <nz-form-item>
-                        <nz-form-label [nzSpan]="8" nzRequired nzFor="name"
-                          >联系人</nz-form-label
-                        >
-                        <nz-form-control [nzSpan]="12" nzErrorTip="请填写联系人">
-                          <input
-                            type="text"
-                            nz-input
-                            formControlName="name"
-                            placeholder="请填写联系人"
-                          />
-                        </nz-form-control>
-                      </nz-form-item>
-                      <nz-form-item>
-                        <nz-form-label [nzSpan]="8" nzRequired nzFor="phone"
-                          >联系人电话</nz-form-label
-                        >
-                        <nz-form-control
-                          [nzSpan]="12"
-                          nzErrorTip="请填写联系人电话"
-                        >
-                          <input
-                            type="text"
-                            nz-input
-                            formControlName="phone"
-                            placeholder="请填写联系人电话"
-                          />
-                        </nz-form-control>
-                      </nz-form-item>
-                      <nz-form-item>
-                        <nz-form-label [nzSpan]="8" nzFor="hospital" nzRequired
-                          >所属院区</nz-form-label
-                        >
-                        <nz-form-control [nzSpan]="12" nzErrorTip="请选择所属院区!">
-                          <nz-select
-                            formControlName="hospital"
-                            nzPlaceHolder="请选择所属院区"
-                            (ngModelChange)="getPlace($event)"
-                          >
-                            <nz-option
-                              [nzValue]="area.id"
-                              [nzLabel]="area.area"
-                              *ngFor="let area of areas"
-                            ></nz-option>
-                          </nz-select>
-                        </nz-form-control>
-                      </nz-form-item>
-                      <nz-form-item>
-                        <nz-form-label [nzSpan]="8" nzFor="building" nzRequired
-                          >楼栋</nz-form-label
-                        >
-                        <nz-form-control [nzSpan]="12" nzErrorTip="请选择楼栋!">
-                          <nz-select
-                            formControlName="building"
-                            nzPlaceHolder="请选择楼栋"
-                          >
-                            <nz-option
-                              [nzValue]="place.id"
-                              [nzLabel]="place.place"
-                              *ngFor="let place of places"
-                            >
-                            </nz-option>
-                          </nz-select>
-                        </nz-form-control>
-                      </nz-form-item>
-                      <nz-form-item>
-                        <nz-form-label [nzSpan]="8" nzRequired
-                          >详细地址</nz-form-label
-                        >
-                        <nz-form-control [nzSpan]="12" nzErrorTip="请填写详细地址">
-                          <textarea
-                            formControlName="address"
-                            nz-input
-                            rows="2"
-                            placeholder="请填写详细地址"
-                          ></textarea>
-                        </nz-form-control>
-                      </nz-form-item> -->
-                      <nz-form-item>
-                        <nz-form-label [nzSpan]="8" nzRequired
-                          >报修内容</nz-form-label
-                        >
-                        <nz-form-control
-                          [nzSpan]="12"
-                          nzErrorTip="请填写报修内容"
-                        >
-                          <textarea
-                            formControlName="content"
-                            nz-input
-                            rows="2"
-                            placeholder="请填写报修内容"
-                          ></textarea>
-                        </nz-form-control>
-                      </nz-form-item>
-                      <nz-form-item>
-                        <nz-form-label
-                          [nzSpan]="8"
-                          style="visibility: hidden"
-                        ></nz-form-label>
-                        <nz-form-control [nzSpan]="12">
-                          <button
-                            nz-button
-                            nzType="primary"
-                            [nzLoading]="bxLoading"
-                          >
-                            提交
-                          </button>
-                        </nz-form-control>
-                      </nz-form-item>
-                    </form>
-                  </div>
-                </div>
-                <!-- <nz-table class="bxFlex bxTable" [nzData]="quickBxlbList" nzSize="small" [nzShowPagination]="false"
-                  [nzLoading]="quickBxlbLoading">
-                  <tbody>
-                    <tr (click)="showBxModal(data,'您的报修为“'+data.content+'” 是否确认报修？')" *ngFor="
-                            let data of quickBxlbList;
-                            let i = index
-                          ">
-                      <td>{{ data.content||'无' }}</td>
-                    </tr>
-                  </tbody>
-                </nz-table> -->
-              </div>
               <!-- 报修列表 -->
               <div
                 *ngIf="checkedTableType == 'bxlb' && isShowBx && coopBtns.repairList"
@@ -2173,7 +1934,7 @@
                       >
                         <nz-option
                           [nzLabel]="data.name"
-                          [nzValue]="data.id"
+                          [nzValue]="data.value"
                           *ngFor="let data of incidentStateList"
                         ></nz-option>
                       </nz-select>
@@ -2222,7 +1983,7 @@
                           <td>
                             <!-- <button (click)="viewBx(data)">查看</button> -->
                             <button class="btn1 mr8 mb8 mt8" (click)="detailBx(data)">查看</button>
-                            <button class="btn1 mr8 mb8 mt8" (click)="showAppraiseBx(data.id)" *ngIf="data.state && data.state.value == 'close' && !data.wxdegree">评价</button>
+                            <button class="btn1 mr8 mb8 mt8" (click)="showAppraiseBx(data)" *ngIf="data.state && data.state.value == 'close' && !data.wxdegree">评价</button>
                           </td>
                         </tr>
                       </tbody>
@@ -3792,16 +3553,9 @@
   </div>
 </div>
 <!-- 是否确认报修模态框 -->
-<div
-  class="commonModal display_flex justify-content_flex-center align-items_center"
-  *ngIf="bxModal"
->
+<div class="commonModal display_flex justify-content_flex-center align-items_center" *ngIf="bxModal">
   <div class="modalBody">
-    <div class="title">
-      一键报修<i
-        class="icon_transport transport-guanbi"
-        (click)="hideBxModal()"
-      ></i>
+    <div class="title">一键报修<i class="icon_transport transport-guanbi" (click)="hideBxModal()"></i>
     </div>
     <overlay-scrollbars #osComponentRef5 class="content">
       <form nz-form [formGroup]="validateBxForm" class="bxFormAdd" (ngSubmit)="confirmBx()">
@@ -3834,7 +3588,7 @@
             <nz-select [nzDropdownMatchSelectWidth]="false" style="width:120px;" class="mr8" type="building"
               nzShowSearch formControlName="building" nzPlaceHolder="请选择楼栋"
               (ngModelChange)="changeBuilding($event)">
-              <nz-option [nzLabel]="data.area" [nzValue]="data.id" *ngFor="let data of buildings">
+              <nz-option [nzLabel]="data.buildingName" [nzValue]="data.id" *ngFor="let data of buildings">
               </nz-option>
             </nz-select>
           </nz-form-control>
@@ -3842,7 +3596,7 @@
           <nz-form-control style="display: inline-block;">
             <nz-select [nzDropdownMatchSelectWidth]="false" style="width:120px;" class="mr8" type="floor" nzShowSearch
              formControlName="floor" nzPlaceHolder="请选择楼层" [nzLoading]="floorLoading">
-              <nz-option [nzLabel]="data.place" [nzValue]="data.id" *ngFor="let data of floors"></nz-option>
+              <nz-option [nzLabel]="data.floorName" [nzValue]="data.id" *ngFor="let data of floors"></nz-option>
             </nz-select>
           </nz-form-control>
           <nz-form-label [nzSm]="4" [nzXs]="4" nzRequired nzFor="officeAddress" hidden></nz-form-label>
@@ -3855,19 +3609,10 @@
       </form>
     </overlay-scrollbars>
     <div class="display_flex justify-content_flex-center">
-      <button
-        nz-button
-        nzType="primary"
-        (click)="confirmBx()"
-      >
+      <button nz-button nzType="primary" (click)="confirmBx()">
         确认
       </button>
-      <button
-        class="btn cancel"
-        nz-button
-        nzType="default"
-        (click)="hideBxModal()"
-      >
+      <button class="btn cancel" nz-button nzType="default" (click)="hideBxModal()">
         取消
       </button>
     </div>
@@ -3950,6 +3695,7 @@
   </div>
   <div class="dialog-operate">
     <strong class="dialog-refresh" (click)="showNurseCode()">刷新</strong>
+    <strong>{{tool.getCurrentUserInfo().name}}</strong>
     <span>{{ refreshQRCodeTime }}s</span>
   </div>
 </div>

src/app/views/hushijiandan/hushijiandan.component.less

@@ -168,6 +168,8 @@
         right: 0;
         bottom: 0;
         left: 0;
+        display: flex;
+        align-items: center;
 
         img {
           width: 100%;

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -115,7 +115,6 @@ export class HushijiandanComponent implements OnInit {
   searchAccountSubject = new Subject(); //查工号防抖
   searchTabInpSubject = new Subject(); //左侧查患者信息和检查信息防抖
   otherSearchChangeSubject = new Subject(); //其他建单搜索防抖
-  incidentSearchChangeSubject = new Subject(); //故障现象搜索防抖
   isYyInspect = false; //需要预约检查
   inspectAndPatientTransportConfig:any = {timeMod: 30};
   constructor(
@@ -199,11 +198,6 @@ export class HushijiandanComponent implements OnInit {
     this.otherSearchChangeSubject.pipe(debounceTime(500)).subscribe((v) => {
       this.getDeptTaskType(v);
     });
-    this.incidentSearchChangeSubject
-      .pipe(debounceTime(500))
-      .subscribe((v: string) => {
-        this.getIncidentcategory(v);
-      });
 
     this.getTodayNum();
     this.initLogin();
@@ -297,9 +291,6 @@ export class HushijiandanComponent implements OnInit {
         case "historicalMedicineListInquiry":
           coopBtns.historicalMedicineListInquiry = true; //历史药单查询
           break;
-        case "quickReportForRepair":
-          coopBtns.quickReportForRepair = true; //快捷报修
-          break;
         case "repairList":
           coopBtns.repairList = true; //报修列表
           break;
@@ -501,32 +492,30 @@ export class HushijiandanComponent implements OnInit {
         if (result.status == 200) {
           this.isShowBx = result.list.find(v => v.key == 'hos_itsmIncident').value == 1;
           this.isAssign = result.list.find(v => v.key == 'nurseSendOrder').value == 1;
-          if (this.isShowBx && (this.coopBtns.repairList || this.coopBtns.quickReportForRepair) && !this.checkedTableType) {
+          if (this.isShowBx && this.coopBtns.repairList && !this.checkedTableType) {
             // 初始化默认显示第一个
-            if(this.tabPermission.length){
-              this.checkedTableType = (this.tabPermission[0] && this.tabPermission[0].system) ? 'other' : this.tabPermission[0].id;
-            }else if(this.coopBtns.suggestionBox){
-              this.checkedTableType = 'advice';
-              this.checkTable(this.checkedTableType);
-            }else if(this.coopBtns.surgery){
-              this.checkedTableType = 'surgery';
-              this.checkTable(this.checkedTableType);
-            }else if(this.coopBtns.outpatientHelpAppointment){
-              this.checkedTableType = 'outpatientHelpAppointment';
-              this.checkTable(this.checkedTableType);
-            }else if(this.coopBtns.inquiryOfHistoricalSpecimens){
-              this.checkedTableType = 'historySpecimen';
-              this.checkTable(this.checkedTableType);
-            }else if(this.coopBtns.historicalMedicineListInquiry){
-              this.checkedTableType = 'historyDrugsbag';
-              this.checkTable(this.checkedTableType);
-            }else if(this.coopBtns.quickReportForRepair && this.isShowBx){
-              this.checkedTableType = 'kjbx';
-              this.checkTable(this.checkedTableType);
-            }else if(this.coopBtns.repairList && this.isShowBx){
-              this.checkedTableType = 'bxlb';
-              this.checkTable(this.checkedTableType);
-            }
+            console.log(this.tabPermission)
+            // if(this.tabPermission.length){
+            //   this.checkedTableType = (this.tabPermission[0] && this.tabPermission[0].system) ? 'other' : this.tabPermission[0].id;
+            // }else if(this.coopBtns.suggestionBox){
+            //   this.checkedTableType = 'advice';
+            //   this.checkTable(this.checkedTableType);
+            // }else if(this.coopBtns.surgery){
+            //   this.checkedTableType = 'surgery';
+            //   this.checkTable(this.checkedTableType);
+            // }else if(this.coopBtns.outpatientHelpAppointment){
+            //   this.checkedTableType = 'outpatientHelpAppointment';
+            //   this.checkTable(this.checkedTableType);
+            // }else if(this.coopBtns.inquiryOfHistoricalSpecimens){
+            //   this.checkedTableType = 'historySpecimen';
+            //   this.checkTable(this.checkedTableType);
+            // }else if(this.coopBtns.historicalMedicineListInquiry){
+            //   this.checkedTableType = 'historyDrugsbag';
+            //   this.checkTable(this.checkedTableType);
+            // }else if(this.coopBtns.repairList && this.isShowBx){
+            //   this.checkedTableType = 'bxlb';
+            //   this.checkTable(this.checkedTableType);
+            // }
             this.smallTabs = [
               { id: 1, name: "综合日志" },
               { id: 2, name: "一键报修" },
@@ -864,12 +853,6 @@ export class HushijiandanComponent implements OnInit {
   otherSearchChange() {
     this.otherSearchChangeSubject.next(this.otherSearch);
   }
-  //搜索
-  incidentSearch = ""; //搜索的关键词
-  incidentNum = 0;
-  incidentSearchChange() {
-    this.incidentSearchChangeSubject.next(this.incidentSearch);
-  }
   // 切换科室
   changeKs() {
     this.hsPromptModalShow = true;
@@ -1165,17 +1148,17 @@ export class HushijiandanComponent implements OnInit {
       contacts: [this.loginUser.name, [Validators.required]],
       contactsInformation: [this.loginUser.phone, [Validators.required]],
     });
-    this.getDeptByCode(this.currentDept.pcode);
+    this.getDeptById(this.currentDept.id);
   }
-  // 根据科室Code获取详情
+  // 根据科室ID获取详情
   deptDto:any = {};
-  getDeptByCode(code){
+  getDeptById(id){
     this.mainService
-      .fetchListBx("department", {
+      .getFetchDataList("simple/data", "department", {
         idx: 0,
         sum: 1,
         department: {
-          eqCode: code,
+          id,
         }
       })
       .subscribe((data:any) => {
@@ -1184,13 +1167,13 @@ export class HushijiandanComponent implements OnInit {
         console.log(this.deptDto);
         this.changeHosp();
         // 回显楼栋
-        if(this.deptDto.place){
-          this.validateBxForm.controls.building.setValue(this.deptDto.place.area.id);
+        if(this.deptDto.building){
+          this.validateBxForm.controls.building.setValue(this.deptDto.building.id);
         }
 
         // 回显楼层
-        if(this.deptDto.place){
-          this.validateBxForm.controls.floor.setValue(this.deptDto.place.id);
+        if(this.deptDto.floor){
+          this.validateBxForm.controls.floor.setValue(this.deptDto.floor.id);
         }
       });
   }
@@ -1202,12 +1185,12 @@ export class HushijiandanComponent implements OnInit {
     let data = {
       idx: 0,
       sum: 9999,
-      area: {
-        branch: this.deptDto.branch,
+      building: {
+        hosId: this.deptDto.hospital.id,
       }
     };
     this.mainService
-      .fetchListBx("area", data)
+      .getFetchDataList("simple/data", "building", data)
       .subscribe((data:any) => {
         this.buildings = data.list || [];
         this.floors = [];
@@ -1230,13 +1213,13 @@ export class HushijiandanComponent implements OnInit {
     let data = {
       idx: 0,
       sum: 9999,
-      place: {
-        area: { id: buildingId },
+      floor: {
+        buildId: buildingId,
       }
     };
     this.floorLoading = true;
     this.mainService
-      .fetchListBx("place", data)
+      .getFetchDataList("simple/data", "floor", data)
       .subscribe((data:any) => {
         this.floorLoading = false;
         this.message.remove(this.maskFlag);
@@ -1286,11 +1269,9 @@ export class HushijiandanComponent implements OnInit {
     }).messageId;
     if(type == 1){
       this.btnLoading = true;
-      let loginUser:any = {
-        account: this.loginUser.account,
-      };
-      if(this.deptDto.branch){
-        loginUser.branch = { id: this.deptDto.branch };
+      let loginUser:any = cloneDeep(this.loginUser);
+      if(this.deptDto.hospital){
+        loginUser.hospital = { id: this.deptDto.hospital.id };
       }
       if(this.deptDto){
         loginUser.dept = {id: this.deptDto.id};
@@ -1298,18 +1279,18 @@ export class HushijiandanComponent implements OnInit {
       if(this.validateBxForm.value.contacts){
         loginUser.name = this.validateBxForm.value.contacts;
       }
-      if(this.validateBxForm.value.floor){
-        loginUser.place = {id: this.validateBxForm.value.floor, area: { id: this.validateBxForm.value.building }};
-      }
-      if(this.validateBxForm.value.officeAddress){
-        loginUser.houseNumber = this.validateBxForm.value.officeAddress;
-      }
+      // if(this.validateBxForm.value.floor){
+      //   loginUser.place = {id: this.validateBxForm.value.floor, area: { id: this.validateBxForm.value.building }};
+      // }
+      // if(this.validateBxForm.value.officeAddress){
+      //   loginUser.houseNumber = this.validateBxForm.value.officeAddress;
+      // }
       if(this.validateBxForm.value.contactsInformation){
         loginUser.phone = this.validateBxForm.value.contactsInformation;
       }
-      let result:any = await this.mainService.saveUser({loginUser}).toPromise();
+      let result:any = await this.mainService.coopData("updData", "user", { user: loginUser }).toPromise();
       console.log(result);
-      if(result.state != 200){
+      if(result.status != 200){
         this.hideReqModal();
         this.btnLoading = false;
         this.message.remove(this.maskFlag);
@@ -1320,38 +1301,34 @@ export class HushijiandanComponent implements OnInit {
     }else{
       this.cancenlLoading = true;
     }
-    this.mainService.getDictionaryByITSM({key: "incident_source", type: "list"}).subscribe((source:any) => {
-      let incidentSourceList = source.data || [];
+    this.mainService.getDictionary("list", "incident_source").subscribe((source:any) => {
+      let incidentSourceList = source || [];
       let im = incidentSourceList.find(v => v.value === 'im');
-      this.mainService.wxbx({}).subscribe((result) => {
-        if ((result as any).status == 200) {
-          let bxcode = (result as any).data; //生成微信报修号
+      this.mainService.getDictionary("list", "repair_incident_type").subscribe((result) => {
+        let repairIncidentTypeList = result || [];
+        let repairIncidentType = repairIncidentTypeList.find(v => v.value === 'dept');
+        if (repairIncidentType) {
           let postData: any = {
             incident: {
-              "incidentsign": bxcode,
-              "deleteFlag": 0,
-              "department": { id: this.deptDto.id },
-              "contactsInformation": this.validateBxForm.value.contactsInformation,
-              "contacts": this.validateBxForm.value.contacts,
-              "branch": this.deptDto.branch,
-              "area": { id: this.validateBxForm.value.building },
-              "place": { id: this.validateBxForm.value.floor },
-              "houseNumber": this.validateBxForm.value.officeAddress,
-              "source": im,
-              "description": this.validateBxForm.value.description,
-              "repairType": 2,
-              "requester": this.loginUser,
-              "acceptUser": this.loginUser,
+              repairIncidentType,
+              place: { id: this.deptDto.floor.id },
+              department: { id: this.deptDto.id},
+              description: this.validateBxForm.value.description,
+              houseNumber: this.validateBxForm.value.officeAddress,
+              contacts: this.validateBxForm.value.contacts,
+              contactsInformation: this.validateBxForm.value.contactsInformation,
+              hosId: this.deptDto.hospital.id,
+              source: im,
+              fromWx: true,
+              requester: this.loginUser,
+              acceptUser: this.loginUser,
+              deleteFlag: 0,
             },
-            loginUser: {
-              account: this.loginUser.account,
-              id: this.loginUser.id,
-            }
           };
           if (this.coopBx.category) {
-            postData.incident.category = this.coopBx.category;
+            postData.incident.category = this.coopBx.categoryDTO;
           }
-          this.mainService.addWxIncident(postData).subscribe((res) => {
+          this.mainService.flowPost("incident/task/request", postData).subscribe((res) => {
             this.btnLoading = false;
             this.cancenlLoading = false;
             this.message.remove(this.maskFlag);
@@ -1367,7 +1344,7 @@ export class HushijiandanComponent implements OnInit {
           });
         } else {
           this.btnLoading = false;
-          this.showPromptModal("提交", false, "");
+          this.showPromptModal("提交", false, "缺少【科室内报修】数据字典");
         }
       });
     })
@@ -1376,38 +1353,13 @@ export class HushijiandanComponent implements OnInit {
   // 获取星级
   degrees = [];
   getDegrees() {
-    let postData = { type: "list", key: "incident_degree" };
     this.iLoading = true;
-    this.mainService.getDictionaryByITSM(postData).subscribe((data: any) => {
+    this.mainService.getDictionary("list", "incident_degree").subscribe((data: any) => {
       this.iLoading = false;
-      if (data.status == 200) {
-        this.degrees = data.data || [];
-      }
+      this.degrees = data || [];
     });
   }
-  // 获取故障现象（三级）
-  incidentList = [];
   iLoading = false;
-  getIncidentcategory(key = "") {
-    let postData = {
-      idx: 0,
-      sum: 9999,
-      incidentcategory: {
-        category: key,
-        selectType: "pinyin_qs",
-        hierarchyQuery: "three",
-      },
-    };
-    this.iLoading = true;
-    this.mainService
-      .fetchListBx("incidentcategory", postData)
-      .subscribe((data: any) => {
-        this.iLoading = false;
-        if (data.status == 200) {
-          this.incidentList = data.list || [];
-        }
-      });
-  }
   // 获取当前登录人科室任务类型信息
   othersList: any = []; // 其他一键建单列表
   bbMsg: any = {}; //标本一键建单
@@ -1508,6 +1460,7 @@ export class HushijiandanComponent implements OnInit {
         }
         // 初始化默认显示第一个
         if(search === undefined && !this.checkedTableType){
+          console.log(this.tabPermission)
           if(this.tabPermission.length){
             this.checkedTableType = (this.tabPermission[0] && this.tabPermission[0].system) ? 'other' : this.tabPermission[0].id;
           }else if(this.coopBtns.suggestionBox){
@@ -1525,9 +1478,6 @@ export class HushijiandanComponent implements OnInit {
           }else if(this.coopBtns.historicalMedicineListInquiry){
             this.checkedTableType = 'historyDrugsbag';
             this.checkTable(this.checkedTableType);
-          }else if(this.coopBtns.quickReportForRepair && this.isShowBx){
-            this.checkedTableType = 'kjbx';
-            this.checkTable(this.checkedTableType);
           }else if(this.coopBtns.repairList && this.isShowBx){
             this.checkedTableType = 'bxlb';
             this.checkTable(this.checkedTableType);
@@ -3648,15 +3598,6 @@ export class HushijiandanComponent implements OnInit {
       this.getBxlb(this.bxlbPageIndex);
       // this.getIncidentState();
       this.getDegrees();
-    } else if (type === "kjbx" && this.isShowBx && this.coopBtns.quickReportForRepair) {
-      // this.getQuickBxlb();
-      this.getIncidentcategory();
-      // 获取报修的区域(所属院区)
-      // this.getArea();
-      // this.bxForm.controls.name.setValue(this.loginUser.name);
-      // this.bxForm.controls.phone.setValue(this.loginUser.phone);
-      // this.bxForm.controls.address.setValue(null);
-      this.bxForm.controls.content.setValue(null);
     }
   }
   //提交报修
@@ -3894,7 +3835,15 @@ export class HushijiandanComponent implements OnInit {
   }
   // 获取事件状态
   incidentStateId = undefined;
-  incidentStateList = [];
+  incidentStateList = [
+    {name: '全部', value: 0},
+    {name: '待受理', value: 'accept,storage'},
+    {name: '处理中', value: 'pending,handler,reassign'},
+    {name: '待评价', value: 'close0', hasWxdegree: 0},
+    {name: '已关闭', value: 'close1', hasWxdegree: 1},
+    {name: '不受理', value: 'reject'},
+    {name: '撤销', value: 'cancel'},
+  ];
   // getIncidentState() {
   //   let postData = { type: "list", key: "wxincident_state" };
   //   this.iLoading = true;
@@ -3914,45 +3863,41 @@ export class HushijiandanComponent implements OnInit {
   bxlbParentSearchInp: string = ""; //患者信息搜索
   processing: number = 0; //处理中的数量
   bxlbLoading = false;
+  repairIncidentTypeList = [];//科室报修或公共报修
   getBxlb(idx, isInitState = false) {
     // 获取事件状态
-    let postData = { type: "list", key: "incident_status" };
     this.iLoading = true;
     this.bxlbLoading = true;
-    this.mainService.getDictionaryByITSM(postData).subscribe((data: any) => {
+    this.mainService.getDictionary('list', 'repair_incident_type').subscribe((data: any) => {
       this.iLoading = false;
-      if (data.status == 200) {
-        let incidentStateList = data.data || [];
-        incidentStateList.unshift({id: 0, name: '全部', value: 0});
-        this.incidentStateList = incidentStateList;
-        if(isInitState){
-          let valueObj2 = this.incidentStateList.find(v => v.value == 0);
-          this.incidentStateId = valueObj2 ? valueObj2.id : undefined;
-        }
+      this.repairIncidentTypeList = data || [];
+      if(isInitState){
+        let valueObj2 = this.incidentStateList.find(v => v.value == 0);
+        this.incidentStateId = valueObj2 ? valueObj2.value : undefined;
+      }
 
-        // 报修列表查询表格数据
-        if (idx) {
-          this.bxlbPageIndex = 1;
-        }
-        let current = JSON.parse(localStorage.getItem("user"));
-        this.mainService
-          .listWxIncident({
-            idx: this.bxlbPageIndex - 1,
-            sum: this.bxlbPageSize,
-            incident: {
-              // assignee: current.user.account,
-              statusId: this.incidentStateId || undefined,
-              department: { pcode: current.user.dept.pcode },
-            }
-          })
-          .subscribe((data: any) => {
-            this.bxlbLoading = false;
-            this.bxlbList = data.list || [];
-            this.bxlbListLength = data.totalNum || 0;
-            this.processing = data.totalNum || 0;
-          });
+      // 报修列表查询表格数据
+      if (idx) {
+        this.bxlbPageIndex = 1;
       }
-    });
+      let current = JSON.parse(localStorage.getItem("user"));
+      this.mainService
+        .getFetchDataList("simple/data", "incident", {
+          idx: this.bxlbPageIndex - 1,
+          sum: this.bxlbPageSize,
+          incident: {
+            repairIncidentType: { id: this.repairIncidentTypeList.find(v => v.value === 'dept').id },
+            statesValues: this.incidentStateId || undefined,
+            department: { id: current.user.dept.id },
+          }
+        })
+        .subscribe((data: any) => {
+          this.bxlbLoading = false;
+          this.bxlbList = data.list || [];
+          this.bxlbListLength = data.totalNum || 0;
+          this.processing = data.totalNum || 0;
+        });
+    })
   }
 
   //快速报修列表
@@ -3961,7 +3906,7 @@ export class HushijiandanComponent implements OnInit {
   getQuickBxlb() {
     this.quickBxlbLoading = true;
     this.mainService
-      .fetchListBx("incidentCategoryContent", { idx: 0, sum: 10 })
+      .getFetchDataList("simple/data", "incidentCategoryContent", { idx: 0, sum: 10 })
       .subscribe((data: any) => {
         this.quickBxlbLoading = false;
         if (data.status == 200) {
@@ -4117,7 +4062,7 @@ export class HushijiandanComponent implements OnInit {
   reqModal: boolean = false;
   extraData:any = {};
   showReqModal() {
-    this.extraData.place = this.floors.find(v => v.id == this.validateBxForm.value.floor);
+    this.extraData.floor = this.floors.find(v => v.id == this.validateBxForm.value.floor);
     // this.reqModal = true;
     this.confirmBxNext(0);
   }
@@ -4331,9 +4276,9 @@ export class HushijiandanComponent implements OnInit {
   appraiseModalBx: boolean = false;
   starNumBx: number = 5; //评价星
   appraiseContentBx: string = ""; //评级
-  appraiseIdBx: number;
-  showAppraiseBx(id) {
-    this.appraiseIdBx = id;
+  appraiseDataBx: any;
+  showAppraiseBx(data) {
+    this.appraiseDataBx = data;
     this.appraiseModalBx = true;
     this.starNumBx = 5;
     this.appraiseContentBx = "";
@@ -4345,12 +4290,14 @@ export class HushijiandanComponent implements OnInit {
     this.btnLoading = true;
     let id = this.degrees.find(v=>v.value == this.starNumBx).id;
     let postData = {
-      degree: id,
-      degreeRemark: this.appraiseContentBx,
-      id: this.appraiseIdBx,
+      incident: {
+        ...this.appraiseDataBx,
+        wxdegree: { id },
+        wxdegreeremark: this.appraiseContentBx,
+      }
     };
     this.mainService
-      .degree(postData)
+      .flowPost("incident/task/resolve", postData)
       .subscribe((data:any) => {
         this.hideAppraiseBx();
         if (data.state == 200) {

src/app/views/incident-config/incident-config.component.html

@@ -36,6 +36,10 @@
   <ng-container *ngIf="activeTagLink === 'incidentConfigHospital'">
     <app-configuration-hospital></app-configuration-hospital>
   </ng-container>
+  <!-- 常见故障 -->
+	<ng-container *ngIf="activeTagLink === 'incidentConfigCommonFaults'">
+	  <app-configuration-commonFaults></app-configuration-commonFaults>
+	</ng-container>
 </div>
 
 

src/app/views/incident-config/incident-config.component.ts

@@ -36,10 +36,12 @@ export class IncidentConfigComponent implements OnInit, AfterViewInit {
   ngOnInit(): void {}
 
   ngAfterViewInit(){
-    let menus = JSON.parse(localStorage.getItem("menu"));
-    let incidentConfig = menus.find(item => item.link == 'incidentConfig');
-    this.tagList = incidentConfig ? (incidentConfig.childrens || []) : [];
-    this.tagList.length && this.clickTag(this.tagList[0]);
+    setTimeout(() => {
+      let menus = JSON.parse(localStorage.getItem("menu"));
+      let incidentConfig = menus.find(item => item.link == 'incidentConfig');
+      this.tagList = incidentConfig ? (incidentConfig.childrens || []) : [];
+      this.tagList.length && this.clickTag(this.tagList[0]);
+    }, 0)
   }
 
   // 点击tab

src/app/views/incident-config/incident-config.module.ts

@@ -11,6 +11,7 @@ import { ConfigurationDeptUserComponent } from 'src/app/components/configuration
 import { ConfigurationMessageComponent } from 'src/app/components/configurationCenter/configuration-message/configuration-message.component';
 import { ConfigurationHospitalComponent } from 'src/app/components/configurationCenter/configuration-hospital/configuration-hospital.component';
 import { ConfigurationDictionaryModule } from 'src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.module';
+import { ConfigurationCommonFaultsComponent } from 'src/app/components/configurationCenter/configuration-commonFaults/configuration-commonFaults.component';
 
 
 @NgModule({
@@ -22,6 +23,7 @@ import { ConfigurationDictionaryModule } from 'src/app/components/configurationC
 		ConfigurationDeptUserComponent,
     ConfigurationMessageComponent,
     ConfigurationHospitalComponent,
+    ConfigurationCommonFaultsComponent,
   ],
   imports: [
     CommonModule,

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

@@ -98,6 +98,7 @@
             <td>
               <div class="coop">
                 <span *ngIf="coopBtns.look" (click)="detail($event,data)">查看</span>
+                <span *ngIf="data.computedEditFlag" (click)="edit($event,data)">编辑</span>
                 <span *ngIf="data.computedVisitFlag" (click)="visit($event,data)">回访</span>
                 <span *ngIf="data.computedReceiveFlag" (click)="showDelModal($event, data,'您确认要接单吗？','接单','receive')">接单</span>
                 <span *ngIf="data.computedHandleFlag" (click)="handle($event,data)">处理</span>
@@ -194,3 +195,6 @@
 
 <!-- 详情 -->
 <app-incident-detail [id]="coopData.id" *ngIf="detailModalShow" (closeModelHs)="closeDetailModelOrder($event)" (confirmModelHs)="confirmDetailModelOrder($event)"></app-incident-detail>
+
+<!-- 编辑/新增 -->
+<app-incident-create [id]="coopData.id" *ngIf="editModalShow" (closeModelHs)="closeEditModelOrder($event)" (confirmModelHs)="confirmEditModelOrder($event)"></app-incident-create>

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

@@ -269,6 +269,11 @@ export class IncidentManagementComponent implements OnInit {
     return this.coopBtns.visit && data.state.value == 'close' && data.deleteFlag !== 1;
   }
 
+  // 是否显示编辑按钮
+  computedEdit(data){
+    return (data.state.value === 'pending' || data.state.value === 'reassign' || data.state.value === 'handler' || data.state.value === 'close') && this.coopBtns.edit && data.deleteFlag !== 1;
+  }
+
   // 表格数据
   loading1 = false;
   getList(isInit = false) {
@@ -320,6 +325,7 @@ export class IncidentManagementComponent implements OnInit {
         let list = result.list || [];
         list.forEach((item) => {
           item.endDeptsName = item.endDepts ? item.endDepts.map(v => v.dept).toString() : '';
+          item.computedEditFlag = this.computedEdit(item);
           item.computedVisitFlag = this.computedVisit(item);
           item.computedReceiveFlag = this.computedReceive(item);
           item.computedHandleFlag = this.computedHandle(item);
@@ -445,6 +451,24 @@ export class IncidentManagementComponent implements OnInit {
     this.getList(true);
   }
 
+  // 编辑-弹窗
+  editModalShow = false; //弹窗开关
+  edit(e, data) {
+    e.stopPropagation();
+    this.coopData = data;
+    this.editModalShow = true;
+  }
+  // 关闭弹窗
+  closeEditModelOrder(e) {
+    this.editModalShow = JSON.parse(e).show;
+  }
+  // 弹窗确定
+  confirmEditModelOrder(e){
+    console.log(e);
+    this.editModalShow = false;
+    this.getList(true);
+  }
+
   // 回访-弹窗
   visitModalShow = false; //弹窗开关
   visit(e, data) {

src/app/views/incident-management/incident-management.module.ts

@@ -10,6 +10,7 @@ import { IncidentSetdutyModule } from 'src/app/components/incidentManagement/inc
 import { IncidentPostponeModule } from 'src/app/components/incidentManagement/incident-postpone/incident-postpone.module';
 import { IncidentVisitModule } from 'src/app/components/incidentManagement/incident-visit/incident-visit.module';
 import { IncidentDetailModule } from 'src/app/components/incidentManagement/incident-detail/incident-detail.module';
+import { IncidentCreateModule } from 'src/app/components/incidentManagement/incident-create/incident-create.module';
 
 
 @NgModule({
@@ -26,6 +27,7 @@ import { IncidentDetailModule } from 'src/app/components/incidentManagement/inci
     IncidentPostponeModule,
     IncidentVisitModule,
     IncidentDetailModule,
+    IncidentCreateModule,
   ]
 })
 export class IncidentManagementModule { }

src/app/views/main/main.component.html

@@ -9,18 +9,18 @@
     <ul id="ds-menu">
       <li class="mainMenuOne" (click)="totoMenu('首页')" [ngClass]="{mainMenuSelected:indexFlag}">
         <i nz-icon nzType="home"></i>
-        <span nz-tooltip nzTooltipTitle="首页">首页</span>
+        <span nzTooltipPlacement="right" nz-tooltip nzTooltipTitle="首页">首页</span>
       </li>
       <li *ngFor="let data of menus" class="mainMenuWrap">
         <div class="mainMenuOne" (click)="clickMenuOne(data)" [ngClass]="{mainMenuSelected:data.flagBg}">
           <i class="icon_transport" [ngClass]="data.icon" *ngIf="isTransportIcon(data.icon)"></i>
           <i nz-icon [nzType]="data.icon" *ngIf="!isTransportIcon(data.icon)"></i>
-          <span nz-tooltip nzTooltipTitle="{{data.title}}">{{data.title}}</span>
+          <span nzTooltipPlacement="right" nz-tooltip nzTooltipTitle="{{data.title}}">{{data.title}}</span>
           <span class="icon_transport transport-xialajiantou" [ngStyle]="{transform:data.flag?'rotate(180deg)':'rotate(0deg)',color:data.flag?'#fff':'#999'}"></span>
         </div>
         <ul>
-          <li *ngFor="let item of data.childrens" class="mainMenu" (click)="totoMenu(item.title,item,data)" [ngStyle]="{height:data.flag?'44px':0}" [ngClass]="{menuTwoSelected:item.flag}" nz-tooltip nzTooltipTitle="{{item.title}}">
-            {{item.title}}
+          <li *ngFor="let item of data.childrens" class="mainMenu" (click)="totoMenu(item.title,item,data)" [ngStyle]="{height:data.flag?'44px':0}" [ngClass]="{menuTwoSelected:item.flag}">
+            <span nzTooltipPlacement="right" nz-tooltip nzTooltipTitle="{{item.title}}">{{item.title}}</span>
           </li>
         </ul>
       </li>

src/app/views/other-config/other-config.component.ts

@@ -26,11 +26,12 @@ export class OtherConfigComponent implements OnInit, AfterViewInit {
   ngOnInit(): void {}
 
   ngAfterViewInit(){
-    let menus = JSON.parse(localStorage.getItem("menu"));
-    let otherConfig = menus.find(item => item.link == 'otherConfig');
-    this.tagList = otherConfig ? (otherConfig.childrens || []) : [];
-    this.tagList.length && this.clickTag(this.tagList[0]);
-    this.tagList.length && this.clickTag(this.tagList[0]);
+    setTimeout(() => {
+      let menus = JSON.parse(localStorage.getItem("menu"));
+      let otherConfig = menus.find(item => item.link == 'otherConfig');
+      this.tagList = otherConfig ? (otherConfig.childrens || []) : [];
+      this.tagList.length && this.clickTag(this.tagList[0]);
+    }, 0)
   }
 
   // 点击tab

src/app/views/page-config/page-config.component.ts

@@ -19,10 +19,12 @@ export class PageConfigComponent implements OnInit, AfterViewInit {
   ngOnInit(): void {}
 
   ngAfterViewInit(){
-    let menus = JSON.parse(localStorage.getItem("menu"));
-    let pageConfig = menus.find(item => item.link == 'pageConfig');
-    this.tagList = pageConfig ? (pageConfig.childrens || []) : [];
-    this.tagList.length && this.clickTag(this.tagList[0]);
+    setTimeout(() => {
+      let menus = JSON.parse(localStorage.getItem("menu"));
+      let pageConfig = menus.find(item => item.link == 'pageConfig');
+      this.tagList = pageConfig ? (pageConfig.childrens || []) : [];
+      this.tagList.length && this.clickTag(this.tagList[0]);
+    }, 0)
   }
 
   // 点击tab