Merge branch 'lmm' into develop

src/app/share/detail-sample/detail-sample.component.html

@@ -17,6 +17,8 @@
         <div nz-col nzSpan="8">目标科室：{{endDepts}}</div>
         <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息：{{orderInfo.worker.name}}</div>
         <div nz-col nzSpan="8">实际接收：{{orderInfo.actualReceiveNum?orderInfo.actualReceiveNum:''}}</div>
+        <div nz-col nzSpan="24" *ngIf="orderInfo.workOrderRemark">备注信息：{{orderInfo.workOrderRemark}}
+        </div>
         <div nz-col nzSpan="24" *ngIf="orderInfo.specialCloseReason">
           特殊情况关闭原因：{{orderInfo.specialCloseReason}}
         </div>

src/app/share/order-detail/order-detail.component.html

@@ -95,6 +95,10 @@
               加急状态：{{orderInfo.urgentDetails.checkStatus.name}}</div>
             <div nz-col nzSpan="24" class="jiaji">加急原因：{{orderInfo.urgentDetails.urgentReason}}</div>
           </div>
+          <div class="info" nz-row *ngIf="orderInfo.workOrderRemark!==undefined">
+            <div nz-col nzSpan="24">备注信息：{{orderInfo.workOrderRemark||'-'}}
+            </div>
+          </div>
           <div class="info" nz-row *ngIf="orderInfo.specialCloseReason!==undefined">
             <div nz-col nzSpan="24">特殊情况关闭原因：{{orderInfo.specialCloseReason||'-'}}
             </div>

src/app/views/hushijiandan/hushijiandan.component.html

@@ -1055,18 +1055,18 @@
     <!-- baba -->
     <div *ngIf="buildMsg1.remarksSwitch == 1">
       <p>工单备注：</p>
-      <textarea nz-input [placeholder]="workOrderRemarkTips"
+      <textarea nz-input [placeholder]="workOrderRemarkTips1"
         [nzAutosize]="{ minRows: 3, maxRows: 5 }" maxlength="100"
-        [(ngModel)]="workOrderRemark" #remarksEle></textarea>
-      <p class="mt8 mb8" *ngIf="customRemarks.length">快捷输入：</p>
-      <div *ngIf="customRemarks.length">
-        <span class="addRemarks" *ngFor="let item of customRemarks"
-          (click)="addRemarks(item)">【{{item}}】</span>
+        [(ngModel)]="workOrderRemark1" #remarksEle1></textarea>
+      <p class="mt8 mb8" *ngIf="customRemarks1.length">快捷输入：</p>
+      <div *ngIf="customRemarks1.length">
+        <span class="addRemarks" *ngFor="let item of customRemarks1"
+          (click)="addRemarks1(item)">【{{item}}】</span>
       </div>
-      <p class="mt8 mb8" *ngIf="historyCustomRemarks.length">历史输入：</p>
-      <div *ngIf="historyCustomRemarks.length">
-        <span class="addRemarks" *ngFor="let item of historyCustomRemarks"
-          (click)="addRemarks(item)">【{{item}}】</span>
+      <p class="mt8 mb8" *ngIf="historyCustomRemarks1.length">历史输入：</p>
+      <div *ngIf="historyCustomRemarks1.length">
+        <span class="addRemarks" *ngFor="let item of historyCustomRemarks1"
+          (click)="addRemarks1(item)">【{{item}}】</span>
       </div>
     </div>
     <div class="btns display_flex justify-content_flex-center">

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -46,6 +46,7 @@ function range(start: number, end: number): number[] {
 })
 export class HushijiandanComponent implements OnInit {
   @ViewChild("remarksEle", { static: false }) remarksEle: ElementRef;
+  @ViewChild("remarksEle1", { static: false }) remarksEle1: ElementRef;
   @ViewChild("osComponentRef1", {
     read: OverlayScrollbarsComponent,
     static: false,
@@ -206,13 +207,21 @@ export class HushijiandanComponent implements OnInit {
 
   btnLoading: boolean = false; //确认按钮loading状态
   workOrderRemark = ""; //备注
+  workOrderRemark1 = ""; //备注
   workOrderRemarkTips = ""; //备注提示
+  workOrderRemarkTips1 = ""; //备注提示
   customRemarks = []; //备注快速输入
+  customRemarks1 = []; //备注快速输入
   // 添加备注
   addRemarks(item) {
     this.remarksEle.nativeElement.focus();
     this.workOrderRemark += item;
   }
+  // 添加备注
+  addRemarks1(item) {
+    this.remarksEle1.nativeElement.focus();
+    this.workOrderRemark1 += item;
+  }
   // 获取护士端更新提示
   updateTipsForNurses = "";
   getUpdateTipsForNurses() {
@@ -1757,7 +1766,11 @@ export class HushijiandanComponent implements OnInit {
   buildMsg1: any = {}; //一键发起返回信息
   urgentFlag = false;
   // 打开一键发起建单模态框,urgent为true的时候是紧急
+  historyCustomRemarks1 = [];
   newShortcutOrder1(msg, type, urgent?) {
+    this.workOrderRemark1 = "";
+    this.customRemarks1 = [];
+    this.historyCustomRemarks1 = [];
     console.log(msg, type);
     this.urgentFlag = Boolean(urgent);
     this.buildType = type;
@@ -1775,11 +1788,11 @@ export class HushijiandanComponent implements OnInit {
         this.buildMsg1 = result;
         if (result.remarksSwitch == 1) {
           if (result.customRemarks === null || result.customRemarks === "") {
-            this.customRemarks = [];
+            this.customRemarks1 = [];
           } else {
-            this.customRemarks = result.customRemarks.split("$");
+            this.customRemarks1 = result.customRemarks.split("$");
           }
-          this.workOrderRemarkTips =
+          this.workOrderRemarkTips1 =
             result.remarksPrompts || "请填写工单备注,不超过100个字符";
           let user = JSON.parse(localStorage.getItem("user"));
           this.mainService
@@ -1789,7 +1802,7 @@ export class HushijiandanComponent implements OnInit {
             })
             .subscribe((result1) => {
               if (result1.state == 200) {
-                this.historyCustomRemarks = result1.data;
+                this.historyCustomRemarks1 = result1.data;
               }
             });
         }
@@ -1842,6 +1855,7 @@ export class HushijiandanComponent implements OnInit {
       postData = {
         urgent: this.urgentFlag ? 1 : 0,
         workOrder: {
+          workOrderRemark: this.workOrderRemark1,
           taskType: { id: that.shortcutMsg1.id },
           createDept: that.loginUserDeptId,
           startDept: { id: that.loginUserDeptId },

src/polyfills.ts

@@ -13,6 +13,62 @@
  *
  * Learn more in https://angular.io/guide/browser-support
  */
+// Array.prototype.includes()兼容问题，2021年7月21日-seimin
+if (!Array.prototype.includes) {
+  Object.defineProperty(Array.prototype, "includes", {
+    value: function (valueToFind, fromIndex) {
+      if (this == null) {
+        throw new TypeError('"this" is null or not defined');
+      }
+
+      // 1. Let O be ? ToObject(this value).
+      var o = Object(this);
+
+      // 2. Let len be ? ToLength(? Get(O, "length")).
+      var len = o.length >>> 0;
+
+      // 3. If len is 0, return false.
+      if (len === 0) {
+        return false;
+      }
+
+      // 4. Let n be ? ToInteger(fromIndex).
+      //    (If fromIndex is undefined, this step produces the value 0.)
+      var n = fromIndex | 0;
+
+      // 5. If n ≥ 0, then
+      //  a. Let k be n.
+      // 6. Else n < 0,
+      //  a. Let k be len + n.
+      //  b. If k < 0, let k be 0.
+      var k = Math.max(n >= 0 ? n : len - Math.abs(n), 0);
+
+      function sameValueZero(x, y) {
+        return (
+          x === y ||
+          (typeof x === "number" &&
+            typeof y === "number" &&
+            isNaN(x) &&
+            isNaN(y))
+        );
+      }
+
+      // 7. Repeat, while k < len
+      while (k < len) {
+        // a. Let elementK be the result of ? Get(O, ! ToString(k)).
+        // b. If SameValueZero(valueToFind, elementK) is true, return true.
+        if (sameValueZero(o[k], valueToFind)) {
+          return true;
+        }
+        // c. Increase k by 1.
+        k++;
+      }
+
+      // 8. Return false
+      return false;
+    },
+  });
+}
 // (function () {
 //     Object.setPrototypeOf = Object.setPrototypeOf || ({ __proto__: [] } instanceof Array ? setProtoOf : mixinProperties);
 
@@ -179,9 +235,7 @@
  * APPLICATION IMPORTS
  */
 
-
-import 'zone.js/dist/zone';  // Included with Angular CLI.
-
+import "zone.js/dist/zone"; // Included with Angular CLI.
 
 // import 'babel-polyfill';