Browse Source

样式修改

seimin 6 months ago
parent
commit
e735739a82

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

@@ -2,7 +2,7 @@
2 2
  * @Author: seimin
3 3
  * @Date: 2024-10-24 13:47:40
4 4
  * @LastEditors: seimin
5
- * @LastEditTime: 2024-12-04 15:22:09
5
+ * @LastEditTime: 2024-12-05 14:36:02
6 6
  * @Description: 创建
7 7
 -->
8 8
 <!-- 新建工单 -->
@@ -117,7 +117,7 @@
117 117
                   </div>
118 118
                 </div>
119 119
 
120
-                <div class="row gap8">
120
+                <div class="row">
121 121
                   <div class="col">
122 122
                     <span class="name">科室电话:</span>
123 123
                     <ng-container *ngIf="incidentMsg.deptManyPhone">{{incidentMsg.deptManyPhone|stringToFirstValue}}<em (click)="importPhone(incidentMsg.deptManyPhone, true)">引入</em></ng-container>
@@ -131,7 +131,7 @@
131 131
                   </div>
132 132
                 </div>
133 133
 
134
-                <div class="row gap8">
134
+                <div class="row">
135 135
                   <div class="col">
136 136
                     <span class="name">联系人:</span>
137 137
                     <input class="w100" nz-input placeholder="请填写联系人" [(ngModel)]="incidentModel.contacts" />
@@ -146,7 +146,7 @@
146 146
                   </div>
147 147
                 </div>
148 148
 
149
-                <div class="row gap8">
149
+                <div class="row">
150 150
                   <div class="col">
151 151
                     <span class="name required">故障现象:</span>
152 152
                     <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 @@
160 160
                   </div>
161 161
                 </div>
162 162
 
163
-                <div class="row gap8">
163
+                <div class="row">
164 164
                   <div class="col alignItemsStart">
165 165
                     <span class="name required">故障描述:</span>
166 166
                     <nz-input-group [nzSuffix]="suffixTemplate">
@@ -170,7 +170,7 @@
170 170
                   </div>
171 171
                 </div>
172 172
 
173
-                <div class="row gap8">
173
+                <div class="row">
174 174
                   <div class="col">
175 175
                     <span class="name required">优先级:</span>
176 176
                     <nz-select class="w100" [(ngModel)]="incidentModel.priorityId" nzAllowClear nzPlaceHolder="请选择优先级" [nzDisabled]="buildType === '编辑事件'">
@@ -189,7 +189,7 @@
189 189
                   </div>
190 190
                 </div>
191 191
 
192
-                <div class="row gap8">
192
+                <div class="row">
193 193
                   <div class="col">
194 194
                     <span class="name">报修图片:</span>
195 195
                     <div class="value w100 upload">
@@ -212,7 +212,7 @@
212 212
                   </div>
213 213
                 </div>
214 214
 
215
-                <div class="row gap8" *ngIf="buildType !== '编辑事件'">
215
+                <div class="row" *ngIf="buildType !== '编辑事件'">
216 216
                   <div class="col">
217 217
                     <span class="name required">处理组:</span>
218 218
                     <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('group', $event)" nzPlaceHolder="请选择处理组" [(ngModel)]="incidentModel.group" (ngModelChange)="changeApplyGroup($event)" (nzOpenChange)="openChangeApplyGroup($event)">

+ 8 - 5
src/app/components/incidentManagement/incident-create/incident-create.component.less

@@ -10,13 +10,16 @@
10 10
   display: flex;
11 11
   align-items: center;
12 12
   flex-wrap: wrap;
13
-  gap: 8px;
14 13
   .thumb{
15 14
     width: 64px;
16 15
     height: 64px;
17 16
     padding: 4px;
18 17
     border-radius: 4px;
19 18
     border: 1px solid rgba(0,0,0,0.15);
19
+    margin-right: 8px;
20
+    &:last-of-type{
21
+      margin-right: 0;
22
+    }
20 23
     img{
21 24
       width: 100%;
22 25
       height: 100%;
@@ -2231,11 +2234,7 @@
2231 2234
               .row{
2232 2235
                 display: flex;
2233 2236
                 align-items: center;
2234
-                gap: 8px;
2235 2237
                 margin-bottom: 16px;
2236
-                &.gap8{
2237
-                  gap: 8px;;
2238
-                }
2239 2238
                 &:last-of-type{
2240 2239
                   margin-bottom: 0;
2241 2240
                 }
@@ -2246,6 +2245,10 @@
2246 2245
                   align-items: center;
2247 2246
                   word-break: break-all;
2248 2247
                   position: relative;
2248
+                  margin-right: 8px;
2249
+                  &:last-of-type{
2250
+                    margin-right: 0;
2251
+                  }
2249 2252
                   &.alignItemsStart{
2250 2253
                     align-items: flex-start;
2251 2254
                   }

+ 12 - 12
src/app/views/fuwutai/fuwutai.component.html

@@ -186,7 +186,7 @@
186 186
                   <!-- 加急单 -->
187 187
                   <img *ngIf="data.data.emergencyType && data.data.emergencyType.id == 301" src="../../assets/images/icon_jiaji.png" alt="" class="ji" />
188 188
                 </div>
189
-                <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center gap8">
189
+                <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center">
190 190
                   <input type="button" *ngIf="data.data.gdState.value == 2" class="top_bot" value="派单" (click)="allotWorker(data.data.id, data.data.gdState.id)" />
191 191
                   <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)" />
192 192
                   <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 @@
239 239
                     </span>
240 240
                   </div>
241 241
                 </div>
242
-                <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center gap8">
242
+                <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center">
243 243
                   <input type="button" *ngIf="data.computedEditFlag && data.data.state.value == 'reassign'" class="top_bot" value="编辑" (click)="edit(data.data)" />
244 244
                   <input type="button" *ngIf="data.computedSubstitutionFlag && data.data.state.value == 'reassign'" class="top_bot" value="换人处理" (click)="substitution(data.data)" />
245 245
                   <input type="button" *ngIf="coopBtns.generate && data.data.state.value == 'accept'" class="top_bot" value="生成" (click)="generateOrder(data.data)" />
@@ -420,7 +420,7 @@
420 420
                     </span>
421 421
                   </div>
422 422
                 </div>
423
-                <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center gap8">
423
+                <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center">
424 424
                   <input type="button" *ngIf="data.computedEditFlag" class="top_bot" value="编辑" (click)="edit(data.data)" />
425 425
                   <input type="button" *ngIf="data.computedSubstitutionFlag" class="top_bot" value="换人处理" (click)="substitution(data.data)" />
426 426
                   <!-- <input type="button" *ngIf="data.computedReceiveFlag" class="top_bot" value="接单" (click)="showDelModal($event, data.data,'您确认要接单吗?','接单','receive')" /> -->
@@ -594,7 +594,7 @@
594 594
                     </span>
595 595
                   </div>
596 596
                 </div>
597
-                <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center gap8">
597
+                <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center">
598 598
                   <input type="button" *ngIf="data.computedEditFlag" class="top_bot" value="编辑" (click)="edit(data.data)" />
599 599
                   <input type="button" *ngIf="data.computedSubstitutionFlag" class="top_bot" value="换人处理" (click)="substitution(data.data)" />
600 600
                   <!-- <input type="button" *ngIf="data.computedHandleFlag" class="top_bot" value="处理" (click)="handle(data.data)" /> -->
@@ -1510,7 +1510,7 @@
1510 1510
                     </div>
1511 1511
                   </div>
1512 1512
 
1513
-                  <div class="row gap8">
1513
+                  <div class="row">
1514 1514
                     <div class="col">
1515 1515
                       <span class="name">科室电话:</span>
1516 1516
                       <ng-container *ngIf="incidentMsg.deptManyPhone">{{incidentMsg.deptManyPhone|stringToFirstValue}}<em (click)="importPhone(incidentMsg.deptManyPhone, true)">引入</em></ng-container>
@@ -1527,7 +1527,7 @@
1527 1527
                     </div>
1528 1528
                   </div>
1529 1529
 
1530
-                  <div class="row gap8">
1530
+                  <div class="row">
1531 1531
                     <div class="col">
1532 1532
                       <span class="name">联系人:</span>
1533 1533
                       <input class="w100" nz-input placeholder="请填写联系人" [(ngModel)]="incidentModel.contacts" />
@@ -1542,7 +1542,7 @@
1542 1542
                     </div>
1543 1543
                   </div>
1544 1544
 
1545
-                  <div class="row gap8">
1545
+                  <div class="row">
1546 1546
                     <div class="col">
1547 1547
                       <span class="name required">故障现象:</span>
1548 1548
                       <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 @@
1556 1556
                     </div>
1557 1557
                   </div>
1558 1558
 
1559
-                  <div class="row gap8">
1559
+                  <div class="row">
1560 1560
                     <div class="col alignItemsStart">
1561 1561
                       <span class="name required">故障描述:</span>
1562 1562
                       <nz-input-group [nzSuffix]="suffixTemplate">
@@ -1566,7 +1566,7 @@
1566 1566
                     </div>
1567 1567
                   </div>
1568 1568
 
1569
-                  <div class="row gap8">
1569
+                  <div class="row">
1570 1570
                     <div class="col">
1571 1571
                       <span class="name required">优先级:</span>
1572 1572
                       <nz-select class="w100" [(ngModel)]="incidentModel.priorityId" nzAllowClear nzPlaceHolder="请选择优先级" [nzDisabled]="buildType === '编辑事件'">
@@ -1585,7 +1585,7 @@
1585 1585
                     </div>
1586 1586
                   </div>
1587 1587
 
1588
-                  <div class="row gap8">
1588
+                  <div class="row">
1589 1589
                     <div class="col">
1590 1590
                       <span class="name">报修图片:</span>
1591 1591
                       <div class="value w100 upload">
@@ -1608,7 +1608,7 @@
1608 1608
                     </div>
1609 1609
                   </div>
1610 1610
 
1611
-                  <div class="row gap8" *ngIf="buildType !== '编辑事件'">
1611
+                  <div class="row" *ngIf="buildType !== '编辑事件'">
1612 1612
                     <div class="col">
1613 1613
                       <span class="name required">处理组:</span>
1614 1614
                       <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 @@
1726 1726
                     <!-- 加急单 -->
1727 1727
                     <img *ngIf="data.emergencyType && data.emergencyType.id == 301" src="../../assets/images/icon_jiaji.png" alt="" class="ji" />
1728 1728
                   </div>
1729
-                  <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center gap8">
1729
+                  <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center">
1730 1730
                     <input type="button" *ngIf="data.gdState.value == 2" class="top_bot" value="派单" (click)="allotWorker(data.id, data.gdState.id)" />
1731 1731
                     <input type="button" *ngIf="data.gdState.value == 3 || data.gdState.value == 4" class="mid_bot" value="撤回" (click)="openRecallModal(data.id)" />
1732 1732
                     <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')" />

+ 9 - 5
src/app/views/fuwutai/fuwutai.component.less

@@ -15,13 +15,16 @@
15 15
   display: flex;
16 16
   align-items: center;
17 17
   flex-wrap: wrap;
18
-  gap: 8px;
19 18
   .thumb{
20 19
     width: 64px;
21 20
     height: 64px;
22 21
     padding: 4px;
23 22
     border-radius: 4px;
24 23
     border: 1px solid rgba(0,0,0,0.15);
24
+    margin-right: 8px;
25
+    &:last-of-type{
26
+      margin-right: 0;
27
+    }
25 28
     img{
26 29
       width: 100%;
27 30
       height: 100%;
@@ -642,6 +645,7 @@
642 645
     border: 1px @primary-color solid;
643 646
     cursor: pointer;
644 647
     height: 27px;
648
+    margin-bottom: 8px;
645 649
   }
646 650
 
647 651
   .slider {
@@ -2266,11 +2270,7 @@
2266 2270
                 .row{
2267 2271
                   display: flex;
2268 2272
                   align-items: center;
2269
-                  gap: 8px;
2270 2273
                   margin-bottom: 16px;
2271
-                  &.gap8{
2272
-                    gap: 8px;;
2273
-                  }
2274 2274
                   &:last-of-type{
2275 2275
                     margin-bottom: 0;
2276 2276
                   }
@@ -2281,6 +2281,10 @@
2281 2281
                     align-items: center;
2282 2282
                     word-break: break-all;
2283 2283
                     position: relative;
2284
+                    margin-right: 8px;
2285
+                    &:last-of-type{
2286
+                      margin-right: 0;
2287
+                    }
2284 2288
                     &.alignItemsStart{
2285 2289
                       align-items: flex-start;
2286 2290
                     }

+ 15 - 4
src/app/views/hushijiandan/hushijiandan.component.html

@@ -2610,7 +2610,7 @@
2610 2610
   <div class="modalBody">
2611 2611
     <div class="title">一键报修<i class="icon_transport transport-guanbi" (click)="hideBxModal()"></i>
2612 2612
     </div>
2613
-    <overlay-scrollbars #osComponentRef5 class="content">
2613
+    <div class="content">
2614 2614
       <form nz-form [formGroup]="validateBxForm" class="bxFormAdd" (ngSubmit)="confirmBx()">
2615 2615
         <nz-form-item>
2616 2616
           <nz-form-label [nzSm]="4" [nzXs]="4" nzRequired nzFor="description">故障描述</nz-form-label>
@@ -2653,14 +2653,25 @@
2653 2653
             </nz-select>
2654 2654
           </nz-form-control>
2655 2655
           <nz-form-label [nzSm]="4" [nzXs]="4" nzRequired nzFor="officeAddress" hidden></nz-form-label>
2656
-          <nz-form-control style="display: inline-block;">
2656
+          <nz-form-control style="display: inline-block;" class="address">
2657 2657
             <nz-input-group>
2658
-              <input style="width:185px;" nz-input formControlName="officeAddress" placeholder="请输入详细位置" />
2658
+              <input style="width:185px;" nz-input formControlName="officeAddress" placeholder="请输入详细位置" (focus)="focusAddress()" (blur)="blurAddress()" />
2659
+              <div class="addressList" *ngIf="isShowAddressList">
2660
+                <ng-container *ngIf="!addressLoading && addressList.length">
2661
+                  <div class="addressItem ellipsis-oneline" *ngFor="let item of addressList" [title]="item.name" (click)="selectAddress(item.name)">{{item.name}}</div>
2662
+                </ng-container>
2663
+                <div *ngIf="!addressLoading && !addressList.length" class="w100 h100 display_flex justify-content_flex-center align-items_center">
2664
+                  <nz-empty></nz-empty>
2665
+                </div>
2666
+                <div *ngIf="addressLoading" class="w100 h100 display_flex justify-content_flex-center align-items_center">
2667
+                  <nz-spin nzSimple></nz-spin>
2668
+                </div>
2669
+              </div>
2659 2670
             </nz-input-group>
2660 2671
           </nz-form-control>
2661 2672
         </nz-form-item>
2662 2673
       </form>
2663
-    </overlay-scrollbars>
2674
+    </div>
2664 2675
     <div class="display_flex justify-content_flex-center">
2665 2676
       <button nz-button nzType="primary" (click)="confirmBx()">
2666 2677
         确认

+ 33 - 3
src/app/views/hushijiandan/hushijiandan.component.less

@@ -1357,13 +1357,16 @@
1357 1357
                   flex: 1;
1358 1358
                   display: flex;
1359 1359
                   align-items: center;
1360
-                  gap: 24px;
1361 1360
                   padding: 0 16px;
1362 1361
                   overflow: auto hidden;
1363 1362
                   .navItem{
1364 1363
                     display: flex;
1365 1364
                     align-items: center;
1366 1365
                     cursor: pointer;
1366
+                    margin-right: 24px;
1367
+                    &:last-of-type{
1368
+                      margin-right: 0;
1369
+                    }
1367 1370
                     .navContent{
1368 1371
                       display: flex;
1369 1372
                       flex-direction: column;
@@ -1406,7 +1409,12 @@
1406 1409
                     .navSpecimen{
1407 1410
                       font-size: 12px;
1408 1411
                       display: flex;
1409
-                      gap: 8px;
1412
+                      span{
1413
+                        margin-right: 8px;
1414
+                        &:last-of-type{
1415
+                          margin-right: 0;
1416
+                        }
1417
+                      }
1410 1418
                     }
1411 1419
                   }
1412 1420
                 }
@@ -2217,6 +2225,28 @@
2217 2225
 
2218 2226
   ::ng-deep .ant-form-item.last{
2219 2227
     margin-bottom: 0!important;
2228
+    .address{
2229
+      position: relative;
2230
+      .addressList{
2231
+        position: absolute;
2232
+        top: 100%;
2233
+        left: 0;
2234
+        width: 100%;
2235
+        height: 256px;
2236
+        z-index: 2;
2237
+        background: #fff;
2238
+        border: 1px solid #d9d9d9;
2239
+        border-radius: 4px;
2240
+        overflow: hidden auto;
2241
+        .addressItem{
2242
+          padding: 5px 12px;
2243
+          cursor: pointer;
2244
+          &:hover{
2245
+            background-color: #e9f7e9;
2246
+          }
2247
+        }
2248
+      }
2249
+    }
2220 2250
   }
2221 2251
 
2222 2252
   ::ng-deep .ant-form-item-label{
@@ -2252,7 +2282,7 @@
2252 2282
       background: #f9fafb;
2253 2283
       border: 1px solid @hs_border_color;
2254 2284
       border-radius: 5px;
2255
-      overflow: hidden;
2285
+      // overflow: hidden;
2256 2286
       margin-top: 12px;
2257 2287
 
2258 2288
       & > div {

+ 46 - 5
src/app/views/hushijiandan/hushijiandan.component.ts

@@ -74,11 +74,11 @@ export class HushijiandanComponent implements OnInit {
74 74
     static: false,
75 75
   })
76 76
   osComponentRef4: OverlayScrollbarsComponent;
77
-  @ViewChild("osComponentRef5", {
78
-    read: OverlayScrollbarsComponent,
79
-    static: false,
80
-  })
81
-  osComponentRef5: OverlayScrollbarsComponent;
77
+  // @ViewChild("osComponentRef5", {
78
+  //   read: OverlayScrollbarsComponent,
79
+  //   static: false,
80
+  // })
81
+  // osComponentRef5: OverlayScrollbarsComponent;
82 82
   @ViewChild("osComponentRef6", {
83 83
     read: OverlayScrollbarsComponent,
84 84
     static: false,
@@ -4964,4 +4964,45 @@ export class HushijiandanComponent implements OnInit {
4964 4964
       this.confirmShortcut1(shortcutForm);
4965 4965
     }
4966 4966
   }
4967
+
4968
+  // 详细地址获取焦点
4969
+  isShowAddressList:boolean = false;
4970
+  focusAddress(){
4971
+    this.isShowAddressList = true;
4972
+    this.getAddressList();
4973
+  }
4974
+
4975
+  // 详细地址失去焦点
4976
+  blurAddress(){
4977
+    setTimeout(() => {
4978
+      this.isShowAddressList = false;
4979
+    }, 100)
4980
+  }
4981
+
4982
+  // 选择地址
4983
+  selectAddress(name){
4984
+    this.validateBxForm.controls.officeAddress.setValue(name)
4985
+  }
4986
+
4987
+  // 获取科室地点列表
4988
+  addressList:any[] = [];
4989
+  addressLoading:boolean = false;
4990
+  getAddressList() {
4991
+    let postData = {
4992
+      idx: 0,
4993
+      sum: 99999,
4994
+      qrCode: {
4995
+        hosId: this.currentHospital.id,
4996
+      }
4997
+    };
4998
+    this.addressLoading = true;
4999
+    this.mainService.getFetchDataList("simple/data", "qrCode", postData).subscribe(result=>{
5000
+      this.addressLoading = false;
5001
+      if(result.status == 200){
5002
+        this.addressList = result.list || [];
5003
+      }else{
5004
+        this.addressList = [];
5005
+      }
5006
+    });
5007
+  }
4967 5008
 }