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

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

@@ -0,0 +1,68 @@
+<div class="content" id="dictionary">
+  <div class="contentInner">
+    <div class="address">
+      <overlay-scrollbars #osComponentRef1 class="contentBody">
+        <div class="contentItem" [title]="item.name" [ngClass]="{ active: item.id === activeDictionaryKey.id }" (click)="clickDictionaryKey(item)" *ngFor="let item of dictionaryKeyList">{{ item.name }}</div>
+      </overlay-scrollbars>
+    </div>
+    <div class="addressAssign">
+      <div class="contentBody">
+        <div class="dictionaryRow">
+          <div class="orders">排序号</div>
+          <div class="name">注意事项</div>
+          <div class="value">备注</div>
+        </div>
+        <overlay-scrollbars #osComponentRef2 class="contentBody2">
+          <form nz-form [formGroup]="validateDictionaryForm" class="w100">
+            <div class="dictionaryRow" *ngFor="let data of dictionaryList;let i = index;">
+              <div class="orders">
+                <nz-form-item>
+                  <nz-form-control [nzSpan]="24" nzErrorTip="请输入排序号!">
+                    <nz-input-group>
+                      <nz-input-number [formControlName]="'orders_' + data.id" class="ordersInput"></nz-input-number>
+                    </nz-input-group>
+                  </nz-form-control>
+                </nz-form-item>
+              </div>
+              <div class="name">
+                <nz-form-item class="w100">
+                  <nz-form-control [nzSpan]="24" nzErrorTip="请输入注意事项!">
+                    <nz-input-group>
+                      <input [formControlName]="'name_' + data.id" nz-input class="nameInput">
+                    </nz-input-group>
+                  </nz-form-control>
+                </nz-form-item>
+              </div>
+              <div class="value">
+                <nz-form-item>
+                  <nz-form-control [nzSpan]="24" nzErrorTip="请输入备注!">
+                    <nz-input-group>
+                      <input [formControlName]="'value_' + data.id" nz-input class="valueInput">
+                    </nz-input-group>
+                  </nz-form-control>
+                </nz-form-item>
+                <i class="icon_transport transport-tag27fuben ml8" (click)="addField(i)" *ngIf="!(activeDictionaryKey.key === 'incident_status' || activeDictionaryKey.key === 'incident_degree')"></i>
+                <i class="icon_transport transport-shanchu1 ml8" *ngIf="dictionaryList.length > 1 && !data.system && !(activeDictionaryKey.key === 'incident_status' || activeDictionaryKey.key === 'incident_degree')" (click)="removeField(data, i)"></i>
+              </div>
+            </div>
+          </form>
+        </overlay-scrollbars>
+      </div>
+      <div class="contentBtns">
+        <button nz-button nzType="primary" class="ml8" (click)="saveDictionary()">保存</button>
+      </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>
+
+<!-- 遮罩 -->
+<app-mask *ngIf="maskFlag"></app-mask>

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

@@ -0,0 +1,178 @@
+@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;
+  }
+  #dictionary{
+    margin: 24px 16px;
+    .addressAssign{
+      flex: 7;
+    }
+    .contentItem{
+      margin: 0 16px;
+      padding: 8px;
+      text-align: center;
+      &.active{
+        background-color: @primary-color;
+        color: #fff;
+        border-radius: 4px;
+      }
+    }
+    .contentBody{
+      padding: 16px;
+      min-height: 0;
+      display: flex;
+      flex-direction: column;
+    }
+    .contentBody2{
+      flex: 1;
+    }
+    ::ng-deep .ant-form-item{
+      margin-bottom: 0;
+    }
+    .dictionaryRow{
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      gap: 16px;
+      .orders{
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+        align-items: center;
+      }
+      .name{
+        width: 600px;
+        display: flex;
+        justify-content: flex-end;
+        align-items: center;
+      }
+      .value{
+        flex: 3;
+        display: flex;
+        align-items: center;
+        .valueInput{
+          width: 100px;
+        }
+        .icon_transport{
+          font-size: 20px;
+          color: #8a8a8a;
+          cursor: pointer;
+        }
+      }
+
+    }
+  }
+  .content{
+    flex: 1;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    border: 1px solid #EEF3F9;
+    &.priority{
+      margin: 24px 118px 0;
+      background-color: #fff;
+      .contentInner{
+        padding: 48px 206px;
+        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;
+    }
+  }
+}

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

@@ -0,0 +1,257 @@
+import { Component, OnInit, ViewChild, Input } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+import { MainService } from "../../../services/main.service";
+import { Validators, FormGroup, FormBuilder, FormControl } from '@angular/forms';
+import { ToolService } from 'src/app/services/tool.service';
+import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
+import { NzMessageService } from 'ng-zorro-antd';
+import { v4 as uuidv4, validate as uuidValidate } from 'uuid';
+
+@Component({
+  selector: "app-configuration-inspect",
+  templateUrl: "./configuration-inspect.component.html",
+  styleUrls: ["./configuration-inspect.component.less"],
+})
+export class ConfigurationInspectComponent implements OnInit {
+  constructor(
+    private route: ActivatedRoute,
+    private mainService: MainService,
+    private fb: FormBuilder,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) {}
+
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef2", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef2: OverlayScrollbarsComponent;
+
+  ngOnInit() {
+    this.activeDictionaryKey = this.dictionaryKeyList[0];
+    this.getDictionaryList();
+    this.initDictionaryForm();
+  }
+
+  // 数据字典key列表
+  dictionaryKeyList:any[] = [
+    { id: 1, name: '注意事项', key: "inspect_notes"},
+  ]
+
+  // 点击数据字典key
+  activeDictionaryKey:any;
+  clickDictionaryKey(item){
+    this.activeDictionaryKey = item;
+    this.getDictionaryList();
+  }
+
+  btnLoading: boolean = false; //提交按钮loading状态
+  // ------------------------------
+
+  // 展示信息提示框（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.getDictionaryList();
+  }
+
+  coopData: any = {}; //当前操作列
+
+  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;
+    this.tipsMsg1 = tipsMsg1;
+    this.tipsMsg2 = tipsMsg2;
+  }
+  // 隐藏删除框
+  hideDelModal() {
+    this.delModal = false;
+  }
+  // 确认删除
+  confirmDel() {
+    this.btnLoading = true;
+    if (this.confirmDelType === "delDictionary") {
+      //删除-数据字典
+      this.mainService
+        .simplePost("rmvData", "dictionary", [this.coopData.id])
+        .subscribe((data) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          if (data.status == 200) {
+            this.mainService.clearDictionary();
+            this.showPromptModal(this.tipsMsg2, true, "");
+          } else {
+            this.showPromptModal(this.tipsMsg2, false, data.msg);
+          }
+        });
+    }
+  }
+
+  // 初始化数据字典新增form表单
+  validateDictionaryForm: FormGroup; //新增/编辑表单
+  dictionaryList: any = [];
+  initDictionaryForm() {
+    this.validateDictionaryForm = this.fb.group({
+      // name: [null, [Validators.required]],//键
+      // value: [null, [Validators.required]],//值
+      // orders: [null, [Validators.required]],//排序号
+    });
+    console.log(this.validateDictionaryForm.controls)
+  }
+
+  // 获取数据字典数据
+  maskFlag: any = false;
+  getDictionaryList() {
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      dictionary: {
+        key: this.activeDictionaryKey.key,
+      }
+    }
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.mainService.getFetchDataList('simple/data','dictionary',postData).subscribe(data => {
+      this.message.remove(this.maskFlag);
+      this.maskFlag = false;
+      let list = data.list || [];
+      if(list.length){
+        this.dictionaryList = list.map(v => {
+          return {
+            id: v.id,
+            name: v.name || null,
+            value: v.value || null,
+            orders: v.orders || null,
+            system: v.system || false,
+          }
+        });
+      }else{
+        this.dictionaryList = [
+          {
+            id: uuidv4(),
+            name: null,
+            value: null,
+            orders: null,
+            system: false,
+          }
+        ];
+      }
+
+      console.log(this.dictionaryList);
+      // 动态添加表单
+      this.dictionaryList.forEach((obj, i) => {
+        for (const key in obj) {
+          if(key !== 'id' && key !== 'system'){
+            if(this.activeDictionaryKey.key === 'incident_status' || this.activeDictionaryKey.key === 'incident_degree'){
+              this.validateDictionaryForm.addControl(key + '_' + obj.id, new FormControl({value: obj[key], disabled: true}, [Validators.required]))
+            }else{
+              this.validateDictionaryForm.addControl(key + '_' + obj.id, new FormControl({value: obj[key], disabled: key === 'value' ? obj.system : false}, [Validators.required]))
+            }
+          }
+        }
+      })
+      console.log(this.validateDictionaryForm.controls)
+    })
+  }
+
+  // 添加数据字典
+  addField(i:number): void{
+    let obj = {
+      id: uuidv4(),
+      name: null,
+      value: null,
+      orders: null,
+      system: false,
+    };
+
+    // 动态添加表单
+    for (const key in obj) {
+      console.log(key + '_' + obj.id)
+      if(key !== 'id' && key !== 'system'){
+        this.validateDictionaryForm.addControl(key + '_' + obj.id, new FormControl(null, [Validators.required]))
+      }
+    }
+
+    this.dictionaryList.splice(i + 1, 0, obj);
+  }
+
+  // 删除
+  removeField(obj, i:number): void {
+    if(uuidValidate(obj.id)){
+      this.dictionaryList.splice(i, 1);
+      this.dictionaryList = [...this.dictionaryList];
+      // 动态删除表单
+      for (const key in obj) {
+        this.validateDictionaryForm.removeControl(key + '_' + obj.id);
+      }
+    }else{
+      this.showDelModal(obj,'您确认要删除吗？','删除','delDictionary')
+    }
+  }
+
+  // 保存数据字典
+  saveDictionary(): void {
+    console.log(this.coopData)
+    for (const i in this.validateDictionaryForm.controls) {
+      this.validateDictionaryForm.controls[i].markAsDirty();
+      this.validateDictionaryForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateDictionaryForm.invalid) {
+      return;
+    }
+    console.log(this.validateDictionaryForm.value);
+    let postData:any = {};
+
+    //增加
+    postData = [];
+    let rawValueObj = this.validateDictionaryForm.getRawValue();
+    for (let i = 0; i < this.dictionaryList.length; i++) {
+      postData.push({
+        id: uuidValidate(this.dictionaryList[i].id) ? undefined : this.dictionaryList[i].id,
+        name: rawValueObj['name_' + this.dictionaryList[i].id],
+        value: rawValueObj['value_' + this.dictionaryList[i].id],
+        orders: rawValueObj['orders_' + this.dictionaryList[i].id],
+        system: uuidValidate(this.dictionaryList[i].id) ? false : this.dictionaryList[i].system,
+        key: this.activeDictionaryKey.key,
+      })
+    }
+    console.log(postData);
+    this.btnLoading = true;
+    this.mainService
+      .simplePost("addListData", "dictionary", postData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        if (result.status == 200) {
+          this.mainService.clearDictionary();
+          this.showPromptModal('保存', true, '');
+        } else {
+          this.showPromptModal('保存', false, result.msg || '');
+        }
+      });
+  }
+}

src/app/components/configurationCenter/configuration-inspect/configuration-inspect.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { ConfigurationInspectComponent } from './configuration-inspect.component';
+import { ShareModule } from '../../../share/share.module';
+
+
+@NgModule({
+  declarations: [
+    ConfigurationInspectComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+  ],
+  exports: [
+    ConfigurationInspectComponent,
+  ]
+})
+export class ConfigurationInspectModule { }

src/app/components/display-form/display-form.component.html

@@ -0,0 +1,85 @@
+<!-- 展示形式 -->
+<div class="init recallOrder display_flex justify-content_flex-center align-items_center">
+  <div class="con modalBody">
+    <div class="title">
+      展示形式<i class="icon_transport transport-guanbi" (click)="cancelInit()"></i>
+    </div>
+    <div class="content">
+      <div class="conditions" *ngIf="!isLoading">
+        <div nz-row>
+          <div nz-col nzSpan="4">护工信息隐藏：</div>
+          <div nz-col nzSpan="20">
+            <nz-radio-group class="w100" [(ngModel)]="hurseInfoHiding">
+              <label nz-radio [nzValue]="1">是</label>
+              <label nz-radio [nzValue]="0">否</label>
+            </nz-radio-group>
+          </div>
+        </div>
+        <div nz-row>
+          <div nz-col nzSpan="4">护工信息：</div>
+          <div nz-col nzSpan="20">
+            <nz-radio-group class="w100" [(ngModel)]="patientCareCol">
+              <!-- <label nz-radio [nzValue]="6">单排</label> -->
+              <label nz-radio [nzValue]="7">14人</label>
+              <!-- <label nz-radio [nzValue]="4">8人</label> -->
+            </nz-radio-group>
+          </div>
+        </div>
+        <div nz-row>
+          <div nz-col nzSpan="4">工单信息：</div>
+          <div nz-col nzSpan="20">
+            <nz-radio-group class="w100" [(ngModel)]="txtLabelCol">
+              <label nz-radio [nzValue]="1">一排一列</label>
+              <!-- <label nz-radio [nzValue]="2">一排两列</label> -->
+            </nz-radio-group>
+          </div>
+        </div>
+        <div nz-row>
+          <div nz-col nzSpan="4">配送人员刷新：</div>
+          <div nz-col nzSpan="4">
+            <nz-input-group nzAddOnAfter="秒">
+              <nz-input-number class="w100" [(ngModel)]="workerInfoTime" [nzMin]="60" [nzStep]="1" placeholder="请输入配送人员刷新时间"></nz-input-number>
+            </nz-input-group>
+          </div>
+        </div>
+        <div nz-row>
+          <div nz-col nzSpan="4">工单刷新：</div>
+          <div nz-col nzSpan="4">
+            <nz-input-group nzAddOnAfter="秒">
+              <nz-input-number class="w100" [(ngModel)]="orderInfoTime" [nzMin]="60" [nzStep]="1" placeholder="请输入工单刷新时间"></nz-input-number>
+            </nz-input-group>
+          </div>
+        </div>
+        <div nz-row>
+          <div nz-col nzSpan="8">是否开启定时播报未派出工单提示音：</div>
+          <div nz-col nzSpan="16">
+            <nz-radio-group class="w100" [(ngModel)]="audioNotDispatched">
+              <label nz-radio [nzValue]="true">是</label>
+              <label nz-radio [nzValue]="false">否</label>
+            </nz-radio-group>
+          </div>
+        </div>
+        <div nz-row>
+          <div nz-col nzSpan="4">排序方式：</div>
+          <div nz-col nzSpan="20">
+            <nz-radio-group class="w100" [(ngModel)]="orderType">
+              <label nz-radio nzValue="priority">优先级</label>
+              <label nz-radio nzValue="time">建单时间</label>
+            </nz-radio-group>
+          </div>
+        </div>
+      </div>
+      <div class="conditions display_flex align-items_center justify-content_flex-center" *ngIf="isLoading">
+        <nz-spin nzSimple></nz-spin>
+      </div>
+    </div>
+    <div class="btns display_flex justify-content_flex-center">
+      <button class="btn" nz-button nzType="primary" [nzLoading]="saveLoading" (click)="saveOrderScope()" *ngIf="!isLoading">
+        保存
+      </button>
+      <button class="btn cancel" nz-button nzType="default" (click)="cancelInit()">
+        知道了
+      </button>
+    </div>
+  </div>
+</div>

src/app/components/display-form/display-form.component.less

@@ -0,0 +1,184 @@
+@import "../../../../src/theme.less";
+:host {
+  ::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;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.4);
+    z-index: 9999999;
+
+    .modalBody {
+      width: 350px;
+      height: 220px;
+      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;
+        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: #ff3b53;
+              font-size: 30px !important;
+
+              &.transport-wenhao {
+                color: #f5a523;
+              }
+            }
+          }
+
+          &.defeat {
+            color: #333;
+            font-size: 18px;
+          }
+
+          &:nth-child(3) {
+            font-size: 14px;
+            color: #666;
+          }
+        }
+
+        .conditions {
+          height: 400px;
+          overflow: auto;
+          padding: 16px 20px;
+
+          div {
+            text-align: left;
+            margin-bottom: 8px;
+          }
+        }
+      }
+
+      .btns {
+        button {
+          margin-top: 10px;
+          margin-left: 5px;
+        }
+
+        .recDelBtn {
+          width: 115px;
+        }
+      }
+    }
+  }
+
+  // 初始化设置
+  .init {
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.4);
+    z-index: 99;
+
+    .con {
+      width: 832px;
+      height: auto;
+      background: #fff;
+      border-radius: 5px;
+      padding: 10px 20px;
+      color: #333;
+
+      .content {
+        width: 100%;
+        height: auto;
+
+        .scopeTab{
+          display: flex;
+          height: 60px;
+          border-bottom: 1px solid #D9D9D9;
+          .scopeTabItem{
+            flex: 1;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            border-right: 1px solid #D9D9D9;
+            background-color: #fff;
+            cursor: pointer;
+            &:last-of-type{
+              border-right: none;
+            }
+            &.active{
+              background-color: #F0F6ED;
+            }
+          }
+        }
+
+        .remin {
+          font-size: 14px;
+          color: #666;
+          line-height: 48px;
+          border-bottom: 1px solid #e5e9ed;
+        }
+
+        .boxes {
+          color: #333;
+          padding: 8px 12px;
+
+          & > div:nth-child(1) {
+            color: #333;
+            text-align: left;
+          }
+
+          & > div:nth-child(2) {
+            color: #666;
+            text-align: left;
+          }
+        }
+      }
+    }
+  }
+}

src/app/components/display-form/display-form.component.ts

@@ -0,0 +1,125 @@
+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-display-form',
+  templateUrl: './display-form.component.html',
+  styleUrls: ['./display-form.component.less']
+})
+export class DisplayFormComponent implements OnInit {
+  @Output() confirmModal = new EventEmitter();
+  @Output() cancelModal = new EventEmitter();
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) { }
+
+  controlView = {}; //展示形式
+  patientCareCol: number = 7; //顶部工单列数(4列-8人，7列-14人，6列-单排 ）
+  hurseInfoHiding = 1; //护工信息隐藏
+  txtLabelCol: number = 1; //工单信息列数
+  orderRefreshTime: number = 30; //工单刷新倒计时
+  orderInfoTime: number = 60; //工单刷新时间
+  workerRefreshTime: number = 30; //配送人员刷新倒计时
+  workerInfoTime: number = 60; //配送人员刷新时间
+  audioNotDispatched: boolean = true; //是否开启定时播报未派出工单提示音
+  orderType: string = 'priority'; //排序方式
+
+  ngOnInit() {
+    this.initControlView();
+  }
+
+  isLoading:boolean = false;
+  initControlView() {
+    this.isLoading = true;
+    let postData = {
+      controlView: {},
+      idx: 0,
+      sum: 1,
+    };
+    this.mainService
+      .coopTypeConfig("fetchDataList", "controlView", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.controlView = data.list[0] ? data.list[0] : [];
+        if (!data.list.length) return;
+        // switch (data.list[0].workerNum) {
+        //   case 1:
+        //     this.patientCareCol = 6;
+        //     break;
+        //   case 2:
+        //     this.patientCareCol = 7;
+        //     break;
+        //   case 3:
+        //     this.patientCareCol = 4;
+        //     break;
+        // }
+        this.patientCareCol = 7;
+        this.hurseInfoHiding = data.list[0].hurseInfoHiding ? 1 : 0;
+        // this.txtLabelCol = data.list[0].labelNum;
+        this.txtLabelCol = 1;
+        this.orderRefreshTime = this.orderInfoTime = data.list[0].orderInfoTime;
+        this.workerRefreshTime = this.workerInfoTime = data.list[0].workerInfoTime;
+        this.audioNotDispatched = data.list[0].unsendOrderVoice !== false;
+        this.orderType = data.list[0].orderType || 'priority';
+      });
+  }
+
+  // 保存展示形式
+  saveLoading: boolean = false; //保存按钮loading状态
+  saveOrderScope() {
+    if(!this.workerInfoTime){
+      this.message.warning('配送人员刷新时间必填！')
+      return;
+    }
+    if(!this.orderInfoTime){
+      this.message.warning('工单刷新时间必填！')
+      return;
+    }
+    this.saveLoading = true;
+    let wn;
+    switch (this.patientCareCol) {
+      case 6:
+        wn = 1;
+        break;
+      case 7:
+        wn = 2;
+        break;
+      case 4:
+        wn = 3;
+        break;
+    }
+
+    let postData = {
+      controlView: {
+        workerNum: wn,
+        labelNum: this.txtLabelCol,
+        workerInfoTime: this.workerInfoTime,
+        orderInfoTime: this.orderInfoTime,
+        unsendOrderVoice: this.audioNotDispatched,
+        hurseInfoHiding: this.hurseInfoHiding == 1,
+        orderType: this.orderType,
+      },
+    };
+    if (this.controlView["id"]) {
+      postData.controlView["id"] = this.controlView["id"];
+    }
+
+    console.log(postData);
+    this.mainService
+      .coopTypeConfig("addData", "controlView", postData)
+      .subscribe((data) => {
+        this.saveLoading = false;
+        this.confirmModal.emit(data);
+      });
+  }
+
+  // 关闭弹窗
+  cancelInit() {
+    this.cancelModal.emit();
+  }
+}

src/app/components/display-form/display-form.module.ts

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

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

@@ -2,11 +2,11 @@
  * @Author: seimin
  * @Date: 2024-10-24 13:47:40
  * @LastEditors: seimin
- * @LastEditTime: 2024-10-25 15:47:50
+ * @LastEditTime: 2024-12-09 15:32:35
  * @Description: 创建
 -->
 <!-- 新建工单 -->
-<div class="newOrder display_flex justify-content_flex-center align-items_center">
+<div class="newOrder display_flex justify-content_flex-center align-items_center" (click)="clickExtra($event)">
   <div class="modalBody">
     <div class="title" *ngIf="currentTabIndex === '故障报修'">
       <div class="newTop">
@@ -22,7 +22,7 @@
             </nz-option>
           </nz-select>
         </div>
-        <div class="newTopItem">
+        <div class="newTopItem" [hidden]="incidentModel.repairIncidentType === 'public'">
           <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">
@@ -34,7 +34,7 @@
           </nz-select>
         </div>
         <div class="newTopItem">
-          <span class="grayFont">申请人：</span>
+          <span class="grayFont" [ngClass]="{'required': incidentModel.repairIncidentType === 'public'}">申请人：</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)">
@@ -45,9 +45,19 @@
                 <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
               </nz-option>
             </nz-select>
-            <label nz-checkbox [(ngModel)]="isRelatedDepartment" (ngModelChange)="changeApplyRelatedDepartment($event)" class="ml8">关联查</label>
+            <label [hidden]="incidentModel.repairIncidentType === 'public'" nz-checkbox [(ngModel)]="isRelatedDepartment" (ngModelChange)="changeApplyRelatedDepartment($event)" class="ml8">关联查</label>
           </ng-container>
         </div>
+        <div class="newTopItem" *ngIf="incidentModel.incomingPhone">
+          <span class="grayFont">来电电话：{{incidentModel.incomingPhone}}</span>
+        </div>
+        <div class="newTopItem">
+          <span class="grayFont">
+            <nz-radio-group [nzDisabled]="buildType === '编辑事件'" [(ngModel)]="incidentModel.repairIncidentType" (ngModelChange)="changeRepairIncidentType($event)">
+              <label nz-radio [nzValue]="item.value" *ngFor="let item of repairIncidentTypeList">{{item.name}}</label>
+            </nz-radio-group>
+          </span>
+        </div>
       </div>
     </div>
     <div nz-row class="content">
@@ -92,11 +102,22 @@
                     </nz-select>
                   </div>
                   <div class="col flex7">
-                    <input nz-input placeholder="请填写详细地址" [(ngModel)]="incidentModel.houseNumber" />
+                    <input class="addressFocus" nz-input placeholder="请填写详细地址" [(ngModel)]="incidentModel.houseNumber" (focus)="focusAddress()" />
+                    <div class="addressList" *ngIf="isShowAddressList">
+                      <ng-container *ngIf="!addressLoading && addressList.length">
+                        <div class="addressItem ellipsis-oneline" *ngFor="let item of addressList" [title]="item.name" (click)="selectAddress(item.name)">{{item.name}}</div>
+                      </ng-container>
+                      <div *ngIf="!addressLoading && !addressList.length" class="w100 h100 padding8 display_flex justify-content_flex-center align-items_center">
+                        <nz-empty></nz-empty>
+                      </div>
+                      <div *ngIf="addressLoading" class="w100 h100 padding8 display_flex justify-content_flex-center align-items_center">
+                        <nz-spin nzSimple></nz-spin>
+                      </div>
+                    </div>
                   </div>
                 </div>
 
-                <div class="row gap8">
+                <div class="row">
                   <div class="col">
                     <span class="name">科室电话：</span>
                     <ng-container *ngIf="incidentMsg.deptManyPhone">{{incidentMsg.deptManyPhone|stringToFirstValue}}<em (click)="importPhone(incidentMsg.deptManyPhone, true)">引入</em></ng-container>
@@ -110,7 +131,7 @@
                   </div>
                 </div>
 
-                <div class="row gap8">
+                <div class="row">
                   <div class="col">
                     <span class="name">联系人：</span>
                     <input class="w100" nz-input placeholder="请填写联系人" [(ngModel)]="incidentModel.contacts" />
@@ -125,7 +146,7 @@
                   </div>
                 </div>
 
-                <div class="row gap8">
+                <div class="row">
                   <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)">
@@ -139,7 +160,7 @@
                   </div>
                 </div>
 
-                <div class="row gap8">
+                <div class="row">
                   <div class="col alignItemsStart">
                     <span class="name required">故障描述：</span>
                     <nz-input-group [nzSuffix]="suffixTemplate">
@@ -149,7 +170,7 @@
                   </div>
                 </div>
 
-                <div class="row gap8">
+                <div class="row">
                   <div class="col">
                     <span class="name required">优先级：</span>
                     <nz-select class="w100" [(ngModel)]="incidentModel.priorityId" nzAllowClear nzPlaceHolder="请选择优先级" [nzDisabled]="buildType === '编辑事件'">
@@ -168,7 +189,7 @@
                   </div>
                 </div>
 
-                <div class="row gap8">
+                <div class="row">
                   <div class="col">
                     <span class="name">报修图片：</span>
                     <div class="value w100 upload">
@@ -191,7 +212,7 @@
                   </div>
                 </div>
 
-                <div class="row gap8" *ngIf="buildType !== '编辑事件'">
+                <div class="row" *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)">

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

@@ -10,13 +10,16 @@
   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);
+    margin-right: 8px;
+    &:last-of-type{
+      margin-right: 0;
+    }
     img{
       width: 100%;
       height: 100%;
@@ -2105,10 +2108,13 @@
         font-size: 14px;
         .name{
           font-weight: bold;
-          margin-right: 48px;
+          margin-right: 24px;
         }
         .newTopItem{
-          margin-right: 24px;
+          margin-right: 16px;
+          &:last-of-type{
+            margin-right: 0;
+          }
         }
       }
     }
@@ -2228,11 +2234,7 @@
               .row{
                 display: flex;
                 align-items: center;
-                gap: 8px;
                 margin-bottom: 16px;
-                &.gap8{
-                  gap: 8px;;
-                }
                 &:last-of-type{
                   margin-bottom: 0;
                 }
@@ -2242,6 +2244,11 @@
                   display: flex;
                   align-items: center;
                   word-break: break-all;
+                  position: relative;
+                  margin-right: 8px;
+                  &:last-of-type{
+                    margin-right: 0;
+                  }
                   &.alignItemsStart{
                     align-items: flex-start;
                   }
@@ -2263,6 +2270,25 @@
                   &.flex7{
                     flex: 7;
                   }
+                  .addressList{
+                    position: absolute;
+                    top: 100%;
+                    left: 0;
+                    width: 100%;
+                    max-height: 256px;
+                    z-index: 2;
+                    background: #fff;
+                    border: 1px solid #d9d9d9;
+                    border-radius: 4px;
+                    overflow: hidden auto;
+                    .addressItem{
+                      padding: 5px 12px;
+                      cursor: pointer;
+                      &:hover{
+                        background-color: #e9f7e9;
+                      }
+                    }
+                  }
                   .ant-input-clear-icon{
                     align-self: center;
                     font-style: normal;

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

@@ -97,6 +97,7 @@ export class IncidentCreateComponent implements OnInit {
     incidentModel.requester && (incidentMsg.requesterPhone = incidentModel.requester.phone);
     incidentModel.requester && (incidentMsg.requesterName = incidentModel.requester.name);
     incidentModel.requester && (incidentModel.requester = incidentModel.requester.id);
+    incidentModel.repairIncidentType && (incidentModel.repairIncidentType = incidentModel.repairIncidentType.value);
     incidentModel.source && (incidentModel.source = incidentModel.source.id);
     incidentModel.area && (incidentModel.area = incidentModel.area.id);
     incidentModel.place && (incidentModel.place = incidentModel.place.id);
@@ -604,6 +605,19 @@ export class IncidentCreateComponent implements OnInit {
       this.applicationSourceList = data || [];
     });
   }
+  // 报修类型列表
+  repairIncidentTypeList:any[] = [];
+  getRepairIncidentType() {
+    this.mainService.getDictionary("list", "repair_incident_type").subscribe((data) => {
+      this.repairIncidentTypeList = data || [];
+    });
+  }
+  // 选择报修类型
+  changeRepairIncidentType(value){
+    this.incidentModel.department = undefined;
+    this.isRelatedDepartment = false;
+    this.changeApplyRelatedDepartment(this.isRelatedDepartment);
+  }
   // 楼栋列表
   applicationBuildingList:any[] = [];
   searchApplicationBuilding(keyWord?, buildingId?) {
@@ -823,6 +837,11 @@ export class IncidentCreateComponent implements OnInit {
   maskFlag:any = false;
   // 运维-直接解决
   directOrder(){
+    if(this.incidentModel.repairIncidentType === 'public' && !this.incidentModel.requester){
+      this.msg.warning('请选择申请人!');
+      return;
+    }
+
     if(!this.incidentModel.category){
       this.msg.warning('请选择故障现象!');
       return;
@@ -834,7 +853,7 @@ export class IncidentCreateComponent implements OnInit {
       return;
     }
 
-    if(!this.incidentModel.department){
+    if(this.incidentModel.repairIncidentType === 'dept' && !this.incidentModel.department){
       this.msg.warning('请选择申请科室!');
       return;
     }
@@ -881,6 +900,7 @@ export class IncidentCreateComponent implements OnInit {
         "deleteFlag": 0,
         "duty": this.incidentModel.duty ? { id: this.incidentModel.duty.id } : undefined,
         "requester": this.incidentModel.requester ? { id: this.incidentModel.requester } : undefined,
+        "repairIncidentType": this.incidentModel.repairIncidentType ? this.repairIncidentTypeList.find(v => v.value === this.incidentModel.repairIncidentType) : undefined,
         "alarmType": false,
         "department": this.incidentModel.department ? { id: this.incidentModel.department } : undefined,
         "contactsInformation": this.incidentModel.contactsInformation,
@@ -951,6 +971,11 @@ export class IncidentCreateComponent implements OnInit {
   }
   // 运维-建单并派单
   assignOrder(){
+    if(this.incidentModel.repairIncidentType === 'public' && !this.incidentModel.requester){
+      this.msg.warning('请选择申请人!');
+      return;
+    }
+
     if(!this.incidentModel.category){
       this.msg.warning('请选择故障现象!');
       return;
@@ -962,7 +987,7 @@ export class IncidentCreateComponent implements OnInit {
       return;
     }
 
-    if(!this.incidentModel.department){
+    if(this.incidentModel.repairIncidentType === 'dept' && !this.incidentModel.department){
       this.msg.warning('请选择申请科室!');
       return;
     }
@@ -1011,6 +1036,7 @@ export class IncidentCreateComponent implements OnInit {
         "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,
+        "repairIncidentType": this.incidentModel.repairIncidentType ? this.repairIncidentTypeList.find(v => v.value === this.incidentModel.repairIncidentType) : undefined,
         "acceptUser": { id: this.tool.getCurrentUserId() },
         "callID": this.incidentModel.callID || undefined,
         "incomingPhone": this.incidentModel.incomingPhone || undefined,
@@ -1085,6 +1111,7 @@ export class IncidentCreateComponent implements OnInit {
         "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,
+        "repairIncidentType": this.incidentModel.repairIncidentType ? this.repairIncidentTypeList.find(v => v.value === this.incidentModel.repairIncidentType) : undefined,
         "acceptUser": { id: this.tool.getCurrentUserId() },
         "callID": this.incidentModel.callID || undefined,
         "incomingPhone": this.incidentModel.incomingPhone || undefined,
@@ -1132,6 +1159,11 @@ export class IncidentCreateComponent implements OnInit {
   buildType;
   editOrder;
   saveOrder(){
+    if(this.incidentModel.repairIncidentType === 'public' && !this.incidentModel.requester){
+      this.msg.warning('请选择申请人!');
+      return;
+    }
+
     if(!this.incidentModel.category){
       this.msg.warning('请选择故障现象!');
       return;
@@ -1143,7 +1175,7 @@ export class IncidentCreateComponent implements OnInit {
       return;
     }
 
-    if(!this.incidentModel.department){
+    if(this.incidentModel.repairIncidentType === 'dept' && !this.incidentModel.department){
       this.msg.warning('请选择申请科室!');
       return;
     }
@@ -1187,6 +1219,7 @@ export class IncidentCreateComponent implements OnInit {
         "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,
+        "repairIncidentType": this.incidentModel.repairIncidentType ? this.repairIncidentTypeList.find(v => v.value === this.incidentModel.repairIncidentType) : undefined,
         "acceptUser": { id: this.tool.getCurrentUserId() },
         "callID": this.incidentModel.callID || undefined,
         "incomingPhone": this.incidentModel.incomingPhone || undefined,
@@ -1328,7 +1361,11 @@ export class IncidentCreateComponent implements OnInit {
   resetOrderData2(){
     this.fileList = [];
     this.repairImgs = [];
-    this.isRelatedDepartment = true;
+    if(this.incidentModel.repairIncidentType === 'public'){
+      this.isRelatedDepartment = false;
+    }else{
+      this.isRelatedDepartment = true;
+    }
   }
 
   // 打开新建工单
@@ -1343,13 +1380,14 @@ export class IncidentCreateComponent implements OnInit {
     this.searchApplicationCategory();
     this.searchApplicationPriority();
     this.searchApplicationSource();
+    this.getRepairIncidentType();
     isInit ? this.searchApplicationDepartment('itsm', undefined, undefined, undefined, true) : this.searchApplicationDepartment('itsm');
     isInit && ((this.isRelatedDepartment && this.incidentModel.department) || (!this.isRelatedDepartment && this.incidentModel.hosId) || this.buildType === '报修转事件' ) && this.incidentModel.hosId && this.searchApplicationBuilding();
     isInit && this.incidentModel.area && this.searchApplicationFloor();
 
     this.currentRTab = 0;
     this.rightTitle_tab = [];
-    this.incidentModel = isInit ? this.incidentModel : {};
+    this.incidentModel = isInit ? this.incidentModel : { repairIncidentType: 'dept' };
     this.incidentMsg = isInit ? this.incidentMsg : {};
     this.isBuildOrderAgagin = false;
     this.incidentModel.department = isInit ? this.incidentModel.department : null;
@@ -1456,4 +1494,50 @@ export class IncidentCreateComponent implements OnInit {
   newOrderCancel() {
     this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
   }
+
+  // 详细地址获取焦点
+  isShowAddressList:boolean = false;
+  focusAddress(){
+    this.isShowAddressList = true;
+    this.getAddressList();
+  }
+
+  // 点击其他位置
+  clickExtra(e){
+    if(document.documentElement.contains(document.querySelector('.addressList')) && e.target !== document.querySelector('.addressFocus')){
+      this.isShowAddressList = false;
+    }
+  }
+
+  // 选择地址
+  selectAddress(name){
+    this.incidentModel.houseNumber = name;
+    this.isShowAddressList = false;
+  }
+
+  // 获取科室地点列表
+  addressList:any[] = [];
+  addressLoading:boolean = false;
+  getAddressList() {
+    if(!this.incidentModel.department){
+      this.addressList = [];
+      return;
+    }
+    let postData = {
+      idx: 0,
+      sum: 99999,
+      qrCode: {
+        deptId: this.incidentModel.department,
+      }
+    };
+    this.addressLoading = true;
+    this.mainService.getFetchDataList("simple/data", "qrCode", postData).subscribe(result=>{
+      this.addressLoading = false;
+      if(result.status == 200){
+        this.addressList = result.list || [];
+      }else{
+        this.addressList = [];
+      }
+    });
+  }
 }

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

@@ -15,6 +15,10 @@
               <div class="col">状态：{{incidentData.state?.name}}</div>
             </div>
             <div class="row">
+              <div class="col">报修类型：{{incidentData.repairIncidentType?.name}}</div>
+              <div class="col display_flex flex2">报修录音：<audio class="audio" controls style="outline: none;" *ngIf="incidentData.reqRecord && audioRequireSrc"><source [src]="audioRequireSrc" type="audio/mp3"></audio></div>
+            </div>
+            <div class="row">
               <div class="col">故障现象：{{incidentData.category?.mutiCategory}}</div>
             </div>
             <div class="row">

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

@@ -60,6 +60,7 @@ export class IncidentDetailComponent implements OnInit {
 
     if(this.activeTabValue == 1){
       this.incidentData.callID && this.getCallLog();
+      this.incidentData.reqRecord && this.getAudioRequireSrc();
       this.incidentData.reqAttachment && this.getRepairImgs();
     }else if(this.activeTabValue == 2){
       this.getHandleImgs();
@@ -205,6 +206,24 @@ export class IncidentDetailComponent implements OnInit {
       });
   }
 
+  // 获取报修录音
+  audioRequireSrc =  '';//音频
+  getAudioRequireSrc() {
+    this.mainService
+      .getPreviewImage('wechatIncidentRecord', this.incidentData.id)
+      .subscribe((res:any) => {
+        res.data = res.data || [];
+        if(res.data.length){
+          res.data.forEach(v => {
+            v.previewUrl = location.origin + "/file" + v.relativeFilePath;
+          })
+          this.audioRequireSrc = res.data[0].previewUrl;
+        }else{
+          this.audioRequireSrc = '';
+        }
+      });
+  }
+
   maskFlag:any = false;
   // 获取处理流程
   incidentLogList:any[] = [];

src/app/components/incidentManagement/incident-ser-visit/incident-ser-visit.component.html

@@ -7,7 +7,7 @@
         <div class="items" *ngFor="let item of visitList">
           <div class="row">
             <div class="col"><span [ngClass]="priorityColor(item.priorityId)">{{item.priorityDTO?.name}}</span> {{item.incidentsign}}</div>
-            <div class="col">{{item.hosName}} {{item.department?.dept}}</div>
+            <div class="col">{{item.hosName}} <ng-container *ngIf="item.repairIncidentType.value === 'public'">{{ item.repairIncidentType.name }}</ng-container><ng-container *ngIf="item.repairIncidentType.value === 'dept'">{{ item.department?.dept }}</ng-container></div>
           </div>
           <div class="row">
             <div class="col">故障描述：{{item.description}}</div>

src/app/services/main.service.ts

@@ -929,21 +929,21 @@ export class MainService {
 	     headers: this.headers,
 	   });
 	 }
-	
+
 	//病理申请单追加打印/全量打印
 	 pathologyCheckPrint(type,businessId,data) {
 	   return this.http.post(host.host + `/pathology/check/${type}/${businessId}`, data, {
 	     headers: this.headers,
 	   });
 	 }
-	
+
 	// 病例申请单暂存
 	pathologyOperation(data,operation) {
 	  return this.http.post(host.host + `/pathology/${operation}`, data, {
 	    headers: this.headers,
 	  });
 	}
-	
+
 	// 病理查询标本条码
 	pathologyScanCode(data) {
 	  return this.http.post(host.host + `/pathology/scanCode`, data, {
@@ -1038,7 +1038,12 @@ export class MainService {
 	    headers: this.headers,
 	  });
 	}
-	// 获取细胞学标本
+  // 根据来电电话查科室
+	findPhoneDept(data) {
+	  return this.http.post(host.host + `/user/data/findPhoneDept`, data, {
+	    headers: this.headers,
+	  });
+	}	// 获取细胞学标本
 	getCellDictionary(data) {
 	  return this.http.post(host.host + `/common/common/getDictionary`,data, {
 	    headers: this.headers,

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

@@ -37,7 +37,7 @@
           <div nz-col nzSpan="8" *ngIf="orderInfo.inspectUsersNum">
             陪检人数：{{orderInfo.inspectUsersNum}}</div>
           <div nz-col nzSpan="24" *ngIf="orderInfo.workOrderRemark">
-            备注信息：{{orderInfo.workOrderRemark}}</div>
+            注意事项：{{orderInfo.workOrderRemark}}</div>
           <div nz-col nzSpan="24" *ngIf="orderInfo.specialCloseReason">
             特殊情况关闭原因：{{orderInfo.specialCloseReason}}
           </div>

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

@@ -682,7 +682,7 @@
             *ngIf="orderInfo.workOrderRemark !== undefined"
           >
             <div nz-col nzSpan="24">
-              备注信息：{{ orderInfo.workOrderRemark || "-" }}
+              注意事项：{{ orderInfo.workOrderRemark || "-" }}
             </div>
           </div>
           <div class="info" nz-row *ngIf="orderInfo.urgentDetails">

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

@@ -15,13 +15,16 @@
   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);
+    margin-right: 8px;
+    &:last-of-type{
+      margin-right: 0;
+    }
     img{
       width: 100%;
       height: 100%;
@@ -32,7 +35,7 @@
   }
 }
 
-.transport-a-11111{
+.transport-a-11111, .transport-luyin{
   color: @primary-color;
 }
 
@@ -642,6 +645,7 @@
     border: 1px @primary-color solid;
     cursor: pointer;
     height: 27px;
+    margin-bottom: 8px;
   }
 
   .slider {
@@ -2140,10 +2144,13 @@
           font-size: 14px;
           .name{
             font-weight: bold;
-            margin-right: 48px;
+            margin-right: 24px;
           }
           .newTopItem{
-            margin-right: 24px;
+            margin-right: 16px;
+            &:last-of-type{
+              margin-right: 0;
+            }
           }
         }
       }
@@ -2263,11 +2270,7 @@
                 .row{
                   display: flex;
                   align-items: center;
-                  gap: 8px;
                   margin-bottom: 16px;
-                  &.gap8{
-                    gap: 8px;;
-                  }
                   &:last-of-type{
                     margin-bottom: 0;
                   }
@@ -2277,6 +2280,11 @@
                     display: flex;
                     align-items: center;
                     word-break: break-all;
+                    position: relative;
+                    margin-right: 8px;
+                    &:last-of-type{
+                      margin-right: 0;
+                    }
                     &.alignItemsStart{
                       align-items: flex-start;
                     }
@@ -2298,6 +2306,25 @@
                     &.flex7{
                       flex: 7;
                     }
+                    .addressList{
+                      position: absolute;
+                      top: 100%;
+                      left: 0;
+                      width: 100%;
+                      max-height: 256px;
+                      z-index: 2;
+                      background: #fff;
+                      border: 1px solid #d9d9d9;
+                      border-radius: 4px;
+                      overflow: hidden auto;
+                      .addressItem{
+                        padding: 5px 12px;
+                        cursor: pointer;
+                        &:hover{
+                          background-color: #e9f7e9;
+                        }
+                      }
+                    }
                     .ant-input-clear-icon{
                       align-self: center;
                       font-style: normal;
@@ -2676,3 +2703,26 @@
     color: #333;
   }
 }
+.noteSign{
+  position: relative;
+  .noteList{
+    position: absolute;
+    bottom: 100%;
+    left: 0;
+    width: 100%;
+    max-height: 256px;
+    z-index: 99;
+    background: #fff;
+    border: 1px solid #d9d9d9;
+    border-radius: 4px;
+    overflow: hidden auto;
+    .noteItem{
+      padding: 5px 12px;
+      cursor: pointer;
+      line-height: normal;
+      &:hover{
+        background-color: #e9f7e9;
+      }
+    }
+  }
+}

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

@@ -146,6 +146,7 @@ export class FuwutaiComponent implements OnInit {
   startDeptQt = ""; //其他->选中起点科室
   endDeptQt = ""; //其他->选中终点科室
   workOrderRemark = ""; //工单备注
+  workOrderRemarkZy = ""; //工单备注
   // 新建工单弹框
   newOrderShow = false; //展示/隐藏新建工单弹框
   newOrderShowOpen = false; //展示/隐藏新建工单弹框(辅助项)
@@ -426,6 +427,7 @@ export class FuwutaiComponent implements OnInit {
             patientCode: this.validateFormZy.controls.patient.value,
           },
           goods: goods,
+          workOrderRemark: this.validateFormZy.controls.workOrderRemarkZy.value,
         },
       };
       if (!this.noWorkerPhone) {
@@ -749,6 +751,7 @@ export class FuwutaiComponent implements OnInit {
       patient: [null, [Validators.required]], //患者信息
       // patient: [null],//患者信息ca
       goods: [null], //携带物品
+      workOrderRemarkZy: [null], //工单备注
     });
     //其他
     this.validateFormQt = this.fb.group({
@@ -764,9 +767,6 @@ export class FuwutaiComponent implements OnInit {
     this.retract();
     this.refresh();
     this.initOrderScope();
-    this.getOrderList(1);
-    this.getOrderList(2);
-    this.getOrderList(3);
     this.getVisitList();
     this.getMessageList();
     this.initControlView();
@@ -1043,7 +1043,7 @@ export class FuwutaiComponent implements OnInit {
     //呼入回调函数
     TLWSA.onCallin = function (jso) {
       console.log(jso);
-      _this.incidentModel = {};
+      _this.incidentModel = { repairIncidentType: 'dept' };
       _this.callNumber = _this.incidentModel.incomingPhone = jso.caller;//来电的电话
       _this.incidentModel.callID = jso.crs;//来电的话机id
       if (jso) {
@@ -1196,8 +1196,8 @@ export class FuwutaiComponent implements OnInit {
   executionSearchCon: string = ""; //执行中搜索框内容
   workerMessage: any = []; //顶部全部工单
   // 展示形式
-  patientCareCol: number = 6; //顶部工单列数(4列-8人，7列-14人，6列-单排 ）
-  hurseInfoHiding = '1'; //护工信息隐藏
+  patientCareCol: number = 7; //顶部工单列数(4列-8人，7列-14人，6列-单排 ）
+  hurseInfoHiding = 1; //护工信息隐藏
   txtLabelCol: number = 1; //工单信息列数
   workerInfoTime: number = 60; //配送人员刷新时间
   orderInfoTime: number = 60; //工单刷新时间
@@ -1336,7 +1336,6 @@ export class FuwutaiComponent implements OnInit {
       this.user.user.scope = data.data;
       localStorage.setItem("user", JSON.stringify(this.user));
       this.initOrderScope();
-      this.initControlView();
     } else {
       this.showPromptModal("保存", false, data.msg);
     }
@@ -1352,6 +1351,26 @@ export class FuwutaiComponent implements OnInit {
     this.showInitModal = true;
   }
 
+  // 展示形式
+  showDisplayFormModal: boolean = false;
+  cancelDisplayForm() {
+    this.showDisplayFormModal = false;
+  }
+
+  showDisplayForm() {
+    this.showDisplayFormModal = true;
+  }
+
+  confirmDisplayForm(data){
+    if (data.status == 200) {
+      this.cancelDisplayForm();
+      this.msg.success('保存成功');
+      this.initControlView();
+    } else {
+      this.msg.error(data.msg || '保存失败');
+    }
+  }
+
   // 绑定分机
   showBindExtensionNumberModal: boolean = false;
   cancelBindExtensionNumber() {
@@ -1410,20 +1429,20 @@ export class FuwutaiComponent implements OnInit {
         // 200签入 201摘机 202来电
         if (data.status == 200 && data.phone) {
           this.incomingService.setPhoneNumber(phoneNumber);
-          this.incidentModel = {};
+          this.incidentModel = { repairIncidentType: 'dept' };
           this.incidentMsg = {};
           this.incidentModel.callID = data.callId || undefined;
           this.msg.info('签入成功');
           this.cancelBindExtensionNumber();
         } else if (data.status == 201 && data.phone) {
-          this.incidentModel = {};
+          this.incidentModel = { repairIncidentType: 'dept' };
           this.incidentMsg = {};
           this.incidentModel.callID = data.callId || undefined;
 
           this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data.phone;
           this.searchBxDept();
         } else if (data.status == 201 && data.phone === "") {
-          this.incidentModel = {};
+          this.incidentModel = { repairIncidentType: 'dept' };
           this.incidentMsg = {};
           this.incidentModel.callID = data.callId || undefined;
           //没绑定科室
@@ -1449,24 +1468,27 @@ export class FuwutaiComponent implements OnInit {
   // 呼叫中心---start
   searchBxDept(){
     let dataObj = {
-      idx: 0,
-      sum: 10,
-      department: {
-        searchType: 2,
-        phone: this.incidentModel.incomingPhone,
-      },
+      hosId: this.tool.getCurrentHospital().id,
+      phone: this.incidentModel.incomingPhone,
     };
     this.mainService
-      .getFetchDataList("data", "department", dataObj)
-      .subscribe((result) => {
-        if (result.status == 200) {
+      .findPhoneDept(dataObj)
+      .subscribe((result:any) => {
+        if (result.state == 200) {
           console.log(result);
-          if (result.list.length > 0) {
+          if (result.data.length > 0) {
+            let deptDTO;
+            if(result.type === 'qrCode'){
+              deptDTO = result.data[0].deptDTO;
+              deptDTO.address = result.data[0].name;
+            }else if(result.type === 'dept'){
+              deptDTO = result.data[0];
+            }
             //绑定了科室
             // if (!this.newOrderShow && !this.newOrderShowOpen) {
               let incidentModel:any = Object.assign({}, this.incidentModel);
               let incidentMsg:any = Object.assign({}, this.incidentMsg);
-              incidentModel.department = result.list[0];
+              incidentModel.department = deptDTO;
               incidentModel.department && incidentModel.department.hospital && (incidentModel.hosId = incidentModel.department.hospital.parent ? incidentModel.department.hospital.parent.id : incidentModel.department.hospital.id);
               incidentModel.department && incidentModel.department.building && (incidentModel.area = incidentModel.department.building.id);
               incidentModel.department && incidentModel.department.floor && (incidentModel.place = incidentModel.department.floor.id);
@@ -1479,7 +1501,7 @@ export class FuwutaiComponent implements OnInit {
               this.incidentModel = incidentModel;
               this.incidentMsg = incidentMsg;
               this.searchApplicationRequester();
-              this.applyDeptMiddle = result.list[0];
+              this.applyDeptMiddle = deptDTO;
               this.showNewOrder("yes", this.incidentModel.incomingPhone, true, '来电弹屏');
             // }
           } else {
@@ -1883,7 +1905,7 @@ export class FuwutaiComponent implements OnInit {
         //   });
         //   postData.groups = groups;
         // }
-        if (this.hurseInfoHiding == '1'){
+        if (this.hurseInfoHiding == 1){
           that.workerMessage = [];
           that.initTopCount();
           return;
@@ -1901,7 +1923,7 @@ export class FuwutaiComponent implements OnInit {
         let postData = {
           groups: [typeId],
         };
-        if (this.hurseInfoHiding == '1'){
+        if (this.hurseInfoHiding == 1){
           that.workerMessage = [];
           that.initTopCount();
           return;
@@ -1978,7 +2000,7 @@ export class FuwutaiComponent implements OnInit {
     let types = "";
 
     let postData:any = {
-      orderType: this['orderType' + stateId],
+      orderType: this.orderType,
     };
     // 配送
     if(this.flagList['hsmsFlag' + stateId]){
@@ -2307,9 +2329,9 @@ export class FuwutaiComponent implements OnInit {
   }
 
   // 护工信息展示形式
-  changPatientCareCol(e) {
-    this.initTopCount();
-  }
+  // changPatientCareCol(e) {
+  //   this.initTopCount();
+  // }
 
   // 获取配置文件写死的任务类型ID(送病人回病房9)，选择此任务类型的话，患者信息从终点科室获取
   getConfigTasktypeLoading: boolean = false;
@@ -2370,7 +2392,11 @@ export class FuwutaiComponent implements OnInit {
   resetOrderData2(){
     this.fileList = [];
     this.repairImgs = [];
-    this.isRelatedDepartment = true;
+    if(this.incidentModel.repairIncidentType === 'public'){
+      this.isRelatedDepartment = false;
+    }else{
+      this.isRelatedDepartment = true;
+    }
   }
   // 打开新建工单
   deathTasktypeId; //获取这个写死的任务类型的id,送病人回病房
@@ -2393,6 +2419,7 @@ export class FuwutaiComponent implements OnInit {
       this.searchApplicationCategory();
       this.searchApplicationPriority();
       this.searchApplicationSource();
+      this.getRepairIncidentType();
       isInit ? this.searchApplicationDepartment('itsm', undefined, undefined, undefined, true) : this.searchApplicationDepartment('itsm');
       isInit && ((this.isRelatedDepartment && this.incidentModel.department) || (!this.isRelatedDepartment && this.incidentModel.hosId) || this.buildType === '报修转事件' ) && this.incidentModel.hosId && this.searchApplicationBuilding();
       isInit && this.incidentModel.area && this.searchApplicationFloor();
@@ -2403,7 +2430,7 @@ export class FuwutaiComponent implements OnInit {
         this.fixedTab = "newOrder";
         this.currentRTab = 0;
         this.rightTitle_tab = [];
-        this.incidentModel = isInit ? this.incidentModel : {};
+        this.incidentModel = isInit ? this.incidentModel : { repairIncidentType: 'dept' };
         this.incidentMsg = isInit ? this.incidentMsg : {};
         this.isBuildOrderAgagin = false;
         this.applyDept = null;
@@ -2445,7 +2472,7 @@ export class FuwutaiComponent implements OnInit {
     this.fixedTab = "newOrder";
     this.currentRTab = 0;
     this.rightTitle_tab = [];
-    this.incidentModel = isInit ? this.incidentModel : {};
+    this.incidentModel = isInit ? this.incidentModel : { repairIncidentType: 'dept' };
     this.incidentMsg = isInit ? this.incidentMsg : {};
     this.isBuildOrderAgagin = false;
     this.applyDept = null;
@@ -2524,6 +2551,7 @@ export class FuwutaiComponent implements OnInit {
     this.patientZy = null;
     this.goodsNow = [];
     this.workOrderRemark = "";
+    this.workOrderRemarkZy = "";
     this.deptZyList["startDept"] = [];
     this.deptZyList["endDept"] = [];
     this.deptZyList["startStatus"] = 0;
@@ -2842,6 +2870,7 @@ export class FuwutaiComponent implements OnInit {
         "deleteFlag": 0,
         "duty": this.incidentModel.duty ? { id: this.incidentModel.duty.id } : undefined,
         "requester": this.incidentModel.requester ? { id: this.incidentModel.requester } : undefined,
+        "repairIncidentType": this.incidentModel.repairIncidentType ? this.repairIncidentTypeList.find(v => v.value === this.incidentModel.repairIncidentType) : undefined,
         "alarmType": false,
         "department": this.incidentModel.department ? { id: this.incidentModel.department } : undefined,
         "contactsInformation": this.incidentModel.contactsInformation,
@@ -3117,6 +3146,21 @@ export class FuwutaiComponent implements OnInit {
       this.applicationSourceList = data || [];
     });
   }
+  // 报修类型列表
+  repairIncidentTypeList:any[] = [];
+  getRepairIncidentType() {
+    this.mainService.getDictionary("list", "repair_incident_type").subscribe((data) => {
+      this.repairIncidentTypeList = data || [];
+    });
+  }
+  // 选择报修类型
+  changeRepairIncidentType(value){
+    this.incidentModel.department = undefined;
+    this.incidentMsg.deptManyPhone = '';
+
+    this.isRelatedDepartment = value !== 'public';
+    this.changeApplyRelatedDepartment(this.isRelatedDepartment);
+  }
   // 楼栋列表
   applicationBuildingList:any[] = [];
   searchApplicationBuilding(keyWord?, buildingId?) {
@@ -3406,6 +3450,7 @@ export class FuwutaiComponent implements OnInit {
     this.goodsNow = [];
     this.patientList = [];
     this.workOrderRemark = "";
+    this.workOrderRemarkZy = "";
     this.deptZyList["startDept"] = [];
     this.deptZyList["endDept"] = [];
     this.deptZyList["startStatus"] = 0;
@@ -3492,6 +3537,11 @@ export class FuwutaiComponent implements OnInit {
   maskFlag:any = false;
   // 运维-直接解决
   directOrder(){
+    if(this.incidentModel.repairIncidentType === 'public' && !this.incidentModel.requester){
+      this.msg.warning('请选择申请人!');
+      return;
+    }
+
     if(!this.incidentModel.category){
       this.msg.warning('请选择故障现象!');
       return;
@@ -3503,7 +3553,7 @@ export class FuwutaiComponent implements OnInit {
       return;
     }
 
-    if(!this.incidentModel.department){
+    if(this.incidentModel.repairIncidentType === 'dept' && !this.incidentModel.department){
       this.msg.warning('请选择申请科室!');
       return;
     }
@@ -3537,6 +3587,11 @@ export class FuwutaiComponent implements OnInit {
   }
   // 运维-建单并派单
   assignOrder(){
+    if(this.incidentModel.repairIncidentType === 'public' && !this.incidentModel.requester){
+      this.msg.warning('请选择申请人!');
+      return;
+    }
+
     if(!this.incidentModel.category){
       this.msg.warning('请选择故障现象!');
       return;
@@ -3549,7 +3604,7 @@ export class FuwutaiComponent implements OnInit {
       return;
     }
 
-    if(!this.incidentModel.department){
+    if(this.incidentModel.repairIncidentType === 'dept' && !this.incidentModel.department){
       this.msg.warning('请选择申请科室!');
       return;
     }
@@ -3598,6 +3653,7 @@ export class FuwutaiComponent implements OnInit {
         "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,
+        "repairIncidentType": this.incidentModel.repairIncidentType ? this.repairIncidentTypeList.find(v => v.value === this.incidentModel.repairIncidentType) : undefined,
         "acceptUser": { id: this.tool.getCurrentUserId() },
         "callID": this.incidentModel.callID || undefined,
         "incomingPhone": this.incidentModel.incomingPhone || undefined,
@@ -3672,6 +3728,7 @@ export class FuwutaiComponent implements OnInit {
         "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,
+        "repairIncidentType": this.incidentModel.repairIncidentType ? this.repairIncidentTypeList.find(v => v.value === this.incidentModel.repairIncidentType) : undefined,
         "acceptUser": { id: this.tool.getCurrentUserId() },
         "callID": this.incidentModel.callID || undefined,
         "incomingPhone": this.incidentModel.incomingPhone || undefined,
@@ -3718,6 +3775,11 @@ export class FuwutaiComponent implements OnInit {
 
   // 运维-保存
   saveOrder(){
+    if(this.incidentModel.repairIncidentType === 'public' && !this.incidentModel.requester){
+      this.msg.warning('请选择申请人!');
+      return;
+    }
+
     if(!this.incidentModel.category){
       this.msg.warning('请选择故障现象!');
       return;
@@ -3729,7 +3791,7 @@ export class FuwutaiComponent implements OnInit {
       return;
     }
 
-    if(!this.incidentModel.department){
+    if(this.incidentModel.repairIncidentType === 'dept' && !this.incidentModel.department){
       this.msg.warning('请选择申请科室!');
       return;
     }
@@ -3772,6 +3834,7 @@ export class FuwutaiComponent implements OnInit {
         "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,
+        "repairIncidentType": this.incidentModel.repairIncidentType ? this.repairIncidentTypeList.find(v => v.value === this.incidentModel.repairIncidentType) : undefined,
         "acceptUser": { id: this.tool.getCurrentUserId() },
         "callID": this.incidentModel.callID || undefined,
         "incomingPhone": this.incidentModel.incomingPhone || undefined,
@@ -4423,6 +4486,7 @@ export class FuwutaiComponent implements OnInit {
     this.goodsNow = [];
     this.patientList = [];
     this.workOrderRemark = "";
+    this.workOrderRemarkZy = "";
     this.deptZyList["startDept"] = [];
     this.deptZyList["endDept"] = [];
     this.deptZyList["startStatus"] = 0;
@@ -4593,9 +4657,6 @@ export class FuwutaiComponent implements OnInit {
   // 初始化展示形式
   controlView = {}; //展示形式
   initControlView() {
-    if(!this.hsmsData.hsmsSwitch){
-      return;
-    }
     let that = this;
     let postData = {
       controlView: {},
@@ -4607,24 +4668,31 @@ export class FuwutaiComponent implements OnInit {
       .subscribe((data) => {
         that.controlView = data.list[0] ? data.list[0] : [];
         if (!data.list.length) return;
-        switch (data.list[0].workerNum) {
-          case 1:
-            that.patientCareCol = 6;
-            break;
-          case 2:
-            that.patientCareCol = 7;
-            break;
-          case 3:
-            that.patientCareCol = 4;
-            break;
-        }
-        this.hurseInfoHiding = data.list[0].hurseInfoHiding ? "1" : "0";
-        that.txtLabelCol = data.list[0].labelNum;
+        // switch (data.list[0].workerNum) {
+        //   case 1:
+        //     that.patientCareCol = 6;
+        //     break;
+        //   case 2:
+        //     that.patientCareCol = 7;
+        //     break;
+        //   case 3:
+        //     that.patientCareCol = 4;
+        //     break;
+        // }
+        that.patientCareCol = 7;
+        this.hurseInfoHiding = data.list[0].hurseInfoHiding ? 1 : 0;
+        // that.txtLabelCol = data.list[0].labelNum;
+        that.txtLabelCol = 1;
         that.orderRefreshTime = that.orderInfoTime = data.list[0].orderInfoTime;
         that.workerRefreshTime = that.workerInfoTime =
           data.list[0].workerInfoTime;
         that.audioNotDispatched = data.list[0].unsendOrderVoice !== false;
+        this.orderType = data.list[0].orderType || 'priority';
         that.checkTab(this.typeId);
+
+        this.getOrderList(1);
+        this.getOrderList(2);
+        this.getOrderList(3);
       });
   }
 
@@ -4652,7 +4720,8 @@ export class FuwutaiComponent implements OnInit {
         workerInfoTime: that.workerInfoTime,
         orderInfoTime: that.orderInfoTime,
         unsendOrderVoice: that.audioNotDispatched,
-        hurseInfoHiding: that.hurseInfoHiding === "1",
+        hurseInfoHiding: that.hurseInfoHiding === 1,
+        orderType: this.orderType,
       },
     };
     if (that.controlView["id"]) {
@@ -4665,10 +4734,10 @@ export class FuwutaiComponent implements OnInit {
       .subscribe((data) => {
         that.saveLoading = false;
         if (data.status == 200) {
-          that.showPromptModal("保存", true, "");
-          that.initControlView();
+          that.msg.success('排序成功');
+          this.initControlView();
         } else {
-          that.showPromptModal("保存", false, data.msg);
+          that.msg.error(data.msg || '排序失败');
         }
       });
   }
@@ -4695,23 +4764,23 @@ export class FuwutaiComponent implements OnInit {
 
   showPromptModalRefresh(){
     this.getUnassignedBuilding2();
-      this.resetList();
-      this.getOrderList(1);
-      this.getOrderList(2);
-      this.getOrderList(3);
-      this.getVisitList();
-      this.getMessageList();
-      if (this.currentRTab === 0) {
-        this.getWorkOrders(this.applyDept);
-      } else if (this.currentRTab === 1) {
-        this.getPatientLog(this.applyDept);
-      } else if (this.currentRTab === 2) {
-        this.getItsmOrders(this.incidentModel.department);
-      } else if (this.currentRTab === 3) {
-        this.getDictionaryList();
-      }
-      this.fixedTab = "";
-      this.fixedMenuShangla();
+    this.resetList();
+    this.getOrderList(1);
+    this.getOrderList(2);
+    this.getOrderList(3);
+    this.getVisitList();
+    this.getMessageList();
+    if (this.currentRTab === 0) {
+      this.getWorkOrders(this.applyDept);
+    } else if (this.currentRTab === 1) {
+      this.getPatientLog(this.applyDept);
+    } else if (this.currentRTab === 2) {
+      this.getItsmOrders(this.incidentModel.department);
+    } else if (this.currentRTab === 3) {
+      this.getDictionaryList();
+    }
+    this.fixedTab = "";
+    this.fixedMenuShangla();
   }
 
   // 格式化时分秒
@@ -4867,12 +4936,10 @@ export class FuwutaiComponent implements OnInit {
   }
 
   // 排序
-  orderType1:any = 'priority';//priority:优先级，time:时间
-  orderType2:any = 'priority';//priority:优先级，time:时间
-  orderType3:any = 'priority';//priority:优先级，time:时间
-  orderList(state){
-    this['orderType' + state] = this['orderType' + state] === 'priority' ? 'time' : 'priority';
-    this.getOrderList(state, state === 1);
+  orderType: string = 'priority'; //排序方式 priority:优先级，time:时间
+  orderList(){
+    this.orderType = this.orderType === 'priority' ? 'time' : 'priority';
+    this.saveControlView();
   }
 
   // 优先级颜色
@@ -4921,6 +4988,10 @@ export class FuwutaiComponent implements OnInit {
     incidentModel.requester && (incidentMsg.requesterPhone = incidentModel.requester.phone);
     incidentModel.requester && (incidentMsg.requesterName = incidentModel.requester.name);
     incidentModel.requester && (incidentModel.requester = incidentModel.requester.id);
+    if(incidentModel.repairIncidentType){
+      incidentModel.repairIncidentType = incidentModel.repairIncidentType.value
+      this.changeRepairIncidentType(incidentModel.repairIncidentType);
+    }
     incidentModel.source && (incidentModel.source = incidentModel.source.id);
     incidentModel.area && (incidentModel.area = incidentModel.area.id);
     incidentModel.place && (incidentModel.place = incidentModel.place.id);
@@ -4951,6 +5022,10 @@ export class FuwutaiComponent implements OnInit {
     incidentModel.requester && (incidentMsg.requesterPhone = incidentModel.requester.phone);
     incidentModel.requester && (incidentMsg.requesterName = incidentModel.requester.name);
     incidentModel.requester && (incidentModel.requester = incidentModel.requester.id);
+    if(incidentModel.repairIncidentType){
+      incidentModel.repairIncidentType = incidentModel.repairIncidentType.value
+      this.changeRepairIncidentType(incidentModel.repairIncidentType);
+    }
     incidentModel.source && (incidentModel.source = incidentModel.source.id);
     incidentModel.area && (incidentModel.area = incidentModel.area.id);
     incidentModel.place && (incidentModel.place = incidentModel.place.id);
@@ -5049,6 +5124,10 @@ export class FuwutaiComponent implements OnInit {
     incidentModel.requester && (incidentMsg.requesterPhone = incidentModel.requester.phone);
     incidentModel.requester && (incidentMsg.requesterName = incidentModel.requester.name);
     incidentModel.requester && (incidentModel.requester = incidentModel.requester.id);
+    if(incidentModel.repairIncidentType){
+      incidentModel.repairIncidentType = incidentModel.repairIncidentType.value
+      this.changeRepairIncidentType(incidentModel.repairIncidentType);
+    }
     incidentModel.source && (incidentModel.source = incidentModel.source.id);
     incidentModel.area && (incidentModel.area = incidentModel.area.id);
     incidentModel.place && (incidentModel.place = incidentModel.place.id);
@@ -5218,23 +5297,19 @@ export class FuwutaiComponent implements OnInit {
     if(e.data){
       // 留言创建工单
       let postData = {
-        idx: 0,
-        sum: 10,
-        department: {
-          searchType: 2,
-          phone: e.data.ano,
-        },
+        hosId: this.tool.getCurrentHospital().id,
+        phone: e.data.ano,
       };
       this.maskFlag = this.msg.loading("正在加载中..", {
         nzDuration: 0,
       }).messageId;
 
       this.mainService
-        .getFetchDataList("data", "department", postData)
-        .subscribe((result) => {
+        .findPhoneDept(postData)
+        .subscribe((result:any) => {
           this.msg.remove(this.maskFlag);
           this.maskFlag = false;
-          if (result.status == 200) {
+          if (result.state == 200) {
             this.mainService.getDictionary("list", "incident_source").subscribe((res) => {
               let sourceList = res || [];
               let incidentModel:any = {
@@ -5244,9 +5319,16 @@ export class FuwutaiComponent implements OnInit {
               let incidentMsg:any = {};
               let source = sourceList.find(v => v.value === 'record');
               source && (incidentModel.source = source.id);
-              if (result.list.length > 0) {
+              if (result.data.length > 0) {
                 //绑定了科室
-                incidentModel.department = result.list[0];
+                let deptDTO;
+                if(result.type === 'qrCode'){
+                  deptDTO = result.data[0].deptDTO;
+                  deptDTO.address = result.data[0].name;
+                }else if(result.type === 'dept'){
+                  deptDTO = result.data[0];
+                }
+                incidentModel.department = deptDTO;
                 incidentModel.department && incidentModel.department.hospital && (incidentModel.hosId = incidentModel.department.hospital.parent ? incidentModel.department.hospital.parent.id : incidentModel.department.hospital.id);
                 incidentModel.department && incidentModel.department.building && (incidentModel.area = incidentModel.department.building.id);
                 incidentModel.department && incidentModel.department.floor && (incidentModel.place = incidentModel.department.floor.id);
@@ -5255,6 +5337,8 @@ export class FuwutaiComponent implements OnInit {
                 incidentModel.department && (incidentMsg.deptName = incidentModel.department.dept);
 
                 incidentModel.department && (incidentModel.department = incidentModel.department.id);
+                incidentModel.repairIncidentType = 'dept';
+                this.changeRepairIncidentType(incidentModel.repairIncidentType);
                 this.incidentModel = incidentModel;
                 console.log('this.incidentModel:', this.incidentModel)
                 this.incidentMsg = incidentMsg;
@@ -5280,4 +5364,87 @@ export class FuwutaiComponent implements OnInit {
   closeCall(e) {
     this.callShow = e.show;
   }
+
+  // 详细地址获取焦点
+  isShowAddressList:boolean = false;
+  focusAddress(){
+    this.isShowAddressList = true;
+    this.getAddressList();
+  }
+
+  // 点击其他位置
+  clickExtra(e){
+    if(document.documentElement.contains(document.querySelector('.addressList')) && e.target !== document.querySelector('.addressFocus')){
+      this.isShowAddressList = false;
+    }
+    if(document.documentElement.contains(document.querySelector('.noteList')) && e.target !== document.querySelector('.noteFocus')){
+      this.isShowNoteList = false;
+    }
+  }
+
+  // 选择地址
+  selectAddress(name){
+    this.incidentModel.houseNumber = name;
+    this.isShowAddressList = false;
+  }
+
+  // 获取科室地点列表
+  addressList:any[] = [];
+  addressLoading:boolean = false;
+  getAddressList() {
+    if(!this.incidentModel.department){
+      this.addressList = [];
+      return;
+    }
+    let postData = {
+      idx: 0,
+      sum: 99999,
+      qrCode: {
+        deptId: this.incidentModel.department,
+      }
+    };
+    this.addressLoading = true;
+    this.mainService.getFetchDataList("simple/data", "qrCode", postData).subscribe(result=>{
+      this.addressLoading = false;
+      if(result.status == 200){
+        this.addressList = result.list || [];
+      }else{
+        this.addressList = [];
+      }
+    });
+  }
+
+  // 选择患者
+  selectPatientZy(e){
+    let patient = this.patientList.find(v => v.patientCode === e);
+    if(patient){
+      this.workOrderRemarkZy = patient.remark || '';
+    }else{
+      this.workOrderRemarkZy = '';
+    }
+  }
+
+  // 注意事项获取焦点
+  isShowNoteList:boolean = false;
+  focusNote(){
+    this.isShowNoteList = true;
+    this.getNoteList();
+  }
+
+  // 选择注意事项
+  selectNote(name){
+    this.workOrderRemarkZy = name;
+    this.isShowNoteList = false;
+  }
+
+  // 获取注意事项列表
+  noteList:any[] = [];
+  noteLoading:boolean = false;
+  getNoteList() {
+    this.noteLoading = true;
+    this.mainService.getDictionary('list', 'inspect_notes',).subscribe(result=>{
+      this.noteLoading = false;
+      this.noteList = result || [];
+    });
+  }
 }

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

@@ -18,6 +18,7 @@ import { IncidentSerMessageModule } from 'src/app/components/incidentManagement/
 import { IncidentSerCallModule } from 'src/app/components/incidentManagement/incident-ser-call/incident-ser-call.module';
 import { VirtualScrollerModule } from 'ngx-virtual-scroller';
 import { BindExtensionNumberModule } from 'src/app/components/bind-extension-number/bind-extension-number.module';
+import { DisplayFormModule } from 'src/app/components/display-form/display-form.module';
 
 
 @NgModule({
@@ -41,6 +42,7 @@ import { BindExtensionNumberModule } from 'src/app/components/bind-extension-num
     IncidentSerCallModule,
     VirtualScrollerModule,
     BindExtensionNumberModule,
+    DisplayFormModule,
   ]
 })
 export class FuwutaiModule { }

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

@@ -39,14 +39,14 @@
               <div class="item" *ngFor="let item of patientList">
                 <div class="itemTit txtC" style="font-weight: bold">
                   <ng-container *ngIf="item.illnessState">
-                    <i *ngIf="item.illnessState.value === '2'" class="colorRed icon_transport transport-wei" nz-tooltip nzTooltipTitle="病危"></i>
-                    <i *ngIf="item.illnessState.value === '3'" class="colorRed icon_transport transport-zhong1" nz-tooltip nzTooltipTitle="病重"></i>
+                    <i *ngIf="item.illnessState.value === '2'" class="colorRed icon_transport transport-wei" nz-tooltip [nzTooltipTitle]="item.illnessState.name"></i>
+                    <i *ngIf="item.illnessState.value === '3'" class="colorRed icon_transport transport-zhong1" nz-tooltip [nzTooltipTitle]="item.illnessState.name"></i>
                   </ng-container>
                   <ng-container *ngIf="item.careLevel">
-                    <i *ngIf="item.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip nzTooltipTitle="特级护理"></i>
-                    <i *ngIf="item.careLevel.value === '1'" class="icon_transport transport-Bduanshuzi1" nz-tooltip nzTooltipTitle="一级护理"></i>
-                    <i *ngIf="item.careLevel.value === '2'" class="icon_transport transport-Bduanshuzi" nz-tooltip nzTooltipTitle="二级护理"></i>
-                    <i *ngIf="item.careLevel.value === '3'" class="icon_transport transport-Bduanshuzi11" nz-tooltip nzTooltipTitle="三级护理"></i>
+                    <i *ngIf="item.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip [nzTooltipTitle]="item.careLevel.name"></i>
+                    <i *ngIf="item.careLevel.value === '1'" class="icon_transport transport-Bduanshuzi1" nz-tooltip [nzTooltipTitle]="item.careLevel.name"></i>
+                    <i *ngIf="item.careLevel.value === '2'" class="icon_transport transport-Bduanshuzi" nz-tooltip [nzTooltipTitle]="item.careLevel.name"></i>
+                    <i *ngIf="item.careLevel.value === '3'" class="icon_transport transport-Bduanshuzi11" nz-tooltip [nzTooltipTitle]="item.careLevel.name"></i>
                   </ng-container>
                   <span nz-tooltip [nzTooltipTitle]="recentInfo" nzTooltipPlacement="right" [nzMouseEnterDelay]="1" (mouseenter)="getRecentInfo(item.patientCode)">{{ item.patientName }}({{ item.bedNum }})</span>
                 </div>
@@ -86,14 +86,14 @@
               <div class="item" *ngFor="let item of patientList">
                 <div class="itemTit txtC" style="font-weight: bold">
                   <ng-container *ngIf="item.illnessState">
-                    <i *ngIf="item.illnessState.value === '2'" class="colorRed icon_transport transport-wei" nz-tooltip nzTooltipTitle="病危"></i>
-                    <i *ngIf="item.illnessState.value === '3'" class="colorRed icon_transport transport-zhong1" nz-tooltip nzTooltipTitle="病重"></i>
+                    <i *ngIf="item.illnessState.value === '2'" class="colorRed icon_transport transport-wei" nz-tooltip [nzTooltipTitle]="item.illnessState.name"></i>
+                    <i *ngIf="item.illnessState.value === '3'" class="colorRed icon_transport transport-zhong1" nz-tooltip [nzTooltipTitle]="item.illnessState.name"></i>
                   </ng-container>
                   <ng-container *ngIf="item.careLevel">
-                    <i *ngIf="item.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip nzTooltipTitle="特级护理"></i>
-                    <i *ngIf="item.careLevel.value === '1'" class="icon_transport transport-Bduanshuzi1" nz-tooltip nzTooltipTitle="一级护理"></i>
-                    <i *ngIf="item.careLevel.value === '2'" class="icon_transport transport-Bduanshuzi" nz-tooltip nzTooltipTitle="二级护理"></i>
-                    <i *ngIf="item.careLevel.value === '3'" class="icon_transport transport-Bduanshuzi11"  nz-tooltip nzTooltipTitle="三级护理"></i>
+                    <i *ngIf="item.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip [nzTooltipTitle]="item.careLevel.name"></i>
+                    <i *ngIf="item.careLevel.value === '1'" class="icon_transport transport-Bduanshuzi1" nz-tooltip [nzTooltipTitle]="item.careLevel.name"></i>
+                    <i *ngIf="item.careLevel.value === '2'" class="icon_transport transport-Bduanshuzi" nz-tooltip [nzTooltipTitle]="item.careLevel.name"></i>
+                    <i *ngIf="item.careLevel.value === '3'" class="icon_transport transport-Bduanshuzi11" nz-tooltip [nzTooltipTitle]="item.careLevel.name"></i>
                   </ng-container>
                   <span nz-tooltip [nzTooltipTitle]="recentInfo" nzTooltipPlacement="right" [nzMouseEnterDelay]="1" (mouseenter)="getRecentInfo(item.patientCode)">{{ item.patientName }}({{ currentDept.typeValue == 'outpatientService' ? item.cardNo : item.bedNum }})</span>
                 </div>
@@ -146,14 +146,14 @@
               <div class="item" *ngFor="let item of patientList">
                 <div class="itemTit txtC" style="font-weight: bold">
                   <ng-container *ngIf="item.patientDTO && item.patientDTO.illnessState">
-                    <i *ngIf="item.patientDTO && item.patientDTO.illnessState.value === '2'" class="colorRed icon_transport transport-wei" nz-tooltip nzTooltipTitle="病危"></i>
-                    <i *ngIf="item.patientDTO && item.patientDTO.illnessState.value === '3'" class="colorRed icon_transport transport-zhong1" nz-tooltip nzTooltipTitle="病重"></i>
+                    <i *ngIf="item.patientDTO && item.patientDTO.illnessState.value === '2'" class="colorRed icon_transport transport-wei" nz-tooltip [nzTooltipTitle]="item.patientDTO.illnessState.name"></i>
+                    <i *ngIf="item.patientDTO && item.patientDTO.illnessState.value === '3'" class="colorRed icon_transport transport-zhong1" nz-tooltip [nzTooltipTitle]="item.patientDTO.illnessState.name"></i>
                   </ng-container>
                   <ng-container *ngIf="item.patientDTO && item.patientDTO.careLevel">
-                    <i *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip nzTooltipTitle="特级护理"></i>
-                    <i *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '1'" class="icon_transport transport-Bduanshuzi1" nz-tooltip nzTooltipTitle="一级护理"></i>
-                    <i *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '2'" class="icon_transport transport-Bduanshuzi" nz-tooltip nzTooltipTitle="二级护理"></i>
-                    <i *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '3'" class="icon_transport transport-Bduanshuzi11" nz-tooltip nzTooltipTitle="三级护理"></i>
+                    <i *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip [nzTooltipTitle]="item.patientDTO.careLevel.name"></i>
+                    <i *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '1'" class="icon_transport transport-Bduanshuzi1" nz-tooltip [nzTooltipTitle]="item.patientDTO.careLevel.name"></i>
+                    <i *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '2'" class="icon_transport transport-Bduanshuzi" nz-tooltip [nzTooltipTitle]="item.patientDTO.careLevel.name"></i>
+                    <i *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '3'" class="icon_transport transport-Bduanshuzi11" nz-tooltip [nzTooltipTitle]="item.patientDTO.careLevel.name"></i>
                   </ng-container>
                   <span>{{ item.patientDTO ? item.patientDTO.patientName : '' }}({{ item.patientDTO ? item.patientDTO.residenceNo : '' }})</span>
                 </div>
@@ -264,13 +264,13 @@
                                   *ngIf="surgeryWKOMsg.patientDTO && surgeryWKOMsg.patientDTO.illnessState.value === '2'"
                                   class="colorRed icon_transport transport-wei"
                                   nz-tooltip
-                                  nzTooltipTitle="病危"
+                                  [nzTooltipTitle]="surgeryWKOMsg.patientDTO.illnessState.name"
                                 ></i>
                                 <i
                                   *ngIf="surgeryWKOMsg.patientDTO && surgeryWKOMsg.patientDTO.illnessState.value === '3'"
                                   class="colorRed icon_transport transport-zhong1"
                                   nz-tooltip
-                                  nzTooltipTitle="病重"
+                                  [nzTooltipTitle]="surgeryWKOMsg.patientDTO.illnessState.name"
                                 ></i>
                               </ng-container>
                               <ng-container *ngIf="surgeryWKOMsg.patientDTO && surgeryWKOMsg.patientDTO.careLevel">
@@ -278,25 +278,25 @@
                                   *ngIf="surgeryWKOMsg.patientDTO && surgeryWKOMsg.patientDTO.careLevel.value === '0'"
                                   class="icon_transport transport-te1"
                                   nz-tooltip
-                                  nzTooltipTitle="特级护理"
+                                  [nzTooltipTitle]="surgeryWKOMsg.patientDTO.careLevel.name"
                                 ></i>
                                 <i
                                   *ngIf="surgeryWKOMsg.patientDTO && surgeryWKOMsg.patientDTO.careLevel.value === '1'"
                                   class="icon_transport transport-Bduanshuzi1"
                                   nz-tooltip
-                                  nzTooltipTitle="一级护理"
+                                  [nzTooltipTitle]="surgeryWKOMsg.patientDTO.careLevel.name"
                                 ></i>
                                 <i
                                   *ngIf="surgeryWKOMsg.patientDTO && surgeryWKOMsg.patientDTO.careLevel.value === '2'"
                                   class="icon_transport transport-Bduanshuzi"
                                   nz-tooltip
-                                  nzTooltipTitle="二级护理"
+                                  [nzTooltipTitle]="surgeryWKOMsg.patientDTO.careLevel.name"
                                 ></i>
                                 <i
                                   *ngIf="surgeryWKOMsg.patientDTO && surgeryWKOMsg.patientDTO.careLevel.value === '3'"
                                   class="icon_transport transport-Bduanshuzi11"
                                   nz-tooltip
-                                  nzTooltipTitle="三级护理"
+                                  [nzTooltipTitle]="surgeryWKOMsg.patientDTO.careLevel.name"
                                 ></i>
                               </ng-container>
                               <strong>{{ surgeryWKOMsg.patientDTO ? surgeryWKOMsg.patientDTO.patientName : '' }}({{ surgeryWKOMsg.patientDTO ? surgeryWKOMsg.patientDTO.residenceNo : '' }})</strong>
@@ -526,7 +526,7 @@
               </div>
               <!-- 其他任务建单 -->
               <ng-container *ngIf="othersList[checkedTableType]">
-                <div style="flex: 1; height: 100%; position: relative">
+                <div style="flex: 1; height: 100%;min-height:0;; position: relative">
                   <div class="otherBox">
                     <div class="otherBoxInner">
                       <div class="otherBox-nav">
@@ -756,7 +756,7 @@
               <!-- 意见箱 -->
               <div
                 *ngIf="checkedTableType == 'advice'"
-                style="flex: 1; height: 100%"
+                style="flex: 1; height: 100%;min-height:0;"
               >
                 <div
                   class="searchBox display_flex align-items_center justify-content_space-between"
@@ -852,7 +852,7 @@
                 </div>
               </div>
               <!-- 手术排程信息 -->
-              <div *ngIf="checkedTableType == 'surgery'" style="flex: 1; height: 100%">
+              <div *ngIf="checkedTableType == 'surgery'" style="flex: 1; height: 100%;min-height:0;">
                 <div class="searchBox display_flex align-items_center justify-content_space-between">
                   <div class="left alignC display_flex justify-content_flex-center align-items_center">
 										<span class="label">排程时间：</span>
@@ -924,7 +924,7 @@
                 </div>
               </div>
               <!-- 门诊帮扶预约 -->
-              <div *ngIf="checkedTableType == 'outpatientHelpAppointment'" style="flex: 1; height: 100%">
+              <div *ngIf="checkedTableType == 'outpatientHelpAppointment'" style="flex: 1; height: 100%;min-height:0;">
                 <div class="searchBox display_flex align-items_center justify-content_space-between">
                   <div class="left alignC display_flex justify-content_flex-center align-items_center">
                     <div>预约时间：</div>
@@ -992,7 +992,7 @@
               <!-- 历史标本查询 -->
               <div
                 *ngIf="checkedTableType == 'historySpecimen'"
-                style="flex: 1; height: 100%"
+                style="flex: 1; height: 100%;min-height:0;"
               >
                 <div
                   class="searchBox display_flex align-items_center justify-content_space-between"
@@ -1102,7 +1102,7 @@
               <!-- 历史药单查询 -->
               <div
                 *ngIf="checkedTableType == 'historyDrugsbag'"
-                style="flex: 1; height: 100%"
+                style="flex: 1; height: 100%;min-height:0;"
               >
                 <div
                   class="searchBox display_flex align-items_center justify-content_space-between"
@@ -1200,7 +1200,7 @@
               <!-- 报修列表 -->
               <div
                 *ngIf="checkedTableType == 'bxlb' && isShowBx && coopBtns.repairList"
-                style="flex: 1; height: 100%"
+                style="flex: 1; height: 100%;min-height:0;"
               >
                 <div
                   class="searchBox display_flex align-items_center justify-content_space-between"
@@ -1427,54 +1427,34 @@
 </div>
 
 <!-- 患者信息一键建单模态框 -->
-<div
-  class="save display_flex align-items_center justify-content_flex-center patient"
-  *ngIf="patientModal"
->
-  <div class="modalBody" style="width: 500px">
-    <div class="title">
-      患者送检<i
-        class="icon_transport transport-guanbi"
-        (click)="hidePatientOrder()"
-      ></i>
-    </div>
-    <overlay-scrollbars
-      #osComponentRef7
-      class="content"
-      style="max-height: 80vh"
-    >
-      <div class="jiTit borderB" *ngIf="checkedShowMsg.msg">
-        提示：您即将创建<b style="color: red">{{ patientMsg.patientName }}</b
-        >患者检查，{{ checkedShowMsg.msg }}
-      </div>
-      <div class="jiTit borderB" *ngIf="!checkedShowMsg.msg">
-        提示：您即将创建<b style="color: red">{{ patientMsg.patientName }}</b
-        >患者检查
-      </div>
-      <div class="jiTit borderB jiTitB">
-        如患者无预约检查无法进行“当天预约检查时”，可使用“特殊情况送检”进行建单。
+<div class="save display_flex align-items_center justify-content_flex-center patient" *ngIf="patientModal" (click)="clickExtra($event)">
+  <div class="modalBody">
+    <div class="title">患者送检<i class="icon_transport transport-guanbi" (click)="hidePatientOrder()"></i></div>
+    <overlay-scrollbars #osComponentRef7 class="content" style="max-height: 80vh">
+      <div class="patientMsg">
+        <div class="patientMsgTips">患者姓名：{{patientMsg.patientName}}</div>
+        <div class="patientMsgTips">住院号：{{patientMsg.residenceNo}}</div>
+        <div class="patientMsgTips">护理级别：{{patientMsg.illnessState?.name}}</div>
+        <div class="patientMsgTips">危重等级：{{patientMsg.careLevel?.name}}</div>
       </div>
       <div>
         <form nz-form [formGroup]="patientForm" class="patientForm">
-          <nz-form-item class="datesControl">
-            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="checkedType"
-              >任务类型</nz-form-label
-            >
-            <nz-form-control nzErrorTip="请选择任务类型!" class="checkedType">
-              <nz-radio-group
-                class="radioGroup"
-                formControlName="checkedType"
-                (ngModelChange)="changeCheckedType()"
-              >
-                <label
-                  *ngFor="let item of checkTypeLis"
-                  nz-radio
-                  [nzValue]="item.id"
-                  >{{ item.taskName }}</label
-                >
-              </nz-radio-group>
-            </nz-form-control>
-          </nz-form-item>
+          <div class="pos">
+            <!-- 提示 -->
+            <nz-form-item class="pos-item pos-tip" *ngIf="checkedShowMsg.msg">
+              <nz-form-control>
+                <b class="pos-red ellipsis-oneline" [title]="checkedShowMsg.msg">{{ checkedShowMsg.msg }}</b>
+              </nz-form-control>
+            </nz-form-item>
+            <nz-form-item class="datesControl">
+              <nz-form-label [nzSm]="24" [nzXs]="24" nzRequired nzFor="checkedType">任务类型</nz-form-label>
+              <nz-form-control nzErrorTip="请选择任务类型!" class="checkedType">
+                <nz-radio-group class="radioGroup w100" formControlName="checkedType" (ngModelChange)="changeCheckedType()">
+                  <label class="col6 ellipsis-oneline" [title]="item.taskName" *ngFor="let item of checkTypeLis" nz-radio [nzValue]="item.id">{{ item.taskName }}</label>
+                </nz-radio-group>
+              </nz-form-control>
+            </nz-form-item>
+          </div>
           <ng-container *ngIf="cLoading">
             <div style="text-align: center">
               <img src="../../../assets/images/loading.gif" alt="" />
@@ -1484,225 +1464,73 @@
           <ng-container *ngIf="!cLoading">
             <!-- 检查 -->
             <nz-form-item *ngIf="checkedShowMsg.status == 200">
-              <nz-form-label [nzSm]="24" [nzXs]="24" nzFor="linkCheck"
-                >关联的检查</nz-form-label
-              >
+              <nz-form-label [nzSm]="24" [nzXs]="24" nzFor="linkCheck">关联的检查</nz-form-label>
               <nz-form-control class="datesGroup" *ngIf="linkCheckLis.length">
-                <nz-checkbox-wrapper
-                  class="linkCheckCheck"
-                  ngDefaultControl
-                  formControlName="linkCheck"
-                  (nzOnChange)="linkCheckLisChange($event)"
-                >
-                  <div nz-row *ngFor="let item of linkCheckLis">
+                <nz-checkbox-wrapper nz-row class="linkCheckCheck w100" ngDefaultControl formControlName="linkCheck" (nzOnChange)="linkCheckLisChange($event)">
+                  <div nz-row nz-col nzSpan="12" *ngFor="let item of linkCheckLis">
                     <div nz-col nzSpan="24">
-                      <label nz-checkbox [nzValue]="item">{{
-                        item.label
-                      }}</label>
-                      <i
-                        class="icon_transport transport-zu1468 priority"
-                        *ngIf="item.priority === 1 || item.priority === '1'"
-                      ></i>
+                      <label nz-checkbox [nzValue]="item">{{ item.label}}</label>
+                      <i class="icon_transport transport-zu1468 priority" *ngIf="item.priority === 1 || item.priority === '1'"></i>
                     </div>
                   </div>
                 </nz-checkbox-wrapper>
-                <div
-                  class="red"
-                  style="line-height: normal; font-weight: bold"
-                  *ngIf="currentTasktype.isMoreDept === 0 && isInspects"
-                >
+                <div class="red" style="line-height: normal; font-weight: bold" *ngIf="currentTasktype.isMoreDept === 0 && isInspects">
                   您选择的检查包含了多个科室，请您只包含一个科室。
                 </div>
               </nz-form-control>
-              <div *ngIf="!linkCheckLis.length">暂无关联的检查</div>
+              <div class="noInspect" *ngIf="!linkCheckLis.length">暂无关联的检查</div>
             </nz-form-item>
-            <div
-              class="pos"
-              *ngIf="
-                (currentTasktype.associationType.value === 'patientTransport' &&
-                  appointmentZyBuildFlag == 1) ||
-                (currentTasktype.associationType.value === 'inspect' &&
-                  appointmentBuildFlag == 1)
-              "
-            >
+            <div class="pos" *ngIf="(currentTasktype.associationType.value === 'patientTransport' && appointmentZyBuildFlag == 1) || (currentTasktype.associationType.value === 'inspect' && appointmentBuildFlag == 1)">
               <!-- 需要预约检查 -->
               <nz-form-item class="pos-item">
                 <nz-form-control>
-                  <label
-                    nz-checkbox
-                    [nzDisabled]="
-                      (!linkCheckLisTrue &&
-                        currentTasktype.associationType.value === 'inspect') ||
-                      (linkCheckLisTrue &&
-                        allowUrgent == 1 &&
-                        currentTasktype.associationType.value === 'inspect') ||
-                      (allowUrgent == 1 &&
-                        currentTasktype.associationType.value ===
-                          'patientTransport')
-                    "
-                    [(ngModel)]="isYyInspect"
-                    (ngModelChange)="yyInspectChange($event)"
-                    [ngModelOptions]="{ standalone: true }"
-                    style="font-weight: bold"
-                    >需要预约检查</label
-                  >
+                  <label class="mt13" nz-checkbox [nzDisabled]="(!linkCheckLisTrue && currentTasktype.associationType.value === 'inspect') || (linkCheckLisTrue && allowUrgent == 1 && currentTasktype.associationType.value === 'inspect') || (allowUrgent == 1 && currentTasktype.associationType.value === 'patientTransport')" [(ngModel)]="isYyInspect" (ngModelChange)="yyInspectChange($event)" [ngModelOptions]="{ standalone: true }" style="font-weight: bold">需要预约检查</label>
+                  <span class="red pos-red">请您填写实际预约检查时间，系统会根据时间安排人员进行陪检!</span>
                 </nz-form-control>
               </nz-form-item>
               <!-- 预约建单时间-患者其他服务 -->
-              <nz-form-item
-                class="yyTime"
-                [ngClass]="{
-                  yyTimeError: (!yyTimeZy || !yyDateZy) && clickYYZyFlag
-                }"
-                *ngIf="
-                  currentTasktype.associationType.value === 'patientTransport'
-                "
-              >
-                <nz-form-label [nzSm]="24" [nzXs]="24"
-                  >预约建单时间</nz-form-label
-                >
+              <nz-form-item class="yyTime" [ngClass]="{yyTimeError: (!yyTimeZy || !yyDateZy) && clickYYZyFlag}" *ngIf="currentTasktype.associationType.value === 'patientTransport'">
+                <nz-form-label [nzSm]="24" [nzXs]="24">预约建单时间</nz-form-label>
                 <nz-form-control [nzSm]="24" [nzXs]="24">
-                  <nz-date-picker
-                    [nzDisabled]="!isYyInspect"
-                    [(ngModel)]="yyDateZy"
-                    (ngModelChange)="yyDateChange($event)"
-                    [ngModelOptions]="{ standalone: true }"
-                    [nzAllowClear]="false"
-                    [nzDisabledDate]="disabledyyDateZy"
-                    [nzShowToday]="false"
-                  ></nz-date-picker>
-                  <nz-time-picker
-                    [nzDisabled]="!isYyInspect || !yyDateZy"
-                    class="ml8"
-                    nzFormat="HH:mm"
-                    [nzMinuteStep]="inspectAndPatientTransportConfig.timeMod"
-                    [nzSecondStep]="60"
-                    [(ngModel)]="yyTimeZy"
-                    (ngModelChange)="yyTimeZyChange($event)"
-                    [ngModelOptions]="{ standalone: true }"
-                    [nzDisabledHours]="disabledHours"
-                    [nzDisabledMinutes]="disabledMinutes"
-                    [nzAllowEmpty]="false"
-                  >
+                  <nz-date-picker [nzDisabled]="!isYyInspect" [(ngModel)]="yyDateZy" (ngModelChange)="yyDateChange($event)" [ngModelOptions]="{ standalone: true }" [nzAllowClear]="false" [nzDisabledDate]="disabledyyDateZy" [nzShowToday]="false"></nz-date-picker>
+                  <nz-time-picker [nzDisabled]="!isYyInspect || !yyDateZy" class="ml8" nzFormat="HH:mm" [nzMinuteStep]="inspectAndPatientTransportConfig.timeMod" [nzSecondStep]="60" [(ngModel)]="yyTimeZy" (ngModelChange)="yyTimeZyChange($event)" [ngModelOptions]="{ standalone: true }" [nzDisabledHours]="disabledHours" [nzDisabledMinutes]="disabledMinutes" [nzAllowEmpty]="false">
                   </nz-time-picker>
-                  <button
-                    [disabled]="!isYyInspect || (isYyInspect && !yyDateZy)"
-                    nz-button
-                    nzType="primary"
-                    class="ml8"
-                    (click)="nextDayZy()"
-                  >
+                  <button [disabled]="!isYyInspect || (isYyInspect && !yyDateZy)" nz-button nzType="primary" class="ml8" (click)="nextDayZy()">
                     下一日
                   </button>
                 </nz-form-control>
-                <div
-                  class="red w100"
-                  *ngIf="(!yyTimeZy || !yyDateZy) && clickYYZyFlag"
-                >
+                <div class="red w100" *ngIf="(!yyTimeZy || !yyDateZy) && clickYYZyFlag">
                   请填写预约建单时间!
                 </div>
-                <div class="red">
-                  请您填写实际预约检查时间，系统会根据时间安排人员进行陪检!
-                </div>
               </nz-form-item>
               <!-- 预约建单时间 -->
-              <nz-form-item
-                class="yyTime"
-                [ngClass]="{ yyTimeError: (!yyTime || !yyDate) && clickYYFlag }"
-                *ngIf="currentTasktype.associationType.value === 'inspect'"
-              >
-                <nz-form-label [nzSm]="24" [nzXs]="24"
-                  >预约建单时间</nz-form-label
-                >
+              <nz-form-item class="yyTime" [ngClass]="{ yyTimeError: (!yyTime || !yyDate) && clickYYFlag }" *ngIf="currentTasktype.associationType.value === 'inspect'">
+                <nz-form-label [nzSm]="24" [nzXs]="24">预约建单时间</nz-form-label>
                 <nz-form-control [nzSm]="24" [nzXs]="24">
-                  <nz-date-picker
-                    [nzDisabled]="!isYyInspect"
-                    [(ngModel)]="yyDate"
-                    (ngModelChange)="yyDateChange($event)"
-                    [ngModelOptions]="{ standalone: true }"
-                    [nzAllowClear]="false"
-                    [nzDisabledDate]="disabledyyDate"
-                    [nzShowToday]="false"
-                  >
+                  <nz-date-picker [nzDisabled]="!isYyInspect" [(ngModel)]="yyDate" (ngModelChange)="yyDateChange($event)" [ngModelOptions]="{ standalone: true }" [nzAllowClear]="false" [nzDisabledDate]="disabledyyDate" [nzShowToday]="false">
                   </nz-date-picker>
-                  <nz-time-picker
-                    [nzDisabled]="!isYyInspect || !yyDate"
-                    class="ml8"
-                    nzFormat="HH:mm"
-                    [nzMinuteStep]="inspectAndPatientTransportConfig.timeMod"
-                    [nzSecondStep]="60"
-                    [(ngModel)]="yyTime"
-                    (ngModelChange)="yyTimeChange($event)"
-                    [ngModelOptions]="{ standalone: true }"
-                    [nzDisabledHours]="disabledHours"
-                    [nzDisabledMinutes]="disabledMinutes"
-                    [nzAllowEmpty]="false"
-                  >
+                  <nz-time-picker [nzDisabled]="!isYyInspect || !yyDate" class="ml8" nzFormat="HH:mm" [nzMinuteStep]="inspectAndPatientTransportConfig.timeMod" [nzSecondStep]="60" [(ngModel)]="yyTime" (ngModelChange)="yyTimeChange($event)" [ngModelOptions]="{ standalone: true }" [nzDisabledHours]="disabledHours" [nzDisabledMinutes]="disabledMinutes" [nzAllowEmpty]="false">
                   </nz-time-picker>
-                  <button
-                    [disabled]="!isYyInspect || (isYyInspect && !yyDate)"
-                    nz-button
-                    nzType="primary"
-                    class="ml8"
-                    (click)="nextDay()"
-                  >
+                  <button [disabled]="!isYyInspect || (isYyInspect && !yyDate)" nz-button nzType="primary" class="ml8" (click)="nextDay()">
                     下一日
                   </button>
                 </nz-form-control>
-                <div
-                  class="red w100"
-                  *ngIf="(!yyTime || !yyDate) && clickYYFlag"
-                >
+                <div class="red w100" *ngIf="(!yyTime || !yyDate) && clickYYFlag">
                   请填写预约建单时间!
                 </div>
-                <div class="red">
-                  请您填写实际预约检查时间，系统会根据时间安排人员进行陪检!
-                </div>
               </nz-form-item>
             </div>
             <!-- 100009 科室任务类型状态码未配置 -->
-            <nz-form-item
-              *ngIf="
-                checkedShowMsg.status != 200 && checkedShowMsg.status == 100009
-              "
-            >
+            <nz-form-item *ngIf="checkedShowMsg.status == 100009">
               <div class="txtC">{{ checkedShowMsg.msg }}</div>
             </nz-form-item>
             <!-- 100015 （护士端一键建单展策略）起点科室和终点科室下拉展示 -->
-            <nz-form-item
-              *ngIf="
-                checkedShowMsg.status != 200 &&
-                (checkedShowMsg.status == 100015 ||
-                  checkedShowMsg.status == 100013)
-              "
-            >
-              <nz-form-label
-                [nzSm]="6"
-                [nzXs]="24"
-                nzRequired
-                nzFor="originOffice"
-                >起点科室</nz-form-label
-              >
-              <nz-form-control nzErrorTip="请选择起点科室!">
-                <nz-select
-                  class="w100"
-                  formControlName="originOffice"
-                  [nzDropdownMatchSelectWidth]="false"
-                  nzServerSearch
-                  nzShowSearch
-                  (nzOnSearch)="searchDept('start', checkedShowMsg, $event)"
-                  nzPlaceHolder="请选择起点科室"
-                >
-                  <ng-container
-                    *ngFor="let option of checkedShowMsg.start.start.list"
-                  >
-                    <nz-option
-                      *ngIf="true"
-                      [nzLabel]="
-                        deptDisplay == 2 ? option.deptalias : option.dept
-                      "
-                      [nzValue]="option.id"
-                    ></nz-option>
+            <nz-form-item class="top16bottom0" nz-row *ngIf="checkedShowMsg.status == 100015 || checkedShowMsg.status == 100013">
+              <nz-form-label [nzSpan]="3" nzRequired nzFor="originOffice">起点科室</nz-form-label>
+              <nz-form-control [nzSpan]="21" nzErrorTip="请选择起点科室!">
+                <nz-select formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchDept('start', checkedShowMsg, $event)" nzPlaceHolder="请选择起点科室">
+                  <ng-container *ngFor="let option of checkedShowMsg.start.start.list">
+                    <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id"></nz-option>
                   </ng-container>
                   <nz-option *ngIf="false" nzDisabled nzCustomContent>
                     <i nz-icon nzType="loading" class="loading-icon"></i>
@@ -1711,41 +1539,26 @@
                 </nz-select>
               </nz-form-control>
             </nz-form-item>
+            <!-- 其他情况 -->
+            <nz-form-item class="top16bottom0" nz-row *ngIf="checkedShowMsg.start && (checkedShowMsg.status == 100014 || checkedShowMsg.status == 100012)">
+              <nz-form-label [nzSpan]="3" nzRequired nzFor="originOffice">起点科室</nz-form-label>
+              <nz-form-control [nzSpan]="21" nzErrorTip="请选择起点科室!">
+                <span class="readonly">{{deptDisplay == 2 ? checkedShowMsg.start.start.list[0].deptalias : checkedShowMsg.start.start.list[0].dept}}</span>
+              </nz-form-control>
+            </nz-form-item>
+            <nz-form-item class="top16bottom0" nz-row *ngIf="checkedShowMsg.end && (checkedShowMsg.status == 100012 || checkedShowMsg.status == 100013)">
+              <nz-form-label [nzSpan]="3" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
+              <nz-form-control [nzSpan]="21" nzErrorTip="请选择目标科室!">
+                <span class="readonly">{{deptDisplay == 2 ? checkedShowMsg.end.end.list[0].deptalias : checkedShowMsg.end.end.list[0].dept}}</span>
+              </nz-form-control>
+            </nz-form-item>
             <!-- 100014 （护士端一键建单展示策略）取终点科室和msg 值展示 -->
-            <nz-form-item
-              *ngIf="
-                checkedShowMsg.status != 200 &&
-                (checkedShowMsg.status == 100014 ||
-                  checkedShowMsg.status == 100015)
-              "
-            >
-              <nz-form-label
-                [nzSm]="6"
-                [nzXs]="24"
-                nzRequired
-                nzFor="targetOffice"
-                >目标科室</nz-form-label
-              >
-              <nz-form-control nzErrorTip="请选择目标科室!">
-                <nz-select
-                  class="w100"
-                  formControlName="targetOffice"
-                  [nzDropdownMatchSelectWidth]="false"
-                  nzServerSearch
-                  nzShowSearch
-                  (nzOnSearch)="searchDept('target', checkedShowMsg, $event)"
-                  nzPlaceHolder="请选择目标科室"
-                >
-                  <ng-container
-                    *ngFor="let option of checkedShowMsg.end.end.list"
-                  >
-                    <nz-option
-                      *ngIf="true"
-                      [nzLabel]="
-                        deptDisplay == 2 ? option.deptalias : option.dept
-                      "
-                      [nzValue]="option.id"
-                    ></nz-option>
+            <nz-form-item class="top16bottom0" nz-row *ngIf="checkedShowMsg.status == 100014 || checkedShowMsg.status == 100015">
+              <nz-form-label [nzSpan]="3" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
+              <nz-form-control [nzSpan]="21" nzErrorTip="请选择目标科室!">
+                <nz-select formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchDept('target', checkedShowMsg, $event)" nzPlaceHolder="请选择目标科室">
+                  <ng-container *ngFor="let option of checkedShowMsg.end.end.list">
+                    <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id"></nz-option>
                   </ng-container>
                   <nz-option *ngIf="false" nzDisabled nzCustomContent>
                     <i nz-icon nzType="loading" class="loading-icon"></i>
@@ -1754,94 +1567,60 @@
                 </nz-select>
               </nz-form-control>
             </nz-form-item>
-            <!-- 自动送回 -->
-            <nz-form-item
-              *ngIf="
-                checkedShowMsg.status != 200 && checkedShowMsg.isRemand == 1
-              "
-            >
+            <div class="display_flex top16bottom0">
+              <!-- 自动送回 -->
+              <nz-form-item class="isRemand" *ngIf="checkedShowMsg.status != 200 && checkedShowMsg.isRemand == 1">
+                <nz-form-control>
+                  <label nz-checkbox [(ngModel)]="isRemand" [ngModelOptions]="{ standalone: true }">自动送回</label>
+                </nz-form-control>
+              </nz-form-item>
+              <!-- 是否加急 -->
+              <nz-form-item nz-row *ngIf="current_allowUrgent" class="allowUrgent">
+                <nz-form-label [nzSpan]="3" nzFor="allowUrgent" class="goods">是否加急</nz-form-label>
+                <nz-form-control [nzSpan]="6">
+                  <nz-radio-group [(ngModel)]="allowUrgent" (ngModelChange)="allowUrgentChange($event)" formControlName="allowUrgent">
+                    <label nz-radio nzValue="1">是</label>
+                    <label nz-radio nzValue="0">否</label>
+                  </nz-radio-group>
+                </nz-form-control>
+              </nz-form-item>
+            </div>
+            <!-- 加急原因 -->
+            <nz-form-item nz-row *ngIf="current_allowUrgent && allowUrgent == 1">
+              <nz-form-label [nzSpan]="24" nzRequired nzFor="urgentReason" class="goods">加急原因</nz-form-label>
               <nz-form-control>
-                <label
-                  nz-checkbox
-                  [(ngModel)]="isRemand"
-                  [ngModelOptions]="{ standalone: true }"
-                  >自动送回</label
-                >
+                <textarea rows="4" placeholder="请输入加急原因" nz-input [(ngModel)]="urgentReason" formControlName="urgentReason"></textarea>
               </nz-form-control>
             </nz-form-item>
-            <!-- 工单备注 -->
+            <!-- 注意事项 -->
             <ng-container *ngIf="isRemarks">
               <nz-form-item>
                 <div class="display_flex align-items_center">
-                  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="workOrderRemark2" class="mt8 mb8">工单备注</nz-form-label>
-                  <div *ngIf="customRemarks2.length" style="word-break: break-all;">
-                    <span class="addRemarks" *ngFor="let item of customRemarks2" (click)="addRemarks2(item)">【{{ item }}】</span>
-                  </div>
+                  <nz-form-label nzFor="workOrderRemark2" class="mt8 mb8">注意事项</nz-form-label>
                 </div>
                 <nz-form-control>
-                  <textarea
-                  nz-input
-                  [placeholder]="workOrderRemarkTips2"
-                  [nzAutosize]="{ minRows: 3, maxRows: 5 }"
-                  maxlength="100"
-                  formControlName="workOrderRemark2"
-                  [(ngModel)]="workOrderRemark2"
-                  #remarksEle2
-                ></textarea>
+                  <div class="noteSign">
+                    <textarea class="noteFocus" (focus)="focusNote()" nz-input [placeholder]="workOrderRemarkTips2" [nzAutosize]="{ minRows: 3, maxRows: 5 }" maxlength="100" formControlName="workOrderRemark2" [(ngModel)]="workOrderRemark2" #remarksEle2></textarea>
+                    <div class="noteList" *ngIf="isShowNoteList">
+                      <ng-container *ngIf="!noteLoading && noteList.length">
+                        <div class="noteItem ellipsis-oneline" *ngFor="let item of noteList" [title]="item.name" (click)="selectNote(item.name)">{{item.name}}</div>
+                      </ng-container>
+                      <div *ngIf="!noteLoading && !noteList.length" class="w100 h100 padding8 display_flex justify-content_flex-center align-items_center">
+                        <nz-empty></nz-empty>
+                      </div>
+                      <div *ngIf="noteLoading" class="w100 h100 padding8 display_flex justify-content_flex-center align-items_center">
+                        <nz-spin nzSimple></nz-spin>
+                      </div>
+                    </div>
+                  </div>
                 </nz-form-control>
               </nz-form-item>
             </ng-container>
             <!-- 携带设备 -->
-            <nz-form-item *ngIf="!isRemarks && goodsLis.length">
-              <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="goods" class="goods"
-                >携带设备</nz-form-label
-              >
-              <nz-form-control>
-                <nz-checkbox-group
-                  formControlName="goods"
-                  [(ngModel)]="goodsLis"
-                >
-                </nz-checkbox-group>
-              </nz-form-control>
-            </nz-form-item>
-            <!-- 是否加急 -->
-            <nz-form-item *ngIf="current_allowUrgent">
-              <nz-form-label
-                [nzSm]="6"
-                [nzXs]="24"
-                nzFor="allowUrgent"
-                class="goods"
-                >是否加急</nz-form-label
-              >
-              <nz-form-control>
-                <nz-radio-group
-                  [(ngModel)]="allowUrgent"
-                  (ngModelChange)="allowUrgentChange($event)"
-                  formControlName="allowUrgent"
-                >
-                  <label nz-radio nzValue="1">是</label>
-                  <label nz-radio nzValue="0">否</label>
-                </nz-radio-group>
-              </nz-form-control>
-            </nz-form-item>
-            <!-- 加急原因 -->
-            <nz-form-item *ngIf="current_allowUrgent && allowUrgent == 1">
-              <nz-form-label
-                [nzSm]="6"
-                [nzXs]="24"
-                nzRequired
-                nzFor="urgentReason"
-                class="goods"
-                >加急原因</nz-form-label
-              >
-              <nz-form-control>
-                <textarea
-                  rows="4"
-                  placeholder="请输入加急原因"
-                  nz-input
-                  [(ngModel)]="urgentReason"
-                  formControlName="urgentReason"
-                ></textarea>
+            <nz-form-item nz-row *ngIf="goodsLis.length">
+              <nz-form-label [nzSpan]="3" nzFor="goods" class="goods">携带设备</nz-form-label>
+              <nz-form-control [nzSpan]="21">
+                <nz-checkbox-group formControlName="goods" [(ngModel)]="goodsLis"></nz-checkbox-group>
               </nz-form-control>
             </nz-form-item>
           </ng-container>
@@ -1849,54 +1628,16 @@
       </div>
     </overlay-scrollbars>
     <div class="btns display_flex justify-content_flex-center">
-      <button
-        nz-button
-        nzType="primary"
-        [nzLoading]="btnLoading1"
-        (click)="confirmPatient1('patient-yuyue')"
-        *ngIf="
-          currentTasktype.associationType.value === 'inspect' &&
-          isYyInspect &&
-          !(currentTasktype.isMoreDept === 0 && isInspects) && checkedShowMsg.status != 100009
-        "
-      >
+      <button nz-button nzType="primary" [nzLoading]="btnLoading1" (click)="confirmPatient1('patient-yuyue')" *ngIf="currentTasktype.associationType.value === 'inspect' && isYyInspect && !(currentTasktype.isMoreDept === 0 && isInspects) && checkedShowMsg.status != 100009">
         预约建单
       </button>
-      <button
-        nz-button
-        nzType="primary"
-        [nzLoading]="btnLoading1"
-        (click)="confirmPatient1('patient-zy-yuyue')"
-        *ngIf="
-          currentTasktype.associationType.value === 'patientTransport' &&
-          isYyInspect && checkedShowMsg.status != 100009
-        "
-      >
+      <button nz-button nzType="primary" [nzLoading]="btnLoading1" (click)="confirmPatient1('patient-zy-yuyue')" *ngIf="currentTasktype.associationType.value === 'patientTransport' && isYyInspect && checkedShowMsg.status != 100009">
         预约建单
       </button>
-      <button
-        nz-button
-        nzType="default"
-        [nzLoading]="btnLoading"
-        (click)="confirmPatient()"
-        class="orderThis"
-        *ngIf="
-          ((!isYyInspect &&
-            currentTasktype.associationType.value === 'inspect' &&
-            linkCheckLisTrue) ||
-            (!isYyInspect &&
-              currentTasktype.associationType.value === 'patientTransport')) &&
-          !(currentTasktype.isMoreDept === 0 && isInspects) && checkedShowMsg.status != 100009
-        "
-      >
+      <button nz-button nzType="primary" [nzLoading]="btnLoading" (click)="confirmPatient()" *ngIf="((!isYyInspect && currentTasktype.associationType.value === 'inspect' && linkCheckLisTrue) || (!isYyInspect && currentTasktype.associationType.value === 'patientTransport')) && !(currentTasktype.isMoreDept === 0 && isInspects) && checkedShowMsg.status != 100009">
         直接建单
       </button>
-      <button
-        class="btn cancel"
-        nz-button
-        nzType="default"
-        (click)="hidePatientOrder()"
-      >
+      <button class="btn cancel" nz-button nzType="default" (click)="hidePatientOrder()">
         取消
       </button>
     </div>
@@ -2573,10 +2314,7 @@
   content="您确认要删除此条意见吗？"
 ></app-dialog-delete>
 <!-- 关注模态框 -->
-<div
-  class="commonModal display_flex justify-content_flex-center align-items_center"
-  *ngIf="commonModal"
->
+<div class="commonModal display_flex justify-content_flex-center align-items_center" *ngIf="commonModal">
   <div class="modalBody">
     <div class="title">
       提示<i
@@ -2609,11 +2347,11 @@
   </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" (click)="clickExtra($event)">
   <div class="modalBody">
     <div class="title">一键报修<i class="icon_transport transport-guanbi" (click)="hideBxModal()"></i>
     </div>
-    <overlay-scrollbars #osComponentRef5 class="content">
+    <div class="content">
       <form nz-form [formGroup]="validateBxForm" class="bxFormAdd" (ngSubmit)="confirmBx()">
         <nz-form-item>
           <nz-form-label [nzSm]="4" [nzXs]="4" nzRequired nzFor="description">故障描述</nz-form-label>
@@ -2656,14 +2394,25 @@
             </nz-select>
           </nz-form-control>
           <nz-form-label [nzSm]="4" [nzXs]="4" nzRequired nzFor="officeAddress" hidden></nz-form-label>
-          <nz-form-control style="display: inline-block;">
+          <nz-form-control style="display: inline-block;" class="address">
             <nz-input-group>
-              <input style="width:185px;" nz-input formControlName="officeAddress" placeholder="请输入详细位置" />
+              <input class="addressFocus" style="width:185px;" nz-input formControlName="officeAddress" placeholder="请输入详细位置" (focus)="focusAddress()" />
+              <div class="addressList" *ngIf="isShowAddressList">
+                <ng-container *ngIf="!addressLoading && addressList.length">
+                  <div class="addressItem ellipsis-oneline" *ngFor="let item of addressList" [title]="item.name" (click)="selectAddress(item.name)">{{item.name}}</div>
+                </ng-container>
+                <div *ngIf="!addressLoading && !addressList.length" class="w100 h100 padding8 display_flex justify-content_flex-center align-items_center">
+                  <nz-empty></nz-empty>
+                </div>
+                <div *ngIf="addressLoading" class="w100 h100 padding8 display_flex justify-content_flex-center align-items_center">
+                  <nz-spin nzSimple></nz-spin>
+                </div>
+              </div>
             </nz-input-group>
           </nz-form-control>
         </nz-form-item>
       </form>
-    </overlay-scrollbars>
+    </div>
     <div class="display_flex justify-content_flex-center">
       <button nz-button nzType="primary" (click)="confirmBx()">
         确认

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

@@ -106,7 +106,7 @@
     bottom: 0;
     left: 0;
     right: 0;
-    height: 100%;
+    height: calc(100% - 48px);
   }
 
 	.isKeyClass{
@@ -1357,13 +1357,16 @@
                   flex: 1;
                   display: flex;
                   align-items: center;
-                  gap: 24px;
                   padding: 0 16px;
                   overflow: auto hidden;
                   .navItem{
                     display: flex;
                     align-items: center;
                     cursor: pointer;
+                    margin-right: 24px;
+                    &:last-of-type{
+                      margin-right: 0;
+                    }
                     .navContent{
                       display: flex;
                       flex-direction: column;
@@ -1406,7 +1409,12 @@
                     .navSpecimen{
                       font-size: 12px;
                       display: flex;
-                      gap: 8px;
+                      span{
+                        margin-right: 8px;
+                        &:last-of-type{
+                          margin-right: 0;
+                        }
+                      }
                     }
                   }
                 }
@@ -1606,7 +1614,7 @@
 
           .table {
             width: 100%;
-            height: 100%;
+            height: calc(100% - 56px);
             padding: 0 8px 8px;
 
             &.turn {
@@ -1750,7 +1758,7 @@
 
           .orderList {
             width: 100%;
-            height: calc(100% - 106px);
+            height: calc(100% - 114px);
 
             .box {
               position: relative;
@@ -2185,6 +2193,7 @@
     .btns {
       button {
         margin-top: 10px;
+        font-size: 18px;
 
         &.btn {
           margin-left: 8px;
@@ -2217,6 +2226,28 @@
 
   ::ng-deep .ant-form-item.last{
     margin-bottom: 0!important;
+    .address{
+      position: relative;
+      .addressList{
+        position: absolute;
+        top: 100%;
+        left: 0;
+        width: 100%;
+        max-height: 256px;
+        z-index: 2;
+        background: #fff;
+        border: 1px solid #d9d9d9;
+        border-radius: 4px;
+        overflow: hidden auto;
+        .addressItem{
+          padding: 5px 12px;
+          cursor: pointer;
+          &:hover{
+            background-color: #e9f7e9;
+          }
+        }
+      }
+    }
   }
 
   ::ng-deep .ant-form-item-label{
@@ -2252,7 +2283,7 @@
       background: #f9fafb;
       border: 1px solid @hs_border_color;
       border-radius: 5px;
-      overflow: hidden;
+      // overflow: hidden;
       margin-top: 12px;
 
       & > div {
@@ -2539,3 +2570,129 @@
 .tabPermissionItem{
   padding: 0 16px;
 }
+
+.patient ::ng-deep .ant-form label{
+  font-size: 18px;
+  margin-top: 8px;
+  &.col6{
+    width: 16.666%;
+  }
+  &.mt13{
+    margin-top: 13px;
+  }
+}
+.patient ::ng-deep .ant-radio-wrapper{
+  margin-right: 0;
+  padding-right: 8px;
+}
+
+.patient ::ng-deep .ant-form-item-control{
+  line-height: normal;
+}
+.patient ::ng-deep .ant-radio-inner{
+  top: -3px;
+}
+.patient ::ng-deep .ant-form-item-label{
+  line-height: 32px!important;
+  flex-shrink: 0;
+}
+.patient .top16bottom0{
+  margin-top: 16px!important;
+  margin-bottom: 0!important;
+}
+.patient{
+  .modalBody{
+    width: 950px;
+    border-radius: 16px;
+    padding: 16px 24px;
+    .title{
+      font-size: 22px;
+      font-weight: bold;
+      i{
+        font-size: 24px;
+        padding: 0;
+      }
+    }
+    .content{
+      margin-top: 16px;
+      border-radius: 8px;
+      padding: 0;
+      .patientMsg{
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 16px;
+        border-bottom: 2px solid #D1D1D1;
+        .patientMsgTips{
+          font-size: 18px;
+          color: #000000;
+        }
+      }
+      .patientForm{
+        padding: 16px 24px;
+        .noInspect{
+          font-size: 18px;
+        }
+        .addRemarks{
+          font-size: 18px;
+        }
+        .goods{
+          margin-top: 5px;
+        }
+        .isRemand{
+          margin-right: 98px;
+        }
+        .allowUrgent{
+          flex: 1;
+        }
+        .readonly{
+          line-height: 32px;
+          font-size: 18px;
+        }
+        .radioGroup{
+          line-height: normal;
+        }
+        .pos-item{
+          left: 125px;
+          &.pos-tip{
+            left: 100px;
+            width: calc(100% - 100px);
+            .pos-red{
+              margin-top: 13px;
+              display: inline-block;
+              width: 100%;
+            }
+          }
+          .pos-red{
+            font-size: 18px;
+            margin-top: 8px;
+            display: inline-block;
+          }
+        }
+      }
+    }
+  }
+}
+.noteSign{
+  position: relative;
+  .noteList{
+    position: absolute;
+    bottom: 100%;
+    left: 0;
+    width: 100%;
+    max-height: 256px;
+    z-index: 99;
+    background: #fff;
+    border: 1px solid #d9d9d9;
+    border-radius: 4px;
+    overflow: hidden auto;
+    .noteItem{
+      padding: 5px 12px;
+      cursor: pointer;
+      line-height: normal;
+      &:hover{
+        background-color: #e9f7e9;
+      }
+    }
+  }
+}

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

@@ -75,11 +75,11 @@ export class HushijiandanComponent implements OnInit {
     static: false,
   })
   osComponentRef4: OverlayScrollbarsComponent;
-  @ViewChild("osComponentRef5", {
-    read: OverlayScrollbarsComponent,
-    static: false,
-  })
-  osComponentRef5: OverlayScrollbarsComponent;
+  // @ViewChild("osComponentRef5", {
+  //   read: OverlayScrollbarsComponent,
+  //   static: false,
+  // })
+  // osComponentRef5: OverlayScrollbarsComponent;
   @ViewChild("osComponentRef6", {
     read: OverlayScrollbarsComponent,
     static: false,
@@ -2392,7 +2392,7 @@ export class HushijiandanComponent implements OnInit {
           }
         }
         that.patientForm.controls.checkedType.setValue(id);
-        this.changeCheckedType();
+        this.changeCheckedType(true);
       });
   }
   yyTimeChange(e) {
@@ -2928,8 +2928,7 @@ export class HushijiandanComponent implements OnInit {
   currentTasktype; //当前选中的任务类型对象
   cLoading = false;
   historyCustomRemarks2 = [];
-  changeCheckedType() {
-    this.workOrderRemark2 = "";
+  changeCheckedType(isInit = false) {
     this.customRemarks2 = [];
     this.historyCustomRemarks2 = [];
     this.isYyInspect = false;
@@ -2939,6 +2938,14 @@ export class HushijiandanComponent implements OnInit {
     this.currentTasktype = this.checkTypeLis.find(
       (item) => item.id == this.patientForm.controls.checkedType.value
     );
+    // 是否回显注意事项
+    if(isInit){
+      if(this.currentTasktype.remarksSwitch === 1){
+        this.workOrderRemark2 = this.patientMsg.remark || "";
+      }else{
+        this.workOrderRemark2 = '';
+      }
+    }
     // 获取患者其他服务，护士端是否预约建单
     let appointmentZyBuildFlag = this.checkTypeLis.filter(
       (item) =>
@@ -4980,4 +4987,73 @@ export class HushijiandanComponent implements OnInit {
       this.confirmShortcut1(shortcutForm);
     }
   }
+
+  // 详细地址获取焦点
+  isShowAddressList:boolean = false;
+  focusAddress(){
+    this.isShowAddressList = true;
+    this.getAddressList();
+  }
+
+  // 点击其他位置
+  clickExtra(e){
+    if(document.documentElement.contains(document.querySelector('.addressList')) && e.target !== document.querySelector('.addressFocus')){
+      this.isShowAddressList = false;
+    }
+    if(document.documentElement.contains(document.querySelector('.noteList')) && e.target !== document.querySelector('.noteFocus')){
+      this.isShowNoteList = false;
+    }
+  }
+
+  // 选择地址
+  selectAddress(name){
+    this.validateBxForm.controls.officeAddress.setValue(name)
+    this.isShowAddressList = false;
+  }
+
+  // 获取科室地点列表
+  addressList:any[] = [];
+  addressLoading:boolean = false;
+  getAddressList() {
+    let postData = {
+      idx: 0,
+      sum: 99999,
+      qrCode: {
+        deptId: this.loginUserDeptId,
+      }
+    };
+    this.addressLoading = true;
+    this.mainService.getFetchDataList("simple/data", "qrCode", postData).subscribe(result=>{
+      this.addressLoading = false;
+      if(result.status == 200){
+        this.addressList = result.list || [];
+      }else{
+        this.addressList = [];
+      }
+    });
+  }
+
+  // 注意事项获取焦点
+  isShowNoteList:boolean = false;
+  focusNote(){
+    this.isShowNoteList = true;
+    this.getNoteList();
+  }
+
+  // 选择注意事项
+  selectNote(name){
+    this.workOrderRemark2 = name;
+    this.isShowNoteList = false;
+  }
+
+  // 获取注意事项列表
+  noteList:any[] = [];
+  noteLoading:boolean = false;
+  getNoteList() {
+    this.noteLoading = true;
+    this.mainService.getDictionary('list', 'inspect_notes',).subscribe(result=>{
+      this.noteLoading = false;
+      this.noteList = result || [];
+    });
+  }
 }

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

@@ -96,7 +96,12 @@
             </td>
             <td class="text_align_left">
               {{ data.hosName || '无' }}<br>
-              {{ data.department?.dept || '无' }}<br>
+              <ng-container *ngIf="data.repairIncidentType.value === 'public'">
+                {{ data.repairIncidentType.name }}<br>
+              </ng-container>
+              <ng-container *ngIf="data.repairIncidentType.value === 'dept'">
+                {{ data.department?.dept || '无' }}<br>
+              </ng-container>
               {{ data.place ? data.place.building.buildingName : '' }}{{ data.place ? data.place.floorName + '层' : '' }}{{ data.houseNumber }}
             </td>
             <td class="text_align_left">

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

@@ -17,6 +17,11 @@
   <ng-container *ngIf="activeTagLink === 'pageConfigDrug'">
     <app-configuration-drug></app-configuration-drug>
   </ng-container>
+
+  <!-- 陪检 -->
+  <ng-container *ngIf="activeTagLink === 'pageConfigInspect'">
+    <app-configuration-inspect></app-configuration-inspect>
+  </ng-container>
 </div>
 
 

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

@@ -6,6 +6,7 @@ import { PageConfigComponent } from './page-config.component';
 import { ShareModule } from 'src/app/share/share.module';
 import { ConfigurationSpecimenComponent } from 'src/app/components/configurationCenter/configuration-specimen/configuration-specimen.component';
 import { ConfigurationDrugComponent } from 'src/app/components/configurationCenter/configuration-drug/configuration-drug.component';
+import { ConfigurationInspectModule } from 'src/app/components/configurationCenter/configuration-inspect/configuration-inspect.module';
 
 
 @NgModule({
@@ -18,6 +19,7 @@ import { ConfigurationDrugComponent } from 'src/app/components/configurationCent
     CommonModule,
     PageConfigRoutingModule,
     ShareModule,
+    ConfigurationInspectModule,
   ]
 })
 export class PageConfigModule { }

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

@@ -2,9 +2,27 @@
   <div class="list-template__content">
     <div class="list-template__top" nz-row>
       <div nz-col nzXl='18' class="list-template__searchBox">
+        <div class="list-template__searchItem">
+          <span class="label">关联科室</span>：
+          <nz-select class="formItem" (nzOnSearch)="changeInp($event)" (nzOpenChange)="openOtherTasktype($event)"
+            [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear nzPlaceHolder="请选择关联科室"
+            [(ngModel)]="searchDto.deptId">
+            <ng-container *ngFor="let option of deptList">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [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="list-template__searchItem">
+          <span class="label">地点名称：</span>
+          <input nz-input class="formItem" [(ngModel)]="searchDto.name" placeholder="请输入地点名称" nzSize="default" />
+        </div>
       </div>
       <div nz-col nzXl='6' class="list-template__btns">
         <button nz-button class="btn default" (click)='search()'>搜索</button>
+        <button class="btn default ml8" (click)='reset()'>重置</button>
         <button nz-button *ngIf="coopBtns.add" class="btn ml8 default" (click)="showModal()">新增</button>
       </div>
     </div>
@@ -13,17 +31,21 @@
         [nzLoading]="loading1">
         <thead>
           <tr class="thead">
-            <th nzWidth="10%">映射名称</th>
-            <th nzWidth="10%">关联科室</th>
-            <th nzWidth="5%">二维码CODE</th>
-            <th nzWidth="20%">操作</th>
+            <th nzWidth="5%">序号</th>
+            <th nzWidth="19%">地点名称</th>
+            <th nzWidth="19%">关联科室</th>
+            <th nzWidth="19%">地点编码</th>
+            <th nzWidth="19%">地点电话</th>
+            <th nzWidth="19%">操作</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let index=index;">
-            <td>{{ data.name || '' }}</td>
-            <td>{{ data.deptDTO ? data.deptDTO.dept : '' }}</td>
-            <td>{{ data.code || '' }}</td>
+            <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
+            <td>{{ data.name }}</td>
+            <td>{{ data.deptDTO?.dept }}</td>
+            <td>{{ data.placeCode}}</td>
+            <td>{{ data.phones}}</td>
             <td>
               <div class="coop">
                 <span *ngIf="coopBtns.edit" (click)="edit(data)">编辑</span>
@@ -49,10 +71,10 @@
     <overlay-scrollbars #osComponentRef1 class="content">
       <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
         <nz-form-item>
-          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="name">映射名称</nz-form-label>
-          <nz-form-control nzErrorTip="请填写映射名称!">
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="name">地点名称</nz-form-label>
+          <nz-form-control nzErrorTip="请填写地点名称!">
             <nz-input-group>
-              <input type="text" nz-input formControlName="name" placeholder="请填写映射名称" />
+              <input type="text" nz-input formControlName="name" placeholder="请填写地点名称" />
             </nz-input-group>
           </nz-form-control>
         </nz-form-item>
@@ -70,6 +92,32 @@
             </nz-select>
           </nz-form-control>
         </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="placeCode">地点编码</nz-form-label>
+          <nz-form-control nzErrorTip="请填写地点编码!">
+            <nz-input-group>
+              <input type="text" nz-input formControlName="placeCode" placeholder="请填写地点编码" />
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="phones">地点电话</nz-form-label>
+          <nz-form-control nzErrorTip="请填写地点电话!">
+            <nz-input-group>
+              <input (ngModelChange)="deptsPhoneChange()" nz-input formControlName="phones" placeholder="请填写地点电话" />
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-input-group *ngFor="let phone of deptPhones;let index = index" class="dynamic">
+          <input nz-input [ngModel]="phone.phone" [ngModelOptions]="{standalone: true}" placeholder="请填写科室电话"
+            (ngModelChange)="deptsPhoneChange($event,phone)" />
+          <i nz-icon nzType="minus-circle-o" (click)="removeDeptPhone(index, $event)"></i>
+        </nz-input-group>
+        <button nz-button nzType="dashed" [disabled]="isAddDeptsPhone" class="add-button"
+          (click)="addDeptPhone($event)">
+          <i nz-icon nzType="plus"></i>
+          添加科室号码
+        </button>
       </form>
     </overlay-scrollbars>
     <div class="display_flex justify-content_flex-center">

src/app/views/qrcode-configuration/qrcode-configuration.component.less

@@ -1,4 +1,22 @@
 @import "../../../../src/theme.less";
+:host{
+  .add-button {
+    margin: 0 auto 16px !important;
+  }
+  .dynamic {
+    margin-bottom: 16px;
+    display: flex;
+    align-items: center;
+    input {
+      width: 90%;
+    }
+    i {
+      margin-left: 8px;
+      cursor: pointer;
+      font-size: 18px;
+    }
+  }
+}
 .save {
   position: fixed;
   left: 0;

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

@@ -61,11 +61,47 @@ export class QRCodeConfigurationComponent implements OnInit {
     this.getList(true);
   }
 
+  // 新添加地点号码
+  deptPhones: any = []; //新添加的地点电话列表
+  deptsPhoneId = 1; //地点电话自增id
+  isAddDeptsPhone = true; //添加新的地点电话是否禁用
+  addDeptPhone(e: MouseEvent) {
+    e.preventDefault();
+    this.deptPhones.push({ id: ++this.deptsPhoneId, phone: "" });
+    this.deptsPhoneChange();
+  }
+  // 删除新添加地点号码
+  removeDeptPhone(index: number, e: MouseEvent) {
+    e.preventDefault();
+    this.deptPhones.splice(index, 1);
+    this.deptsPhoneChange();
+  }
+  //监听科室电话输入事件
+  deptsPhoneChange(e?, phone?) {
+    if (e !== undefined && phone !== undefined) {
+      phone.phone = e;
+    }
+    // -------------判断添加按钮是否禁用 start
+    this.isAddDeptsPhone = !this.validateForm.value.phones;
+    if (!this.isAddDeptsPhone) {
+      //如果没禁用
+      this.isAddDeptsPhone = this.deptPhones.some((item) => item.phone === "");
+    }
+    // -------------判断添加按钮是否禁用 end
+  }
+
   // 搜索
   search() {
     this.getList(true);
   }
+  // 重置
+  reset() {
+    this.searchDto = {};
+    this.getList(true);
+  }
   // 表格数据
+  alldepart1: any = []; //所有所属科室(搜索)
+  searchDto:any =  {};
   loading1 = false;
   getList(isResetPageIndex = false) {
     isResetPageIndex && (this.pageIndex = 1);
@@ -73,6 +109,7 @@ export class QRCodeConfigurationComponent implements OnInit {
       pageIndex: this.pageIndex,
       pageSize: this.pageSize,
       hosId: this.hosId,
+      searchDto: this.searchDto,
     };
     this.loading1 = true;
     this.qrCodeConfigurationService
@@ -85,7 +122,7 @@ export class QRCodeConfigurationComponent implements OnInit {
       });
   }
 
-  // 获取任务类型列表-其他临床服务
+  // 获取科室列表
   getOtherTasktype(keywords = '') {
     let hosId = this.tool.getCurrentHospital().id;
     this.isLoading = true;
@@ -103,6 +140,8 @@ export class QRCodeConfigurationComponent implements OnInit {
     this.add = true;
     this.modal = true;
     this.initForm();
+    this.isAddDeptsPhone = true;
+    this.deptPhones = [];
   }
   hideModal() {
     this.modal = false;
@@ -117,6 +156,8 @@ export class QRCodeConfigurationComponent implements OnInit {
     this.validateForm = this.fb.group({
       name: ['', [Validators.required]],
       deptId: [null, [Validators.required]],
+      placeCode: ['', [Validators.required]],
+      phones: [null],
     });
   }
   // 表单提交
@@ -127,11 +168,14 @@ export class QRCodeConfigurationComponent implements OnInit {
     }
     if (this.validateForm.invalid) return;
     this.btnLoading = true;
+    let deptsPhone = this.deptPhones.map((item) => item.phone).join();
     if(this.add){
       this.qrCodeConfigurationService
       .add({
         name: this.validateForm.value.name,
         deptId: this.validateForm.value.deptId,
+        placeCode: this.validateForm.value.placeCode,
+        phones: deptsPhone ? this.validateForm.value.phones + "," + deptsPhone : this.validateForm.value.phones,
         hosId: this.hosId,
       })
       .subscribe((data) => {
@@ -149,6 +193,8 @@ export class QRCodeConfigurationComponent implements OnInit {
       .update({
         name: this.validateForm.value.name,
         deptId: this.validateForm.value.deptId,
+        placeCode: this.validateForm.value.placeCode,
+        phones: deptsPhone ? this.validateForm.value.phones + "," + deptsPhone : this.validateForm.value.phones,
         coopData: this.coopData,
       })
       .subscribe((data) => {
@@ -168,8 +214,27 @@ export class QRCodeConfigurationComponent implements OnInit {
   maskFlag: any = false;
   coopData = {};
   edit(data) {
+    this.isAddDeptsPhone = false;
+    this.deptPhones = [];
+    let phones = data.phones ? data.phones.split(",") : [];
+    if (phones.length === 0) {
+      this.validateForm.controls.phones.setValue("");
+      this.deptPhones = [];
+    } else if (phones.length === 1) {
+      this.validateForm.controls.phones.setValue(phones[0]);
+      this.deptPhones = [];
+    } else {
+      this.validateForm.controls.phones.setValue(phones[0]);
+      this.deptPhones = phones.slice(1).map((item) => {
+        return {
+          id: ++this.deptsPhoneId,
+          phone: item,
+        };
+      });
+    }
     this.validateForm.controls.name.setValue(data.name);
     this.validateForm.controls.deptId.setValue(data.deptId);
+    this.validateForm.controls.placeCode.setValue(data.placeCode);
     this.modal = true;
     this.add = false;
     this.coopId = data.id;

src/app/views/qrcode-configuration/qrcode-configuration.service.ts

@@ -11,12 +11,13 @@ export class QRCodeConfigurationService {
   ) { }
 
   // 列表-查
-  query({pageIndex, pageSize, hosId}) {
+  query({pageIndex, pageSize, searchDto, hosId}) {
     let data = {
       idx: pageIndex - 1,
       sum: pageSize,
       qrCode: {
         hosId,
+        ...searchDto,
       },
     };
     return this.mainService.getFetchDataList("simple/data", "qrCode", data);
@@ -28,23 +29,34 @@ export class QRCodeConfigurationService {
   }
 
   // 列表-增
-  add({name, deptId, hosId}) {
+  add({name, deptId, placeCode, phones, hosId}) {
     let data = {
-      name,
-      deptId,
-      hosId,
+      qrCode: {
+        name,
+        deptId,
+        placeCode,
+        phones,
+        hosId,
+      }
     };
 
-    return this.mainService.simplePost("addData", "qrCode", data);
+    return this.mainService.coopData("addData", "qrCode", data);
   }
 
   // 列表-改
-  update({name, deptId, coopData}) {
-    let data = {
+  update({name, deptId, placeCode, phones, coopData}) {
+    let data:any = {
       name,
       deptId,
+      placeCode,
+      phones,
+    };
+    data = {
+      qrCode: {
+        ...coopData,
+        ...data,
+      }
     };
-    data = {...coopData, ...data};
     return this.mainService.simplePost("addData", "qrCode", data);
   }
 
@@ -54,6 +66,7 @@ export class QRCodeConfigurationService {
       department: {
         cascadeHosId: hosId,
         dept: keywords,
+        searchType: 1,// 简单查询
       },
       idx: 0,
       sum: 9999,

src/app/views/task-type-management/task-type-management.component.html

@@ -143,17 +143,17 @@
           </nz-radio-group>
         </div>
         <div class="mb8 w100">
-          <nz-form-label class="label" nzRequired>是否需要备注信息</nz-form-label>
+          <nz-form-label class="label" nzRequired>{{(association.value == 'inspect' || association.value == 'patientTransport') ? '是否需要注意事项' : '是否需要备注信息'}}</nz-form-label>
           <nz-radio-group class="handlerType" [(ngModel)]="isRemarks" (ngModelChange)="isRemarksChange()">
             <label nz-radio nzValue='1'>是</label>
             <label nz-radio nzValue='0'>否</label>
           </nz-radio-group>
         </div>
         <div class="mb8 display_flex align-items_center" *ngIf="isRemarks == 1">
-          <nz-form-label class="label">备注信息提示用语</nz-form-label>
+          <nz-form-label class="label">{{(association.value == 'inspect' || association.value == 'patientTransport') ? '注意事项提示用语' : '备注信息提示用语'}}</nz-form-label>
           <input nz-input class="flex_1" [(ngModel)]="remarks" placeholder="请填写备注信息提示用语" nzSize="default" />
         </div>
-        <div class="mb8 w100" *ngIf="isRemarks == 1">
+        <div class="mb8 w100" *ngIf="!(association.value == 'inspect' || association.value == 'patientTransport') && isRemarks == 1">
           <nz-form-label class="label">备注快捷输入</nz-form-label>
           <button nz-button nzType="dashed" (click)="addQuickRemarks()" *ngIf="!quickRemarks">
             <i nz-icon nzType="plus"></i>
@@ -279,7 +279,7 @@
         </div> -->
         <div nz-row *ngIf="association.value == 'inspect' || association.value == 'patientTransport'">
           <nz-form-label class="label">携带设备</nz-form-label>
-          <nz-checkbox-group class="handlerType" [nzDisabled]="isRemarks == 1" [(ngModel)]="carryEquipmentIds"></nz-checkbox-group>
+          <nz-checkbox-group class="handlerType" [(ngModel)]="carryEquipmentIds"></nz-checkbox-group>
         </div>
         <div nz-row class="mb8 display_flex align-items_center">
           <nz-form-label class="label">急单权重</nz-form-label>

src/common.less

@@ -1,6 +1,9 @@
 .ant-table-tbody tr:nth-of-type(2n){
   background-color: #e9f7e9!important;
 }
+.padding8{
+  padding: 8px!important
+}
 .w320px {
   width: 320px;
 }
@@ -34,6 +37,9 @@
 .w100 {
   width: 100% !important;
 }
+.h100 {
+  height: 100% !important;
+}
 .w135 {
   width: 135px !important;
 }