seimin 3 vuotta sitten
vanhempi
commit
68a65af95e

+ 13 - 23
src/app/views/group-management/group-management.component.ts

@@ -120,7 +120,12 @@ export class GroupManagementComponent implements OnInit {
120 120
         that.groupList = data1.list;
121 121
         console.log(this.checkedGroup);
122 122
         if (Object.keys(this.checkedGroup).length) {
123
-          this.checkGroup(this.checkedGroup);
123
+          console.log(this.checkedGroup);
124
+          data1.list.forEach((item) => {
125
+            if (item.id == this.checkedGroup.id) {
126
+              this.checkGroup(item);
127
+            }
128
+          });
124 129
         } else {
125 130
           this.checkGroup(data1.list[0]);
126 131
         }
@@ -168,27 +173,13 @@ export class GroupManagementComponent implements OnInit {
168 173
       this.refreshStatus(true);
169 174
     }
170 175
   }
171
-  // 获取组内用户
172
-  // getUserFromGroup() {
173
-  //   // let that = this;
174
-  //   // that.mainService.getDataFetchData('group', that.checkedGroup['id']).subscribe(data => {
175
-  //   //   that.groupUserList = data.data.users ? data.data.users : [];
176
-  //   //   setTimeout(() => {
177
-  //   //     that.refreshStatus(true)
178
-  //   //   }, 300);
179
-  //   // })
180
-  //   this.groupUserList = this.checkedGroup['users'];
181
-  // }
182 176
 
183 177
   // 输入用户信息搜索节流阀
184 178
   time: any;
185 179
   timeNum = 0;
186 180
   searchInp(e) {
187 181
     let that = this;
188
-    // clearTimeout(that.time);
189
-    // that.time = setTimeout(() => {
190 182
     that.getAllUser();
191
-    // }, 2000);
192 183
   }
193 184
 
194 185
   // 院区列表
@@ -227,25 +218,24 @@ export class GroupManagementComponent implements OnInit {
227 218
   usersArr = [];
228 219
   refreshStatus(first?): void {
229 220
     let i, j;
230
-    let that = this;
231 221
     // 切换分组信息时初始化表格內checkbox选中情况
232 222
     if (first) {
233
-      for (j = 0; j < that.groupUserList.length; j++) {
234
-        for (i = 0; i < that.allUserList.length; i++) {
235
-          if (that.allUserList[i]["id"] == that.groupUserList[j]["id"]) {
236
-            that.mapOfCheckedId[that.allUserList[i]["id"]] = true;
223
+      for (j = 0; j < this.groupUserList.length; j++) {
224
+        for (i = 0; i < this.allUserList.length; i++) {
225
+          if (this.allUserList[i]["id"] == this.groupUserList[j]["id"]) {
226
+            this.mapOfCheckedId[this.allUserList[i]["id"]] = true;
237 227
             break;
238 228
           }
239 229
         }
240 230
       }
241 231
     }
242 232
     let arr = [];
243
-    for (var m in that.mapOfCheckedId) {
244
-      if (that.mapOfCheckedId[m]) {
233
+    for (var m in this.mapOfCheckedId) {
234
+      if (this.mapOfCheckedId[m]) {
245 235
         arr.push({ id: m });
246 236
       }
247 237
     }
248
-    that.usersArr = arr;
238
+    this.usersArr = arr;
249 239
   }
250 240
 
251 241
   // 保存

+ 56 - 49
src/app/views/hushijiandan/hushijiandan.component.html

@@ -802,52 +802,56 @@
802 802
               </nz-form-control>
803 803
               <div *ngIf="!linkCheckLis.length">暂无关联的检查</div>
804 804
             </nz-form-item>
805
-            <!-- 需要预约检查 -->
806
-            <nz-form-item>
807
-              <nz-form-control>
808
-                <label nz-checkbox
809
-                  [nzDisabled]="!linkCheckLisTrue&&currentTasktype.associationType.value === 'inspect'||linkCheckLisTrue&&allowUrgent==1&&currentTasktype.associationType.value === 'inspect'||allowUrgent==1&&currentTasktype.associationType.value ==='patientTransport'"
810
-                  [(ngModel)]="isYyInspect" (ngModelChange)="yyInspectChange($event)"
811
-                  [ngModelOptions]="{standalone: true}">需要预约检查</label>
812
-              </nz-form-control>
813
-            </nz-form-item>
814
-            <!-- 预约建单时间-患者其他服务 -->
815
-            <nz-form-item class="yyTime" [ngClass]="{yyTimeError:(!yyTimeZy||!yyDateZy)&&clickYYZyFlag}"
816
-              *ngIf="currentTasktype.associationType.value === 'patientTransport'">
817
-              <nz-form-label [nzSm]="24" [nzXs]="24">预约建单时间</nz-form-label>
818
-              <nz-form-control [nzSm]="24" [nzXs]="24">
819
-                <nz-date-picker [nzDisabled]="!isYyInspect" [(ngModel)]="yyDateZy" (ngModelChange)="yyDateChange($event)" [ngModelOptions]="{standalone: true}"
820
-                  [nzAllowClear]="false" [nzDisabledDate]="disabledyyDateZy" [nzShowToday]="false"></nz-date-picker>
821
-                <nz-time-picker [nzDisabled]="!isYyInspect||!yyDateZy" class="ml8" nzFormat="HH:mm" [nzMinuteStep]="30"
822
-                  [nzSecondStep]="60" [(ngModel)]="yyTimeZy" (ngModelChange)="yyTimeZyChange($event)"
823
-                  [ngModelOptions]="{standalone: true}" [nzDisabledHours]="disabledHours"
824
-                  [nzDisabledMinutes]="disabledMinutes" [nzAllowEmpty]="false">
825
-                </nz-time-picker>
826
-                <button [disabled]="!isYyInspect||(isYyInspect&&!yyDateZy)" nz-button nzType="primary"
827
-                  class="ml8" (click)="nextDayZy()">下一日</button>
828
-              </nz-form-control>
829
-              <div class="red w100" *ngIf="(!yyTimeZy||!yyDateZy)&&clickYYZyFlag">请填写预约建单时间!</div>
830
-              <div class="red">请您在预约建单时至少在预约检查时间的基础上提前30分钟,以免错过检查!</div>
831
-            </nz-form-item>
832
-            <!-- 预约建单时间 -->
833
-            <nz-form-item class="yyTime" [ngClass]="{yyTimeError:(!yyTime||!yyDate)&&clickYYFlag}"
834
-              *ngIf="currentTasktype.associationType.value === 'inspect'">
835
-              <nz-form-label [nzSm]="24" [nzXs]="24">预约建单时间</nz-form-label>
836
-              <nz-form-control [nzSm]="24" [nzXs]="24">
837
-                <nz-date-picker [nzDisabled]="!isYyInspect" [(ngModel)]="yyDate" (ngModelChange)="yyDateChange($event)" [ngModelOptions]="{standalone: true}"
838
-                  [nzAllowClear]="false" [nzDisabledDate]="disabledyyDate" [nzShowToday]="false">
839
-                </nz-date-picker>
840
-                <nz-time-picker [nzDisabled]="!isYyInspect||!yyDate" class="ml8" nzFormat="HH:mm" [nzMinuteStep]="30"
841
-                  [nzSecondStep]="60" [(ngModel)]="yyTime" (ngModelChange)="yyTimeChange($event)"
842
-                  [ngModelOptions]="{standalone: true}" [nzDisabledHours]="disabledHours"
843
-                  [nzDisabledMinutes]="disabledMinutes" [nzAllowEmpty]="false">
844
-                </nz-time-picker>
845
-                <button [disabled]="!isYyInspect||(isYyInspect&&!yyDate)" nz-button nzType="primary"
846
-                  class="ml8" (click)="nextDay()">下一日</button>
847
-              </nz-form-control>
848
-              <div class="red w100" *ngIf="(!yyTime||!yyDate)&&clickYYFlag">请填写预约建单时间!</div>
849
-              <div class="red">请您在预约建单时至少在预约检查时间的基础上提前30分钟,以免错过检查!</div>
850
-            </nz-form-item>
805
+            <div class="pos">
806
+              <!-- 需要预约检查 -->
807
+              <nz-form-item class="pos-item">
808
+                <nz-form-control>
809
+                  <label nz-checkbox
810
+                    [nzDisabled]="!linkCheckLisTrue&&currentTasktype.associationType.value === 'inspect'||linkCheckLisTrue&&allowUrgent==1&&currentTasktype.associationType.value === 'inspect'||allowUrgent==1&&currentTasktype.associationType.value ==='patientTransport'"
811
+                    [(ngModel)]="isYyInspect" (ngModelChange)="yyInspectChange($event)"
812
+                    [ngModelOptions]="{standalone: true}">需要预约检查</label>
813
+                </nz-form-control>
814
+              </nz-form-item>
815
+              <!-- 预约建单时间-患者其他服务 -->
816
+              <nz-form-item class="yyTime" [ngClass]="{yyTimeError:(!yyTimeZy||!yyDateZy)&&clickYYZyFlag}"
817
+                *ngIf="currentTasktype.associationType.value === 'patientTransport'">
818
+                <nz-form-label [nzSm]="24" [nzXs]="24">预约建单时间</nz-form-label>
819
+                <nz-form-control [nzSm]="24" [nzXs]="24">
820
+                  <nz-date-picker [nzDisabled]="!isYyInspect" [(ngModel)]="yyDateZy"
821
+                    (ngModelChange)="yyDateChange($event)" [ngModelOptions]="{standalone: true}" [nzAllowClear]="false"
822
+                    [nzDisabledDate]="disabledyyDateZy" [nzShowToday]="false"></nz-date-picker>
823
+                  <nz-time-picker [nzDisabled]="!isYyInspect||!yyDateZy" class="ml8" nzFormat="HH:mm"
824
+                    [nzMinuteStep]="30" [nzSecondStep]="60" [(ngModel)]="yyTimeZy"
825
+                    (ngModelChange)="yyTimeZyChange($event)" [ngModelOptions]="{standalone: true}"
826
+                    [nzDisabledHours]="disabledHours" [nzDisabledMinutes]="disabledMinutes" [nzAllowEmpty]="false">
827
+                  </nz-time-picker>
828
+                  <button [disabled]="!isYyInspect||(isYyInspect&&!yyDateZy)" nz-button nzType="primary" class="ml8"
829
+                    (click)="nextDayZy()">下一日</button>
830
+                </nz-form-control>
831
+                <div class="red w100" *ngIf="(!yyTimeZy||!yyDateZy)&&clickYYZyFlag">请填写预约建单时间!</div>
832
+                <div class="red">请您在预约建单时至少在预约检查时间的基础上提前30分钟,以免错过检查!</div>
833
+              </nz-form-item>
834
+              <!-- 预约建单时间 -->
835
+              <nz-form-item class="yyTime" [ngClass]="{yyTimeError:(!yyTime||!yyDate)&&clickYYFlag}"
836
+                *ngIf="currentTasktype.associationType.value === 'inspect'">
837
+                <nz-form-label [nzSm]="24" [nzXs]="24">预约建单时间</nz-form-label>
838
+                <nz-form-control [nzSm]="24" [nzXs]="24">
839
+                  <nz-date-picker [nzDisabled]="!isYyInspect" [(ngModel)]="yyDate"
840
+                    (ngModelChange)="yyDateChange($event)" [ngModelOptions]="{standalone: true}" [nzAllowClear]="false"
841
+                    [nzDisabledDate]="disabledyyDate" [nzShowToday]="false">
842
+                  </nz-date-picker>
843
+                  <nz-time-picker [nzDisabled]="!isYyInspect||!yyDate" class="ml8" nzFormat="HH:mm" [nzMinuteStep]="30"
844
+                    [nzSecondStep]="60" [(ngModel)]="yyTime" (ngModelChange)="yyTimeChange($event)"
845
+                    [ngModelOptions]="{standalone: true}" [nzDisabledHours]="disabledHours"
846
+                    [nzDisabledMinutes]="disabledMinutes" [nzAllowEmpty]="false">
847
+                  </nz-time-picker>
848
+                  <button [disabled]="!isYyInspect||(isYyInspect&&!yyDate)" nz-button nzType="primary" class="ml8"
849
+                    (click)="nextDay()">下一日</button>
850
+                </nz-form-control>
851
+                <div class="red w100" *ngIf="(!yyTime||!yyDate)&&clickYYFlag">请填写预约建单时间!</div>
852
+                <div class="red">请您在预约建单时至少在预约检查时间的基础上提前30分钟,以免错过检查!</div>
853
+              </nz-form-item>
854
+            </div>
851 855
             <!-- 100009 科室任务类型状态码未配置 -->
852 856
             <nz-form-item *ngIf="(checkedShowMsg.status!=200)&&(checkedShowMsg.status==100009)">
853 857
               <div class="txtC">{{checkedShowMsg.msg}}</div>
@@ -924,9 +928,12 @@
924 928
       </div>
925 929
     </overlay-scrollbars>
926 930
     <div class="btns display_flex justify-content_flex-center">
927
-      <button nz-button nzType="primary" [nzLoading]="btnLoading1" (click)="confirmPatient1('patient-yuyue')" *ngIf="currentTasktype.associationType.value === 'inspect'&&isYyInspect">预约建单</button>
928
-      <button nz-button nzType="primary" [nzLoading]="btnLoading1" (click)="confirmPatient1('patient-zy-yuyue')" *ngIf="currentTasktype.associationType.value === 'patientTransport'&&isYyInspect">预约建单</button>
929
-      <button nz-button nzType="default" [nzLoading]="btnLoading" (click)="confirmPatient()" class="orderThis" *ngIf="!isYyInspect">直接建单</button>
931
+      <button nz-button nzType="primary" [nzLoading]="btnLoading1" (click)="confirmPatient1('patient-yuyue')"
932
+        *ngIf="currentTasktype.associationType.value === 'inspect'&&isYyInspect">预约建单</button>
933
+      <button nz-button nzType="primary" [nzLoading]="btnLoading1" (click)="confirmPatient1('patient-zy-yuyue')"
934
+        *ngIf="currentTasktype.associationType.value === 'patientTransport'&&isYyInspect">预约建单</button>
935
+      <button nz-button nzType="default" [nzLoading]="btnLoading" (click)="confirmPatient()" class="orderThis"
936
+        *ngIf="!isYyInspect">直接建单</button>
930 937
       <button class="btn cancel" nz-button nzType="default" (click)="hidePatientOrder()">取消</button>
931 938
     </div>
932 939
   </div>

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

@@ -14,6 +14,14 @@
14 14
       border: 1px solid red !important;
15 15
     }
16 16
   }
17
+  .pos{
18
+    position: relative;
19
+    .pos-item{
20
+      position: absolute;
21
+      left: 100px;
22
+      top: -10px;
23
+    }
24
+  }
17 25
   .addRemarks {
18 26
     color: @primary-color;
19 27
     cursor: pointer;