样式修改

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

@@ -2,7 +2,7 @@
  * @Author: seimin
  * @Date: 2024-10-24 13:47:40
  * @LastEditors: seimin
- * @LastEditTime: 2024-12-04 15:22:09
+ * @LastEditTime: 2024-12-05 14:36:02
  * @Description: 创建
 -->
 <!-- 新建工单 -->
@@ -117,7 +117,7 @@
                   </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>
@@ -131,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" />
@@ -146,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)">
@@ -160,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">
@@ -170,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 === '编辑事件'">
@@ -189,7 +189,7 @@
                   </div>
                 </div>
 
-                <div class="row gap8">
+                <div class="row">
                   <div class="col">
                     <span class="name">报修图片：</span>
                     <div class="value w100 upload">
@@ -212,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%;
@@ -2231,11 +2234,7 @@
               .row{
                 display: flex;
                 align-items: center;
-                gap: 8px;
                 margin-bottom: 16px;
-                &.gap8{
-                  gap: 8px;;
-                }
                 &:last-of-type{
                   margin-bottom: 0;
                 }
@@ -2246,6 +2245,10 @@
                   align-items: center;
                   word-break: break-all;
                   position: relative;
+                  margin-right: 8px;
+                  &:last-of-type{
+                    margin-right: 0;
+                  }
                   &.alignItemsStart{
                     align-items: flex-start;
                   }

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

@@ -186,7 +186,7 @@
                   <!-- 加急单 -->
                   <img *ngIf="data.data.emergencyType && data.data.emergencyType.id == 301" src="../../assets/images/icon_jiaji.png" alt="" class="ji" />
                 </div>
-                <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center gap8">
+                <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.worker)" class="btm_bot" value="删除" (click)="openDelModal(data.data.id, 'hsms')" />
@@ -239,7 +239,7 @@
                     </span>
                   </div>
                 </div>
-                <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center gap8">
+                <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center">
                   <input type="button" *ngIf="data.computedEditFlag && data.data.state.value == 'reassign'" class="top_bot" value="编辑" (click)="edit(data.data)" />
                   <input type="button" *ngIf="data.computedSubstitutionFlag && data.data.state.value == 'reassign'" class="top_bot" value="换人处理" (click)="substitution(data.data)" />
                   <input type="button" *ngIf="coopBtns.generate && data.data.state.value == 'accept'" class="top_bot" value="生成" (click)="generateOrder(data.data)" />
@@ -420,7 +420,7 @@
                     </span>
                   </div>
                 </div>
-                <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center gap8">
+                <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center">
                   <input type="button" *ngIf="data.computedEditFlag" class="top_bot" value="编辑" (click)="edit(data.data)" />
                   <input type="button" *ngIf="data.computedSubstitutionFlag" class="top_bot" value="换人处理" (click)="substitution(data.data)" />
                   <!-- <input type="button" *ngIf="data.computedReceiveFlag" class="top_bot" value="接单" (click)="showDelModal($event, data.data,'您确认要接单吗？','接单','receive')" /> -->
@@ -594,7 +594,7 @@
                     </span>
                   </div>
                 </div>
-                <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center gap8">
+                <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center">
                   <input type="button" *ngIf="data.computedEditFlag" class="top_bot" value="编辑" (click)="edit(data.data)" />
                   <input type="button" *ngIf="data.computedSubstitutionFlag" class="top_bot" value="换人处理" (click)="substitution(data.data)" />
                   <!-- <input type="button" *ngIf="data.computedHandleFlag" class="top_bot" value="处理" (click)="handle(data.data)" /> -->
@@ -1510,7 +1510,7 @@
                     </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>
@@ -1527,7 +1527,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" />
@@ -1542,7 +1542,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)">
@@ -1556,7 +1556,7 @@
                     </div>
                   </div>
 
-                  <div class="row gap8">
+                  <div class="row">
                     <div class="col alignItemsStart">
                       <span class="name required">故障描述：</span>
                       <nz-input-group [nzSuffix]="suffixTemplate">
@@ -1566,7 +1566,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 === '编辑事件'">
@@ -1585,7 +1585,7 @@
                     </div>
                   </div>
 
-                  <div class="row gap8">
+                  <div class="row">
                     <div class="col">
                       <span class="name">报修图片：</span>
                       <div class="value w100 upload">
@@ -1608,7 +1608,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)">
@@ -1726,7 +1726,7 @@
                     <!-- 加急单 -->
                     <img *ngIf="data.emergencyType && data.emergencyType.id == 301" src="../../assets/images/icon_jiaji.png" alt="" class="ji" />
                   </div>
-                  <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center gap8">
+                  <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center">
                     <input type="button" *ngIf="data.gdState.value == 2" class="top_bot" value="派单" (click)="allotWorker(data.id, data.gdState.id)" />
                     <input type="button" *ngIf="data.gdState.value == 3 || data.gdState.value == 4" class="mid_bot" value="撤回" (click)="openRecallModal(data.id)" />
                     <input type="button" *ngIf="data.gdState.value == 2 || data.gdState.value == 3 || data.gdState.value == 4" class="btm_bot" value="删除" (click)="openDelModal(data.id, 'hsms')" />

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%;
@@ -642,6 +645,7 @@
     border: 1px @primary-color solid;
     cursor: pointer;
     height: 27px;
+    margin-bottom: 8px;
   }
 
   .slider {
@@ -2266,11 +2270,7 @@
                 .row{
                   display: flex;
                   align-items: center;
-                  gap: 8px;
                   margin-bottom: 16px;
-                  &.gap8{
-                    gap: 8px;;
-                  }
                   &:last-of-type{
                     margin-bottom: 0;
                   }
@@ -2281,6 +2281,10 @@
                     align-items: center;
                     word-break: break-all;
                     position: relative;
+                    margin-right: 8px;
+                    &:last-of-type{
+                      margin-right: 0;
+                    }
                     &.alignItemsStart{
                       align-items: flex-start;
                     }

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

@@ -2610,7 +2610,7 @@
   <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>
@@ -2653,14 +2653,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 style="width:185px;" nz-input formControlName="officeAddress" placeholder="请输入详细位置" (focus)="focusAddress()" (blur)="blurAddress()" />
+              <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">
+                  <nz-empty></nz-empty>
+                </div>
+                <div *ngIf="addressLoading" class="w100 h100 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

@@ -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;
+                        }
+                      }
                     }
                   }
                 }
@@ -2217,6 +2225,28 @@
 
   ::ng-deep .ant-form-item.last{
     margin-bottom: 0!important;
+    .address{
+      position: relative;
+      .addressList{
+        position: absolute;
+        top: 100%;
+        left: 0;
+        width: 100%;
+        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 +2282,7 @@
       background: #f9fafb;
       border: 1px solid @hs_border_color;
       border-radius: 5px;
-      overflow: hidden;
+      // overflow: hidden;
       margin-top: 12px;
 
       & > div {

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

@@ -74,11 +74,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,
@@ -4964,4 +4964,45 @@ export class HushijiandanComponent implements OnInit {
       this.confirmShortcut1(shortcutForm);
     }
   }
+
+  // 详细地址获取焦点
+  isShowAddressList:boolean = false;
+  focusAddress(){
+    this.isShowAddressList = true;
+    this.getAddressList();
+  }
+
+  // 详细地址失去焦点
+  blurAddress(){
+    setTimeout(() => {
+      this.isShowAddressList = false;
+    }, 100)
+  }
+
+  // 选择地址
+  selectAddress(name){
+    this.validateBxForm.controls.officeAddress.setValue(name)
+  }
+
+  // 获取科室地点列表
+  addressList:any[] = [];
+  addressLoading:boolean = false;
+  getAddressList() {
+    let postData = {
+      idx: 0,
+      sum: 99999,
+      qrCode: {
+        hosId: this.currentHospital.id,
+      }
+    };
+    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 = [];
+      }
+    });
+  }
 }