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

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

@@ -82,7 +82,7 @@ export class ConfigurationManHourComponent implements OnInit {
         key: "incident_category_score"
       },
       idx: 0,
-      sum: 10,
+      sum: 99999,
     };
     this.mainService
       .getFetchDataList("simple/data", "dictionary", postData)

src/app/components/edit-work-order-remark/edit-work-order-remark.component.html

@@ -0,0 +1,55 @@
+<div class="save add display_flex align-items_center justify-content_flex-center">
+  <div class="modalBody">
+    <div class="title">修改备注<i class="icon_transport transport-guanbi" (click)="cancel()"></i>
+    </div>
+    <div class="contentBody">
+      <div class="body modalBody_box">
+        <div class="modalBody_left" *ngIf="!nLoading">
+          <overlay-scrollbars #osComponentRef2 class="modalBody_left_box">
+            <div class="modalBody_left_box">
+              <div style="flex:1 1 auto; display: flex; flex-direction: column; justify-content: center; align-items: center;">
+                <!-- 工单备注： -->
+                <div class="w100" *ngIf="buildMsg.remarksSwitch == 1">
+                  <div nz-row class="tabRow">
+                    <div nz-col [nzSpan]="6">
+                      <p>工单备注：</p>
+                    </div>
+                    <div nz-col [nzSpan]="14">
+                      <textarea nz-input [placeholder]="workOrderRemarkTips" [nzAutosize]="{minRows: 3, maxRows: 5}" maxlength="100" [(ngModel)]="workOrderRemark" #remarksEle></textarea>
+                    </div>
+                  </div>
+
+                  <div nz-row class="tabRow" *ngIf="customRemarks.length">
+                    <div nz-col [nzSpan]="6">
+                      <p>快捷输入：</p>
+                    </div>
+                    <div nz-col [nzSpan]="14">
+                      <span class="addRemarks" *ngFor="let item of customRemarks" (click)="addRemarks(item)">【{{ item }}】</span>
+                    </div>
+                  </div>
+
+                  <div nz-row class="tabRow" *ngIf="historyCustomRemarks.length">
+                    <div nz-col [nzSpan]="6">
+                      <p>历史输入：</p>
+                    </div>
+                    <div nz-col [nzSpan]="14">
+                      <span class="addRemarks" *ngFor="let item of historyCustomRemarks" (click)="addRemarks(item)">【{{item }}】</span>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </overlay-scrollbars>
+        </div>
+        <div class="modalBody_left nLoading" *ngIf="nLoading">
+          <img src="../../../assets/images/loading.gif" alt="" />
+          <div>加载中...</div>
+        </div>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center btns">
+      <button class="mr8" nzType="default" nz-button (click)="cancel()">取消</button>
+      <button nzType="primary" nz-button (click)="confirm()" [nzLoading]="loading5">确认</button>
+    </div>
+  </div>
+</div>

src/app/components/edit-work-order-remark/edit-work-order-remark.component.less

@@ -0,0 +1,157 @@
+@import "../../../../src/theme.less";
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 700px;
+    height: 400px;
+    background: #fff;
+    border-radius: 4px;
+    padding: 14px 24px 10px 24px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 16px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 16px;
+        color: #666;
+        cursor: pointer;
+      }
+    }
+
+    .contentBody {
+      width: 100%;
+      height: 296px;
+      margin-top: 14px;
+      background: #F9FAFB;
+      border-radius: 4px;
+      border: 1px solid rgba(0,0,0,0.25);
+      display: flex;
+      overflow: hidden;
+      .nav{
+        width: 182px;
+        height: 100%;
+        flex-shrink: 1;
+        border-right: 1px solid #CCCCCC;
+        .navItem{
+          height: 48px;
+          line-height: 48px;
+          font-size: 14px;
+          padding: 0 16px;
+          cursor: pointer;
+          &.active{
+            background: #F0F6ED;
+            color: @primary-color;
+          }
+        }
+      }
+      .body{
+        flex: 1;
+        height: 100%;
+        .addRemarks {
+          color: @primary-color;
+          cursor: pointer;
+        }
+
+        .modalBody_left_box {
+          height: 100%;
+          box-sizing: border-box;
+          padding: 8px;
+          display: flex;
+          flex-direction: column;
+          justify-content: space-between;
+        }
+      }
+    }
+  }
+  .btns{
+    margin-top: 10px;
+  }
+  .modalBody_box {
+    width: 100%;
+    min-width: 0;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+
+    .content {
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+
+      & > div {
+        width: 100%;
+      }
+
+      .shortcutForm {
+        width: 100%;
+
+        .ant-form-item-label {
+          text-align: right;
+        }
+      }
+    }
+
+    .btns {
+      padding-bottom: 16px;
+      padding-top: 16px;
+    }
+  }
+  .defeat{
+    text-align: center;
+    margin-bottom: 16px;
+  }
+  .tabRow{
+    margin-bottom: 24px;
+    word-break: break-all;
+    &:first-of-type{
+      margin-top: 24px;
+    }
+    p{
+      text-align: right;
+      margin-bottom: 0;
+    }
+  }
+}
+.modalBody_left {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+
+  &.nLoading,
+  &.noData {
+    justify-content: center;
+    align-items: center;
+
+    img {
+      width: 24px;
+    }
+
+    div {
+      display: inline-block;
+    }
+  }
+}
+:host .readonly{
+  ::ng-deep .ant-form-item-label,::ng-deep .ant-form-item-control{
+    line-height: normal!important;
+  }
+}

src/app/components/edit-work-order-remark/edit-work-order-remark.component.ts

@@ -0,0 +1,87 @@
+import { Component, OnInit, Output, Input, ViewChild, ElementRef } from '@angular/core';
+import { EventEmitter } from '@angular/core';
+import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
+import { FormGroup, FormBuilder, FormControl } from '@angular/forms';
+import { MainService } from 'src/app/services/main.service';
+import { ToolService } from 'src/app/services/tool.service';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+
+@Component({
+  selector: 'app-edit-work-order-remark',
+  templateUrl: './edit-work-order-remark.component.html',
+  styleUrls: ['./edit-work-order-remark.component.less']
+})
+export class EditWorkOrderRemarkComponent implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  @ViewChild("remarksEle", { static: false }) remarksEle: ElementRef;
+  @Output() cancelModal = new EventEmitter();
+  @Output() confirmModal = new EventEmitter();
+  @Input() buildQuickConfirmData: any = {};//数据
+  @Input() loading5: boolean = false;//loading
+  hosLoading: boolean = false;//确定按钮的loading
+  constructor(
+    private mainService: MainService,
+    private fb: FormBuilder,
+    public tool: ToolService,
+  ) { }
+
+  ngOnInit() {
+    console.log(this.buildQuickConfirmData);
+    this.workOrderRemark = this.buildQuickConfirmData.workOrderRemark || "";
+    this.newShortcutOrder(this.buildQuickConfirmData.taskType);
+  }
+
+  // 建单条件
+  workOrderRemark = ""; //备注
+  customRemarks = []; //备注快速输入
+  buildMsg: any = {}; //一键发起返回信息
+  historyCustomRemarks = []; //历史快捷输入
+  workOrderRemarkTips = ""; //备注提示
+  nLoading = false;
+  newShortcutOrder(taskType) {
+    console.log(taskType);
+    this.nLoading = true;
+    this.buildMsg = taskType;
+    if (taskType.remarksSwitch == 1) {
+      if (taskType.customRemarks === null || taskType.customRemarks === "") {
+        this.customRemarks = [];
+      } else {
+        this.customRemarks = taskType.customRemarks.split("$");
+      }
+      this.workOrderRemarkTips = taskType.remarksPrompts || "请填写工单备注,不超过100个字符";
+      let user = JSON.parse(localStorage.getItem("user"));
+      this.mainService.postCustom("nurse", "workOrder/recentRemarks", {
+          deptId: this.buildQuickConfirmData.createDept,
+          taskTypeId: taskType.id,
+        })
+        .subscribe((result) => {
+          this.nLoading = false;
+          if (result.state == 200) {
+            this.historyCustomRemarks = result.data;
+          }
+        });
+    } else {
+      this.nLoading = false;
+    }
+  }
+
+  // 添加备注
+  addRemarks(item) {
+    this.remarksEle.nativeElement.focus();
+    this.workOrderRemark += item;
+  }
+
+  // 取消
+  cancel() {
+    this.cancelModal.emit(false)
+  }
+  // 确认
+  confirm() {
+    this.confirmModal.emit({workOrderRemark: this.workOrderRemark})
+  }
+}

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

@@ -189,6 +189,7 @@
                 <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center">
                   <input type="button" *ngIf="data.data.gdState.value == 2" class="top_bot" value="派单" (click)="allotWorker(data.data.id, data.data.gdState.id)" />
                   <input type="button" *ngIf="!data.data.worker && data.data.gdState.value != 2" class="top_bot" value="派单" (click)="allotWorker(data.data.id, data.data.gdState.id, 1)" />
+                  <input type="button" *ngIf="(data.data.gdState.value == 2 || data.data.gdState.value == 3 || data.data.gdState.value == 4) && data.data.taskType.remarksSwitch == 1" class="top_bot" value="修改备注" (click)="buildQuick(data.data)" />
                   <input type="button" *ngIf="data.data.gdState.value == 2 || ((data.data.gdState.value == 3 || data.data.gdState.value == 4) && data.data.worker)" class="btm_bot" value="删除" (click)="openDelModal(data.data.id, 'hsms')" />
                 </div>
                 <div *ngIf="data.data.timeOut != true" class="slider sgreen" [ngStyle]="{ width: data.data.percent + '%' }"></div>
@@ -369,7 +370,8 @@
                 </div>
                 <div class="right_bots display_flex col-flex align-items_center justify-content_space-around">
                   <input type="button" *ngIf="data.data.gdState.value == 2" class="top_bot" value="派单" (click)="allotWorker(data.data.id, data.data.gdState.id)" />
-                  <input type="button" *ngIf="data.data.gdState.value == 3 || data.data.gdState.value == 4" class="mid_bot" value="撤回" (click)="openRecallModal(data.data.id)" />
+                  <input type="button" *ngIf="data.data.gdState.value == 3 || data.data.gdState.value == 4" class="top_bot" value="撤回" (click)="openRecallModal(data.data.id)" />
+                  <input type="button" *ngIf="(data.data.gdState.value == 2 || data.data.gdState.value == 3 || data.data.gdState.value == 4) && data.data.taskType.remarksSwitch == 1" class="top_bot" value="修改备注" (click)="buildQuick(data.data)" />
                   <input type="button" *ngIf="data.data.gdState.value == 2 || data.data.gdState.value == 3 || data.data.gdState.value == 4" class="btm_bot" value="删除" (click)="openDelModal(data.data.id, 'hsms')" />
                 </div>
                 <div *ngIf="data.data.timeOut != true" class="slider sgreen" [ngStyle]="{ width: data.data.percent + '%' }"></div>
@@ -1893,3 +1895,6 @@
 
 <!-- 通话列表 -->
 <app-incident-ser-call [itsmData]="itsmData" [hsmsData]="hsmsData" *ngIf="callShow" (closeModelHs)="closeCall($event)"></app-incident-ser-call>
+
+<!-- 修改备注弹窗 -->
+<app-edit-work-order-remark *ngIf="isShowBuildQuickConfirm" [buildQuickConfirmData]="buildQuickConfirmData" (cancelModal)="cancelBuildQuickConfirm($event)" (confirmModal)="confirmBuildQuickConfirm($event)" [loading5]="loadingQuick"></app-edit-work-order-remark>

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

@@ -2431,7 +2431,7 @@
                     display: flex;
                     flex-wrap: wrap;
                     .ant-radio-wrapper {
-                      width: 16.66%;
+                      width: 20%;
                       display: flex;
                       align-items: center;
                       margin-right: 0;

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

@@ -2732,6 +2732,10 @@ export class FuwutaiComponent implements OnInit {
       this.patientList = [patient];
       return;
     }
+    if(!id){
+      this.patientList = [];
+      return;
+    }
     let dataObj = { searchWords, deptId: id };
     this.isLoadingPatient = true;
     this.mainService.getPatientList(dataObj).subscribe((result) => {
@@ -5809,4 +5813,40 @@ export class FuwutaiComponent implements OnInit {
       }
     });
   }
+
+  // 修改备注
+  isShowBuildQuickConfirm:boolean = false;
+  buildQuickConfirmData:any = {};
+  buildQuick(data){
+    this.buildQuickConfirmData = data || {};
+    this.isShowBuildQuickConfirm = true;
+  }
+  cancelBuildQuickConfirm(e){
+    this.isShowBuildQuickConfirm = false;
+  }
+  loadingQuick:boolean = false;
+  confirmBuildQuickConfirm(options){
+    let { workOrderRemark} = options;
+    this.maskFlag = this.msg.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+
+    let postData:any = {
+      orderId: this.buildQuickConfirmData.id,
+      workOrderRemark,
+    };
+
+    this.mainService.coopWorkerOrder("editOrder", postData)
+      .subscribe((result) => {
+        this.msg.remove(this.maskFlag);
+        this.maskFlag = false;
+
+        if (result.state == 200) {
+          this.isShowBuildQuickConfirm = false;
+          this.showPromptModal("修改备注", true, "");
+        } else {
+          this.showPromptModal("修改备注", false, result.msg || '');
+        }
+      });
+  }
 }

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

@@ -3,6 +3,7 @@ import { CommonModule } from '@angular/common';
 
 import { FuwutaiRoutingModule } from './fuwutai-routing.module';
 import { FuwutaiComponent } from './fuwutai.component';
+import { EditWorkOrderRemarkComponent } from 'src/app/components/edit-work-order-remark/edit-work-order-remark.component'
 import { ShareModule } from 'src/app/share/share.module';
 
 import { NgxPrintModule } from 'ngx-print';
@@ -23,7 +24,8 @@ import { DisplayFormModule } from 'src/app/components/display-form/display-form.
 
 @NgModule({
   declarations: [
-    FuwutaiComponent
+    FuwutaiComponent,
+    EditWorkOrderRemarkComponent,
   ],
   imports: [
     CommonModule,

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

@@ -1562,7 +1562,7 @@ export class HushijiandanComponent implements OnInit {
           let postData: any = {
             incident: {
               repairIncidentType,
-              place: { id: this.deptDto.floor.id },
+              place: this.validateBxForm.value.floor ? { id: this.validateBxForm.value.floor } : undefined,
               department: { id: this.deptDto.id},
               description: this.validateBxForm.value.description,
               houseNumber: this.validateBxForm.value.officeAddress,

src/app/views/inspect-and-patient-transport-config/inspect-and-patient-transport-config.component.html

@@ -125,13 +125,33 @@
         <!-- 配置执行中扫科室批量签到 -->
         <div class="display_flex align-items_center mb8">
           <nz-form-label class="label">配置执行中扫科室批量签到</nz-form-label>
-          <nz-checkbox-group [(ngModel)]="batchSignExecutionDept"></nz-checkbox-group>
+          <nz-checkbox-group [(ngModel)]="batchSignExecutionDept" (ngModelChange)="changeBatchSignExecutionDept($event)"></nz-checkbox-group>
+        </div>
+        <!-- 支持父子集科室同签 -->
+        <div class="display_flex align-items_center mb8" *ngIf="batchSignExecutionDept[0].checked">
+          <nz-form-label class="label">支持父子集科室同签</nz-form-label>
+          <nz-checkbox-group [(ngModel)]="batchSignExecutionParent"></nz-checkbox-group>
         </div>
         <!-- 终点科室扫科室批量签到 -->
         <div class="display_flex align-items_center mb8">
           <nz-form-label class="label">终点科室扫科室批量签到</nz-form-label>
-          <nz-checkbox-group [(ngModel)]="batchSignEndDept"></nz-checkbox-group>
+          <nz-checkbox-group [(ngModel)]="batchSignEndDept" (ngModelChange)="changeBatchSignEndDept($event)"></nz-checkbox-group>
+        </div>
+        <!-- 支持父子集科室同签 -->
+        <div class="display_flex align-items_center mb8" *ngIf="batchSignEndDept[0].checked">
+          <nz-form-label class="label">支持父子集科室同签</nz-form-label>
+          <nz-checkbox-group [(ngModel)]="batchSignEndParent"></nz-checkbox-group>
+        </div>
+        <!-- 隐藏陪检小扫描 -->
+        <div class="display_flex align-items_center mb8">
+          <nz-form-label class="label">隐藏陪检小扫描</nz-form-label>
+          <nz-checkbox-group [(ngModel)]="hideInspectScan"></nz-checkbox-group>
         </div>
+        <!-- 检查预约不进行工单合并 -->
+        <!-- <div class="display_flex align-items_center mb8">
+          <nz-form-label class="label">检查预约不进行工单合并</nz-form-label>
+          <nz-checkbox-group [(ngModel)]="yyInspectMergeOrder"></nz-checkbox-group>
+        </div> -->
 
         <!-- 自动关单 -->
         <!-- <div class="display_flex align-items_center mb8">

src/app/views/inspect-and-patient-transport-config/inspect-and-patient-transport-config.component.ts

@@ -72,8 +72,38 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
   batchSignEndDept:any[] = [
     {label:'是否开启',value: 0}
   ];
+  // 执行中-支持父子集科室同签
+  batchSignExecutionParent:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+  // 终点-支持父子集科室同签
+  batchSignEndParent:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+  // 隐藏陪检小扫描
+  hideInspectScan:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+  // 检查预约不进行工单合并
+  // yyInspectMergeOrder:any[] = [
+  //   {label:'是否开启',value: 0}
+  // ];
 
+  changeBatchSignExecutionDept(e){
+    if(!e[0].checked){
+      this.batchSignExecutionParent = [
+        {label:'是否开启',value: 0}
+      ];
+    }
+  }
 
+  changeBatchSignEndDept(e){
+    if(!e[0].checked){
+      this.batchSignEndParent = [
+        {label:'是否开启',value: 0}
+      ];
+    }
+  }
 
   timeMod:any;
   // 交接方式
@@ -249,6 +279,10 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
       batchCreationAndReturn: this.batchCreationAndReturn[0].checked ? 1 : 0,
       batchSignExecutionDept: this.batchSignExecutionDept[0].checked ? 1 : 0,
       batchSignEndDept: this.batchSignEndDept[0].checked ? 1 : 0,
+      batchSignExecutionParent: this.batchSignExecutionParent[0].checked ? 1 : 0,
+      batchSignEndParent: this.batchSignEndParent[0].checked ? 1 : 0,
+      hideInspectScan: this.hideInspectScan[0].checked ? 1 : 0,
+      // yyInspectMergeOrder: this.yyInspectMergeOrder[0].checked ? 1 : 0,
       addService: this.addService[0].checked ? 1 : 0,
       addServiceTaskIds: this.addServiceTaskIds.length ? this.addServiceTaskIds.toString() : undefined,
 
@@ -373,6 +407,10 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
           this.batchCreationAndReturn[0].checked = this.configs.batchCreationAndReturn == 1;
           this.batchSignExecutionDept[0].checked = this.configs.batchSignExecutionDept == 1;
           this.batchSignEndDept[0].checked = this.configs.batchSignEndDept == 1;
+          this.batchSignExecutionParent[0].checked = this.configs.batchSignExecutionParent == 1;
+          this.batchSignEndParent[0].checked = this.configs.batchSignEndParent == 1;
+          this.hideInspectScan[0].checked = this.configs.hideInspectScan == 1;
+          // this.yyInspectMergeOrder[0].checked = this.configs.yyInspectMergeOrder == 1;
           this.addService[0].checked = this.configs.addService == 1;
           this.addServiceTaskIds = this.configs.addServiceTaskIds ? this.configs.addServiceTaskIds.split(',').map(v => +v) : [];