Explorar o código

护士端快捷输入优化

seimin hai 1 ano
pai
achega
f3e83d7869

+ 1 - 1
proxy.conf.json

@@ -1,6 +1,6 @@
1 1
 {
2 2
   "/service": {
3
-    "target": "http://192.168.3.108",
3
+    "target": "http://192.168.4.170",
4 4
     "logLevel": "debug",
5 5
     "changeOrigin": true,
6 6
     "pathRewrite": {

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

@@ -2493,7 +2493,7 @@
2493 2493
             <!-- 工单备注 -->
2494 2494
             <ng-container *ngIf="isRemarks">
2495 2495
               <nz-form-item>
2496
-                <p class="mt8 mb8" *ngIf="customRemarks2.length">快捷输入:</p>
2496
+                <!-- <p class="mt8 mb8" *ngIf="customRemarks2.length">快捷输入:</p>
2497 2497
                 <div *ngIf="customRemarks2.length">
2498 2498
                   <span
2499 2499
                     class="addRemarks"
@@ -2501,8 +2501,8 @@
2501 2501
                     (click)="addRemarks2(item)"
2502 2502
                     >【{{ item }}】</span
2503 2503
                   >
2504
-                </div>
2505
-                <p class="mt8 mb8" *ngIf="historyCustomRemarks2.length">历史输入:</p>
2504
+                </div> -->
2505
+                <!-- <p class="mt8 mb8" *ngIf="historyCustomRemarks2.length">历史输入:</p>
2506 2506
                 <div *ngIf="historyCustomRemarks2.length">
2507 2507
                   <span
2508 2508
                     class="addRemarks"
@@ -2510,15 +2510,20 @@
2510 2510
                     (click)="addRemarks2(item)"
2511 2511
                     >【{{ item }}】</span
2512 2512
                   >
2513
+                </div> -->
2514
+                <div class="display_flex align-items_center">
2515
+                  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="workOrderRemark2" class="mt8 mb8">工单备注</nz-form-label>
2516
+                  <div *ngIf="customRemarks2.length" style="word-break: break-all;">
2517
+                    <span class="addRemarks" *ngFor="let item of customRemarks2" (click)="addRemarks2(item)">【{{ item }}】</span>
2518
+                  </div>
2513 2519
                 </div>
2514
-                <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="workOrderRemark2" class="mt8 mb8">工单备注</nz-form-label>
2515 2520
                 <nz-form-control>
2516 2521
                   <textarea
2517 2522
                   nz-input
2518 2523
                   [placeholder]="workOrderRemarkTips2"
2519 2524
                   [nzAutosize]="{ minRows: 3, maxRows: 5 }"
2520 2525
                   maxlength="100"
2521
-                  formControlName="workOrderRemark2" 
2526
+                  formControlName="workOrderRemark2"
2522 2527
                   [(ngModel)]="workOrderRemark2"
2523 2528
                   #remarksEle2
2524 2529
                 ></textarea>

+ 11 - 11
src/app/views/hushijiandan/hushijiandan.component.ts

@@ -1942,17 +1942,17 @@ export class HushijiandanComponent implements OnInit {
1942 1942
           }
1943 1943
           that.workOrderRemarkTips2 =
1944 1944
           data.remarksPrompts || "请填写工单备注,不超过100个字符";
1945
-          let user = JSON.parse(localStorage.getItem("user"));
1946
-          that.mainService
1947
-            .postCustom("nurse", "workOrder/recentRemarks", {
1948
-              deptId: user.user.dept.id,
1949
-              taskTypeId: that.patientForm.controls.checkedType.value,
1950
-            })
1951
-            .subscribe((result) => {
1952
-              if (result.state == 200) {
1953
-                that.historyCustomRemarks2 = result.data;
1954
-              }
1955
-            });
1945
+          // let user = JSON.parse(localStorage.getItem("user"));
1946
+          // that.mainService
1947
+          //   .postCustom("nurse", "workOrder/recentRemarks", {
1948
+          //     deptId: user.user.dept.id,
1949
+          //     taskTypeId: that.patientForm.controls.checkedType.value,
1950
+          //   })
1951
+          //   .subscribe((result) => {
1952
+          //     if (result.state == 200) {
1953
+          //       that.historyCustomRemarks2 = result.data;
1954
+          //     }
1955
+          //   });
1956 1956
         }
1957 1957
         // 工单备注配置 end
1958 1958
         that.linkCheckLis = [];