服务台建单

src/app/components/incidentManagement/incident-direct-order/incident-direct-order.component.html

@@ -0,0 +1,36 @@
+<div class="save display_flex justify-content_flex-center align-items_center add">
+  <div class="modalBody">
+    <div class="title">直接解决<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="content">
+      <form nz-form [formGroup]="validateForm" class="addForm">
+        <nz-form-item [hidden]="itsmSimpleHandle.value == 1">
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="handleDescription">解决方案</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请填写解决方案!">
+            <textarea nz-input rows="4" placeholder="请填写解决方案" formControlName="handleDescription"></textarea>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="closecode">处理结果</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择处理结果!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="closecode" nzShowSearch
+              nzPlaceHolder="请选择处理结果" nzServerSearch>
+              <ng-container *ngFor="let data of closecodeList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.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 nz-button nzType="primary" (click)="submitForm()"[nzLoading]="isLoading">确认</button>
+      <button nz-button nzType="default" class="btn cancel" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>
+
+<!-- 遮罩 -->
+<app-mask *ngIf="maskFlag"></app-mask>

src/app/components/incidentManagement/incident-direct-order/incident-direct-order.component.less

@@ -0,0 +1,125 @@
+@import "../../../../../src/theme.less";
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+
+  .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: 100%;
+      height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      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: 16px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 19px 14px 0 14px;
+        max-height: 500px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              text-align: left;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button:nth-child(1) {
+        margin-right: 20px;
+      }
+    }
+  }
+}

src/app/components/incidentManagement/incident-direct-order/incident-direct-order.component.ts

@@ -0,0 +1,120 @@
+import { Component, OnInit, Input, Output, EventEmitter, ViewChild } from '@angular/core';
+import { MainService } from '../../../services/main.service';
+import { Router, ActivatedRoute } from '@angular/router';
+import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
+import { NzMessageService } from 'ng-zorro-antd';
+import { ToolService } from 'src/app/services/tool.service';
+import { FormGroup, Validators, FormBuilder, FormControl } from '@angular/forms';
+
+@Component({
+  selector: 'app-incident-direct-order',
+  templateUrl: './incident-direct-order.component.html',
+  styleUrls: ['./incident-direct-order.component.less']
+})
+export class IncidentDicrectOrderComponent implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+  @Output() confirmModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  @Input() id: any;
+
+  constructor(
+    private mainService: MainService,
+    private router: Router,
+    private route: ActivatedRoute,
+    private message: NzMessageService,
+    private tool: ToolService,
+    private fb: FormBuilder,
+  ) { }
+
+  isLoading = false;
+  hosId:any;
+
+  ngOnInit() {
+    this.hosId = this.tool.getCurrentHospital().id;
+    this.initForm();
+    this.getClosecodes();
+    this.getHospitalConfig();
+  }
+
+  // 初始化新增form表单
+  validateForm: FormGroup; //新增/编辑表单
+  initForm() {
+    this.validateForm = this.fb.group({
+      handleDescription: [null],//解决方案
+      closecode: [null, [Validators.required]],//处理结果
+    });
+    console.log(this.validateForm.controls)
+  }
+
+  requiredChange(name:string, required: boolean): void {
+    if (!required) {
+      this.validateForm.get(name)!.clearValidators();
+      this.validateForm.get(name)!.markAsPristine();
+    } else {
+      this.validateForm.get(name)!.setValidators(Validators.required);
+      this.validateForm.get(name)!.markAsDirty();
+    }
+    this.validateForm.get(name)!.updateValueAndValidity();
+  }
+
+  // 获取处理结果列表
+  closecodeList:any[] = [];
+  getClosecodes(){
+    this.mainService.getDictionary("list", "incident_closecode").subscribe((data) => {
+      this.closecodeList = data || [];
+    });
+  }
+
+  // 获取院区配置信息
+  itsmSimpleHandle: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.itsmSimpleHandle = list.find(v => v.key == 'itsmSimpleHandle') || {};
+        if(this.itsmSimpleHandle.value != 1){
+          this.requiredChange('handleDescription', true);
+        }
+      });
+  }
+
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+  }
+
+  // 表单提交
+  maskFlag:any = false;
+  submitForm(): void {
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty();
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateForm.invalid) {
+      return;
+    }
+
+    this.confirmModelHs.emit({
+      handleDescription: this.validateForm.value.handleDescription,
+      closecode: this.validateForm.value.closecode,
+    });//emits(向上弹射)事件
+  }
+}
+
+
+
+

src/app/components/incidentManagement/incident-direct-order/incident-direct-order.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { IncidentDicrectOrderComponent } from './incident-direct-order.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    IncidentDicrectOrderComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+  ],
+  exports: [
+    IncidentDicrectOrderComponent,
+  ]
+})
+export class IncidentDicrectOrderModule { }

src/app/components/knowledge-look/knowledge-look.component.ts

@@ -53,7 +53,7 @@ export class KnowledgeLookComponent implements OnInit {
 				this.getFile()
 				let data = res.list
 				this.detailData = data
-				let content = data[0].content
+				let content = data.length ? data[0].content : ''
 				if(content){
 					this.richText = this.sanitizer.bypassSecurityTrustHtml(content);
 				}else{
@@ -67,7 +67,7 @@ export class KnowledgeLookComponent implements OnInit {
 					}
 				}
 				this.lookData = data[0]
-				this.solutionLogs = data[0].solutionLogs
+				this.solutionLogs = data.length ? data[0].solutionLogs : []
 				this.stepLength = this.solutionLogs.length
 				this.isSpinning = false
 			});

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

@@ -15,14 +15,14 @@
         <div nz-row>
           <div nz-col nzSpan="4">是否不限制部门：</div>
           <div nz-col nzSpan="20">
-            <nz-radio-group class="w100" [(ngModel)]="allDuty" [nzDisabled]="!activeScopeTab.checked">
+            <nz-radio-group class="w100" [(ngModel)]="allDuty" (ngModelChange)="changeAllDuty($event)" [nzDisabled]="!activeScopeTab.checked">
               <label nz-radio [nzValue]="1">是</label>
               <label nz-radio [nzValue]="0">否</label>
             </nz-radio-group>
           </div>
         </div>
         <div nz-row>
-          <div nz-col nzSpan="3">运维部门：</div>
+          <div nz-col nzSpan="3" [ngClass]="{ required: allDuty === 0 }">运维部门：</div>
           <div nz-col nzSpan="21">
             <nz-checkbox-group *ngIf="allDuty === 0" class="w100" style="display: flex; flex-wrap: wrap; gap:8px;" [nzDisabled]="!activeScopeTab.checked" [(ngModel)]="itsmCheckedHos" (ngModelChange)="changeItsmHospital($event)"></nz-checkbox-group>
           </div>
@@ -50,9 +50,9 @@
       <!-- 配送 -->
       <div class="conditions" *ngIf="activeScopeTab.value == 2">
         <div nz-row>
-          <div nz-col nzSpan="3">院区：</div>
+          <div nz-col nzSpan="3" class="required">院区：</div>
           <div nz-col nzSpan="21">
-            <nz-radio-group class="w100" style="display: flex; flex-wrap: wrap; gap:8px;" [(ngModel)]="checkedHos" [nzDisabled]="!activeScopeTab.checked">
+            <nz-radio-group class="w100" style="display: flex; flex-wrap: wrap; gap:8px;" [(ngModel)]="checkedHos" [nzDisabled]="!activeScopeTab.checked" (ngModelChange)="changeCheckedHos($event)">
               <label *ngFor="let data of hosList" nz-radio [nzValue]="data.id">{{ data.hosName }}</label>
             </nz-radio-group>
           </div>

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

@@ -3,6 +3,20 @@
   ::ng-deep .ant-checkbox-wrapper + .ant-checkbox-wrapper{
     margin-left: 0!important;
   }
+  .required{
+    position: relative;
+    &::before{
+      font-family: icon_transport;
+      font-size: 10px;
+      content:'\e606';
+      color: red;
+      position: absolute;
+      right: 100%;
+      top: 50%;
+      transform: translateY(-50%);
+      margin-right: 2px;
+    }
+  }
   // 撤回工单
   .recallOrder {
     position: fixed;

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

@@ -2,6 +2,7 @@ import { Component, OnInit, Output, Input } from '@angular/core';
 import { EventEmitter } from '@angular/core';
 import { MainService } from 'src/app/services/main.service';
 import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from 'ng-zorro-antd';
 
 @Component({
   selector: 'app-order-scope',
@@ -24,6 +25,7 @@ export class OrderScopeComponent implements OnInit {
   constructor(
     private mainService: MainService,
     private tool: ToolService,
+    private message: NzMessageService,
   ) { }
 
   user = JSON.parse(localStorage.getItem("user")); //用户信息
@@ -42,7 +44,8 @@ export class OrderScopeComponent implements OnInit {
 
   initHsms(){
     console.log('hsmsData：', this.hsmsData);
-    this.scopeTabs[0].checked = this.hsmsData.hsmsSwitch;
+    let index = this.scopeTabs.findIndex(v => v.value === 2);
+    this.scopeTabs[index].checked = this.hsmsData.hsmsSwitch;
     this.checkedHos = this.hsmsData.checkedHos;
     this.orderScopeRadio = this.hsmsData.orderScopeRadio;
     this.initOrderScope();
@@ -51,7 +54,8 @@ export class OrderScopeComponent implements OnInit {
 
   initItsm(){
     console.log('itsmData', this.itsmData);
-    this.scopeTabs[1].checked = this.itsmData.mdv2Switch;
+    let index = this.scopeTabs.findIndex(v => v.value === 1);
+    this.scopeTabs[index].checked = this.itsmData.mdv2Switch;
     this.itsmOrderScopeRadio = this.itsmData.orderScopeRadio;
     this.itsmInitOrderScope();
     this.itsmGetOrderScope();
@@ -177,6 +181,11 @@ export class OrderScopeComponent implements OnInit {
 
     }
 
+    // 修改院区
+    changeCheckedHos(e){
+      this.getTypeAndGroup();
+    }
+
     // 工单类型
     checkedTypes = []; //已选中taskTypes的ID数组
     changeType: boolean = false; //是否改变工单类型
@@ -261,12 +270,33 @@ export class OrderScopeComponent implements OnInit {
       for (let k1 in this.initGroups) {
         this.initGroups[k1] = false;
       }
-      this.orderScopeRadio = "0";
+      // this.orderScopeRadio = "0";
+    }
+
+    // 切换是否不限制部门
+    changeAllDuty(e){
+      console.log(e);
+      this.itsmCheckedHos.forEach(v => (v.checked = false));
+      this.itsmCheckedGroup = [];
     }
 
     // 保存工单范围设置
     saveLoading: boolean = false; //保存按钮loading状态
     saveOrderScope() {
+      // 配送的院区必填
+      let value2 = this.scopeTabs.find(v => v.value == 2 );
+      if(value2.checked && !this.checkedHos){
+        this.message.warning('【配送】的院区必填！')
+        return;
+      }
+
+      // 运维限制部门的时候，部门必填
+      let value1 = this.scopeTabs.find(v => v.value == 1 );
+      if(value1.checked && !this.itsmCheckedHos.filter(v => v.checked).length && this.allDuty != 1){
+        this.message.warning('【运维】的部门必填！')
+        return;
+      }
+
       this.saveLoading = true;
       let types = [];
       if (!this.changeType) {
@@ -317,19 +347,21 @@ export class OrderScopeComponent implements OnInit {
           userId: this.user.user.id,
           mdv2Switch: Number(itsm.checked),
           hsmsSwitch: Number(hsms.checked),
+          range: 0,
+          dutyRange: 0,
         },
       };
 
       if(itsm.checked){
         postData.workerOrderScope.allDuty = this.allDuty;
-        postData.workerOrderScope.dutyIds = this.itsmCheckedHos.filter(v => v.checked).map(v => v.value).toString();
-        postData.workerOrderScope.dutyGroupIds = this.itsmCheckedGroup.filter(v => v.checked).map(v => v.value).toString();
+        postData.workerOrderScope.dutyIds = this.itsmCheckedHos.filter(v => v.checked).map(v => v.value).toString() || undefined;
+        postData.workerOrderScope.dutyGroupIds = this.itsmCheckedGroup.filter(v => v.checked).map(v => v.value).toString() || undefined;
         postData.workerOrderScope.dutyRange = this.itsmOrderScopeRadio - 0;
       }
       if(hsms.checked){
-        postData.workerOrderScope.hospitalId = { id: this.checkedHos - 0 };
-        postData.workerOrderScope.typeIds = typesId;
-        postData.workerOrderScope.groupIds = groupsId;
+        postData.workerOrderScope.hospitalId = this.checkedHos ? { id: this.checkedHos - 0 } : undefined;
+        postData.workerOrderScope.typeIds = typesId || undefined;
+        postData.workerOrderScope.groupIds = groupsId || undefined;
         postData.workerOrderScope.range = this.orderScopeRadio - 0;
       }
       if (this.user.user.scope && this.user.user.scope.id) {

src/app/pipes/string-to-first-name.pipe.ts

@@ -0,0 +1,17 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+  name: 'stringToFirstValue'
+})
+export class StringToFirstValuePipe implements PipeTransform {
+
+  transform(value: string, ...args: any[]): any {
+    if(value){
+      return value.split(',')[0];
+    }else{
+      return '';
+    }
+
+  }
+
+}

src/app/services/tool.service.ts

@@ -241,8 +241,8 @@ export class ToolService {
         case "assign":
           coopBtns.assign = true; //指派
           break;
-        case "postpone":
-          coopBtns.postpone = true; //延期处理
+        case "handle":
+          coopBtns.handle = true; //处理
           break;
         case "settings":
           coopBtns.settings = true; //设置

src/app/share/share.module.ts

@@ -57,6 +57,7 @@ import { wangEditorComponent } from './wang-editor/wang-editor.component';
 import { StripHtmlPipe } from '../pipes/strip-html.pipe.';
 import { PathologyAddComponent } from './pathology-add/pathology-add.component';
 import { PathologyDetailComponent } from './pathology-detail/pathology-detail.component';
+import { StringToFirstValuePipe } from '../pipes/string-to-first-name.pipe';
 
 @NgModule({
   declarations: [
@@ -91,6 +92,7 @@ import { PathologyDetailComponent } from './pathology-detail/pathology-detail.co
 		PathologyDetailComponent,
     DateTransformPipe,
     DataToNamePipe,
+    StringToFirstValuePipe,
     DialogDeleteComponent,
     DialogBxComponent,
     DialogSurgeryComponent,
@@ -162,6 +164,7 @@ import { PathologyDetailComponent } from './pathology-detail/pathology-detail.co
     OverlayscrollbarsModule,
     DateTransformPipe,
     DataToNamePipe,
+    StringToFirstValuePipe,
     DialogDeleteComponent,
     DialogBxComponent,
     DialogSurgeryComponent,

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

@@ -6,8 +6,42 @@
   padding: 16px;
   display: flex;
   flex-direction: column;
-  ::ng-deep .ant-form-item-label {
-    line-height: 24px !important;
+  ::ng-deep .yyTime .ant-form-item-label {
+    line-height: 24px;
+  }
+}
+
+.anticon-plus{
+  font-size: 32px;
+  margin-bottom: 8px;
+}
+
+.thead {
+  background-image: linear-gradient(to right, @bg-start, @bg-end);
+
+  th {
+    background: transparent;
+    color: #fff;
+    text-align: center;
+  }
+  td{
+    text-align: center;
+  }
+}
+
+.required{
+  position: relative;
+  padding-left: 12px;
+  box-sizing: content-box;
+  &::before{
+    font-family: icon_transport;
+    font-size: 10px;
+    content:'\e606';
+    color: red;
+    position: absolute;
+    left: 0;
+    top: 50%;
+    transform: translateY(-50%);
   }
 }
 
@@ -673,6 +707,12 @@
     white-space: nowrap;
     overflow: hidden;//文本超出隐藏
     text-overflow: ellipsis;//文本超出省略号替代
+    &.noEllipsis{
+      white-space: normal;
+      overflow: visible;
+      text-overflow: inherit;
+      word-break: break-all;
+    }
   }
 
   .weifenpai .didian .right {
@@ -1681,23 +1721,23 @@
     width: 100%;
     height: 100%;
     background: rgba(0, 0, 0, 0.5);
-    z-index: 999;
+    z-index: 99;
 
     .modalBody {
-      width: 1300px;
+      width: 1318px;
       // height: 580px;
       background: #fff;
       border-radius: 5px;
-      padding: 12px 20px;
+      // padding: 12px 20px;
+      padding: 12px 0;
       color: #333;
       font-size: 14px;
 
       .title {
         font-size: 18px;
-        text-align: center;
+        // text-align: center;
         line-height: 24px;
-        margin: 0;
-        margin-bottom: 12px;
+        margin: 6px 24px 18px;
         position: relative;
 
         i {
@@ -1709,14 +1749,30 @@
           cursor: pointer;
           padding: 0 5px;
         }
+
+        .newTop{
+          display: flex;
+          align-items: center;
+          font-size: 14px;
+          .name{
+            font-weight: bold;
+            margin-right: 48px;
+          }
+          .newTopItem{
+            margin-right: 24px;
+          }
+        }
       }
 
       .content {
         // width: 960px;
-        height: 474px;
-        border: 1px solid #e5e9ed;
-        background: #f9fafb;
-        border-radius: 5px;
+        // height: 474px;
+        height: 603px;
+        // border: 1px solid #e5e9ed;
+        border-top: 1px solid #e5e9ed;
+        border-bottom: 1px solid #e5e9ed;
+        // background: #f9fafb;
+        // border-radius: 5px;
         overflow: hidden;
 
         .grayFont {
@@ -1744,8 +1800,7 @@
             // tab 任务类型
             .tabs {
               display: flex;
-              height: 41px;
-              border-top: 1px solid #e5e9ed;
+              height: 37px;
               border-bottom: 1px solid #e5e9ed;
               background-color: #fff;
               .tabs__inner {
@@ -1757,16 +1812,26 @@
                   display: flex;
                   transition: all 1s;
                   .tab {
-                    width: 93px;
-                    height: 41px;
+                    width: 120px;
+                    height: 36px;
                     text-align: center;
-                    line-height: 41px;
+                    line-height: 36px;
                     background: #fff;
-                    border-right: 1px solid #e5e9ed;
                     cursor: pointer;
+                    font-size: 14px;
+                    position: relative;
 
                     &.checked {
-                      background: #e5e9ed;
+                      color: @primary-color;
+                      &::after{
+                        content: '';
+                        position: absolute;
+                        bottom: 0;
+                        left: 0;
+                        width: 100%;
+                        height: 1px;
+                        background-color: @primary-color;
+                      }
                     }
                   }
                 }
@@ -1805,9 +1870,72 @@
             .bottomWrap {
               flex: 1;
               height: 300px;
+              .bottom_req{
+                height: 100%;
+                padding: 16px;
+                ::ng-deep .ant-calendar-picker{
+                  width: 100%!important;
+                }
+                .row{
+                  display: flex;
+                  align-items: center;
+                  gap: 8px;
+                  margin-bottom: 16px;
+                  &.gap8{
+                    gap: 8px;;
+                  }
+                  &:last-of-type{
+                    margin-bottom: 0;
+                  }
+                  .col{
+                    flex: 1;
+                    flex-shrink: 0;
+                    display: flex;
+                    align-items: center;
+                    word-break: break-all;
+                    &.alignItemsStart{
+                      align-items: flex-start;
+                    }
+                    &.flex2{
+                      flex: 2;
+                    }
+                    &.flex3{
+                      flex: 3;
+                    }
+                    &.flex4{
+                      flex: 4;
+                    }
+                    &.flex5{
+                      flex: 5;
+                    }
+                    &.flex6{
+                      flex: 6;
+                    }
+                    &.flex7{
+                      flex: 7;
+                    }
+                    .name{
+                      flex-shrink: 0;
+                      width: 6em;
+                      text-align-last: justify;
+                      padding-left: 12px;
+                      box-sizing: content-box;
+                    }
+                    em{
+                      font-style: normal;
+                      cursor: pointer;
+                      margin-left: 8px;
+                      font-size: 12px;
+                      border-bottom: 1px solid @primary-color;
+                      color: @primary-color;
+                    }
+                  }
+                }
+              }
               .bottom {
                 padding: 0 36px;
-                height: 310px;
+                // height: 310px;
+                height: 567px;
                 overflow-y: auto;
                 .ant-form {
                   height: 100%;
@@ -1863,7 +1991,8 @@
                 }
 
                 .radios {
-                  height: 96px;
+                  // height: 96px;
+                  height: 267px;
                   width: 100%;
                   overflow-y: auto;
                   padding: 10px 18px;
@@ -1913,8 +2042,8 @@
             .rightTitle {
               position: absolute;
               width: 100%;
-              height: 46px;
-              line-height: 46px;
+              height: 37px;
+              line-height: 37px;
               font-size: 16px;
               margin: 0;
               border-bottom: 1px solid #e5e9ed;
@@ -1923,13 +2052,26 @@
               display: flex;
               align-items: center;
               .rightTitle_tab {
-                height: 100%;
-                padding: 0 16px;
-                border-right: 1px solid #e5e9ed;
+                width: 120px;
+                height: 36px;
+                text-align: center;
+                line-height: 36px;
+                background: #fff;
                 cursor: pointer;
-                background-color: #fff;
+                font-size: 14px;
+                position: relative;
+                overflow: hidden;
                 &.active {
-                  background-color: #f9fafb;
+                  color: @primary-color;
+                  &::after{
+                    content: '';
+                    position: absolute;
+                    bottom: 0;
+                    left: 0;
+                    width: 100%;
+                    height: 1px;
+                    background-color: @primary-color;
+                  }
                 }
               }
             }
@@ -1947,9 +2089,9 @@
     }
 
     .btns {
+      padding-top: 12px;
       .btn {
-        margin: 9px;
-        margin-bottom: 0;
+        margin: 0 4px;
       }
     }
   }
@@ -1974,7 +2116,7 @@
 
       .title {
         width: 100%;
-        text-align: center;
+        // text-align: center;
         font-size: 18px;
         position: relative;
 

src/app/views/fuwutai/fuwutai.module.ts

@@ -7,6 +7,8 @@ import { ShareModule } from 'src/app/share/share.module';
 
 import { NgxPrintModule } from 'ngx-print';
 import { OrderScopeModule } from 'src/app/components/order-scope/order-scope.module';
+import { IncidentDicrectOrderModule } from 'src/app/components/incidentManagement/incident-direct-order/incident-direct-order.module';
+import { KnowledgeLookModule } from 'src/app/components/knowledge-look/knowledge-look.module';
 
 
 @NgModule({
@@ -19,6 +21,8 @@ import { OrderScopeModule } from 'src/app/components/order-scope/order-scope.mod
     FuwutaiRoutingModule,
     NgxPrintModule,
     OrderScopeModule,
+    IncidentDicrectOrderModule,
+    KnowledgeLookModule,
   ]
 })
 export class FuwutaiModule { }

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

@@ -245,7 +245,7 @@ export class IncidentManagementComponent implements OnInit {
 
   // 是否显示处理按钮
   computedHandle(data){
-    return data.state.value === 'handler' && data.handlingPersonnelUser && data.handlingPersonnelUser.id == this.tool.getCurrentUserId() && data.deleteFlag !== 1;
+    return this.coopBtns.handle && data.state.value === 'handler' && data.handlingPersonnelUser && data.handlingPersonnelUser.id == this.tool.getCurrentUserId() && data.deleteFlag !== 1;
   }
 
   // 是否显示换人处理按钮
@@ -255,7 +255,7 @@ export class IncidentManagementComponent implements OnInit {
 
   // 是否显示延期处理按钮
   computedPostpone(data){
-    return this.coopBtns.postpone && data.state.value == 'handler' && data.handlingPersonnelUser && data.handlingPersonnelUser.id == this.tool.getCurrentUserId() && data.deleteFlag !== 1;
+    return data.state.value == 'handler' && data.handlingPersonnelUser && data.handlingPersonnelUser.id == this.tool.getCurrentUserId() && data.deleteFlag !== 1;
   }
 
   // 是否显示设置责任部门按钮