浏览代码

工单列表备注增加搜索功能

seimin 1 年之前
父节点
当前提交
679abb764f

+ 1 - 1
proxy.conf.json

@@ -1,6 +1,6 @@
1
 {
1
 {
2
   "/service": {
2
   "/service": {
3
-    "target": "http://192.168.3.108",
3
+    "target": "http://192.168.4.241",
4
     "logLevel": "debug",
4
     "logLevel": "debug",
5
     "changeOrigin": true,
5
     "changeOrigin": true,
6
     "pathRewrite": {
6
     "pathRewrite": {

+ 4 - 0
src/app/views/order-management/order-management.component.html

@@ -65,6 +65,10 @@
65
           </nz-select>
65
           </nz-select>
66
         </div>
66
         </div>
67
         <div class="list-template__searchItem">
67
         <div class="list-template__searchItem">
68
+          <span class="label">工单备注</span>:
69
+          <input nz-input class="formItem" placeholder="请输入工单备注" [(ngModel)]="workOrderRemark" />
70
+        </div>
71
+        <div class="list-template__searchItem">
68
           <span class="label">发起时间</span>:
72
           <span class="label">发起时间</span>:
69
           <!-- <nz-range-picker [(ngModel)]="dateRange" (ngModelChange)="changeDate($event)"
73
           <!-- <nz-range-picker [(ngModel)]="dateRange" (ngModelChange)="changeDate($event)"
70
             [nzDisabled]="checkOptionsOne[2]?.checked"></nz-range-picker> -->
74
             [nzDisabled]="checkOptionsOne[2]?.checked"></nz-range-picker> -->

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

@@ -54,6 +54,7 @@ export class OrderManagementComponent implements OnInit {
54
   allTasktype: any = []; //当前院区任务类型列表
54
   allTasktype: any = []; //当前院区任务类型列表
55
   gdState: number; //选择工单状态
55
   gdState: number; //选择工单状态
56
   specialCloseFlag: any; //特殊情况关闭
56
   specialCloseFlag: any; //特殊情况关闭
57
+  workOrderRemark: string = ''; //工单备注
57
   dateRange: any = []; //发起时间
58
   dateRange: any = []; //发起时间
58
   gdStates: any; //工单状态列表
59
   gdStates: any; //工单状态列表
59
   pageIndex: number = 1; //页码
60
   pageIndex: number = 1; //页码
@@ -103,6 +104,7 @@ export class OrderManagementComponent implements OnInit {
103
     this.gdcode = "";
104
     this.gdcode = "";
104
     this.gdState = null;
105
     this.gdState = null;
105
     this.specialCloseFlag = null;
106
     this.specialCloseFlag = null;
107
+    this.workOrderRemark = '';
106
     this.dateRange = [];
108
     this.dateRange = [];
107
     this.changeDate();
109
     this.changeDate();
108
     this.getList();
110
     this.getList();
@@ -255,6 +257,7 @@ export class OrderManagementComponent implements OnInit {
255
     } else if (that.startDate && that.endDate) {
257
     } else if (that.startDate && that.endDate) {
256
       data.workOrder.startTime1 = that.startDate;
258
       data.workOrder.startTime1 = that.startDate;
257
       data.workOrder.endTime1 = that.endDate;
259
       data.workOrder.endTime1 = that.endDate;
260
+      data.workOrder.workOrderRemark = that.workOrderRemark;
258
     }
261
     }
259
     that.mapOfCheckedId = {};
262
     that.mapOfCheckedId = {};
260
     that.checkedDepIds = [];
263
     that.checkedDepIds = [];
@@ -435,6 +438,7 @@ export class OrderManagementComponent implements OnInit {
435
     } else if (that.startDate && that.endDate) {
438
     } else if (that.startDate && that.endDate) {
436
       postData.workOrder.startTime1 = that.startDate;
439
       postData.workOrder.startTime1 = that.startDate;
437
       postData.workOrder.endTime1 = that.endDate;
440
       postData.workOrder.endTime1 = that.endDate;
441
+      postData.workOrder.workOrderRemark = that.workOrderRemark;
438
     }
442
     }
439
     this.loading2 = true;
443
     this.loading2 = true;
440
     that.mainService.dataExport("workOrder", postData).subscribe(
444
     that.mainService.dataExport("workOrder", postData).subscribe(