优化

src/app/views/order-management/order-management.component.ts

@@ -5,6 +5,7 @@ import { MainService } from "../../services/main.service";
 import { ToolService } from "../../services/tool.service";
 import { Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
+import { NzMessageService } from 'ng-zorro-antd/message';
 @Component({
   selector: "app-order-management",
   templateUrl: "./order-management.component.html",
@@ -15,7 +16,8 @@ export class OrderManagementComponent implements OnInit {
     public route: ActivatedRoute,
     private router: Router,
     private mainService: MainService,
-    private tool: ToolService
+    private tool: ToolService,
+    private message: NzMessageService,
   ) {}
   searchTimerSubject = new Subject();
   ngOnInit() {
@@ -190,6 +192,11 @@ export class OrderManagementComponent implements OnInit {
   // 表格数据
   loading1 = false;
   getList() {
+    // 有备注，无发起时间则提示
+    if(this.workOrderRemark && !this.dateRange.length){
+      this.message.info('请选择发起时间！');
+      return;
+    }
     // 三个权限都没有，则不展示
     if(!this.coopBtns.currentDept && !this.coopBtns.currentUser && !this.coopBtns.allOrders){
       this.listOfData = [];
@@ -399,6 +406,15 @@ export class OrderManagementComponent implements OnInit {
   // 导出
   loading2 = false;
   export() {
+    // 有备注，无发起时间则提示
+    if(this.workOrderRemark && !this.dateRange.length){
+      this.message.info('请选择发起时间！');
+      return;
+    }
+    // 三个权限都没有，则不展示
+    if(!this.coopBtns.currentDept && !this.coopBtns.currentUser && !this.coopBtns.allOrders){
+      return;
+    }
     let that = this;
     let postData: any = {
       idx: that.pageIndex - 1,
@@ -406,12 +422,21 @@ export class OrderManagementComponent implements OnInit {
       workOrder: {
         worker: { id: that.worker },
         gdState: { id: that.gdState },
+        gdcode: this.gdcode,
+        specialCloseFlag: that.specialCloseFlag,
         createDept: that.department,
         hosId: that.hospital,
         abnormityType: that.checkOptionsOne[1].checked ? 1 : undefined,
         timeOut: that.checkOptionsOne[0].checked ? 1 : 0,
       },
     };
+    if (that.checkOptionsOne[2]) {
+      if (that.checkOptionsOne[2].checked) {
+        postData.workOrder.deleteFlag = 1;
+      } else {
+        delete postData.workOrder.deleteFlag;
+      }
+    }
     if (that.association) {
       postData.workOrder.taskType = {
         associationType: { id: that.association },
@@ -426,6 +451,12 @@ export class OrderManagementComponent implements OnInit {
     if (!postData.workOrder.gdState.id) {
       delete postData.workOrder.gdState;
     }
+    if (
+      postData.workOrder.specialCloseFlag === undefined ||
+      postData.workOrder.specialCloseFlag === null
+    ) {
+      delete postData.workOrder.specialCloseFlag;
+    }
     if (!postData.workOrder.createDept) {
       delete postData.workOrder.createDept;
     }
@@ -440,6 +471,9 @@ export class OrderManagementComponent implements OnInit {
       postData.workOrder.endTime1 = that.endDate;
       postData.workOrder.workOrderRemark = that.workOrderRemark;
     }
+    that.mapOfCheckedId = {};
+    that.checkedDepIds = [];
+    that.isAllDisplayDataChecked = false;
     this.loading2 = true;
     that.mainService.dataExport("workOrder", postData).subscribe(
       (data) => {