注意事项

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>
+                  <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: 100px;
+        display: flex;
+        justify-content: flex-end;
+        align-items: center;
+      }
+      .value{
+        flex: 3;
+        display: flex;
+        align-items: center;
+        .valueInput{
+          width: 600px;
+        }
+        .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/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.html

@@ -1130,7 +1130,20 @@
                           <nz-form-item>
                             <nz-form-label class="label" [nzSm]="3" [nzXs]="3" nzFor="workOrderRemarkZy">注意事项</nz-form-label>
                             <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请填写注意事项！">
-                              <textarea formControlName="workOrderRemarkZy" nz-input [placeholder]="deptZyList.taskType.remarksPrompts" [nzAutosize]="{ minRows: 3, maxRows: 5 }" maxlength="100" [(ngModel)]="workOrderRemarkZy"></textarea>
+                              <div class="noteSign">
+                                <textarea class="noteFocus" (focus)="focusNote()" formControlName="workOrderRemarkZy" nz-input [placeholder]="deptZyList.taskType.remarksPrompts" [nzAutosize]="{ minRows: 3, maxRows: 5 }" maxlength="100" [(ngModel)]="workOrderRemarkZy"></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>
                         </div>

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

@@ -2703,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

@@ -5377,6 +5377,9 @@ export class FuwutaiComponent implements OnInit {
     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;
+    }
   }
 
   // 选择地址
@@ -5420,4 +5423,28 @@ export class FuwutaiComponent implements OnInit {
       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/hushijiandan/hushijiandan.component.html

@@ -1463,8 +1463,8 @@
             <nz-form-item *ngIf="checkedShowMsg.status == 200">
               <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" 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>
@@ -1596,14 +1596,27 @@
                   <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 nz-row *ngIf="goodsLis.length">
-              <nz-form-label [nzSpan]="4" nzFor="goods" class="goods">携带设备</nz-form-label>
-              <nz-form-control [nzSpan]="20">
+              <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>

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

@@ -2673,3 +2673,26 @@
     }
   }
 }
+.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

@@ -2390,7 +2390,7 @@ export class HushijiandanComponent implements OnInit {
           }
         }
         that.patientForm.controls.checkedType.setValue(id);
-        this.changeCheckedType();
+        this.changeCheckedType(true);
       });
   }
   yyTimeChange(e) {
@@ -2926,7 +2926,7 @@ export class HushijiandanComponent implements OnInit {
   currentTasktype; //当前选中的任务类型对象
   cLoading = false;
   historyCustomRemarks2 = [];
-  changeCheckedType() {
+  changeCheckedType(isInit = false) {
     this.customRemarks2 = [];
     this.historyCustomRemarks2 = [];
     this.isYyInspect = false;
@@ -2937,10 +2937,12 @@ export class HushijiandanComponent implements OnInit {
       (item) => item.id == this.patientForm.controls.checkedType.value
     );
     // 是否回显注意事项
-    if(this.currentTasktype.remarksSwitch === 1){
-      this.workOrderRemark2 = this.patientMsg.remark || "";
-    }else{
-      this.workOrderRemark2 = '';
+    if(isInit){
+      if(this.currentTasktype.remarksSwitch === 1){
+        this.workOrderRemark2 = this.patientMsg.remark || "";
+      }else{
+        this.workOrderRemark2 = '';
+      }
     }
     // 获取患者其他服务，护士端是否预约建单
     let appointmentZyBuildFlag = this.checkTypeLis.filter(
@@ -4982,6 +4984,9 @@ export class HushijiandanComponent implements OnInit {
     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;
+    }
   }
 
   // 选择地址
@@ -5011,4 +5016,28 @@ export class HushijiandanComponent implements OnInit {
       }
     });
   }
+
+  // 注意事项获取焦点
+  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/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 { }