Quellcode durchsuchen

在系统配置管理中增加护士端更新提示

seimin vor 3 Jahren
Ursprung
Commit
14a5a05215

+ 5 - 3
src/app/views/hushijiandan/hushijiandan.component.html

@@ -95,7 +95,8 @@
95 95
       <nz-header>
96 96
         <div class="app-header borderB display_flex justify-content_space-between align-items_center">
97 97
           <div class="nurseTitle display_flex justify-content_space-between align-items_center">
98
-            护士端
98
+            <span>护士端</span>
99
+            <p class="updateTipsForNurses red">{{updateTipsForNurses}}</p>
99 100
             <div class="nurseCode" (click)="showNurseCode()">
100 101
               <i class="nurseCodeIcon icon_transport transport-erweima"></i>二维码
101 102
             </div>
@@ -1268,8 +1269,9 @@
1268 1269
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
1269 1270
   [info]="promptInfo" [back]="back" (closeModel)="closeModel($event)"></app-prompt-modal>
1270 1271
 <!-- 护士端科室切换提示框 -->
1271
-<app-hs-prompt-modal [changeShow]="changeShow" [closeTime]="closeTime" [closeTimeFlag]="closeTimeFlag" [show]="hsPromptModalShow"
1272
-  (closeModelHs)="closeModelHs($event)" (clearModelHs)="clearModelHs($event)"></app-hs-prompt-modal>
1272
+<app-hs-prompt-modal [changeShow]="changeShow" [closeTime]="closeTime" [closeTimeFlag]="closeTimeFlag"
1273
+  [show]="hsPromptModalShow" (closeModelHs)="closeModelHs($event)" (clearModelHs)="clearModelHs($event)">
1274
+</app-hs-prompt-modal>
1273 1275
 <!-- 标本历史记录查看 -->
1274 1276
 <app-history-prompt-modal *ngIf="historyPromptModalShow" [show]="historyPromptModalShow" [scode]="scode"
1275 1277
   (closeModelHs)="closeModelHistory($event)"></app-history-prompt-modal>

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

@@ -14,9 +14,9 @@
14 14
       border: 1px solid red !important;
15 15
     }
16 16
   }
17
-  .pos{
17
+  .pos {
18 18
     position: relative;
19
-    .pos-item{
19
+    .pos-item {
20 20
       position: absolute;
21 21
       left: 100px;
22 22
       top: -10px;
@@ -665,6 +665,12 @@
665 665
           font-size: 22px;
666 666
           color: #333;
667 667
           flex: 1;
668
+          .updateTipsForNurses {
669
+            margin: 0;
670
+            width: 50%;
671
+            line-height: normal;
672
+            font-size: 14px;
673
+          }
668 674
           .nurseCode {
669 675
             width: 80px;
670 676
             font-size: 14px;

+ 17 - 0
src/app/views/hushijiandan/hushijiandan.component.ts

@@ -131,6 +131,7 @@ export class HushijiandanComponent implements OnInit {
131 131
   logTime = 0; //综合日志自动刷新秒数
132 132
   logTimeConst = 30; //综合日志自动刷新秒数
133 133
   ngOnInit() {
134
+    this.getUpdateTipsForNurses();
134 135
     this.getCloseTimeFlag();
135 136
     this.currentUser = this.tool.getCurrentUserDept();
136 137
     console.log(this.currentUser, this.tabSearchCont);
@@ -212,6 +213,22 @@ export class HushijiandanComponent implements OnInit {
212 213
     this.remarksEle.nativeElement.focus();
213 214
     this.workOrderRemark += item;
214 215
   }
216
+  // 获取护士端更新提示
217
+  updateTipsForNurses = '';
218
+  getUpdateTipsForNurses(){
219
+    let postData = {
220
+      idx: 0,
221
+      sum: 1,
222
+      systemConfiguration: { keyconfig: "updateTipsForNurses" },
223
+    };
224
+    this.mainService
225
+      .getFetchDataList("simple/data", "systemConfiguration", postData)
226
+      .subscribe((result) => {
227
+        if (result.status == 200) {
228
+          this.updateTipsForNurses = result.list[0].valueconfig;
229
+        }
230
+      });
231
+  }
215 232
   // 获取护士端弹窗的配置
216 233
   // (1)	当用户设置为正数时,用户必须查看此窗体指定秒数。
217 234
   // (2)	当用户设置为负数时,用户可点击知道了也可倒计时自动关闭。

+ 10 - 2
src/app/views/sys-config/sys-config.component.html

@@ -62,9 +62,9 @@
62 62
           </nz-form-control>
63 63
         </nz-form-item>
64 64
         <nz-form-item class="formItem">
65
-          <nz-form-label [nzSpan]="11" nzFor="deptQRCode" nzRequired class="label">是否开通科室二维码设置
65
+          <nz-form-label [nzSpan]="10" nzFor="deptQRCode" nzRequired class="label">是否开通科室二维码设置
66 66
           </nz-form-label>
67
-          <nz-form-control [nzSpan]="13" nzErrorTip="是否开通科室二维码设置是必填项!">
67
+          <nz-form-control [nzSpan]="14" nzErrorTip="是否开通科室二维码设置是必填项!">
68 68
             <nz-radio-group formControlName="deptQRCode">
69 69
               <label nz-radio nzValue="1">是</label>
70 70
               <label nz-radio nzValue="0">否</label>
@@ -99,6 +99,14 @@
99 99
             <nz-input-number class="w100" formControlName="nurseDeptSwitchTip" [nzStep]="1"></nz-input-number>
100 100
           </nz-form-control>
101 101
         </nz-form-item>
102
+        <nz-form-item class="formItem">
103
+          <nz-form-label [nzSpan]="7" nzFor="updateTipsForNurses" class="label">护士端更新提示
104
+          </nz-form-label>
105
+          <nz-form-control [nzSpan]="17" nzErrorTip="护士端更新提示是必填项!">
106
+            <textarea nz-input placeholder="最多50个字" formControlName="updateTipsForNurses"
107
+              [nzAutosize]="{ minRows: 3, maxRows: 3 }" maxlength="50"></textarea>
108
+          </nz-form-control>
109
+        </nz-form-item>
102 110
       </div>
103 111
     </form>
104 112
   </div>

+ 7 - 0
src/app/views/sys-config/sys-config.component.ts

@@ -38,6 +38,7 @@ export class SysConfigComponent implements OnInit {
38 38
       deptQRCode: [null, [Validators.required]],
39 39
       workOrderSettings: [5, [Validators.required]],
40 40
       nurseDeptSwitchTip: [0, [Validators.required]],
41
+      updateTipsForNurses: [""],
41 42
       defaultRoleOfNurse: [null, [Validators.required]],
42 43
       formUrl: [{ value: null, disabled: true }, [Validators.required]],
43 44
       serviceUrl: [{ value: null, disabled: true }, [Validators.required]],
@@ -96,6 +97,7 @@ export class SysConfigComponent implements OnInit {
96 97
         item.keyconfig === "deptQRCode" ||
97 98
         item.keyconfig === "workOrderSettings" ||
98 99
         item.keyconfig === "nurseDeptSwitchTip" ||
100
+        item.keyconfig === "updateTipsForNurses" ||
99 101
         item.keyconfig === "defaultRoleOfNurse" ||
100 102
         item.keyconfig === "busiViewDeptId"
101 103
     );
@@ -113,6 +115,8 @@ export class SysConfigComponent implements OnInit {
113 115
         item.valueconfig = this.validateForm.controls.workOrderSettings.value;
114 116
       } else if (item.keyconfig === "nurseDeptSwitchTip") {
115 117
         item.valueconfig = this.validateForm.controls.nurseDeptSwitchTip.value;
118
+      } else if (item.keyconfig === "updateTipsForNurses") {
119
+        item.valueconfig = this.validateForm.controls.updateTipsForNurses.value;
116 120
       } else if (item.keyconfig === "defaultRoleOfNurse") {
117 121
         item.valueconfig = this.validateForm.controls.defaultRoleOfNurse.value;
118 122
       } else if (item.keyconfig === "busiViewDeptId") {
@@ -183,6 +187,9 @@ export class SysConfigComponent implements OnInit {
183 187
                 case "nurseDeptSwitchTip":
184 188
                   this.validateForm.controls.nurseDeptSwitchTip.setValue(c[1]);
185 189
                   break;
190
+                case "updateTipsForNurses":
191
+                  this.validateForm.controls.updateTipsForNurses.setValue(c[1]);
192
+                  break;
186 193
                 case "defaultRoleOfNurse":
187 194
                   this.validateForm.controls.defaultRoleOfNurse.setValue(
188 195
                     c[1] - 0