修改

src/app/views/form-management-detail/form-management-detail.component.ts

@@ -51,7 +51,7 @@ export class FormManagementDetailComponent implements OnInit {
             id: v,
             name: Object.values(Object.values(data[v])[0])[0][0][3],
             departments: (
-              Object.values(data[v]).map(vv => Object.keys(vv).map(vvv => ({id: vvv, name: vv[vvv][0][6], orders: vv[vvv], checked: false, isDisabled: vv[vvv].every(vvvv => !(vvvv[12] == 2 || (!vvvv[8] && vvvv[12] != 2)))}))) as any
+              Object.values(data[v]).map(vv => Object.keys(vv).map(vvv => ({id: vvv, name: vv[vvv][0][6], orders: vv[vvv], checked: false, isDisabled: vv[vvv].every(vvvv => !(vvvv[12] == 2 || (!vvvv[8] && vvvv[12] != 2 && vvvv[12] != 6 && vvvv[12] != 7 && vvvv[12] != 11)))}))) as any
             ).flat()
           }));
           console.log(buildings)
@@ -72,7 +72,7 @@ export class FormManagementDetailComponent implements OnInit {
     this.buildings.forEach(v => {
       v.departments.forEach(vv => {
         if(vv.checked){
-          arr = arr.concat(vv.orders.filter(vvv => vvv[12] == 2 || (!vvv[8] && vvv[12] != 2)));
+          arr = arr.concat(vv.orders.filter(vvv => vvv[12] == 2 || (!vvv[8] && vvv[12] != 2 && vvv[12] != 6 && vvv[12] != 7 && vvv[12] != 11)));
         }
       })
     })
@@ -87,7 +87,7 @@ export class FormManagementDetailComponent implements OnInit {
       if (item[12] == 2) {
         //普通派单
         ids_types.push(`${item[9]}_assign`);
-      } else if (!item[8] && item[12] != 2) {
+      } else if (!item[8] && item[12] != 2 && item[12] != 6 && item[12] != 7 && item[12] != 11) {
         ids_types.push(`${item[9]}_reassign`);
       }
       stateIds.push(item[10]);

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

@@ -1378,7 +1378,7 @@
                                       *ngIf="buildMsg.reserveUserSwitch == 1"
                                     >
                                       <p>工号：</p>
-                                      <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchAccount($event)" nzPlaceHolder="请选择" [(ngModel)]="account">
+                                      <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchAccount($event)" nzPlaceHolder="请选择" [(ngModel)]="account" (ngModelChange)="changeAccount($event)">
                                         <ng-container *ngFor="let option of accountList">
                                           <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id">
                                           </nz-option>
@@ -3849,5 +3849,5 @@
 (confirmDelEvent)="confirmSendAwakeningRoom($event)" [content]="sendAwakeningRoomInfo" [isChecked]="surgeryConfigs && surgeryConfigs.remandClean == 1" [isSelected]="surgeryCarryingCourse && (surgeryCarryingCourse.departmentStrategy.value == 2 || surgeryCarryingCourse.departmentStrategy.value == 3)" [isSelectedArr]="surgeryCarryingCourseDepts" [deptDisplay]="deptDisplay"></app-dialog-delete>
 
 <!-- 是否限制业务发起时间模态框 -->
-<app-dialog-delete [delModal]="limitTimeModal" (hideDelModalEvent)="hideLimitTimeModal()" [btnLoading]="btnLoading"
+<app-dialog-delete [delModal]="limitTimeModal" (hideDelModalEvent)="hideLimitTimeModal()" [btnLoading]="limitTimeLoading"
 (confirmDelEvent)="confirmLimitTime()" [content]="limitTimeInfo" confirmTxt="继续建单"></app-dialog-delete>

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

@@ -2677,6 +2677,11 @@ export class HushijiandanComponent implements OnInit {
       return { required: true };
     }
   };
+  // 修改工号
+  userAccount = null;
+  changeAccount(e){
+    this.userAccount =this.accountList.find(v => v.id == e);
+  }
   // 一键发起建单保存
   loading5 = false;
   confirmShortcut() {
@@ -2691,15 +2696,11 @@ export class HushijiandanComponent implements OnInit {
     let postData;
     that.buildType = "other";
     if (that.buildType == "other") {
-      let userAccount = null;
-      if(this.account){
-        userAccount = this.accountList.find(v => v.id == this.account);
-      }
       // 其他
       postData = {
         workOrder: {
           sourceId: SourceId.hushi,
-          workOrderRemark: userAccount ? `${userAccount.account}-${userAccount.name}:${this.workOrderRemark}` : this.workOrderRemark,
+          workOrderRemark: this.userAccount ? `${this.userAccount.account}-${this.userAccount.name}:${this.workOrderRemark}` : this.workOrderRemark,
           taskType: { id: that.shortcutMsg.id },
           createDept: that.loginUserDeptId,
           startDept: { id: that.buildMsg.startDept },
@@ -2866,9 +2867,9 @@ export class HushijiandanComponent implements OnInit {
   }
   // 确认
   jdFlagId;
+  limitTimeLoading:boolean = false;
   confirmLimitTime() {
     console.log(this.limitTimeItem);
-    this.btnLoading = true;
     this.limitTimeModal = false;
     this.jdFlagId = this.message.loading("正在加载中..", {
       nzDuration: 0,

src/app/views/task-type-management/task-type-management.component.ts

@@ -112,7 +112,7 @@ export class TaskTypeManagementComponent implements OnInit {
   isDigitalHandover = "0"; //是否允许数字交接
   reserveSwitch = "0"; //是否预定工单
   reserveUserSwitch = "0"; //是否需要填写工号
-  reserveType = "0"; //是否限制业务发起时间
+  reserveType = "1"; //是否限制业务发起时间
   reserveTypes:any = []; //是否限制业务发起时间-字典
   reserveDate = null; //是否限制业务发起时间-时间
   reserveMsg = ''; //是否限制业务发起时间-提示
@@ -1380,6 +1380,10 @@ export class TaskTypeManagementComponent implements OnInit {
     this.remarks = ""; //提前生效时间，默认20分钟
     this.quickRemarks = ""; //备注快速输入
     this.styleType = false;
+    this.isRepeatCreateOder = '2';
+    this.reserveType = '1';
+    this.reserveSwitch = '0';
+    this.reserveUserSwitch = '0';
     this.styleDes(this.styleType);
     this.carryingCourses = [
       {

src/polyfills.ts

@@ -69,6 +69,38 @@ if (!Array.prototype.includes) {
     },
   });
 }
+if (!Object.values) {
+  Object.values = function(obj) {
+    if (obj !== Object(obj)) throw new TypeError('Object.values called on a non-object');
+    var val=[],key;
+    for (key in obj) {
+        if (Object.prototype.hasOwnProperty.call(obj,key)) {
+            val.push(obj[key]);
+        }
+    }
+    return val;
+  }
+}
+
+if(!Array.prototype['flat']){
+  Array.prototype['flat'] = function(depth = 1) {
+    if (!Number(depth) || Number(depth) < 0) {
+        return this
+    }
+    let arr = this // 获得调用 fakeFlat 函数的数组
+    while (depth > 0) {
+        if (arr.some(item => Array.isArray(item))) {
+             // 数组中还有数组元素的话并且 num > 0，继续展开一层数组
+            arr = [].concat.apply([], arr)
+        } else {
+            break // 数组中没有数组元素并且不管 num 是否依旧大于 0，停止循环。
+        }
+        depth--
+    }
+    return arr
+  }
+}
+
 // (function () {
 //     Object.setPrototypeOf = Object.setPrototypeOf || ({ __proto__: [] } instanceof Array ? setProtoOf : mixinProperties);