seimin пре 3 месеци
родитељ
комит
cec401cd55

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

@@ -2,11 +2,11 @@
2 2
  * @Author: seimin
3 3
  * @Date: 2024-10-24 13:47:40
4 4
  * @LastEditors: seimin
5
- * @LastEditTime: 2024-12-05 14:36:02
5
+ * @LastEditTime: 2024-12-09 11:11:15
6 6
  * @Description: 创建
7 7
 -->
8 8
 <!-- 新建工单 -->
9
-<div class="newOrder display_flex justify-content_flex-center align-items_center">
9
+<div class="newOrder display_flex justify-content_flex-center align-items_center" (click)="clickExtra($event)">
10 10
   <div class="modalBody">
11 11
     <div class="title" *ngIf="currentTabIndex === '故障报修'">
12 12
       <div class="newTop">
@@ -102,15 +102,15 @@
102 102
                     </nz-select>
103 103
                   </div>
104 104
                   <div class="col flex7">
105
-                    <input nz-input placeholder="请填写详细地址" [(ngModel)]="incidentModel.houseNumber" (focus)="focusAddress()" (blur)="blurAddress()" />
105
+                    <input class="addressFocus" nz-input placeholder="请填写详细地址" [(ngModel)]="incidentModel.houseNumber" (focus)="focusAddress()" />
106 106
                     <div class="addressList" *ngIf="isShowAddressList">
107 107
                       <ng-container *ngIf="!addressLoading && addressList.length">
108 108
                         <div class="addressItem ellipsis-oneline" *ngFor="let item of addressList" [title]="item.name" (click)="selectAddress(item.name)">{{item.name}}</div>
109 109
                       </ng-container>
110
-                      <div *ngIf="!addressLoading && !addressList.length" class="w100 h100 display_flex justify-content_flex-center align-items_center">
110
+                      <div *ngIf="!addressLoading && !addressList.length" class="w100 h100 padding8 display_flex justify-content_flex-center align-items_center">
111 111
                         <nz-empty></nz-empty>
112 112
                       </div>
113
-                      <div *ngIf="addressLoading" class="w100 h100 display_flex justify-content_flex-center align-items_center">
113
+                      <div *ngIf="addressLoading" class="w100 h100 padding8 display_flex justify-content_flex-center align-items_center">
114 114
                         <nz-spin nzSimple></nz-spin>
115 115
                       </div>
116 116
                     </div>

+ 5 - 4
src/app/components/incidentManagement/incident-create/incident-create.component.ts

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

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

@@ -941,7 +941,7 @@
941 941
   <button ngxPrint printSectionId="print-section" #printBtn hidden>打印</button>
942 942
 
943 943
   <!-- 新建工单 -->
944
-  <div class="newOrder display_flex justify-content_flex-center align-items_center" *ngIf="newOrderShow && newOrderShowOpen">
944
+  <div class="newOrder display_flex justify-content_flex-center align-items_center" *ngIf="newOrderShow && newOrderShowOpen" (click)="clickExtra($event)">
945 945
     <div class="modalBody">
946 946
       <div class="title" *ngIf="currentTabIndex !== '故障报修'">
947 947
         <div class="newTop">
@@ -1495,15 +1495,15 @@
1495 1495
                       </nz-select>
1496 1496
                     </div>
1497 1497
                     <div class="col flex7">
1498
-                      <input nz-input placeholder="请填写详细地址" [(ngModel)]="incidentModel.houseNumber" (focus)="focusAddress()" (blur)="blurAddress()" />
1498
+                      <input class="addressFocus" nz-input placeholder="请填写详细地址" [(ngModel)]="incidentModel.houseNumber" (focus)="focusAddress()" />
1499 1499
                       <div class="addressList" *ngIf="isShowAddressList">
1500 1500
                         <ng-container *ngIf="!addressLoading && addressList.length">
1501 1501
                           <div class="addressItem ellipsis-oneline" *ngFor="let item of addressList" [title]="item.name" (click)="selectAddress(item.name)">{{item.name}}</div>
1502 1502
                         </ng-container>
1503
-                        <div *ngIf="!addressLoading && !addressList.length" class="w100 h100 display_flex justify-content_flex-center align-items_center">
1503
+                        <div *ngIf="!addressLoading && !addressList.length" class="w100 h100 padding8 display_flex justify-content_flex-center align-items_center">
1504 1504
                           <nz-empty></nz-empty>
1505 1505
                         </div>
1506
-                        <div *ngIf="addressLoading" class="w100 h100 display_flex justify-content_flex-center align-items_center">
1506
+                        <div *ngIf="addressLoading" class="w100 h100 padding8 display_flex justify-content_flex-center align-items_center">
1507 1507
                           <nz-spin nzSimple></nz-spin>
1508 1508
                         </div>
1509 1509
                       </div>

+ 24 - 10
src/app/views/fuwutai/fuwutai.component.ts

@@ -1465,7 +1465,7 @@ export class FuwutaiComponent implements OnInit {
1465 1465
   // 呼叫中心---start
1466 1466
   searchBxDept(){
1467 1467
     let dataObj = {
1468
-      hosId: this.tool.getCurrentUserDept().id,
1468
+      hosId: this.tool.getCurrentHospital().id,
1469 1469
       phone: this.incidentModel.incomingPhone,
1470 1470
     };
1471 1471
     this.mainService
@@ -3145,7 +3145,9 @@ export class FuwutaiComponent implements OnInit {
3145 3145
   // 选择报修类型
3146 3146
   changeRepairIncidentType(value){
3147 3147
     this.incidentModel.department = undefined;
3148
-    this.isRelatedDepartment = false;
3148
+    this.incidentMsg.deptManyPhone = '';
3149
+
3150
+    this.isRelatedDepartment = value !== 'public';
3149 3151
     this.changeApplyRelatedDepartment(this.isRelatedDepartment);
3150 3152
   }
3151 3153
   // 楼栋列表
@@ -4973,7 +4975,10 @@ export class FuwutaiComponent implements OnInit {
4973 4975
     incidentModel.requester && (incidentMsg.requesterPhone = incidentModel.requester.phone);
4974 4976
     incidentModel.requester && (incidentMsg.requesterName = incidentModel.requester.name);
4975 4977
     incidentModel.requester && (incidentModel.requester = incidentModel.requester.id);
4976
-    incidentModel.repairIncidentType && (incidentModel.repairIncidentType = incidentModel.repairIncidentType.value);
4978
+    if(incidentModel.repairIncidentType){
4979
+      incidentModel.repairIncidentType = incidentModel.repairIncidentType.value
4980
+      this.changeRepairIncidentType(incidentModel.repairIncidentType);
4981
+    }
4977 4982
     incidentModel.source && (incidentModel.source = incidentModel.source.id);
4978 4983
     incidentModel.area && (incidentModel.area = incidentModel.area.id);
4979 4984
     incidentModel.place && (incidentModel.place = incidentModel.place.id);
@@ -5004,7 +5009,10 @@ export class FuwutaiComponent implements OnInit {
5004 5009
     incidentModel.requester && (incidentMsg.requesterPhone = incidentModel.requester.phone);
5005 5010
     incidentModel.requester && (incidentMsg.requesterName = incidentModel.requester.name);
5006 5011
     incidentModel.requester && (incidentModel.requester = incidentModel.requester.id);
5007
-    incidentModel.repairIncidentType && (incidentModel.repairIncidentType = incidentModel.repairIncidentType.value);
5012
+    if(incidentModel.repairIncidentType){
5013
+      incidentModel.repairIncidentType = incidentModel.repairIncidentType.value
5014
+      this.changeRepairIncidentType(incidentModel.repairIncidentType);
5015
+    }
5008 5016
     incidentModel.source && (incidentModel.source = incidentModel.source.id);
5009 5017
     incidentModel.area && (incidentModel.area = incidentModel.area.id);
5010 5018
     incidentModel.place && (incidentModel.place = incidentModel.place.id);
@@ -5103,7 +5111,10 @@ export class FuwutaiComponent implements OnInit {
5103 5111
     incidentModel.requester && (incidentMsg.requesterPhone = incidentModel.requester.phone);
5104 5112
     incidentModel.requester && (incidentMsg.requesterName = incidentModel.requester.name);
5105 5113
     incidentModel.requester && (incidentModel.requester = incidentModel.requester.id);
5106
-    incidentModel.repairIncidentType && (incidentModel.repairIncidentType = incidentModel.repairIncidentType.value);
5114
+    if(incidentModel.repairIncidentType){
5115
+      incidentModel.repairIncidentType = incidentModel.repairIncidentType.value
5116
+      this.changeRepairIncidentType(incidentModel.repairIncidentType);
5117
+    }
5107 5118
     incidentModel.source && (incidentModel.source = incidentModel.source.id);
5108 5119
     incidentModel.area && (incidentModel.area = incidentModel.area.id);
5109 5120
     incidentModel.place && (incidentModel.place = incidentModel.place.id);
@@ -5273,7 +5284,7 @@ export class FuwutaiComponent implements OnInit {
5273 5284
     if(e.data){
5274 5285
       // 留言创建工单
5275 5286
       let postData = {
5276
-        hosId: this.tool.getCurrentUserDept().id,
5287
+        hosId: this.tool.getCurrentHospital().id,
5277 5288
         phone: e.data.ano,
5278 5289
       };
5279 5290
       this.maskFlag = this.msg.loading("正在加载中..", {
@@ -5306,6 +5317,8 @@ export class FuwutaiComponent implements OnInit {
5306 5317
                 incidentModel.department && (incidentMsg.deptName = incidentModel.department.dept);
5307 5318
 
5308 5319
                 incidentModel.department && (incidentModel.department = incidentModel.department.id);
5320
+                incidentModel.repairIncidentType = 'dept';
5321
+                this.changeRepairIncidentType(incidentModel.repairIncidentType);
5309 5322
                 this.incidentModel = incidentModel;
5310 5323
                 console.log('this.incidentModel:', this.incidentModel)
5311 5324
                 this.incidentMsg = incidentMsg;
@@ -5339,16 +5352,17 @@ export class FuwutaiComponent implements OnInit {
5339 5352
     this.getAddressList();
5340 5353
   }
5341 5354
 
5342
-  // 详细地址失去焦
5343
-  blurAddress(){
5344
-    setTimeout(() => {
5355
+  // 点击其他位置
5356
+  clickExtra(e){
5357
+    if(document.documentElement.contains(document.querySelector('.addressList')) && e.target !== document.querySelector('.addressFocus')){
5345 5358
       this.isShowAddressList = false;
5346
-    }, 100)
5359
+    }
5347 5360
   }
5348 5361
 
5349 5362
   // 选择地址
5350 5363
   selectAddress(name){
5351 5364
     this.incidentModel.houseNumber = name;
5365
+    this.isShowAddressList = false;
5352 5366
   }
5353 5367
 
5354 5368
   // 获取科室地点列表

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

@@ -1475,7 +1475,7 @@
1475 1475
                   您选择的检查包含了多个科室,请您只包含一个科室。
1476 1476
                 </div>
1477 1477
               </nz-form-control>
1478
-              <div *ngIf="!linkCheckLis.length">暂无关联的检查</div>
1478
+              <div class="noInspect" *ngIf="!linkCheckLis.length">暂无关联的检查</div>
1479 1479
             </nz-form-item>
1480 1480
             <div class="pos" *ngIf="(currentTasktype.associationType.value === 'patientTransport' && appointmentZyBuildFlag == 1) || (currentTasktype.associationType.value === 'inspect' && appointmentBuildFlag == 1)">
1481 1481
               <!-- 需要预约检查 -->
@@ -1523,8 +1523,8 @@
1523 1523
             </nz-form-item>
1524 1524
             <!-- 100015 (护士端一键建单展策略)起点科室和终点科室下拉展示 -->
1525 1525
             <nz-form-item nz-row *ngIf="checkedShowMsg.status == 100015 || checkedShowMsg.status == 100013">
1526
-              <nz-form-label [nzSpan]="4" nzRequired nzFor="originOffice">起点科室</nz-form-label>
1527
-              <nz-form-control [nzSpan]="20" nzErrorTip="请选择起点科室!">
1526
+              <nz-form-label [nzSpan]="3" nzRequired nzFor="originOffice">起点科室</nz-form-label>
1527
+              <nz-form-control [nzSpan]="21" nzErrorTip="请选择起点科室!">
1528 1528
                 <nz-select formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchDept('start', checkedShowMsg, $event)" nzPlaceHolder="请选择起点科室">
1529 1529
                   <ng-container *ngFor="let option of checkedShowMsg.start.start.list">
1530 1530
                     <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id"></nz-option>
@@ -1538,21 +1538,21 @@
1538 1538
             </nz-form-item>
1539 1539
             <!-- 其他情况 -->
1540 1540
             <nz-form-item nz-row *ngIf="checkedShowMsg.start && !(checkedShowMsg.status == 100014 || checkedShowMsg.status == 100015)">
1541
-              <nz-form-label [nzSpan]="4" nzRequired nzFor="originOffice">起点科室</nz-form-label>
1542
-              <nz-form-control [nzSpan]="20" nzErrorTip="请选择起点科室!">
1541
+              <nz-form-label [nzSpan]="3" nzRequired nzFor="originOffice">起点科室</nz-form-label>
1542
+              <nz-form-control [nzSpan]="21" nzErrorTip="请选择起点科室!">
1543 1543
                 <span class="readonly">{{deptDisplay == 2 ? checkedShowMsg.start.start.list[0].deptalias : checkedShowMsg.start.start.list[0].dept}}</span>
1544 1544
               </nz-form-control>
1545 1545
             </nz-form-item>
1546 1546
             <nz-form-item nz-row *ngIf="checkedShowMsg.end && !(checkedShowMsg.status == 100015 || checkedShowMsg.status == 100013)">
1547
-              <nz-form-label [nzSpan]="4" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
1548
-              <nz-form-control [nzSpan]="20" nzErrorTip="请选择目标科室!">
1547
+              <nz-form-label [nzSpan]="3" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
1548
+              <nz-form-control [nzSpan]="21" nzErrorTip="请选择目标科室!">
1549 1549
                 <span class="readonly">{{deptDisplay == 2 ? checkedShowMsg.end.end.list[0].deptalias : checkedShowMsg.end.end.list[0].dept}}</span>
1550 1550
               </nz-form-control>
1551 1551
             </nz-form-item>
1552 1552
             <!-- 100014 (护士端一键建单展示策略)取终点科室和msg 值展示 -->
1553 1553
             <nz-form-item nz-row *ngIf="checkedShowMsg.status == 100014 || checkedShowMsg.status == 100015">
1554
-              <nz-form-label [nzSpan]="4" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
1555
-              <nz-form-control [nzSpan]="20" nzErrorTip="请选择目标科室!">
1554
+              <nz-form-label [nzSpan]="3" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
1555
+              <nz-form-control [nzSpan]="21" nzErrorTip="请选择目标科室!">
1556 1556
                 <nz-select formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchDept('target', checkedShowMsg, $event)" nzPlaceHolder="请选择目标科室">
1557 1557
                   <ng-container *ngFor="let option of checkedShowMsg.end.end.list">
1558 1558
                     <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id"></nz-option>
@@ -1621,7 +1621,7 @@
1621 1621
       <button nz-button nzType="primary" [nzLoading]="btnLoading1" (click)="confirmPatient1('patient-zy-yuyue')" *ngIf="currentTasktype.associationType.value === 'patientTransport' && isYyInspect && checkedShowMsg.status != 100009">
1622 1622
         预约建单
1623 1623
       </button>
1624
-      <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">
1624
+      <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">
1625 1625
         直接建单
1626 1626
       </button>
1627 1627
       <button class="btn cancel" nz-button nzType="default" (click)="hidePatientOrder()">
@@ -2301,10 +2301,7 @@
2301 2301
   content="您确认要删除此条意见吗?"
2302 2302
 ></app-dialog-delete>
2303 2303
 <!-- 关注模态框 -->
2304
-<div
2305
-  class="commonModal display_flex justify-content_flex-center align-items_center"
2306
-  *ngIf="commonModal"
2307
->
2304
+<div class="commonModal display_flex justify-content_flex-center align-items_center" *ngIf="commonModal">
2308 2305
   <div class="modalBody">
2309 2306
     <div class="title">
2310 2307
       提示<i
@@ -2337,7 +2334,7 @@
2337 2334
   </div>
2338 2335
 </div>
2339 2336
 <!-- 是否确认报修模态框 -->
2340
-<div class="commonModal display_flex justify-content_flex-center align-items_center" *ngIf="bxModal">
2337
+<div class="commonModal display_flex justify-content_flex-center align-items_center" *ngIf="bxModal" (click)="clickExtra($event)">
2341 2338
   <div class="modalBody">
2342 2339
     <div class="title">一键报修<i class="icon_transport transport-guanbi" (click)="hideBxModal()"></i>
2343 2340
     </div>
@@ -2386,15 +2383,15 @@
2386 2383
           <nz-form-label [nzSm]="4" [nzXs]="4" nzRequired nzFor="officeAddress" hidden></nz-form-label>
2387 2384
           <nz-form-control style="display: inline-block;" class="address">
2388 2385
             <nz-input-group>
2389
-              <input style="width:185px;" nz-input formControlName="officeAddress" placeholder="请输入详细位置" (focus)="focusAddress()" (blur)="blurAddress()" />
2386
+              <input class="addressFocus" style="width:185px;" nz-input formControlName="officeAddress" placeholder="请输入详细位置" (focus)="focusAddress()" />
2390 2387
               <div class="addressList" *ngIf="isShowAddressList">
2391 2388
                 <ng-container *ngIf="!addressLoading && addressList.length">
2392 2389
                   <div class="addressItem ellipsis-oneline" *ngFor="let item of addressList" [title]="item.name" (click)="selectAddress(item.name)">{{item.name}}</div>
2393 2390
                 </ng-container>
2394
-                <div *ngIf="!addressLoading && !addressList.length" class="w100 h100 display_flex justify-content_flex-center align-items_center">
2391
+                <div *ngIf="!addressLoading && !addressList.length" class="w100 h100 padding8 display_flex justify-content_flex-center align-items_center">
2395 2392
                   <nz-empty></nz-empty>
2396 2393
                 </div>
2397
-                <div *ngIf="addressLoading" class="w100 h100 display_flex justify-content_flex-center align-items_center">
2394
+                <div *ngIf="addressLoading" class="w100 h100 padding8 display_flex justify-content_flex-center align-items_center">
2398 2395
                   <nz-spin nzSimple></nz-spin>
2399 2396
                 </div>
2400 2397
               </div>

+ 4 - 0
src/app/views/hushijiandan/hushijiandan.component.less

@@ -2193,6 +2193,7 @@
2193 2193
     .btns {
2194 2194
       button {
2195 2195
         margin-top: 10px;
2196
+        font-size: 18px;
2196 2197
 
2197 2198
         &.btn {
2198 2199
           margin-left: 8px;
@@ -2625,6 +2626,9 @@
2625 2626
       }
2626 2627
       .patientForm{
2627 2628
         padding: 16px 24px;
2629
+        .noInspect{
2630
+          font-size: 18px;
2631
+        }
2628 2632
         .addRemarks{
2629 2633
           font-size: 18px;
2630 2634
         }

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

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

+ 3 - 0
src/common.less

@@ -1,6 +1,9 @@
1 1
 .ant-table-tbody tr:nth-of-type(2n){
2 2
   background-color: #e9f7e9!important;
3 3
 }
4
+.padding8{
5
+  padding: 8px!important
6
+}
4 7
 .w320px {
5 8
   width: 320px;
6 9
 }