Bladeren bron

工单列表增加已删除工单查询选项,增加已删除多选框

seimin 3 jaren geleden
bovenliggende
commit
fbbc76f7fe

+ 3 - 0
src/app/services/tool.service.ts

@@ -87,6 +87,9 @@ export class ToolService {
87 87
         case "generateQRcode":
88 88
           coopBtns.generateQRcode = true; //生成二维码
89 89
           break;
90
+        case "deleted":
91
+          coopBtns.deleted = true; //已删除
92
+          break;
90 93
       }
91 94
     });
92 95
     console.log(coopBtns);

+ 3 - 3
src/app/views/order-management/order-management.component.html

@@ -71,8 +71,8 @@
71 71
         </div>
72 72
       </div>
73 73
       <div nz-col nzXl='7' class="list-template__btns">
74
-        <button nz-button class="btn default" *ngIf="coopBtns.del" [disabled]="!checkedDepIds.length"
75
-          (click)='showDelModals($event)'>批量删除</button>
74
+        <button nz-button class="btn default" *ngIf="coopBtns.del"
75
+          [disabled]="!checkedDepIds.length||(checkOptionsOne[3]?.checked)" (click)='showDelModals($event)'>批量删除</button>
76 76
         <button nz-button class="btn default ml8" (click)='search()'>搜索</button>
77 77
         <button nz-button *ngIf="coopBtns.export" class="btn default ml8" (click)='export()'
78 78
           [nzLoading]="loading2">导出</button>
@@ -121,7 +121,7 @@
121 121
             <td>
122 122
               <div class="coop">
123 123
                 <span *ngIf="coopBtns.look" (click)="detail($event,data.id)">查看</span>
124
-                <span *ngIf="coopBtns.del&&data.gdState.value!=6&&data.gdState.value!=7"
124
+                <span *ngIf="coopBtns.del&&data.gdState.value!=6&&data.gdState.value!=7&&!(checkOptionsOne[3]?.checked)"
125 125
                   (click)="showDelModal($event,data.id)">删除</span>
126 126
               </div>
127 127
             </td>

+ 15 - 0
src/app/views/order-management/order-management.component.ts

@@ -25,6 +25,14 @@ export class OrderManagementComponent implements OnInit {
25 25
     });
26 26
     this.initOrderType();
27 27
     this.coopBtns = this.tool.initCoopBtns(this.route);
28
+    if (this.coopBtns.deleted) {
29
+      //是否显示已删除
30
+      this.checkOptionsOne.push({
31
+        label: "已删除",
32
+        value: "3",
33
+        checked: false,
34
+      });
35
+    }
28 36
     this.getAllHos();
29 37
     this.getGdStates();
30 38
   }
@@ -190,6 +198,13 @@ export class OrderManagementComponent implements OnInit {
190 198
         timeOut: that.checkOptionsOne[0].checked ? 1 : 0,
191 199
       },
192 200
     };
201
+    if (that.checkOptionsOne[3]) {
202
+      if (that.checkOptionsOne[3].checked) {
203
+        data.workOrder.deleteFlag = 1;
204
+      } else {
205
+        delete data.workOrder.deleteFlag;
206
+      }
207
+    }
193 208
     if (that.association) {
194 209
       data.workOrder.taskType = {
195 210
         associationType: { id: that.association },