seimin 4 months ago
parent
commit
072a2e8f65

+ 5 - 5
src/app/components/configurationCenter/configuration-inspect/configuration-inspect.component.html

@@ -9,8 +9,8 @@
9
       <div class="contentBody">
9
       <div class="contentBody">
10
         <div class="dictionaryRow">
10
         <div class="dictionaryRow">
11
           <div class="orders">排序号</div>
11
           <div class="orders">排序号</div>
12
-          <div class="name"></div>
13
-          <div class="value"></div>
12
+          <div class="name">注意事项</div>
13
+          <div class="value">备注</div>
14
         </div>
14
         </div>
15
         <overlay-scrollbars #osComponentRef2 class="contentBody2">
15
         <overlay-scrollbars #osComponentRef2 class="contentBody2">
16
           <form nz-form [formGroup]="validateDictionaryForm" class="w100">
16
           <form nz-form [formGroup]="validateDictionaryForm" class="w100">
@@ -25,8 +25,8 @@
25
                 </nz-form-item>
25
                 </nz-form-item>
26
               </div>
26
               </div>
27
               <div class="name">
27
               <div class="name">
28
-                <nz-form-item>
29
-                  <nz-form-control [nzSpan]="24" nzErrorTip="请输入!">
28
+                <nz-form-item class="w100">
29
+                  <nz-form-control [nzSpan]="24" nzErrorTip="请输入注意事项!">
30
                     <nz-input-group>
30
                     <nz-input-group>
31
                       <input [formControlName]="'name_' + data.id" nz-input class="nameInput">
31
                       <input [formControlName]="'name_' + data.id" nz-input class="nameInput">
32
                     </nz-input-group>
32
                     </nz-input-group>
@@ -35,7 +35,7 @@
35
               </div>
35
               </div>
36
               <div class="value">
36
               <div class="value">
37
                 <nz-form-item>
37
                 <nz-form-item>
38
-                  <nz-form-control [nzSpan]="24" nzErrorTip="请输入!">
38
+                  <nz-form-control [nzSpan]="24" nzErrorTip="请输入备注!">
39
                     <nz-input-group>
39
                     <nz-input-group>
40
                       <input [formControlName]="'value_' + data.id" nz-input class="valueInput">
40
                       <input [formControlName]="'value_' + data.id" nz-input class="valueInput">
41
                     </nz-input-group>
41
                     </nz-input-group>

+ 2 - 2
src/app/components/configurationCenter/configuration-inspect/configuration-inspect.component.less

@@ -54,7 +54,7 @@
54
         align-items: center;
54
         align-items: center;
55
       }
55
       }
56
       .name{
56
       .name{
57
-        width: 100px;
57
+        width: 600px;
58
         display: flex;
58
         display: flex;
59
         justify-content: flex-end;
59
         justify-content: flex-end;
60
         align-items: center;
60
         align-items: center;
@@ -64,7 +64,7 @@
64
         display: flex;
64
         display: flex;
65
         align-items: center;
65
         align-items: center;
66
         .valueInput{
66
         .valueInput{
67
-          width: 600px;
67
+          width: 100px;
68
         }
68
         }
69
         .icon_transport{
69
         .icon_transport{
70
           font-size: 20px;
70
           font-size: 20px;

+ 2 - 2
src/app/views/hushijiandan/hushijiandan.component.html

@@ -1424,7 +1424,7 @@
1424
 </div>
1424
 </div>
1425
 
1425
 
1426
 <!-- 患者信息一键建单模态框 -->
1426
 <!-- 患者信息一键建单模态框 -->
1427
-<div class="save display_flex align-items_center justify-content_flex-center patient" *ngIf="patientModal">
1427
+<div class="save display_flex align-items_center justify-content_flex-center patient" *ngIf="patientModal" (click)="clickExtra($event)">
1428
   <div class="modalBody">
1428
   <div class="modalBody">
1429
     <div class="title">患者送检<i class="icon_transport transport-guanbi" (click)="hidePatientOrder()"></i></div>
1429
     <div class="title">患者送检<i class="icon_transport transport-guanbi" (click)="hidePatientOrder()"></i></div>
1430
     <overlay-scrollbars #osComponentRef7 class="content" style="max-height: 80vh">
1430
     <overlay-scrollbars #osComponentRef7 class="content" style="max-height: 80vh">
@@ -1463,7 +1463,7 @@
1463
             <nz-form-item *ngIf="checkedShowMsg.status == 200">
1463
             <nz-form-item *ngIf="checkedShowMsg.status == 200">
1464
               <nz-form-label [nzSm]="24" [nzXs]="24" nzFor="linkCheck">关联的检查</nz-form-label>
1464
               <nz-form-label [nzSm]="24" [nzXs]="24" nzFor="linkCheck">关联的检查</nz-form-label>
1465
               <nz-form-control class="datesGroup" *ngIf="linkCheckLis.length">
1465
               <nz-form-control class="datesGroup" *ngIf="linkCheckLis.length">
1466
-                <nz-checkbox-wrapper nz-row class="linkCheckCheck" ngDefaultControl formControlName="linkCheck" (nzOnChange)="linkCheckLisChange($event)">
1466
+                <nz-checkbox-wrapper nz-row class="linkCheckCheck w100" ngDefaultControl formControlName="linkCheck" (nzOnChange)="linkCheckLisChange($event)">
1467
                   <div nz-row nz-col nzSpan="12" *ngFor="let item of linkCheckLis">
1467
                   <div nz-row nz-col nzSpan="12" *ngFor="let item of linkCheckLis">
1468
                     <div nz-col nzSpan="24">
1468
                     <div nz-col nzSpan="24">
1469
                       <label nz-checkbox [nzValue]="item">{{ item.label}}</label>
1469
                       <label nz-checkbox [nzValue]="item">{{ item.label}}</label>