seimin 1 anno fa
parent
commit
3e6874b92c

+ 117 - 283
src/app/views/main/main-routing.module.ts

@@ -7,467 +7,301 @@ const routes: Routes = [
7 7
     path: "",
8 8
     component: MainComponent,
9 9
     children: [
10
+      // 默认跳转到主页
10 11
       {
11
-        // 主页
12 12
         path: "",
13 13
         redirectTo: "home",
14 14
         pathMatch: "full",
15 15
       },
16
+      // 主页
16 17
       {
17
-        // 主页
18 18
         path: "home",
19
-        loadChildren: () =>
20
-          import("../home/home.module").then((m) => m.HomeModule),
19
+        loadChildren: () => import("../home/home.module").then((m) => m.HomeModule),
21 20
       },
21
+      // 班次管理
22 22
       {
23
-        //班次管理
24 23
         path: "classesManagement",
25
-        loadChildren: () =>
26
-          import("../classes-management/classes-management.module").then(
27
-            (m) => m.ClassesManagementModule
28
-          ),
24
+        loadChildren: () => import("../classes-management/classes-management.module").then((m) => m.ClassesManagementModule),
29 25
       },
26
+      // 节假日管理
30 27
       {
31
-        //节假日管理
32 28
         path: "holidaysManagement",
33
-        loadChildren: () =>
34
-          import("../holidays-management/holidays-management.module").then(
35
-            (m) => m.HolidaysManagementModule
36
-          ),
29
+        loadChildren: () => import("../holidays-management/holidays-management.module").then((m) => m.HolidaysManagementModule),
37 30
       },
31
+      // 分组管理
38 32
       {
39
-        // 分组管理
40 33
         path: "groupManagement",
41
-        loadChildren: () =>
42
-          import("../group-management/group-management.module").then(
43
-            (m) => m.GroupManagementModule
44
-          ),
34
+        loadChildren: () => import("../group-management/group-management.module").then((m) => m.GroupManagementModule),
45 35
       },
36
+      // 院区管理
46 37
       {
47
-        // 院区管理
48 38
         path: "hospitalManagement",
49
-        loadChildren: () =>
50
-          import("../hospital-management/hospital-management.module").then(
51
-            (m) => m.HospitalManagementModule
52
-          ),
39
+        loadChildren: () => import("../hospital-management/hospital-management.module").then((m) => m.HospitalManagementModule),
53 40
       },
41
+      // 微信配置
54 42
       {
55
-        // 微信配置
56 43
         path: "wechatConfig",
57
-        loadChildren: () =>
58
-          import("../wechat-config/wechat-config.module").then(
59
-            (m) => m.WechatConfigModule
60
-          ),
44
+        loadChildren: () => import("../wechat-config/wechat-config.module").then((m) => m.WechatConfigModule),
61 45
       },
46
+      // 系统配置
62 47
       {
63
-        // 系统配置
64 48
         path: "sysConfig",
65
-        loadChildren: () =>
66
-          import("../sys-config/sys-config.module").then(
67
-            (m) => m.SysConfigModule
68
-          ),
49
+        loadChildren: () => import("../sys-config/sys-config.module").then((m) => m.SysConfigModule),
69 50
       },
51
+      // 数据字典
70 52
       {
71
-        // 数据字典
72 53
         path: "dataDictionary",
73
-        loadChildren: () =>
74
-          import("../data-dictionary/data-dictionary.module").then(
75
-            (m) => m.DataDictionaryModule
76
-          ),
54
+        loadChildren: () => import("../data-dictionary/data-dictionary.module").then((m) => m.DataDictionaryModule),
77 55
       },
56
+      // 科室管理
78 57
       {
79
-        // 科室管理
80 58
         path: "officeManagement",
81
-        loadChildren: () =>
82
-          import("../office-management/office-management.module").then(
83
-            (m) => m.OfficeManagementModule
84
-          ),
59
+        loadChildren: () => import("../office-management/office-management.module").then((m) => m.OfficeManagementModule),
85 60
       },
61
+      // 任务类型管理
86 62
       {
87
-        // 任务类型管理
88 63
         path: "taskTypeManagement",
89
-        loadChildren: () =>
90
-          import("../task-type-management/task-type-management.module").then(
91
-            (m) => m.TaskTypeManagementModule
92
-          ),
64
+        loadChildren: () => import("../task-type-management/task-type-management.module").then((m) => m.TaskTypeManagementModule),
93 65
       },
66
+      // 血制品页面控制
94 67
       {
95
-        // 血制品页面控制
96 68
         path: "bloodProductsConfig",
97
-        loadChildren: () =>
98
-          import("../blood-products-config/blood-products-config.module").then(
99
-            (m) => m.BloodProductsConfigModule
100
-          ),
69
+        loadChildren: () => import("../blood-products-config/blood-products-config.module").then((m) => m.BloodProductsConfigModule),
101 70
       },
71
+      // 检查页面控制
102 72
       {
103
-        // 检查页面控制
104 73
         path: "inspectAndPatientTransportConfig",
105
-        loadChildren: () =>
106
-          import("../inspect-and-patient-transport-config/inspect-and-patient-transport-config.module").then(
107
-            (m) => m.InspectAndPatientTransportConfigModule
108
-          ),
74
+        loadChildren: () => import("../inspect-and-patient-transport-config/inspect-and-patient-transport-config.module").then((m) => m.InspectAndPatientTransportConfigModule),
109 75
       },
76
+      // 手术页面控制
110 77
       {
111
-        // 手术页面控制
112 78
         path: "operationConfig",
113
-        loadChildren: () =>
114
-          import("../operation-config/operation-config.module").then(
115
-            (m) => m.OperationConfigModule
116
-          ),
79
+        loadChildren: () => import("../operation-config/operation-config.module").then((m) => m.OperationConfigModule),
117 80
       },
81
+      // 工作分配方案列表
118 82
       {
119
-        // 工作分配方案列表
120 83
         path: "workAssignment",
121
-        loadChildren: () =>
122
-          import("../work-assignment/work-assignment.module").then(
123
-            (m) => m.WorkAssignmentModule
124
-          ),
84
+        loadChildren: () => import("../work-assignment/work-assignment.module").then((m) => m.WorkAssignmentModule),
125 85
       },
86
+      // 老工作分配方案
126 87
       {
127
-        // 老工作分配方案
128 88
         path: "jobAssignment",
129
-        loadChildren: () =>
130
-          import("../job-assignment/job-assignment.module").then(
131
-            (m) => m.JobAssignmentModule
132
-          ),
89
+        loadChildren: () => import("../job-assignment/job-assignment.module").then((m) => m.JobAssignmentModule),
133 90
       },
91
+      // 工作分配方案快速组合
134 92
       {
135
-        // 工作分配方案快速组合
136 93
         path: "quickCombination",
137
-        loadChildren: () =>
138
-          import("../quick-combination/quick-combination.module").then(
139
-            (m) => m.QuickCombinationModule
140
-          ),
94
+        loadChildren: () => import("../quick-combination/quick-combination.module").then((m) => m.QuickCombinationModule),
141 95
       },
96
+      // 用户管理
142 97
       {
143
-        // 用户管理
144 98
         path: "usersManagement",
145
-        loadChildren: () =>
146
-          import("../users-management/users-management.module").then(
147
-            (m) => m.UsersManagementModule
148
-          ),
99
+        loadChildren: () => import("../users-management/users-management.module").then((m) => m.UsersManagementModule),
149 100
       },
101
+      // 临床用户
150 102
       {
151
-        // 临床用户
152 103
         path: "clinicalUsersManagement",
153
-        loadChildren: () =>
154
-          import("../clinical-users-management/clinical-users-management.module").then(
155
-            (m) => m.ClinicalUsersManagementModule
156
-          ),
104
+        loadChildren: () => import("../clinical-users-management/clinical-users-management.module").then((m) => m.ClinicalUsersManagementModule),
157 105
       },
106
+      // TAB自定义
158 107
       {
159
-        // TAB自定义
160 108
         path: "tabCustom",
161
-        loadChildren: () =>
162
-          import("../tab-custom/tab-custom.module").then(
163
-            (m) => m.TabCustomModule
164
-          ),
109
+        loadChildren: () => import("../tab-custom/tab-custom.module").then((m) => m.TabCustomModule),
165 110
       },
111
+      // 权限管理
166 112
       {
167
-        // 权限管理
168 113
         path: "jurisdictionManagement",
169
-        loadChildren: () =>
170
-          import(
171
-            "../jurisdiction-management/jurisdiction-management.module"
172
-          ).then((m) => m.JurisdictionManagementModule),
114
+        loadChildren: () => import("../jurisdiction-management/jurisdiction-management.module").then((m) => m.JurisdictionManagementModule),
173 115
       },
116
+      // 意见箱
174 117
       {
175
-        // 意见箱
176 118
         path: "adviceManagement",
177
-        loadChildren: () =>
178
-          import("../advice-management/advice-management.module").then(
179
-            (m) => m.AdviceManagementModule
180
-          ),
119
+        loadChildren: () => import("../advice-management/advice-management.module").then((m) => m.AdviceManagementModule),
181 120
       },
121
+      // 差评处理
182 122
       {
183
-        // 差评处理
184 123
         path: "appraiseManagement",
185
-        loadChildren: () =>
186
-          import("../appraise-management/appraise-management.module").then(
187
-            (m) => m.AppraiseManagementModule
188
-          ),
124
+        loadChildren: () => import("../appraise-management/appraise-management.module").then((m) => m.AppraiseManagementModule),
189 125
       },
126
+      // 工单列表
190 127
       {
191
-        // 工单列表
192 128
         path: "orderManagement",
193
-        loadChildren: () =>
194
-          import("../order-management/order-management.module").then(
195
-            (m) => m.OrderManagementModule
196
-          ),
129
+        loadChildren: () => import("../order-management/order-management.module").then((m) => m.OrderManagementModule),
197 130
       },
131
+      // 核酸接收列表
198 132
       {
199
-        // 核酸接收列表
200 133
         path: "nucleicAcidCollection",
201
-        loadChildren: () =>
202
-          import("../nucleic-acid-collection/nucleic-acid-collection.module").then(
203
-            (m) => m.NucleicAcidCollectionModule
204
-          ),
134
+        loadChildren: () => import("../nucleic-acid-collection/nucleic-acid-collection.module").then((m) => m.NucleicAcidCollectionModule),
205 135
       },
136
+      // 表单管理列表
206 137
       {
207
-        // 表单管理列表
208 138
         path: "formManagement",
209
-        loadChildren: () =>
210
-          import("../form-management/form-management.module").then(
211
-            (m) => m.FormManagementModule
212
-          ),
139
+        loadChildren: () => import("../form-management/form-management.module").then((m) => m.FormManagementModule),
213 140
       },
141
+      // 表单管理列表详情
214 142
       {
215
-        // 表单管理列表
216 143
         path: "formManagementDetail/:id",
217
-        loadChildren: () =>
218
-          import("../form-management-detail/form-management-detail.module").then(
219
-            (m) => m.FormManagementDetailModule
220
-          ),
144
+        loadChildren: () => import("../form-management-detail/form-management-detail.module").then((m) => m.FormManagementDetailModule),
221 145
       },
146
+      // 统计分析-综合统计
222 147
       {
223
-        // 统计分析-综合统计
224 148
         path: "compreStatistics",
225
-        loadChildren: () =>
226
-          import("../compre-statistics/compre-statistics.module").then(
227
-            (m) => m.CompreStatisticsModule
228
-          ),
149
+        loadChildren: () => import("../compre-statistics/compre-statistics.module").then((m) => m.CompreStatisticsModule),
229 150
       },
151
+      // 统计分析-任务类型统计
230 152
       {
231
-        // 统计分析-任务类型统计
232 153
         path: "taskTypeStatistics",
233
-        loadChildren: () =>
234
-          import("../task-type-statistics/task-type-statistics.module").then(
235
-            (m) => m.TaskTypeStatisticsModule
236
-          ),
154
+        loadChildren: () => import("../task-type-statistics/task-type-statistics.module").then((m) => m.TaskTypeStatisticsModule),
237 155
       },
156
+      // 统计分析-科室统计
238 157
       {
239
-        // 统计分析-科室统计
240 158
         path: "deptStatistics",
241
-        loadChildren: () =>
242
-          import("../dept-statistics/dept-statistics.module").then(
243
-            (m) => m.DeptStatisticsModule
244
-          ),
159
+        loadChildren: () => import("../dept-statistics/dept-statistics.module").then((m) => m.DeptStatisticsModule),
245 160
       },
161
+      // 统计分析-工单统计
246 162
       {
247
-        // 统计分析-工单统计
248 163
         path: "orderStatistics",
249
-        loadChildren: () =>
250
-          import("../order-statistics/order-statistics.module").then(
251
-            (m) => m.OrderStatisticsModule
252
-          ),
164
+        loadChildren: () => import("../order-statistics/order-statistics.module").then((m) => m.OrderStatisticsModule),
253 165
       },
166
+      // 统计分析-支助人员统计
254 167
       {
255
-        // 统计分析-支助人员统计
256 168
         path: "workerStatistics",
257
-        loadChildren: () =>
258
-          import("../worker-statistics/worker-statistics.module").then(
259
-            (m) => m.WorkerStatisticsModule
260
-          ),
169
+        loadChildren: () => import("../worker-statistics/worker-statistics.module").then((m) => m.WorkerStatisticsModule),
261 170
       },
171
+      // 轮巡计划列表
262 172
       {
263
-        // 轮巡计划列表
264 173
         path: "roundRobin",
265
-        loadChildren: () =>
266
-          import("../round-robin/round-robin.module").then(
267
-            (m) => m.RoundRobinModule
268
-          ),
174
+        loadChildren: () => import("../round-robin/round-robin.module").then((m) => m.RoundRobinModule),
269 175
       },
176
+      // 快捷建单列表
270 177
       {
271
-        // 快捷建单列表
272 178
         path: "shortcutBuildOrders",
273
-        loadChildren: () =>
274
-          import("../shortcut-build-orders/shortcut-build-orders.module").then(
275
-            (m) => m.ShortcutBuildOrdersModule
276
-          ),
179
+        loadChildren: () => import("../shortcut-build-orders/shortcut-build-orders.module").then((m) => m.ShortcutBuildOrdersModule),
277 180
       },
181
+      // 通话记录列表
278 182
       {
279
-        // 通话记录列表
280 183
         path: "callLog",
281
-        loadChildren: () =>
282
-          import("../call-log/call-log.module").then((m) => m.CallLogModule),
184
+        loadChildren: () => import("../call-log/call-log.module").then((m) => m.CallLogModule),
283 185
       },
186
+      // 定时消息发送列表
284 187
       {
285
-        // 定时消息发送列表
286 188
         path: "timingMessageSending",
287
-        loadChildren: () =>
288
-          import(
289
-            "../timing-message-sending/timing-message-sending.module"
290
-          ).then((m) => m.TimingMessageSendingModule),
189
+        loadChildren: () => import("../timing-message-sending/timing-message-sending.module").then((m) => m.TimingMessageSendingModule),
291 190
       },
191
+      // 定时下班
292 192
       {
293
-        // 定时下班
294 193
         path: "regularOffDuty",
295
-        loadChildren: () =>
296
-          import("../regular-off-duty/regular-off-duty.module").then(
297
-            (m) => m.RegularOffDutyModule
298
-          ),
194
+        loadChildren: () => import("../regular-off-duty/regular-off-duty.module").then((m) => m.RegularOffDutyModule),
299 195
       },
196
+      // 标本信息
300 197
       {
301
-        // 标本信息
302 198
         path: "specimenSearch",
303
-        loadChildren: () =>
304
-          import("../specimen-search/specimen-search.module").then(
305
-            (m) => m.SpecimenSearchModule
306
-          ),
199
+        loadChildren: () => import("../specimen-search/specimen-search.module").then((m) => m.SpecimenSearchModule),
307 200
       },
201
+      // 检查信息
308 202
       {
309
-        // 检查信息
310 203
         path: "inspectSearch",
311
-        loadChildren: () =>
312
-          import("../inspect-search/inspect-search.module").then(
313
-            (m) => m.InspectSearchModule
314
-          ),
204
+        loadChildren: () => import("../inspect-search/inspect-search.module").then((m) => m.InspectSearchModule),
315 205
       },
206
+      // 患者信息
316 207
       {
317
-        // 患者信息
318 208
         path: "patientSearch",
319
-        loadChildren: () =>
320
-          import("../patient-search/patient-search.module").then(
321
-            (m) => m.PatientSearchModule
322
-          ),
209
+        loadChildren: () => import("../patient-search/patient-search.module").then((m) => m.PatientSearchModule),
323 210
       },
211
+      // 药品信息
324 212
       {
325
-        // 药品信息
326 213
         path: "drugSearch",
327
-        loadChildren: () =>
328
-          import("../drug-search/drug-search.module").then(
329
-            (m) => m.DrugSearchModule
330
-          ),
214
+        loadChildren: () => import("../drug-search/drug-search.module").then((m) => m.DrugSearchModule),
331 215
       },
216
+      // 静配信息
332 217
       {
333
-        // 静配信息
334 218
         path: "jpSearch",
335
-        loadChildren: () =>
336
-          import("../jp-search/jp-search.module").then((m) => m.JpSearchModule),
219
+        loadChildren: () => import("../jp-search/jp-search.module").then((m) => m.JpSearchModule),
337 220
       },
221
+      // 血制品信息
338 222
       {
339
-        // 血制品信息
340 223
         path: "bloodSearch",
341
-        loadChildren: () =>
342
-          import("../blood-search/blood-search.module").then((m) => m.BloodSearchModule),
224
+        loadChildren: () => import("../blood-search/blood-search.module").then((m) => m.BloodSearchModule),
343 225
       },
226
+      // 数据核对
344 227
       {
345
-        // 数据核对
346 228
         path: "infoSearch",
347
-        loadChildren: () =>
348
-          import("../info-search/info-search.module").then(
349
-            (m) => m.InfoSearchModule
350
-          ),
229
+        loadChildren: () => import("../info-search/info-search.module").then((m) => m.InfoSearchModule),
351 230
       },
231
+      // 院区系统配置
352 232
       {
353
-        // 院区系统配置
354 233
         path: "hospitalConfig",
355
-        loadChildren: () =>
356
-          import("../hospital-config/hospital-config.module").then(
357
-            (m) => m.HospitalConfigModule
358
-          ),
234
+        loadChildren: () => import("../hospital-config/hospital-config.module").then((m) => m.HospitalConfigModule),
359 235
       },
236
+      // 楼栋绩效
360 237
       {
361
-        // 楼栋绩效
362 238
         path: "buildingDistance",
363
-        loadChildren: () =>
364
-          import("../building-distance/building-distance.module").then(
365
-            (m) => m.BuildingDistanceModule
366
-          ),
239
+        loadChildren: () => import("../building-distance/building-distance.module").then((m) => m.BuildingDistanceModule),
367 240
       },
241
+      // 陪检绩效
368 242
       {
369
-        // 陪检绩效
370 243
         path: "inspectionDistance",
371
-        loadChildren: () =>
372
-          import("../inspection-distance/inspection-distance.module").then(
373
-            (m) => m.InspectionDistanceModule
374
-          ),
244
+        loadChildren: () => import("../inspection-distance/inspection-distance.module").then((m) => m.InspectionDistanceModule),
375 245
       },
246
+      // 检查类型配置
376 247
       {
377
-        // 检查类型配置
378 248
         path: "inspectTypeConfig",
379
-        loadChildren: () =>
380
-          import("../inspect-type-config/inspect-type-config.module").then(
381
-            (m) => m.InspectTypeConfigModule
382
-          ),
249
+        loadChildren: () => import("../inspect-type-config/inspect-type-config.module").then((m) => m.InspectTypeConfigModule),
383 250
       },
251
+      // 检查科室异常设置
384 252
       {
385
-        // 检查科室异常设置
386 253
         path: "checkDeptException",
387
-        loadChildren: () =>
388
-          import("../check-dept-exception/check-dept-exception.module").then(
389
-            (m) => m.CheckDeptExceptionModule
390
-          ),
254
+        loadChildren: () => import("../check-dept-exception/check-dept-exception.module").then((m) => m.CheckDeptExceptionModule),
391 255
       },
256
+      // 工单消息设置
392 257
       {
393
-        // 工单消息设置
394 258
         path: "workorderMessage",
395
-        loadChildren: () =>
396
-          import("../workorder-message/workorder-message.module").then(
397
-            (m) => m.WorkorderMessageModule
398
-          ),
259
+        loadChildren: () => import("../workorder-message/workorder-message.module").then((m) => m.WorkorderMessageModule),
399 260
       },
261
+      // 楼栋楼层
400 262
       {
401
-        // 楼栋楼层
402 263
         path: "buildingFloor",
403
-        loadChildren: () =>
404
-          import("../building-floor/building-floor.module").then(
405
-            (m) => m.BuildingFloorModule
406
-          ),
264
+        loadChildren: () => import("../building-floor/building-floor.module").then((m) => m.BuildingFloorModule),
407 265
       },
266
+      // 检查自动建单
408 267
       {
409
-        // 检查自动建单
410 268
         path: "inspectAuto",
411
-        loadChildren: () =>
412
-          import("../inspect-auto/inspect-auto.module").then(
413
-            (m) => m.InspectAutoModule
414
-          ),
269
+        loadChildren: () => import("../inspect-auto/inspect-auto.module").then((m) => m.InspectAutoModule),
415 270
       },
271
+      // 人员检查主动服务统计
416 272
       {
417
-        // 人员检查主动服务统计
418 273
         path: "inspectActive",
419
-        loadChildren: () =>
420
-          import("../inspect-active/inspect-active.module").then(
421
-            (m) => m.InspectActiveModule
422
-          ),
274
+        loadChildren: () => import("../inspect-active/inspect-active.module").then((m) => m.InspectActiveModule),
423 275
       },
276
+      // 建单来源统计
424 277
       {
425
-        // 建单来源统计
426 278
         path: "orderSourceStatistics",
427
-        loadChildren: () =>
428
-          import(
429
-            "../order-source-statistics/order-source-statistics.module"
430
-          ).then((m) => m.OrderSourceStatisticsModule),
279
+        loadChildren: () => import("../order-source-statistics/order-source-statistics.module").then((m) => m.OrderSourceStatisticsModule),
431 280
       },
281
+      // 科室建单来源统计
432 282
       {
433
-        // 科室建单来源统计
434 283
         path: "deptOrderSourceStatistics",
435
-        loadChildren: () =>
436
-          import(
437
-            "../dept-order-source-statistics/dept-order-source-statistics.module"
438
-          ).then((m) => m.DeptOrderSourceStatisticsModule),
284
+        loadChildren: () => import("../dept-order-source-statistics/dept-order-source-statistics.module").then((m) => m.DeptOrderSourceStatisticsModule),
439 285
       },
286
+      // 任务类型建单来源统计
440 287
       {
441
-        // 任务类型建单来源统计
442 288
         path: "tasktypeOrderSourceStatistics",
443
-        loadChildren: () =>
444
-          import(
445
-            "../tasktype-order-source-statistics/tasktype-order-source-statistics.module"
446
-          ).then((m) => m.TasktypeOrderSourceStatisticsModule),
289
+        loadChildren: () => import("../tasktype-order-source-statistics/tasktype-order-source-statistics.module").then((m) => m.TasktypeOrderSourceStatisticsModule),
447 290
       },
291
+      // 问卷调查管理列表
448 292
       {
449
-        // 问卷调查管理列表
450 293
         path: "questionnaireManagement",
451
-        loadChildren: () =>
452
-          import("../questionnaire-management/questionnaire-management.module").then(
453
-            (m) => m.QuestionnaireManagementModule
454
-          ),
294
+        loadChildren: () => import("../questionnaire-management/questionnaire-management.module").then((m) => m.QuestionnaireManagementModule),
455 295
       },
296
+      // 问卷问题列表
456 297
       {
457
-        // 问卷问题列表
458 298
         path: "questions",
459
-        loadChildren: () =>
460
-          import("../questions/questions.module").then(
461
-            (m) => m.QuestionsModule
462
-          ),
299
+        loadChildren: () => import("../questions/questions.module").then((m) => m.QuestionsModule),
463 300
       },
301
+      // 问卷回收数据列表
464 302
       {
465
-        // 问卷回收数据列表
466 303
         path: "questionnaireAnswer",
467
-        loadChildren: () =>
468
-          import("../questionnaire-answer/questionnaire-answer.module").then(
469
-            (m) => m.QuestionnaireAnswerModule
470
-          ),
304
+        loadChildren: () => import("../questionnaire-answer/questionnaire-answer.module").then((m) => m.QuestionnaireAnswerModule),
471 305
       },
472 306
     ],
473 307
   },

+ 14 - 26
src/app/views/main/main.component.html

@@ -37,17 +37,14 @@
37 37
           <button nz-button nzType="primary" *ngIf="pharmacyRole" (click)="toPharmacy()">药房端</button>
38 38
           <button nz-button nzType="primary" *ngIf="pharmacyRole" (click)="toPharmacy2()">药房端2</button>
39 39
           <button nz-button nzType="primary" *ngIf="largeScreenRole" (click)="toBigScreen('largeScreen')">大屏端</button>
40
-          <button nz-button nzType="primary" *ngIf="largeScreenRole2"
41
-            (click)="toBigScreen('largeScreen2')">大屏端2</button>
42
-          <button nz-button nzType="primary" *ngIf="specimenViewRole" (click)="toBigScreen('specimenView')"
43
-            [nzLoading]="deptTypeLoading">业务视图</button>
40
+          <button nz-button nzType="primary" *ngIf="largeScreenRole2" (click)="toBigScreen('largeScreen2')">大屏端2</button>
41
+          <button nz-button nzType="primary" *ngIf="specimenViewRole" (click)="toBigScreen('specimenView')" [nzLoading]="deptTypeLoading">业务视图</button>
44 42
           <button nz-button nzType="primary" *ngIf="specimenViewRole2" (click)="toSpecimenView2()">标本视图</button>
45 43
           <button nz-button nzType="primary" *ngIf="disinfectionSupplyRole" (click)="toDisinfectionSupply()">全局业务查看</button>
46 44
         </div>
47 45
         <div class="right">
48 46
           <div class="msg">
49
-            <div class="msgBtn display_flex align-items_center justify-content_flex-center" nz-popover
50
-              [nzPopoverContent]="contentTemplate" nzPopoverPlacement="bottomRight">
47
+            <div class="msgBtn display_flex align-items_center justify-content_flex-center" nz-popover [nzPopoverContent]="contentTemplate" nzPopoverPlacement="bottomRight">
51 48
               <i nz-icon nzType="bell" nzTheme="outline"></i>
52 49
             </div>
53 50
             <ng-template #contentTemplate>
@@ -58,8 +55,7 @@
58 55
           </div>
59 56
           <div class="userInfo">
60 57
             <div class="wel">欢迎您,{{currentHospital.hosName}}:</div>
61
-            <div class="user"><img src="../../assets/images/icon_keshi.png"
62
-                alt="">{{(userInfo&&userInfo.user)?userInfo.user.name:''}}</div>
58
+            <div class="user"><img src="../../assets/images/icon_keshi.png" alt="">{{(userInfo&&userInfo.user)?userInfo.user.name:''}}</div>
63 59
             <div class="logOut">
64 60
               <span (click)="hosFlag1 = true">选择院区</span>
65 61
               <span (click)="showUpPwd()">修改密码</span>
@@ -91,24 +87,21 @@
91 87
   </div>
92 88
 </ng-template>
93 89
 <!-- 修改密码 -->
94
-<nz-modal [(nzVisible)]="isPwdVisible" nzTitle="修改密码" (nzOnCancel)="pwdHandleCancel()" (nzOnOk)="pwdHandleOk()"
95
-  [nzOkLoading]="pwdIsOkLoading" (nzAfterOpen)="pwdAfterOpen()">
90
+<nz-modal [(nzVisible)]="isPwdVisible" nzTitle="修改密码" (nzOnCancel)="pwdHandleCancel()" (nzOnOk)="pwdHandleOk()" [nzOkLoading]="pwdIsOkLoading" (nzAfterOpen)="pwdAfterOpen()">
96 91
   <div>
97
-    <label>原始密码:
92
+    <label>
93
+      原始密码:
98 94
       <nz-input-group [nzSuffix]="suffixTemplate">
99
-        <input minlength="9" [type]="passwordVisible ? 'text' : 'password'" nz-input placeholder="原始密码"
100
-          [(ngModel)]="upModalData.pwdOld" />
95
+        <input minlength="9" [type]="passwordVisible ? 'text' : 'password'" nz-input placeholder="原始密码" [(ngModel)]="upModalData.pwdOld" />
101 96
       </nz-input-group>
102 97
       <ng-template #suffixTemplate>
103
-        <i nz-icon [nzType]="passwordVisible ? 'eye-invisible' : 'eye'"
104
-          (click)="passwordVisible = !passwordVisible"></i>
98
+        <i nz-icon [nzType]="passwordVisible ? 'eye-invisible' : 'eye'" (click)="passwordVisible = !passwordVisible"></i>
105 99
       </ng-template>
106 100
     </label>
107 101
     <label>新密码:
108 102
       <div style="display: flex;">
109 103
         <nz-input-group [nzSuffix]="suffixTemplate">
110
-          <input minlength="9" [type]="passwordVisible ? 'text' : 'password'" nz-input placeholder="新密码"
111
-            [(ngModel)]="upModalData.newPwd" (ngModelChange)="blurNewPwd()" />
104
+          <input minlength="9" [type]="passwordVisible ? 'text' : 'password'" nz-input placeholder="新密码" [(ngModel)]="upModalData.newPwd" (ngModelChange)="blurNewPwd()" />
112 105
         </nz-input-group>
113 106
         <ng-template #suffixTemplate>
114 107
           <i nz-icon [nzType]="passwordVisible ? 'eye-invisible' : 'eye'" (click)="passwordVisible = !passwordVisible"></i>
@@ -121,23 +114,18 @@
121 114
     <div class="red">强密码需包含大小写字母、数字、特殊字符,长度至少9个字符</div>
122 115
     <label>确认新密码:
123 116
       <nz-input-group [nzSuffix]="suffixTemplate">
124
-        <input minlength="9" [type]="passwordVisible ? 'text' : 'password'" nz-input placeholder="确认新密码"
125
-          [(ngModel)]="upModalData.newPwd2" />
117
+        <input minlength="9" [type]="passwordVisible ? 'text' : 'password'" nz-input placeholder="确认新密码" [(ngModel)]="upModalData.newPwd2" />
126 118
       </nz-input-group>
127 119
       <ng-template #suffixTemplate>
128
-        <i nz-icon [nzType]="passwordVisible ? 'eye-invisible' : 'eye'"
129
-          (click)="passwordVisible = !passwordVisible"></i>
120
+        <i nz-icon [nzType]="passwordVisible ? 'eye-invisible' : 'eye'" (click)="passwordVisible = !passwordVisible"></i>
130 121
       </ng-template>
131 122
     </label>
132 123
   </div>
133 124
 </nz-modal>
134 125
 <!-- 大屏或视图选择院区模态框 -->
135
-<app-select-hospital (hosFlagHand)="hosFlagHand($event)" (submitFormHand)="submitFormHand($event)" [hosFlag]="hosFlag">
136
-</app-select-hospital>
126
+<app-select-hospital (hosFlagHand)="hosFlagHand($event)" (submitFormHand)="submitFormHand($event)" [hosFlag]="hosFlag"></app-select-hospital>
137 127
 <!-- 切换院区 -->
138
-<app-select-hospital (hosFlagHand)="hosFlagHand1($event)" (submitFormHand)="submitFormHand1($event)"
139
-  [hosFlag]="hosFlag1">
140
-</app-select-hospital>
128
+<app-select-hospital (hosFlagHand)="hosFlagHand1($event)" (submitFormHand)="submitFormHand1($event)" [hosFlag]="hosFlag1"></app-select-hospital>
141 129
 <!-- 模态框 -->
142 130
 <div class="save display_flex justify-content_flex-center align-items_center" *ngIf="delModal">
143 131
   <div class="modalBody">

+ 0 - 42
src/app/views/main/main.component.less

@@ -240,7 +240,6 @@ nz-header.ant-layout-header {
240 240
 .inner-content {
241 241
   background: #fff;
242 242
   height: 100%;
243
-  // height: calc(100vh - 88px) !important;
244 243
 }
245 244
 
246 245
 .msgTemBox {
@@ -348,45 +347,4 @@ nz-header.ant-layout-header {
348 347
       }
349 348
     }
350 349
   }
351
-
352
-  // 新增
353
-  &.add {
354
-    .modalBody {
355
-      width: 480px;
356
-      height: auto;
357
-
358
-      .content {
359
-        width: 100%;
360
-        height: auto;
361
-        padding: 19px 14px 0 14px;
362
-        max-height: 500px;
363
-        overflow-y: auto;
364
-
365
-        .addForm {
366
-          .ant-form-item {
367
-            margin-bottom: 14px;
368
-
369
-            .ant-form-item-label {
370
-              line-height: 14px;
371
-              text-align: left;
372
-            }
373
-          }
374
-        }
375
-
376
-        .editForm {
377
-          .ant-form-item {
378
-            margin-bottom: 14px;
379
-
380
-            .ant-form-item-label {
381
-              line-height: 0;
382
-            }
383
-          }
384
-        }
385
-      }
386
-
387
-      button:nth-child(1) {
388
-        margin-right: 20px;
389
-      }
390
-    }
391
-  }
392 350
 }