seimin месяцев назад: 4
Родитель
Сommit
9565efd9b1

+ 92 - 0
src/app/components/configurationCenter/configuration-quick/configuration-quick.component.html

@@ -0,0 +1,92 @@
1
+<div class="content priority">
2
+  <div class="contentInner">
3
+    <div class="list-template" id="priorityTable">
4
+      <div class="list-template__content">
5
+        <div class="list-template__bottom">
6
+         <div class="list-template__top" nz-row>
7
+            <div nz-col nzLg="24" class="list-template__btns">
8
+              <button nz-button class="btn default" (click)="addPriorityModal()">新增</button>
9
+            </div>
10
+          </div>
11
+          <nz-table class="list-template__nzTable" [nzData]="commonFaultsList" nzSize="middle" [nzShowPagination]="false"
12
+            [nzLoading]="loading1" [nzScroll]="{ y: tablePriorityHeight + 'px' }">
13
+            <thead>
14
+              <tr class="thead">
15
+                <th nzWidth="25%">排序号</th>
16
+                <th nzWidth="25%">故障现象</th>
17
+                <th nzWidth="25%">别名</th>
18
+                <th nzWidth="25%">操作</th>
19
+              </tr>
20
+            </thead>
21
+            <tbody>
22
+              <tr *ngFor="let data of commonFaultsList;let i = index">
23
+                <td>{{data.orders}}</td>
24
+                <td>{{data.categoryDTO?.mutiCategory}}</td>
25
+                <td>{{data.content}}</td>
26
+                <td>
27
+                  <div class="coop">
28
+                    <span (click)="showDelModal(data,'您确认要删除吗?','删除','delPriority')">删除</span>
29
+                    <span (click)="editPriority(data)">编辑</span>
30
+                  </div>
31
+                </td>
32
+              </tr>
33
+            </tbody>
34
+          </nz-table>
35
+        </div>
36
+      </div>
37
+    </div>
38
+  </div>
39
+</div>
40
+
41
+<!-- 操作成功/失败提示框 -->
42
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
43
+  [info]="promptInfo">
44
+</app-prompt-modal>
45
+
46
+<!-- 删除模态框 -->
47
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
48
+(confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>
49
+
50
+<!-- 新增/编辑模态框 -->
51
+<div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="modalPriority">
52
+  <div class="modalBody">
53
+    <div class="title">{{modelName}}<i class="icon_transport transport-guanbi" (click)="hidePriorityModal()"></i></div>
54
+    <div class="content">
55
+      <form nz-form [formGroup]="validatePriorityForm" class="addForm">
56
+        <nz-form-item>
57
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="orders">排序号</nz-form-label>
58
+          <nz-form-control [nzSpan]="18" nzErrorTip="请输入排序号!">
59
+            <nz-input-group>
60
+              <nz-input-number class="w100" formControlName="orders" nzPlaceHolder="请输入排序号" [nzMin]="0" [nzStep]="1" [nzPrecision]="0"></nz-input-number>
61
+            </nz-input-group>
62
+          </nz-form-control>
63
+        </nz-form-item>
64
+        <nz-form-item>
65
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="content">别名</nz-form-label>
66
+          <nz-form-control [nzSpan]="18" nzErrorTip="请输入别名!">
67
+            <nz-input-group>
68
+              <input formControlName="content" nz-input placeholder="请输入别名">
69
+            </nz-input-group>
70
+          </nz-form-control>
71
+        </nz-form-item>
72
+        <nz-form-item>
73
+          <nz-form-label nzFor="category" nzRequired [nzSpan]="6">故障现象</nz-form-label>
74
+          <nz-form-control [nzSpan]="18">
75
+						<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择故障现象" formControlName="category" (nzOnSearch)="changeCommonInp('category', $event)">
76
+						  <ng-container *ngFor="let option of malfunctionData">
77
+						    <nz-option *ngIf="!isLoading" [nzLabel]="option.mutiCategory" [nzValue]="option.id"></nz-option>
78
+						  </ng-container>
79
+						  <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
80
+						    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
81
+						  </nz-option>
82
+						</nz-select>
83
+          </nz-form-control>
84
+        </nz-form-item>
85
+      </form>
86
+    </div>
87
+    <div class=" display_flex justify-content_flex-center">
88
+      <button nzType="primary" nz-button (click)="submitPriorityForm()" [nzLoading]="btnLoading">确认</button>
89
+      <button class="btn cancel" nz-button nzType="default" (click)="hidePriorityModal()">取消</button>
90
+    </div>
91
+  </div>
92
+</div>

+ 290 - 0
src/app/components/configurationCenter/configuration-quick/configuration-quick.component.less

@@ -0,0 +1,290 @@
1
+@import "../../../../../src/theme.less";
2
+:host {
3
+  height: 100%;
4
+  display: flex;
5
+  flex-direction: column;
6
+  justify-content: space-between;
7
+  background-color: #F0F2F5;
8
+  .list-template__nzTable,
9
+  .list-template__bottom{
10
+    padding: 0!important;
11
+    border: none!important;
12
+    background: #fff!important;
13
+  }
14
+  .list-template{
15
+    width: 100%!important;
16
+    height: 100%!important;
17
+  }
18
+  .content{
19
+    flex: 1;
20
+    min-height: 0;
21
+    display: flex;
22
+    flex-direction: column;
23
+    justify-content: space-between;
24
+    border: 1px solid #EEF3F9;
25
+    &.priority{
26
+      margin: 20px;
27
+      background-color: #fff;
28
+      .contentInner{
29
+        border: 1px solid #E8EBEF;
30
+      }
31
+    }
32
+    .contentItem{
33
+      padding: 4px 16px;
34
+      cursor: pointer;
35
+      overflow: hidden;
36
+      text-overflow: ellipsis;
37
+      white-space: nowrap;
38
+      &.active{
39
+        color: @primary-color;
40
+        background-color: #F0F6ED;
41
+        border-radius: 4px;
42
+      }
43
+    }
44
+    .contentInner{
45
+      flex: 1;
46
+      display: flex;
47
+      justify-content: space-between;
48
+      align-items: center;
49
+      padding: 0 16px;
50
+      gap: 16px;
51
+      .contentHead{
52
+        height: 45px;
53
+        display: flex;
54
+        justify-content: space-between;
55
+        align-items: center;
56
+        gap: 16px;
57
+        padding: 0 16px;
58
+        font-size: 16px;
59
+        font-weight: bold;
60
+        border-bottom: 1px solid #D9D9D9;
61
+        .title{
62
+          overflow: hidden;
63
+          text-overflow: ellipsis;
64
+          white-space: nowrap;
65
+        }
66
+        .btns{
67
+          flex-shrink: 0;
68
+        }
69
+      }
70
+      .contentBody{
71
+        padding: 0 8px;
72
+        margin: 4px 0;
73
+        flex: 1;
74
+      }
75
+      .address{
76
+        flex: 1;
77
+        height: 100%;
78
+        background: #FFFFFF;
79
+        border: 1px solid #E8EBEF;
80
+        display: flex;
81
+        flex-direction: column;
82
+        width: 0;
83
+      }
84
+      .addressAssign{
85
+        flex: 3;
86
+        height: 100%;
87
+        background: #FFFFFF;
88
+        border: 1px solid #E8EBEF;
89
+        display: flex;
90
+        flex-direction: column;
91
+        width: 0;
92
+      }
93
+      .list-template__searchItem {
94
+        margin-bottom: 16px;
95
+        .label {
96
+          color: #333;
97
+          display: inline-block;
98
+          width: 70px;
99
+          text-align-last: justify;
100
+          text-align: justify;
101
+          &.label--big {
102
+            width: 100px;
103
+          }
104
+        }
105
+        .formItem {
106
+          width: 135px;
107
+        }
108
+      }
109
+    }
110
+    .contentBtns{
111
+      margin-bottom: 16px;
112
+      display: flex;
113
+      justify-content: center;
114
+      align-items: center;
115
+    }
116
+  }
117
+
118
+  .save {
119
+    position: fixed;
120
+    left: 0;
121
+    top: 0;
122
+    width: 100%;
123
+    height: 100%;
124
+    background: rgba(0, 0, 0, 0.4);
125
+    z-index: 99;
126
+
127
+    .tips{
128
+      margin-bottom: 16px!important;
129
+    }
130
+
131
+    .modalBody {
132
+      width: 350px;
133
+      background: #fff;
134
+      border-radius: 5px;
135
+      padding: 10px 20px;
136
+      color: #333;
137
+
138
+      .title {
139
+        width: 100%;
140
+        text-align: center;
141
+        font-size: 18px;
142
+        position: relative;
143
+
144
+        i {
145
+          position: absolute;
146
+          right: 0;
147
+          top: 0;
148
+          font-size: 20px;
149
+          color: #666;
150
+          cursor: pointer;
151
+          padding: 0 5px;
152
+        }
153
+      }
154
+
155
+      .content {
156
+        width: 310px;
157
+        background: #f9fafb;
158
+        border: 1px solid #e5e9ed;
159
+        border-radius: 5px;
160
+        overflow: hidden;
161
+        margin-top: 12px;
162
+        padding: 16px 0;
163
+
164
+        .busyList{
165
+          display: flex;
166
+          margin-bottom: 8px;
167
+          .busyContent{
168
+            margin-right: 8px;
169
+            flex: 1;
170
+          }
171
+        }
172
+
173
+        & > div {
174
+          text-align: center;
175
+          margin: 0;
176
+
177
+          &.icon {
178
+            // margin-top: 17px;
179
+
180
+            i {
181
+              color: #34b349;
182
+              font-size: 30px !important;
183
+
184
+              &.transport-wenhao {
185
+                color: #f5a523;
186
+              }
187
+
188
+              &.transport-shibai {
189
+                color: #ff3a52;
190
+              }
191
+            }
192
+          }
193
+
194
+          &.defeat {
195
+            color: #333;
196
+            font-size: 14px;
197
+          }
198
+
199
+          &:nth-child(3) {
200
+            font-size: 14px;
201
+            color: #666;
202
+          }
203
+        }
204
+        .workAssignmentTips {
205
+          font-size: 12px;
206
+        }
207
+      }
208
+
209
+      button {
210
+        margin-top: 10px;
211
+
212
+        &.btn {
213
+          margin-left: 8px;
214
+        }
215
+      }
216
+    }
217
+
218
+    // 新增
219
+    &.add {
220
+      .modalBody {
221
+        width: 480px;
222
+        height: auto;
223
+
224
+        .content {
225
+          width: 100%;
226
+          height: auto;
227
+          padding: 16px;
228
+          max-height: 497px;
229
+          overflow-y: auto;
230
+
231
+          .addForm {
232
+            .ant-form-item {
233
+              margin-bottom: 0;
234
+							.ant-select{
235
+								width: 100% !important;
236
+							}
237
+              .ant-form-item-label {
238
+                text-align: left;
239
+              }
240
+
241
+              .desc {
242
+                margin-top: 5px;
243
+              }
244
+            }
245
+
246
+            .datesControl {
247
+              margin-top: -16px;
248
+
249
+              .ant-form-item-label {
250
+                line-height: 40px;
251
+              }
252
+            }
253
+
254
+            .timer {
255
+              .ant-form-item-label {
256
+                width: 100%;
257
+                text-align: left;
258
+              }
259
+
260
+              .numInp {
261
+                margin-right: 5px;
262
+              }
263
+
264
+              .line {
265
+                margin-right: 5px;
266
+              }
267
+            }
268
+
269
+            .timer2 {
270
+              .ant-form-item-label {
271
+                line-height: 20px;
272
+              }
273
+            }
274
+          }
275
+
276
+          .editForm {
277
+            .ant-form-item {
278
+              margin-bottom: 15px;
279
+
280
+              .ant-form-item-label {
281
+                line-height: 14px;
282
+                text-align: left;
283
+              }
284
+            }
285
+          }
286
+        }
287
+      }
288
+    }
289
+  }
290
+}

+ 235 - 0
src/app/components/configurationCenter/configuration-quick/configuration-quick.component.ts

@@ -0,0 +1,235 @@
1
+import { Component, OnInit } from "@angular/core";
2
+import { ActivatedRoute } from "@angular/router";
3
+import { Subject } from 'rxjs';
4
+import { debounceTime } from 'rxjs/operators';
5
+import { MainService } from "../../../services/main.service";
6
+import { Validators, FormGroup, FormBuilder } from '@angular/forms';
7
+import { ToolService } from 'src/app/services/tool.service';
8
+import { NzMessageService } from 'ng-zorro-antd';
9
+
10
+@Component({
11
+  selector: "app-configuration-quick",
12
+  templateUrl: "./configuration-quick.component.html",
13
+  styleUrls: ["./configuration-quick.component.less"],
14
+})
15
+export class ConfigurationQuickComponent implements OnInit {
16
+  constructor(
17
+    private route: ActivatedRoute,
18
+    private mainService: MainService,
19
+    private fb: FormBuilder,
20
+    private tool: ToolService,
21
+    private message: NzMessageService,
22
+  ) {}
23
+
24
+  coopData: any = {}; //当前操作列
25
+	hosId:any;
26
+	hospitals:any = [];
27
+	isDeptLoading: boolean = false;
28
+
29
+	currentHospital:any;
30
+	malfunctionData:any = [];
31
+	allUserGroup:any = [];
32
+	userData:any = [];
33
+
34
+  changeCommonInpSubject = new Subject();
35
+
36
+  ngOnInit() {
37
+		this.changeCommonInpSubject.pipe(debounceTime(500)).subscribe((v) => {
38
+      if(v[0] === 'category'){
39
+        this.searchApplicationCategory(v[1]);
40
+      }
41
+    });
42
+
43
+    // 优先级
44
+    setTimeout(() => {
45
+      this.tablePriorityHeight = document.querySelector('#priorityTable').clientHeight - document.querySelector('#priorityTable .list-template__top').clientHeight - 8 - document.querySelector('#priorityTable .thead').clientHeight;
46
+    }, 100)
47
+		this.hosId = this.tool.getCurrentHospital().id;
48
+		this.currentHospital = this.tool.getCurrentHospital();
49
+    this.getCommonFaultsList();
50
+		this.searchApplicationCategory()
51
+  }
52
+
53
+  // 新增优先级弹框
54
+  modelName = ""; //模态框名称
55
+  modalPriority: boolean = false; //新增/编辑模态框
56
+  add: boolean; //true:新增;false:编辑
57
+  addPriorityModal() {
58
+    this.modelName = "新增";
59
+    this.add = true; //新增
60
+    this.modalPriority = true;
61
+    this.initForm();
62
+  }
63
+  //关闭新增/编辑弹框
64
+  hidePriorityModal() {
65
+    this.modalPriority = false;
66
+  }
67
+
68
+  changeCommonInp(type, e) {
69
+    this.changeCommonInpSubject.next([type, e]);
70
+  }
71
+
72
+	// 获取故障现象数据
73
+  isLoading:boolean = false;
74
+	searchApplicationCategory(keyWord?){
75
+		let postData = {
76
+		  category: {
77
+        category: keyWord,
78
+        selectType: "mutlQuery",
79
+		    hierarchy: 3,
80
+		  },
81
+		};
82
+    this.isLoading = true;
83
+		this.mainService.incidentPost("listIncidentCategory", postData).subscribe(data => {
84
+		  this.isLoading = false;
85
+      if (data.status == 200) {
86
+        this.malfunctionData = data.data || [];
87
+      }
88
+		})
89
+	}
90
+
91
+  // 编辑
92
+  editPriority(data) {
93
+    console.log(data);
94
+    this.modelName = "编辑";
95
+    this.add = false;
96
+    this.modalPriority = true;
97
+    this.initForm();
98
+    this.coopData = data;
99
+    this.validatePriorityForm.controls.orders.setValue(data.orders);
100
+    this.validatePriorityForm.controls.content.setValue(data.content);
101
+    this.validatePriorityForm.controls.category.setValue(data.category);
102
+  }
103
+
104
+  // 新增/编辑表单提交
105
+  btnLoading: boolean = false; //提交按钮loading状态
106
+  submitPriorityForm(): void {
107
+    for (const i in this.validatePriorityForm.controls) {
108
+      this.validatePriorityForm.controls[i].markAsDirty();
109
+      this.validatePriorityForm.controls[i].updateValueAndValidity();
110
+    }
111
+    if (this.validatePriorityForm.invalid) {
112
+      return;
113
+    }
114
+    console.log(this.validatePriorityForm.value);
115
+    this.btnLoading = true;
116
+    let postData:any = {};
117
+    if (this.add) {
118
+      //增加
119
+      postData = {
120
+        orders: this.validatePriorityForm.value.orders,
121
+        content: this.validatePriorityForm.value.content,
122
+        category: this.validatePriorityForm.value.category,
123
+      };
124
+    } else {
125
+      //编辑
126
+      postData = {
127
+				...this.coopData,
128
+				orders: this.validatePriorityForm.value.orders,
129
+        content: this.validatePriorityForm.value.content,
130
+        category: this.validatePriorityForm.value.category,
131
+      };
132
+    }
133
+    this.mainService
134
+      .simplePost("addData", "incidentCategoryContent", postData)
135
+      .subscribe((result) => {
136
+        this.btnLoading = false;
137
+        this.hidePriorityModal();
138
+        let msg = "";
139
+        if (this.add) {
140
+          msg = "新增";
141
+        } else {
142
+          msg = "修改";
143
+        }
144
+        if (result.status == 200) {
145
+          this.showPromptModal(msg, true, '');
146
+        } else {
147
+          this.showPromptModal(msg, false, result.msg);
148
+        }
149
+      });
150
+  }
151
+
152
+  // 初始化新增form表单
153
+  validatePriorityForm: FormGroup; //新增/编辑表单
154
+  initForm() {
155
+    this.validatePriorityForm = this.fb.group({
156
+      orders: [0, [Validators.required]],//排序号
157
+      content: [null, [Validators.required]],//别名
158
+      category: [null, [Validators.required]],//故障现象
159
+    });
160
+    console.log(this.validatePriorityForm.controls)
161
+  }
162
+
163
+  // 获取列表
164
+  loading1:boolean = false;
165
+  commonFaultsList: any[] = []; //表格数据
166
+  tablePriorityHeight:number = 0;
167
+  getCommonFaultsList() {
168
+    let data = {
169
+			idx: 0,
170
+			sum: 99999,
171
+			incidentCategoryContent: {},
172
+		};
173
+		this.loading1 = true;
174
+		this.mainService
175
+			.getFetchDataList("simple/data", "incidentCategoryContent", data)
176
+			.subscribe((data) => {
177
+				this.loading1 = false;
178
+				this.commonFaultsList = data.list || [];
179
+			});
180
+  }
181
+
182
+  delModal: boolean = false; //删除模态框
183
+  tipsMsg1: string; //提示框信息
184
+  tipsMsg2: string; //操作后信息
185
+  confirmDelType: string; //确认的类型(启用/停用,删除)
186
+  showDelModal(
187
+    data,
188
+    tipsMsg1: string,
189
+    tipsMsg2: string,
190
+    type: string,
191
+  ) {
192
+    this.confirmDelType = type;
193
+    this.delModal = true;
194
+    this.coopData = data;
195
+    console.log(this.coopData);
196
+    this.tipsMsg1 = tipsMsg1;
197
+    this.tipsMsg2 = tipsMsg2;
198
+  }
199
+  // 隐藏删除框
200
+  hideDelModal() {
201
+    this.delModal = false;
202
+  }
203
+  // 确认删除
204
+  confirmDel() {
205
+    this.btnLoading = true;
206
+		//删除-优先级
207
+		this.mainService
208
+			.simplePost("rmvData", "incidentCategoryContent", [this.coopData.id])
209
+			.subscribe((data) => {
210
+				this.btnLoading = false;
211
+				this.delModal = false;
212
+				if (data.status == 200) {
213
+					this.showPromptModal(this.tipsMsg2, true, "");
214
+				} else {
215
+					this.showPromptModal(this.tipsMsg2, false, data.msg);
216
+				}
217
+			});
218
+  }
219
+
220
+  // 展示信息提示框(con:提示信息,success:操作是否成功,promptInfo:操作结果提示信息)
221
+  promptContent: string; //操作提示框提示信息
222
+  ifSuccess: boolean; //操作成功/失败
223
+  promptInfo: string; //操作结果提示信息
224
+  promptModalShow: boolean; //操作提示框是否展示
225
+  showPromptModal(con, success, promptInfo?) {
226
+    this.promptModalShow = false;
227
+    this.promptContent = con;
228
+    this.ifSuccess = success;
229
+    this.promptInfo = promptInfo;
230
+    setTimeout(() => {
231
+      this.promptModalShow = true;
232
+    }, 100);
233
+    this.getCommonFaultsList();
234
+  }
235
+}

+ 43 - 355
src/app/views/hushijiandan/hushijiandan.component.html

@@ -1,27 +1,12 @@
1 1
 <div class="nurse">
2 2
   <nz-layout class="app-layout display_flex flex_auto">
3
-    <nz-sider
4
-      class="menu-sidebar slider"
5
-      nzWidth="224px"
6
-      nzBreakpoint="xs"
7
-      [nzTrigger]="null"
8
-    >
9
-      <div
10
-        class="sidebar-logo display_flex align-items_center justify-content_flex-center"
11
-      >
12
-        <div style="line-height: normal;height: 100%;" class="display_flex align-items_center justify-content_flex-center flex-direction_column">
13
-          <!-- <img src="../../assets/images/xiehe_logo.jpg" style="width:100%;" alt="logo" /> -->
14
-          <img [src]="tool.logoUrl" />
15
-          <span>{{tool.logoTitle}}</span>
3
+    <nz-sider class="menu-sidebar slider" nzWidth="190px" nzBreakpoint="xs" [nzTrigger]="null">
4
+      <div class="sidebar-logo display_flex align-items_center justify-content_flex-center">
5
+        <div style="line-height: normal;height: 100%;" class="display_flex align-items_center justify-content_flex-center logoTitle">
6
+          <div class="title ellipsis-multiline" nz-tooltip nzTooltipTitle="{{tool.logoTitle}}">{{tool.logoTitle}}</div>
16 7
         </div>
17 8
       </div>
18
-      <div
19
-        class="notAvailable display_flex align-items_center justify-content_flex-center"
20
-        *ngIf="
21
-          !deptTaskTypeRules.openInspection &&
22
-          !deptTaskTypeRules.openPatientTransport
23
-        "
24
-      >
9
+      <div class="notAvailable display_flex align-items_center justify-content_flex-center" *ngIf="!deptTaskTypeRules.openInspection && !deptTaskTypeRules.openPatientTransport">
25 10
         <div>
26 11
           <img src="../../assets/images/icon_jianchakong.png" alt="" />
27 12
           <div>暂未开通</div>
@@ -29,44 +14,23 @@
29 14
       </div>
30 15
       <div class="mainInfo">
31 16
         <div class="searchBox">
32
-          <input
33
-            nz-input
34
-            [(ngModel)]="tabSearchCont"
35
-            (ngModelChange)="searchTabInp($event)"
36
-            placeholder="请输入关键字"
37
-          />
17
+          <input nz-input [(ngModel)]="tabSearchCont" (ngModelChange)="searchTabInp($event)" placeholder="请输入关键字" />
38 18
         </div>
39 19
         <div class="checkBanner" nz-row>
40
-          <button
41
-            nz-button
42
-            nz-col
43
-            nzSpan="12"
44
-            class="checkItem checked"
45
-            (click)="changeInfo()"
46
-          >
20
+          <button nz-button nz-col nzSpan="12" class="checkItem checked" (click)="changeInfo()">
47 21
           {{(currentDept.typeValue == 'surgery' && !this.tabSearchCont) ? '手术安排信息' : '患者信息'}}
48 22
           </button>
49 23
         </div>
50 24
         <!-- 患者信息-复苏室科室类型 -->
51 25
         <div class="checkedInfo patient" style="padding-bottom: 0" *ngIf="currentDept.typeValue == 'recovery'">
52 26
           <overlay-scrollbars #osComponentRef4 class="box">
53
-            <div
54
-              class="loading display_flex align-items_center justify-content_flex-center"
55
-              *ngIf="
56
-                pLoading &&
57
-                (deptTaskTypeRules.openInspection ||
58
-                  deptTaskTypeRules.openPatientTransport)
59
-              "
60
-            >
27
+            <div class="loading display_flex align-items_center justify-content_flex-center" *ngIf="pLoading && (deptTaskTypeRules.openInspection || deptTaskTypeRules.openPatientTransport)">
61 28
               <div>
62 29
                 <img src="../../assets/images/loading.gif" alt="" />
63 30
                 <div>加载中...</div>
64 31
               </div>
65 32
             </div>
66
-            <div
67
-              class="loading display_flex align-items_center justify-content_flex-center"
68
-              *ngIf="!patientList.length && !pLoading"
69
-            >
33
+            <div class="loading display_flex align-items_center justify-content_flex-center" *ngIf="!patientList.length && !pLoading">
70 34
               <div>
71 35
                 <div>暂无数据</div>
72 36
               </div>
@@ -75,101 +39,28 @@
75 39
               <div class="item" *ngFor="let item of patientList">
76 40
                 <div class="itemTit txtC" style="font-weight: bold">
77 41
                   <ng-container *ngIf="item.illnessState">
78
-                    <i
79
-                      *ngIf="item.illnessState.value === '2'"
80
-                      class="colorRed icon_transport transport-wei"
81
-                      nz-tooltip
82
-                      nzTooltipTitle="病危"
83
-                    ></i>
84
-                    <i
85
-                      *ngIf="item.illnessState.value === '3'"
86
-                      class="colorRed icon_transport transport-zhong1"
87
-                      nz-tooltip
88
-                      nzTooltipTitle="病重"
89
-                    ></i>
42
+                    <i *ngIf="item.illnessState.value === '2'" class="colorRed icon_transport transport-wei" nz-tooltip nzTooltipTitle="病危"></i>
43
+                    <i *ngIf="item.illnessState.value === '3'" class="colorRed icon_transport transport-zhong1" nz-tooltip nzTooltipTitle="病重"></i>
90 44
                   </ng-container>
91 45
                   <ng-container *ngIf="item.careLevel">
92
-                    <i
93
-                      *ngIf="item.careLevel.value === '0'"
94
-                      class="icon_transport transport-te1"
95
-                      nz-tooltip
96
-                      nzTooltipTitle="特级护理"
97
-                    ></i>
98
-                    <i
99
-                      *ngIf="item.careLevel.value === '1'"
100
-                      class="icon_transport transport-Bduanshuzi1"
101
-                      nz-tooltip
102
-                      nzTooltipTitle="一级护理"
103
-                    ></i>
104
-                    <i
105
-                      *ngIf="item.careLevel.value === '2'"
106
-                      class="icon_transport transport-Bduanshuzi"
107
-                      nz-tooltip
108
-                      nzTooltipTitle="二级护理"
109
-                    ></i>
110
-                    <i
111
-                      *ngIf="item.careLevel.value === '3'"
112
-                      class="icon_transport transport-Bduanshuzi11"
113
-                      nz-tooltip
114
-                      nzTooltipTitle="三级护理"
115
-                    ></i>
46
+                    <i *ngIf="item.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip nzTooltipTitle="特级护理"></i>
47
+                    <i *ngIf="item.careLevel.value === '1'" class="icon_transport transport-Bduanshuzi1" nz-tooltip nzTooltipTitle="一级护理"></i>
48
+                    <i *ngIf="item.careLevel.value === '2'" class="icon_transport transport-Bduanshuzi" nz-tooltip nzTooltipTitle="二级护理"></i>
49
+                    <i *ngIf="item.careLevel.value === '3'" class="icon_transport transport-Bduanshuzi11" nz-tooltip nzTooltipTitle="三级护理"></i>
116 50
                   </ng-container>
117
-                  <span
118
-                    nz-tooltip
119
-                    [nzTooltipTitle]="recentInfo"
120
-                    nzTooltipPlacement="right"
121
-                    [nzMouseEnterDelay]="1"
122
-                    (mouseenter)="getRecentInfo(item.patientCode)"
123
-                    >{{ item.patientName }}({{ item.bedNum }})</span
124
-                  >
51
+                  <span nz-tooltip [nzTooltipTitle]="recentInfo" nzTooltipPlacement="right" [nzMouseEnterDelay]="1" (mouseenter)="getRecentInfo(item.patientCode)">{{ item.patientName }}({{ item.bedNum }})</span>
125 52
                 </div>
126
-                <div
127
-                  class="checkInfo"
128
-                  nz-row
129
-                  *ngIf="
130
-                    followFlag === '1' &&
131
-                    currentDept.typeValue != 'checkRoom2' &&
132
-                    currentDept.typeValue != 'outpatientDept' &&
133
-                    currentDept.typeValue != 'checkRoom'
134
-                  "
135
-                >
136
-                  <span
137
-                    nz-col
138
-                    nzSpan="2"
139
-                    class="icon_transport transport-zhongdianguanzhu"
140
-                    (click)="follow(item)"
141
-                    [ngStyle]="{
142
-                      color: item.focusPatient === 0 ? 'white' : 'red'
143
-                    }"
144
-                    nz-tooltip
145
-                    [nzTooltipTitle]="
146
-                      item.focusPatient === 0
147
-                        ? '白色心为非特殊关注,需手动建单后配送人员上门送检'
148
-                        : '红色心为特殊关注,患者所有检查会自动建单,配送人员主动上门送检'
149
-                    "
150
-                  ></span>
53
+                <div class="checkInfo" nz-row *ngIf="followFlag === '1' && currentDept.typeValue != 'checkRoom2' && currentDept.typeValue != 'outpatientDept' && currentDept.typeValue != 'checkRoom'">
54
+                  <span nz-col nzSpan="2" class="icon_transport transport-zhongdianguanzhu" (click)="follow(item)" [ngStyle]="{color: item.focusPatient === 0 ? 'white' : 'red'}" nz-tooltip [nzTooltipTitle]="item.focusPatient === 0 ? '白色心为非特殊关注,需手动建单后配送人员上门送检' : '红色心为特殊关注,患者所有检查会自动建单,配送人员主动上门送检'"></span>
151 55
                   <span nz-col nzSpan="2"></span>
152 56
                   <span nz-col nzSpan="12">{{ item.residenceNo }}</span>
153
-                  <span nz-col nzSpan="6" class="txtR"
154
-                    >待检 {{ item.watingCount }}</span
155
-                  >
57
+                  <span nz-col nzSpan="6" class="txtR">待检 {{ item.watingCount }}</span>
156 58
                   <span nz-col nzSpan="2"></span>
157 59
                 </div>
158
-                <div
159
-                  class="checkInfo"
160
-                  nz-row
161
-                  *ngIf="
162
-                    followFlag === '0' ||
163
-                    currentDept.typeValue == 'checkRoom2' ||
164
-                    currentDept.typeValue == 'outpatientDept' ||
165
-                    currentDept.typeValue == 'checkRoom'
166
-                  "
167
-                >
60
+                <div class="checkInfo" nz-row *ngIf="followFlag === '0' || currentDept.typeValue == 'checkRoom2' || currentDept.typeValue == 'outpatientDept' || currentDept.typeValue == 'checkRoom'">
168 61
                   <span nz-col nzSpan="2"></span>
169 62
                   <span nz-col nzSpan="12">{{ item.residenceNo }}</span>
170
-                  <span nz-col nzSpan="6" class="txtR"
171
-                    >待检 {{ item.watingCount }}</span
172
-                  >
63
+                  <span nz-col nzSpan="6" class="txtR">待检 {{ item.watingCount }}</span>
173 64
                   <span nz-col nzSpan="2"></span>
174 65
                 </div>
175 66
                 <div class="btn" (click)="newPatientOrder(item)">一键建单</div>
@@ -180,23 +71,13 @@
180 71
         <!-- 患者信息 -->
181 72
         <div class="checkedInfo patient" style="padding-bottom: 0" *ngIf="(currentDept.typeValue != 'surgery' || (currentDept.typeValue == 'surgery' && this.tabSearchCont)) && currentDept.typeValue != 'recovery'">
182 73
           <overlay-scrollbars #osComponentRef4 class="box">
183
-            <div
184
-              class="loading display_flex align-items_center justify-content_flex-center"
185
-              *ngIf="
186
-                pLoading &&
187
-                (deptTaskTypeRules.openInspection ||
188
-                  deptTaskTypeRules.openPatientTransport)
189
-              "
190
-            >
74
+            <div class="loading display_flex align-items_center justify-content_flex-center" *ngIf="pLoading && (deptTaskTypeRules.openInspection || deptTaskTypeRules.openPatientTransport)">
191 75
               <div>
192 76
                 <img src="../../assets/images/loading.gif" alt="" />
193 77
                 <div>加载中...</div>
194 78
               </div>
195 79
             </div>
196
-            <div
197
-              class="loading display_flex align-items_center justify-content_flex-center"
198
-              *ngIf="!patientList.length && !pLoading"
199
-            >
80
+            <div class="loading display_flex align-items_center justify-content_flex-center" *ngIf="!patientList.length && !pLoading">
200 81
               <div>
201 82
                 <div>暂无数据</div>
202 83
               </div>
@@ -205,79 +86,19 @@
205 86
               <div class="item" *ngFor="let item of patientList">
206 87
                 <div class="itemTit txtC" style="font-weight: bold">
207 88
                   <ng-container *ngIf="item.illnessState">
208
-                    <i
209
-                      *ngIf="item.illnessState.value === '2'"
210
-                      class="colorRed icon_transport transport-wei"
211
-                      nz-tooltip
212
-                      nzTooltipTitle="病危"
213
-                    ></i>
214
-                    <i
215
-                      *ngIf="item.illnessState.value === '3'"
216
-                      class="colorRed icon_transport transport-zhong1"
217
-                      nz-tooltip
218
-                      nzTooltipTitle="病重"
219
-                    ></i>
89
+                    <i *ngIf="item.illnessState.value === '2'" class="colorRed icon_transport transport-wei" nz-tooltip nzTooltipTitle="病危"></i>
90
+                    <i *ngIf="item.illnessState.value === '3'" class="colorRed icon_transport transport-zhong1" nz-tooltip nzTooltipTitle="病重"></i>
220 91
                   </ng-container>
221 92
                   <ng-container *ngIf="item.careLevel">
222
-                    <i
223
-                      *ngIf="item.careLevel.value === '0'"
224
-                      class="icon_transport transport-te1"
225
-                      nz-tooltip
226
-                      nzTooltipTitle="特级护理"
227
-                    ></i>
228
-                    <i
229
-                      *ngIf="item.careLevel.value === '1'"
230
-                      class="icon_transport transport-Bduanshuzi1"
231
-                      nz-tooltip
232
-                      nzTooltipTitle="一级护理"
233
-                    ></i>
234
-                    <i
235
-                      *ngIf="item.careLevel.value === '2'"
236
-                      class="icon_transport transport-Bduanshuzi"
237
-                      nz-tooltip
238
-                      nzTooltipTitle="二级护理"
239
-                    ></i>
240
-                    <i
241
-                      *ngIf="item.careLevel.value === '3'"
242
-                      class="icon_transport transport-Bduanshuzi11"
243
-                      nz-tooltip
244
-                      nzTooltipTitle="三级护理"
245
-                    ></i>
93
+                    <i *ngIf="item.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip nzTooltipTitle="特级护理"></i>
94
+                    <i *ngIf="item.careLevel.value === '1'" class="icon_transport transport-Bduanshuzi1" nz-tooltip nzTooltipTitle="一级护理"></i>
95
+                    <i *ngIf="item.careLevel.value === '2'" class="icon_transport transport-Bduanshuzi" nz-tooltip nzTooltipTitle="二级护理"></i>
96
+                    <i *ngIf="item.careLevel.value === '3'" class="icon_transport transport-Bduanshuzi11"  nz-tooltip nzTooltipTitle="三级护理"></i>
246 97
                   </ng-container>
247
-                  <span
248
-                    nz-tooltip
249
-                    [nzTooltipTitle]="recentInfo"
250
-                    nzTooltipPlacement="right"
251
-                    [nzMouseEnterDelay]="1"
252
-                    (mouseenter)="getRecentInfo(item.patientCode)"
253
-                    >{{ item.patientName }}({{ currentDept.typeValue == 'outpatientService' ? item.cardNo : item.bedNum }})</span
254
-                  >
98
+                  <span nz-tooltip [nzTooltipTitle]="recentInfo" nzTooltipPlacement="right" [nzMouseEnterDelay]="1" (mouseenter)="getRecentInfo(item.patientCode)">{{ item.patientName }}({{ currentDept.typeValue == 'outpatientService' ? item.cardNo : item.bedNum }})</span>
255 99
                 </div>
256
-                <div
257
-                  class="checkInfo"
258
-                  nz-row
259
-                  *ngIf="
260
-                    followFlag === '1' &&
261
-                    currentDept.typeValue != 'checkRoom2' &&
262
-                    currentDept.typeValue != 'outpatientDept' &&
263
-                    currentDept.typeValue != 'checkRoom'
264
-                  "
265
-                >
266
-                  <span
267
-                    nz-col
268
-                    nzSpan="2"
269
-                    class="icon_transport transport-zhongdianguanzhu"
270
-                    (click)="follow(item)"
271
-                    [ngStyle]="{
272
-                      color: item.focusPatient === 0 ? 'white' : 'red'
273
-                    }"
274
-                    nz-tooltip
275
-                    [nzTooltipTitle]="
276
-                      item.focusPatient === 0
277
-                        ? '白色心为非特殊关注,需手动建单后配送人员上门送检'
278
-                        : '红色心为特殊关注,患者所有检查会自动建单,配送人员主动上门送检'
279
-                    "
280
-                  ></span>
100
+                <div class="checkInfo" nz-row *ngIf="followFlag === '1' && currentDept.typeValue != 'checkRoom2' && currentDept.typeValue != 'outpatientDept' && currentDept.typeValue != 'checkRoom'">
101
+                  <span nz-col nzSpan="2" class="icon_transport transport-zhongdianguanzhu" (click)="follow(item)" [ngStyle]="{color: item.focusPatient === 0 ? 'white' : 'red'}" nz-tooltip [nzTooltipTitle]="item.focusPatient === 0 ? '白色心为非特殊关注,需手动建单后配送人员上门送检' : '红色心为特殊关注,患者所有检查会自动建单,配送人员主动上门送检'"></span>
281 102
                   <span nz-col nzSpan="2"></span>
282 103
                   <ng-container *ngIf="currentDept.typeValue == 'outpatientService'">
283 104
                     <span nz-col nzSpan="18">{{ item.identityCardNo }}</span>
@@ -288,16 +109,7 @@
288 109
                   </ng-container>
289 110
                   <span nz-col nzSpan="2"></span>
290 111
                 </div>
291
-                <div
292
-                  class="checkInfo"
293
-                  nz-row
294
-                  *ngIf="
295
-                    followFlag === '0' ||
296
-                    currentDept.typeValue == 'checkRoom2' ||
297
-                    currentDept.typeValue == 'outpatientDept' ||
298
-                    currentDept.typeValue == 'checkRoom'
299
-                  "
300
-                >
112
+                <div class="checkInfo" nz-row *ngIf="followFlag === '0' || currentDept.typeValue == 'checkRoom2' || currentDept.typeValue == 'outpatientDept' || currentDept.typeValue == 'checkRoom'">
301 113
                   <span nz-col nzSpan="2"></span>
302 114
                   <ng-container *ngIf="currentDept.typeValue == 'outpatientService'">
303 115
                     <span nz-col nzSpan="18">{{ item.identityCardNo }}</span>
@@ -319,23 +131,13 @@
319 131
         <!-- 手术安排信息-手术室科室类型 -->
320 132
         <div class="checkedInfo patient" style="padding-bottom: 0" *ngIf="currentDept.typeValue == 'surgery' && !this.tabSearchCont">
321 133
           <overlay-scrollbars #osComponentRef4 class="box">
322
-            <div
323
-              class="loading display_flex align-items_center justify-content_flex-center"
324
-              *ngIf="
325
-                pLoading &&
326
-                (deptTaskTypeRules.openInspection ||
327
-                  deptTaskTypeRules.openPatientTransport)
328
-              "
329
-            >
134
+            <div class="loading display_flex align-items_center justify-content_flex-center" *ngIf="pLoading && (deptTaskTypeRules.openInspection || deptTaskTypeRules.openPatientTransport)">
330 135
               <div>
331 136
                 <img src="../../assets/images/loading.gif" alt="" />
332 137
                 <div>加载中...</div>
333 138
               </div>
334 139
             </div>
335
-            <div
336
-              class="loading display_flex align-items_center justify-content_flex-center"
337
-              *ngIf="!patientList.length && !pLoading"
338
-            >
140
+            <div class="loading display_flex align-items_center justify-content_flex-center" *ngIf="!patientList.length && !pLoading">
339 141
               <div>
340 142
                 <div>暂无数据</div>
341 143
               </div>
@@ -344,44 +146,14 @@
344 146
               <div class="item" *ngFor="let item of patientList">
345 147
                 <div class="itemTit txtC" style="font-weight: bold">
346 148
                   <ng-container *ngIf="item.patientDTO && item.patientDTO.illnessState">
347
-                    <i
348
-                      *ngIf="item.patientDTO && item.patientDTO.illnessState.value === '2'"
349
-                      class="colorRed icon_transport transport-wei"
350
-                      nz-tooltip
351
-                      nzTooltipTitle="病危"
352
-                    ></i>
353
-                    <i
354
-                      *ngIf="item.patientDTO && item.patientDTO.illnessState.value === '3'"
355
-                      class="colorRed icon_transport transport-zhong1"
356
-                      nz-tooltip
357
-                      nzTooltipTitle="病重"
358
-                    ></i>
149
+                    <i *ngIf="item.patientDTO && item.patientDTO.illnessState.value === '2'" class="colorRed icon_transport transport-wei" nz-tooltip nzTooltipTitle="病危"></i>
150
+                    <i *ngIf="item.patientDTO && item.patientDTO.illnessState.value === '3'" class="colorRed icon_transport transport-zhong1" nz-tooltip nzTooltipTitle="病重"></i>
359 151
                   </ng-container>
360 152
                   <ng-container *ngIf="item.patientDTO && item.patientDTO.careLevel">
361
-                    <i
362
-                      *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '0'"
363
-                      class="icon_transport transport-te1"
364
-                      nz-tooltip
365
-                      nzTooltipTitle="特级护理"
366
-                    ></i>
367
-                    <i
368
-                      *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '1'"
369
-                      class="icon_transport transport-Bduanshuzi1"
370
-                      nz-tooltip
371
-                      nzTooltipTitle="一级护理"
372
-                    ></i>
373
-                    <i
374
-                      *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '2'"
375
-                      class="icon_transport transport-Bduanshuzi"
376
-                      nz-tooltip
377
-                      nzTooltipTitle="二级护理"
378
-                    ></i>
379
-                    <i
380
-                      *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '3'"
381
-                      class="icon_transport transport-Bduanshuzi11"
382
-                      nz-tooltip
383
-                      nzTooltipTitle="三级护理"
384
-                    ></i>
153
+                    <i *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '0'" class="icon_transport transport-te1" nz-tooltip nzTooltipTitle="特级护理"></i>
154
+                    <i *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '1'" class="icon_transport transport-Bduanshuzi1" nz-tooltip nzTooltipTitle="一级护理"></i>
155
+                    <i *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '2'" class="icon_transport transport-Bduanshuzi" nz-tooltip nzTooltipTitle="二级护理"></i>
156
+                    <i *ngIf="item.patientDTO && item.patientDTO.careLevel.value === '3'" class="icon_transport transport-Bduanshuzi11" nz-tooltip nzTooltipTitle="三级护理"></i>
385 157
                   </ng-container>
386 158
                   <span>{{ item.patientDTO ? item.patientDTO.patientName : '' }}({{ item.patientDTO ? item.patientDTO.residenceNo : '' }})</span>
387 159
                 </div>
@@ -398,14 +170,6 @@
398 170
             </div>
399 171
           </overlay-scrollbars>
400 172
         </div>
401
-        <!-- 翻页 -->
402
-        <!-- <div class="paging">
403
-          <div>
404
-            <nz-pagination [(nzPageIndex)]="infoPageIdx" [(nzTotal)]="infoLength" (nzPageIndexChange)="getPatient()"
405
-              [nzPageSize]='5' nzSimple>
406
-            </nz-pagination>
407
-          </div>
408
-        </div> -->
409 173
       </div>
410 174
     </nz-sider>
411 175
     <nz-layout class="layout" style="background: #fff; position: relative">
@@ -442,6 +206,7 @@
442 206
           <div class="mainInfo" nz-row>
443 207
             <div nz-col nzSpan="17" class="cont">
444 208
               <div class="top" [ngSwitch]="currentDept.typeValue">
209
+                <ng-container *ngIf="false">
445 210
                 <div class="nums borderB" nz-row *ngSwitchCase="'outpatientService'" hidden></div>
446 211
                 <div class="nums borderB" nz-row *ngSwitchCase="'surgery'">
447 212
                   <!-- 手术未开通 -->
@@ -859,6 +624,7 @@
859 624
                     </div>
860 625
                   </div>
861 626
                 </div>
627
+                </ng-container>
862 628
                 <div class="tab borderB" nz-row style="padding: 4px 0">
863 629
                   <div nz-col nzSpan="21" class="h100p">
864 630
                     <overlay-scrollbars #osComponentRef11 nz-row class="h100p w100">
@@ -2292,36 +2058,6 @@
2292 2058
   </nz-layout>
2293 2059
 </div>
2294 2060
 
2295
-<!-- 返回系统按钮 -->
2296
-<!-- 右侧悬浮框 -->
2297
-<!-- <div id="fixedMenu" class="fixed" *ngIf="mainRole">
2298
-  <div class="right">
2299
-    <div class="fixedMenu hujiaozhongxin">
2300
-      <div class="menuItems">
2301
-        <div class="item">快捷菜单</div>
2302
-      </div>
2303
-    </div>
2304
-    <div class="fixedMenu">
2305
-      <div class="menuItems">
2306
-        <div class="others" [ngStyle]="{'height':showLastItems?(mainRole?(35*2)+'px':(35*1)+'px'):0}">
2307
-          <div [ngClass]="{'item':true,'checked':fixedTab=='back'}" *ngIf="mainRole"
2308
-            (click)="checkFixedTab('toSystem')">
2309
-            返回系统
2310
-          </div>
2311
-        </div>
2312
-      </div>
2313
-      <div class="arrow" *ngIf="!showLastItems" (click)="fixedMenuXiala()">
2314
-        <i class="icon_transport transport-xiala2-01"></i>
2315
-      </div>
2316
-      <div class="arrow" *ngIf="showLastItems" (click)="fixedMenuShangla()">
2317
-        <i class="icon_transport transport-shangla-"></i>
2318
-      </div>
2319
-    </div>
2320
-  </div>
2321
-  <div *ngIf="showLastItems&&fixedTab!=''" (click)="fixedMenuShangla()" class="fixedMark">
2322
-  </div>
2323
-</div> -->
2324
-
2325 2061
 <!-- 患者信息一键建单模态框 -->
2326 2062
 <div
2327 2063
   class="save display_flex align-items_center justify-content_flex-center patient"
@@ -2666,56 +2402,8 @@
2666 2402
               </nz-form-control>
2667 2403
             </nz-form-item>
2668 2404
             <!-- 工单备注 -->
2669
-            <!-- <div *ngIf="isRemarks">
2670
-              <p class="mt8 mb8">工单备注:</p>
2671
-              <textarea
2672
-                nz-input
2673
-                [placeholder]="workOrderRemarkTips1"
2674
-                [nzAutosize]="{ minRows: 3, maxRows: 5 }"
2675
-                maxlength="100"
2676
-                [(ngModel)]="workOrderRemark1"
2677
-                #remarksEle1
2678
-              ></textarea>
2679
-              <p class="mt8 mb8" *ngIf="customRemarks1.length">快捷输入:</p>
2680
-              <div *ngIf="customRemarks1.length">
2681
-                <span
2682
-                  class="addRemarks"
2683
-                  *ngFor="let item of customRemarks1"
2684
-                  (click)="addRemarks1(item)"
2685
-                  >【{{ item }}】</span
2686
-                >
2687
-              </div>
2688
-              <p class="mt8 mb8" *ngIf="historyCustomRemarks1.length">历史输入:</p>
2689
-              <div *ngIf="historyCustomRemarks1.length">
2690
-                <span
2691
-                  class="addRemarks"
2692
-                  *ngFor="let item of historyCustomRemarks1"
2693
-                  (click)="addRemarks1(item)"
2694
-                  >【{{ item }}】</span
2695
-                >
2696
-              </div>
2697
-            </div> -->
2698
-            <!-- 工单备注 -->
2699 2405
             <ng-container *ngIf="isRemarks">
2700 2406
               <nz-form-item>
2701
-                <!-- <p class="mt8 mb8" *ngIf="customRemarks2.length">快捷输入:</p>
2702
-                <div *ngIf="customRemarks2.length">
2703
-                  <span
2704
-                    class="addRemarks"
2705
-                    *ngFor="let item of customRemarks2"
2706
-                    (click)="addRemarks2(item)"
2707
-                    >【{{ item }}】</span
2708
-                  >
2709
-                </div> -->
2710
-                <!-- <p class="mt8 mb8" *ngIf="historyCustomRemarks2.length">历史输入:</p>
2711
-                <div *ngIf="historyCustomRemarks2.length">
2712
-                  <span
2713
-                    class="addRemarks"
2714
-                    *ngFor="let item of historyCustomRemarks2"
2715
-                    (click)="addRemarks2(item)"
2716
-                    >【{{ item }}】</span
2717
-                  >
2718
-                </div> -->
2719 2407
                 <div class="display_flex align-items_center">
2720 2408
                   <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="workOrderRemark2" class="mt8 mb8">工单备注</nz-form-label>
2721 2409
                   <div *ngIf="customRemarks2.length" style="word-break: break-all;">

+ 37 - 38
src/app/views/hushijiandan/hushijiandan.component.less

@@ -102,17 +102,17 @@
102 102
 
103 103
   .nzContent {
104 104
     position: absolute;
105
-    top: 88px;
105
+    top: 48px;
106 106
     bottom: 0;
107 107
     left: 0;
108 108
     right: 0;
109 109
     height: 100%;
110 110
   }
111
-	
111
+
112 112
 	.isKeyClass{
113 113
 		height: 350px !important;
114 114
 	}
115
-	
115
+
116 116
   .modal {
117 117
     // 相对于 background 定位, 位置暂时设置为 0,0,0,0 在指令中将其位置水平垂直居中在页面中间
118 118
     position: absolute;
@@ -142,8 +142,8 @@
142 142
         text-align: center;
143 143
         margin: 0;
144 144
       }
145
-			
146
-			
145
+
146
+
147 147
       .icon-close {
148 148
         position: absolute;
149 149
         top: 0;
@@ -153,7 +153,7 @@
153 153
         color: @hs_border_color;
154 154
       }
155 155
     }
156
-		
156
+
157 157
 		.key{
158 158
 			letter-spacing: 10px;
159 159
 			font-weight: bold;
@@ -164,7 +164,7 @@
164 164
 			top: -15px;
165 165
 			height: 33px;
166 166
 		}
167
-		
167
+
168 168
     .dialog-center {
169 169
       width: 235px;
170 170
       height: 208px;
@@ -266,13 +266,13 @@
266 266
       border-radius: 5px;
267 267
       overflow: hidden;
268 268
       margin-top: 12px;
269
-			
269
+
270 270
 			.weight{
271 271
 				font-weight: 600;
272 272
 				position: relative;
273 273
 				top: -9px;
274 274
 			}
275
-			
275
+
276 276
       div {
277 277
         text-align: center;
278 278
         margin: 0;
@@ -327,7 +327,7 @@
327 327
         padding: 19px 14px 0 14px;
328 328
         max-height: 500px;
329 329
         overflow-y: auto;
330
-				
330
+
331 331
 				.ant-select{
332 332
 					width: 100%;
333 333
 				}
@@ -342,34 +342,34 @@
342 342
 				  position: relative;
343 343
 				  .list-template__nzTable {
344 344
 				    padding: 16px 16px 0;
345
-				
345
+
346 346
 				    .thead {
347 347
 				      background-image: linear-gradient(to right, @bg-start, @bg-end);
348
-				
348
+
349 349
 				      th {
350 350
 				        background: transparent;
351 351
 				        color: #fff;
352 352
 				        text-align: center;
353 353
 				      }
354 354
 				    }
355
-				
355
+
356 356
 				    .ant-table-body {
357 357
 				      border-bottom: 1px solid #e5e9ed;
358 358
 				    }
359
-				
359
+
360 360
 				    .ant-table-tbody {
361 361
 				      tr {
362 362
 				        text-align: center;
363 363
 				        color: #333;
364
-				
364
+
365 365
 				        td {
366 366
 				          border: none;
367
-				
367
+
368 368
 				          &.tab_hover:hover{
369 369
 				            text-decoration: underline;
370 370
 				            cursor: pointer;
371 371
 				          }
372
-				
372
+
373 373
 				          .coop {
374 374
 				            button{
375 375
 				              color: #333;
@@ -379,19 +379,19 @@
379 379
 				              padding: 0 8px;
380 380
 				              cursor: pointer;
381 381
 				              position: relative;
382
-				
382
+
383 383
 				              &::after {
384 384
 				                content: "|";
385 385
 				                position: absolute;
386 386
 				                top: 0;
387 387
 				                right: 0;
388 388
 				              }
389
-				
389
+
390 390
 				              &:hover,
391 391
 				              &:active {
392 392
 				                color: @primary-color;
393 393
 				              }
394
-				
394
+
395 395
 				              &:nth-last-child(1) {
396 396
 				                &::after {
397 397
 				                  content: "";
@@ -411,7 +411,7 @@
411 411
 				    right: 8px;
412 412
 				  }
413 413
 				}
414
-				
414
+
415 415
         .addForm {
416 416
           .ant-form-item {
417 417
             margin-bottom: 14px;
@@ -926,26 +926,25 @@
926 926
       }
927 927
 
928 928
       .sidebar-logo {
929
-        height: 88px;
929
+        height: 48px;
930 930
         overflow: hidden;
931
-        line-height: 88px;
931
+        line-height: 48px;
932 932
         background: #fff;
933 933
         transition: all 0.3s;
934 934
         border-bottom: 1px solid #fff;
935 935
         z-index: 10;
936 936
         position: relative;
937 937
 
938
-        img {
939
-          max-width: 100%;
940
-          max-height: 50%;
941
-          vertical-align: middle;
938
+        .logoTitle{
939
+          padding: 0 8px;
940
+          line-height: normal;
941
+          height:100%;
942 942
         }
943 943
 
944
-        span {
945
-          margin-top: 8px;
944
+        .title {
946 945
           color: @primary-color;
947 946
           font-weight: 600;
948
-          font-size: 14px;
947
+          font-size: 13px;
949 948
         }
950 949
       }
951 950
 
@@ -955,7 +954,7 @@
955 954
         color: #fff;
956 955
         position: absolute;
957 956
         top: 0;
958
-        padding-top: 88px;
957
+        padding-top: 48px;
959 958
         overflow: hidden;
960 959
 
961 960
         .searchBox {
@@ -989,7 +988,7 @@
989 988
           top: 0;
990 989
           height: 100%;
991 990
           width: 110%;
992
-          padding-top: 170px;
991
+          padding-top: 130px;
993 992
           padding-bottom: 60px;
994 993
           overflow: hidden;
995 994
           padding-right: 10%;
@@ -1110,7 +1109,7 @@
1110 1109
         position: absolute;
1111 1110
         top: 0;
1112 1111
         z-index: 9;
1113
-        padding-top: 88px;
1112
+        padding-top: 48px;
1114 1113
         background: rgba(0, 0, 0, 0.5);
1115 1114
         color: #fff;
1116 1115
         font-size: 20px;
@@ -1127,11 +1126,11 @@
1127 1126
       width: 100%;
1128 1127
       z-index: 2;
1129 1128
       background: #fff;
1130
-      height: 88px;
1129
+      height: 48px;
1131 1130
 
1132 1131
       .app-header {
1133 1132
         position: relative;
1134
-        height: 88px;
1133
+        height: 48px;
1135 1134
         padding: 0;
1136 1135
         background: #fff;
1137 1136
         box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
@@ -1139,7 +1138,7 @@
1139 1138
 
1140 1139
         .nurseTitle {
1141 1140
           display: flex;
1142
-          height: 88px;
1141
+          height: 48px;
1143 1142
           font-size: 22px;
1144 1143
           color: #333;
1145 1144
           flex: 1;
@@ -1323,7 +1322,7 @@
1323 1322
             z-index: 9;
1324 1323
 
1325 1324
             .nums {
1326
-              height: 88px;
1325
+              height: 48px;
1327 1326
               position: relative;
1328 1327
 
1329 1328
               div {
@@ -2269,7 +2268,7 @@
2269 2268
     width: 100%;
2270 2269
     height: 100%;
2271 2270
     background: rgba(0, 0, 0, 0.2);
2272
-    z-index: 88;
2271
+    z-index: 48;
2273 2272
   }
2274 2273
 
2275 2274
   & > .left {

+ 4 - 9
src/app/views/nurse-config/nurse-config.component.html

@@ -1,21 +1,16 @@
1 1
 <div class="incidentConfig">
2 2
   <div class="tagsAndTemplete">
3 3
     <div class="tags">
4
-      <div><i class="icon_transport transport-peizhizhongxin"></i>配置中心&emsp;&gt;&emsp;业务流程控制</div>
4
+      <div><i class="icon_transport transport-peizhizhongxin"></i>配置中心&emsp;&gt;&emsp;护士端配置</div>
5 5
       <div class="tagList">
6 6
         <span *ngFor="let tag of tagList" [ngClass]="{ active: activeTagLink === tag.link }" (click)="clickTag(tag)">{{ tag.title }}</span>
7 7
       </div>
8 8
       <button nz-button class="btn default" (click)="goBack()">返回</button>
9 9
     </div>
10 10
   </div>
11
-  <!-- 标本 -->
12
-  <ng-container *ngIf="activeTagLink === 'pageConfigSpecimen'">
13
-    <!-- <app-configuration-specimen></app-configuration-specimen> -->
14
-  </ng-container>
15
-
16
-  <!-- 药品 -->
17
-  <ng-container *ngIf="activeTagLink === 'pageConfigDrug'">
18
-    <!-- <app-configuration-drug></app-configuration-drug> -->
11
+  <!-- 快捷按钮配置 -->
12
+  <ng-container *ngIf="activeTagLink === 'nurseConfigQuick'">
13
+    <app-configuration-quick></app-configuration-quick>
19 14
   </ng-container>
20 15
 </div>
21 16
 

+ 3 - 3
src/app/views/nurse-config/nurse-config.component.ts

@@ -13,7 +13,7 @@ export class NurseConfigComponent implements OnInit, AfterViewInit {
13 13
 
14 14
   // tab
15 15
   tagList:any = [
16
-    // { id: 1, name: '标本',},
16
+    // { id: 1, name: '快捷按钮配置',},
17 17
   ];
18 18
 
19 19
   ngOnInit(): void {}
@@ -21,8 +21,8 @@ export class NurseConfigComponent implements OnInit, AfterViewInit {
21 21
   ngAfterViewInit(){
22 22
     setTimeout(() => {
23 23
       let menus = JSON.parse(localStorage.getItem("menu"));
24
-      let pageConfig = menus.find(item => item.link == 'pageConfig');
25
-      this.tagList = pageConfig ? (pageConfig.childrens || []) : [];
24
+      let nurseConfig = menus.find(item => item.link == 'nurseConfig');
25
+      this.tagList = nurseConfig ? (nurseConfig.childrens || []) : [];
26 26
       this.tagList.length && this.clickTag(this.tagList[0]);
27 27
     }, 0)
28 28
   }

+ 2 - 4
src/app/views/nurse-config/nurse-config.module.ts

@@ -4,15 +4,13 @@ import { CommonModule } from '@angular/common';
4 4
 import { NurseConfigRoutingModule } from './nurse-config-routing.module';
5 5
 import { NurseConfigComponent } from './nurse-config.component';
6 6
 import { ShareModule } from 'src/app/share/share.module';
7
-// import { ConfigurationSpecimenComponent } from 'src/app/components/configurationCenter/configuration-specimen/configuration-specimen.component';
8
-// import { ConfigurationDrugComponent } from 'src/app/components/configurationCenter/configuration-drug/configuration-drug.component';
7
+import { ConfigurationQuickComponent } from 'src/app/components/configurationCenter/configuration-quick/configuration-quick.component';
9 8
 
10 9
 
11 10
 @NgModule({
12 11
   declarations: [
13 12
     NurseConfigComponent,
14
-    // ConfigurationSpecimenComponent,
15
-    // ConfigurationDrugComponent,
13
+    ConfigurationQuickComponent,
16 14
   ],
17 15
   imports: [
18 16
     CommonModule,