seimin 3 years ago
parent
commit
4dfbfaa7af

+ 18 - 1
src/app/views/hushijiandan/hushijiandan.component.html

@@ -965,7 +965,6 @@
965
       <div class="icon"><i class="icon_transport transport-wenhao"></i></div>
965
       <div class="icon"><i class="icon_transport transport-wenhao"></i></div>
966
       <div class="defeat">{{buildMsg1.msg}}</div>
966
       <div class="defeat">{{buildMsg1.msg}}</div>
967
     </div>
967
     </div>
968
-
969
     <!-- 100013 (护士端一键建单展示策略)取起点科室,和mgs值展示 -->
968
     <!-- 100013 (护士端一键建单展示策略)取起点科室,和mgs值展示 -->
970
     <div class="content" *ngIf='buildMsg1.status==100013'>
969
     <div class="content" *ngIf='buildMsg1.status==100013'>
971
       <div class="jiTit borderB">
970
       <div class="jiTit borderB">
@@ -1052,6 +1051,24 @@
1052
         </form>
1051
         </form>
1053
       </div>
1052
       </div>
1054
     </div>
1053
     </div>
1054
+    <!-- 标本配送备注 -->
1055
+    <!-- baba -->
1056
+    <div *ngIf="buildMsg1.remarksSwitch == 1">
1057
+      <p>工单备注:</p>
1058
+      <textarea nz-input [placeholder]="workOrderRemarkTips"
1059
+        [nzAutosize]="{ minRows: 3, maxRows: 5 }" maxlength="100"
1060
+        [(ngModel)]="workOrderRemark" #remarksEle></textarea>
1061
+      <p class="mt8 mb8" *ngIf="customRemarks.length">快捷输入:</p>
1062
+      <div *ngIf="customRemarks.length">
1063
+        <span class="addRemarks" *ngFor="let item of customRemarks"
1064
+          (click)="addRemarks(item)">【{{item}}】</span>
1065
+      </div>
1066
+      <p class="mt8 mb8" *ngIf="historyCustomRemarks.length">历史输入:</p>
1067
+      <div *ngIf="historyCustomRemarks.length">
1068
+        <span class="addRemarks" *ngFor="let item of historyCustomRemarks"
1069
+          (click)="addRemarks(item)">【{{item}}】</span>
1070
+      </div>
1071
+    </div>
1055
     <div class="btns display_flex justify-content_flex-center">
1072
     <div class="btns display_flex justify-content_flex-center">
1056
       <button *ngIf="buildMsg1.status!=100009&&buildMsg1.status!=100010" nz-button nzType="primary"
1073
       <button *ngIf="buildMsg1.status!=100009&&buildMsg1.status!=100010" nz-button nzType="primary"
1057
         [nzLoading]="btnLoading" (click)="confirmShortcut1()">确认</button>
1074
         [nzLoading]="btnLoading" (click)="confirmShortcut1()">确认</button>

+ 1 - 1
src/app/views/hushijiandan/hushijiandan.component.less

@@ -1513,7 +1513,7 @@
1513
 
1513
 
1514
         &.defeat {
1514
         &.defeat {
1515
           color: #333;
1515
           color: #333;
1516
-          font-size: 18px;
1516
+          font-size: 16px;
1517
         }
1517
         }
1518
 
1518
 
1519
         &.otherInfo {
1519
         &.otherInfo {

+ 22 - 2
src/app/views/hushijiandan/hushijiandan.component.ts

@@ -1770,9 +1770,29 @@ export class HushijiandanComponent implements OnInit {
1770
     };
1770
     };
1771
     this.mainService
1771
     this.mainService
1772
       .postCustom("nurse", "workOrder/buildTrip", postData)
1772
       .postCustom("nurse", "workOrder/buildTrip", postData)
1773
-      .subscribe((data) => {
1773
+      .subscribe((result) => {
1774
         this.shortcutModal = true;
1774
         this.shortcutModal = true;
1775
-        this.buildMsg1 = data;
1775
+        this.buildMsg1 = result;
1776
+        if (result.remarksSwitch == 1) {
1777
+          if (result.customRemarks === null || result.customRemarks === "") {
1778
+            this.customRemarks = [];
1779
+          } else {
1780
+            this.customRemarks = result.customRemarks.split("$");
1781
+          }
1782
+          this.workOrderRemarkTips =
1783
+            result.remarksPrompts || "请填写工单备注,不超过100个字符";
1784
+          let user = JSON.parse(localStorage.getItem("user"));
1785
+          this.mainService
1786
+            .postCustom("nurse", "workOrder/recentRemarks", {
1787
+              deptId: user.user.dept.id,
1788
+              taskTypeId: msg.id,
1789
+            })
1790
+            .subscribe((result1) => {
1791
+              if (result1.state == 200) {
1792
+                this.historyCustomRemarks = result1.data;
1793
+              }
1794
+            });
1795
+        }
1776
       });
1796
       });
1777
   }
1797
   }
1778
   hideShortcutOrder() {
1798
   hideShortcutOrder() {