bugfix

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-12-05 14:36:02
+ * @LastEditTime: 2024-12-09 11:11:15
  * @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">
@@ -102,15 +102,15 @@
                     </nz-select>
                   </div>
                   <div class="col flex7">
-                    <input nz-input placeholder="请填写详细地址" [(ngModel)]="incidentModel.houseNumber" (focus)="focusAddress()" (blur)="blurAddress()" />
+                    <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 display_flex justify-content_flex-center align-items_center">
+                      <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 display_flex justify-content_flex-center align-items_center">
+                      <div *ngIf="addressLoading" class="w100 h100 padding8 display_flex justify-content_flex-center align-items_center">
                         <nz-spin nzSimple></nz-spin>
                       </div>
                     </div>

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

@@ -1502,16 +1502,17 @@ export class IncidentCreateComponent implements OnInit {
     this.getAddressList();
   }
 
-  // 详细地址失去焦点
-  blurAddress(){
-    setTimeout(() => {
+  // 点击其他位置
+  clickExtra(e){
+    if(document.documentElement.contains(document.querySelector('.addressList')) && e.target !== document.querySelector('.addressFocus')){
       this.isShowAddressList = false;
-    }, 100)
+    }
   }
 
   // 选择地址
   selectAddress(name){
     this.incidentModel.houseNumber = name;
+    this.isShowAddressList = false;
   }
 
   // 获取科室地点列表

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

@@ -941,7 +941,7 @@
   <button ngxPrint printSectionId="print-section" #printBtn hidden>打印</button>
 
   <!-- 新建工单 -->
-  <div class="newOrder display_flex justify-content_flex-center align-items_center" *ngIf="newOrderShow && newOrderShowOpen">
+  <div class="newOrder display_flex justify-content_flex-center align-items_center" *ngIf="newOrderShow && newOrderShowOpen" (click)="clickExtra($event)">
     <div class="modalBody">
       <div class="title" *ngIf="currentTabIndex !== '故障报修'">
         <div class="newTop">
@@ -1495,15 +1495,15 @@
                       </nz-select>
                     </div>
                     <div class="col flex7">
-                      <input nz-input placeholder="请填写详细地址" [(ngModel)]="incidentModel.houseNumber" (focus)="focusAddress()" (blur)="blurAddress()" />
+                      <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 display_flex justify-content_flex-center align-items_center">
+                        <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 display_flex justify-content_flex-center align-items_center">
+                        <div *ngIf="addressLoading" class="w100 h100 padding8 display_flex justify-content_flex-center align-items_center">
                           <nz-spin nzSimple></nz-spin>
                         </div>
                       </div>

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

@@ -1465,7 +1465,7 @@ export class FuwutaiComponent implements OnInit {
   // 呼叫中心---start
   searchBxDept(){
     let dataObj = {
-      hosId: this.tool.getCurrentUserDept().id,
+      hosId: this.tool.getCurrentHospital().id,
       phone: this.incidentModel.incomingPhone,
     };
     this.mainService
@@ -3145,7 +3145,9 @@ export class FuwutaiComponent implements OnInit {
   // 选择报修类型
   changeRepairIncidentType(value){
     this.incidentModel.department = undefined;
-    this.isRelatedDepartment = false;
+    this.incidentMsg.deptManyPhone = '';
+
+    this.isRelatedDepartment = value !== 'public';
     this.changeApplyRelatedDepartment(this.isRelatedDepartment);
   }
   // 楼栋列表
@@ -4973,7 +4975,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);
-    incidentModel.repairIncidentType && (incidentModel.repairIncidentType = incidentModel.repairIncidentType.value);
+    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);
@@ -5004,7 +5009,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);
-    incidentModel.repairIncidentType && (incidentModel.repairIncidentType = incidentModel.repairIncidentType.value);
+    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);
@@ -5103,7 +5111,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);
-    incidentModel.repairIncidentType && (incidentModel.repairIncidentType = incidentModel.repairIncidentType.value);
+    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);
@@ -5273,7 +5284,7 @@ export class FuwutaiComponent implements OnInit {
     if(e.data){
       // 留言创建工单
       let postData = {
-        hosId: this.tool.getCurrentUserDept().id,
+        hosId: this.tool.getCurrentHospital().id,
         phone: e.data.ano,
       };
       this.maskFlag = this.msg.loading("正在加载中..", {
@@ -5306,6 +5317,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;
@@ -5339,16 +5352,17 @@ export class FuwutaiComponent implements OnInit {
     this.getAddressList();
   }
 
-  // 详细地址失去焦点
-  blurAddress(){
-    setTimeout(() => {
+  // 点击其他位置
+  clickExtra(e){
+    if(document.documentElement.contains(document.querySelector('.addressList')) && e.target !== document.querySelector('.addressFocus')){
       this.isShowAddressList = false;
-    }, 100)
+    }
   }
 
   // 选择地址
   selectAddress(name){
     this.incidentModel.houseNumber = name;
+    this.isShowAddressList = false;
   }
 
   // 获取科室地点列表

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

@@ -1475,7 +1475,7 @@
                   您选择的检查包含了多个科室，请您只包含一个科室。
                 </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)">
               <!-- 需要预约检查 -->
@@ -1523,8 +1523,8 @@
             </nz-form-item>
             <!-- 100015 （护士端一键建单展策略）起点科室和终点科室下拉展示 -->
             <nz-form-item nz-row *ngIf="checkedShowMsg.status == 100015 || checkedShowMsg.status == 100013">
-              <nz-form-label [nzSpan]="4" nzRequired nzFor="originOffice">起点科室</nz-form-label>
-              <nz-form-control [nzSpan]="20" nzErrorTip="请选择起点科室!">
+              <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>
@@ -1538,21 +1538,21 @@
             </nz-form-item>
             <!-- 其他情况 -->
             <nz-form-item nz-row *ngIf="checkedShowMsg.start && !(checkedShowMsg.status == 100014 || checkedShowMsg.status == 100015)">
-              <nz-form-label [nzSpan]="4" nzRequired nzFor="originOffice">起点科室</nz-form-label>
-              <nz-form-control [nzSpan]="20" nzErrorTip="请选择起点科室!">
+              <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 nz-row *ngIf="checkedShowMsg.end && !(checkedShowMsg.status == 100015 || checkedShowMsg.status == 100013)">
-              <nz-form-label [nzSpan]="4" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
-              <nz-form-control [nzSpan]="20" nzErrorTip="请选择目标科室!">
+              <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 nz-row *ngIf="checkedShowMsg.status == 100014 || checkedShowMsg.status == 100015">
-              <nz-form-label [nzSpan]="4" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
-              <nz-form-control [nzSpan]="20" nzErrorTip="请选择目标科室!">
+              <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>
@@ -1621,7 +1621,7 @@
       <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()">
@@ -2301,10 +2301,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
@@ -2337,7 +2334,7 @@
   </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>
@@ -2386,15 +2383,15 @@
           <nz-form-label [nzSm]="4" [nzXs]="4" nzRequired nzFor="officeAddress" hidden></nz-form-label>
           <nz-form-control style="display: inline-block;" class="address">
             <nz-input-group>
-              <input style="width:185px;" nz-input formControlName="officeAddress" placeholder="请输入详细位置" (focus)="focusAddress()" (blur)="blurAddress()" />
+              <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 display_flex justify-content_flex-center align-items_center">
+                <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 display_flex justify-content_flex-center align-items_center">
+                <div *ngIf="addressLoading" class="w100 h100 padding8 display_flex justify-content_flex-center align-items_center">
                   <nz-spin nzSimple></nz-spin>
                 </div>
               </div>

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

@@ -2193,6 +2193,7 @@
     .btns {
       button {
         margin-top: 10px;
+        font-size: 18px;
 
         &.btn {
           margin-left: 8px;
@@ -2625,6 +2626,9 @@
       }
       .patientForm{
         padding: 16px 24px;
+        .noInspect{
+          font-size: 18px;
+        }
         .addRemarks{
           font-size: 18px;
         }

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

@@ -4972,16 +4972,17 @@ export class HushijiandanComponent implements OnInit {
     this.getAddressList();
   }
 
-  // 详细地址失去焦点
-  blurAddress(){
-    setTimeout(() => {
+  // 点击其他位置
+  clickExtra(e){
+    if(document.documentElement.contains(document.querySelector('.addressList')) && e.target !== document.querySelector('.addressFocus')){
       this.isShowAddressList = false;
-    }, 100)
+    }
   }
 
   // 选择地址
   selectAddress(name){
     this.validateBxForm.controls.officeAddress.setValue(name)
+    this.isShowAddressList = false;
   }
 
   // 获取科室地点列表

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;
 }