seimin 2 månader sedan
förälder
incheckning
67df7ef07b

+ 15 - 6
src/app/views/inspect-info-config/inspect-info-config.component.html

@@ -5,7 +5,7 @@
5
       <span class="label">检查时间:</span>
5
       <span class="label">检查时间:</span>
6
       <nz-date-picker [(ngModel)]="searchData.dateRange" [nzAllowClear]="false"></nz-date-picker>
6
       <nz-date-picker [(ngModel)]="searchData.dateRange" [nzAllowClear]="false"></nz-date-picker>
7
     </div>
7
     </div>
8
-    <div class="patient">
8
+    <div class="searchItem">
9
       <span class="label">患者:</span>
9
       <span class="label">患者:</span>
10
       <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择患者" [(ngModel)]="searchData.id" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeInp('patient', $event)" (nzOpenChange)="openChangePatient($event)">
10
       <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择患者" [(ngModel)]="searchData.id" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeInp('patient', $event)" (nzOpenChange)="openChangePatient($event)">
11
         <ng-container *ngFor="let option of patientList">
11
         <ng-container *ngFor="let option of patientList">
@@ -16,10 +16,19 @@
16
         </nz-option>
16
         </nz-option>
17
       </nz-select>
17
       </nz-select>
18
     </div>
18
     </div>
19
-    <div class="patient">
20
-        <div><label nz-checkbox [(ngModel)]="searchData.noneTripType">未标记患者</label></div>
21
-        <div><label nz-checkbox [(ngModel)]="searchData.noneEndDept">未标记检查科室</label></div>
22
-        <div><label nz-checkbox [(ngModel)]="searchData.noneYY">无预约时间检查</label></div>
19
+    <div class="searchItem">
20
+        <div class="patient">
21
+          <label nz-checkbox [(ngModel)]="searchData.noneTripType">未标记患者</label>
22
+        </div>
23
+        <div class="patient">
24
+          <label nz-checkbox [(ngModel)]="searchData.noneEndDept">未标记检查科室</label>
25
+          <span class="circle red" title="未标记检查科室"></span>
26
+          <span class="circle red" style="right: -21px;" title="未标记检查科室"></span>
27
+        </div>
28
+        <div class="patient">
29
+          <label nz-checkbox [(ngModel)]="searchData.noneYY">无预约时间检查</label>
30
+          <span class="circle red" title="无预约时间检查"></span>
31
+        </div>
23
     </div>
32
     </div>
24
   </div>
33
   </div>
25
   <div class="display_flex align-items_center">
34
   <div class="display_flex align-items_center">
@@ -73,7 +82,7 @@
73
         </td>
82
         </td>
74
         <td class="text_align_left">
83
         <td class="text_align_left">
75
           <div class="remarkText">
84
           <div class="remarkText">
76
-            <span class="remarkTextInner">{{data.remark}}<span style="margin-top: 2px;" class="icon_transport transport-weibiaoti2010104 remarkTextEdit" (click)="editRemark({data: data, inspect: inspect})"></span></span>
85
+            <span class="remarkTextInner" (click)="editRemark({data: data, inspect: inspect})"><span [ngStyle]="{ color: data.remark ? '#333' : '#999'}">{{data.remark || '请点击填写注意事项!'}}</span><span style="margin-top: 2px;" class="icon_transport transport-weibiaoti2010104 remarkTextEdit"></span></span>
77
           </div>
86
           </div>
78
         </td>
87
         </td>
79
         <td>
88
         <td>

+ 19 - 1
src/app/views/inspect-info-config/inspect-info-config.component.less

@@ -12,6 +12,7 @@
12
     .remarkTextInner{
12
     .remarkTextInner{
13
       position: relative;
13
       position: relative;
14
       display: inline-block;
14
       display: inline-block;
15
+      cursor: pointer;
15
       .remarkTextEdit{
16
       .remarkTextEdit{
16
         position: absolute;
17
         position: absolute;
17
         top: 50%;
18
         top: 50%;
@@ -31,8 +32,25 @@
31
     .dept{
32
     .dept{
32
       margin-right: 48px;
33
       margin-right: 48px;
33
     }
34
     }
34
-    .patient{
35
+    .searchItem{
35
       margin-left: 24px;
36
       margin-left: 24px;
37
+      .patient{
38
+        position: relative;
39
+        text-align: left;
40
+        .circle{
41
+          width: 8px;
42
+          height: 8px;
43
+          border-radius: 50%;
44
+          background-color: @primary-color;
45
+          position: absolute;
46
+          top: 51%;
47
+          right: -8px;
48
+          transform: translate(-50%,-50%);
49
+          &.red{
50
+            background-color: red;
51
+          }
52
+        }
53
+      }
36
     }
54
     }
37
     .label{
55
     .label{
38
       padding-right: 16px;
56
       padding-right: 16px;