工单列表统计分类

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-    "target": "http://192.168.3.108",
+    "target": "http://192.168.4.223",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

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

@@ -7,10 +7,10 @@
           <input nz-input class="formItem" placeholder="请输入工单单号" [(ngModel)]="gdcode" />
         </div>
         <div class="list-template__searchItem">
-          <span class="label">工单类型</span>：
+          <span class="label">统计分类</span>：
           <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="false" nzAllowClear
-            nzPlaceHolder="请选择工单类型" [ngModel]="association" (ngModelChange)="selectAssociation($event)">
-            <nz-option *ngFor="let option of allAssociation" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+            nzPlaceHolder="请选择统计分类" [ngModel]="statisticsDateType" (ngModelChange)="selectStatisticsDateType($event)">
+            <nz-option *ngFor="let option of statisticsDateTypeList" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
           </nz-select>
         </div>
         <div class="list-template__searchItem">
@@ -99,7 +99,7 @@
             <th nzWidth="5%">序号</th>
             <th nzWidth="9%">单号|申请科室</th>
             <th nzWidth="18%">起点科室|终点科室</th>
-            <th nzWidth="9%">工单类型|任务类型</th>
+            <th nzWidth="9%">统计分类|任务类型</th>
             <th nzWidth="27%">发起时间|备注</th>
             <th nzWidth="8%">执行人员|总积分</th>
             <th nzWidth="8%">状态|执行时长</th>
@@ -113,7 +113,7 @@
             <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
             <td>{{ data.gdcode }}<br>{{ data.createDeptDTO ? data.createDeptDTO.dept : '' }}</td>
             <td>{{ data.startDept ? data.startDept.dept : '' }}<br>{{ data.endDeptsName || '' }}</td>
-            <td>{{ data.taskType.associationType.name}}<br>{{ data.taskType.taskName }}<ng-container *ngIf="data.goodsRemark">-{{data.goodsRemark}}</ng-container></td>
+            <td>{{ data.taskType.statisticsDateType.name}}<br>{{ data.taskType.taskName }}<ng-container *ngIf="data.goodsRemark">-{{data.goodsRemark}}</ng-container></td>
             <td>{{ data.startTime|date:'yyyy-MM-dd HH:mm'}}<br>{{ data.workOrderRemark }}</td>
             <td>{{ data.worker?data.worker.name:'' }}<br>{{ data.grade ? data.grade.gradeTotal : '' }}</td>
             <td>{{ data.gdState.name }}<br>{{data.showTimeNum}}</td>

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

@@ -46,8 +46,8 @@ export class OrderManagementComponent implements OnInit {
   coopId: string; //表格中执行操作的id
   hospital: string; //选中院区
   gdcode: string = ""; //工单单号
-  association: number; //工单类型
-  allAssociation: any = []; //当前院区所有工单类型
+  statisticsDateType: number; //统计分类
+  statisticsDateTypeList: any = []; //统计分类
   department: any; //所属科室
   alldepart: any = []; //当前院区所属科室
   worker: number; //选择执行配送人员
@@ -95,7 +95,7 @@ export class OrderManagementComponent implements OnInit {
   // 重置
   reset() {
     this.pageIndex = 1;
-    this.association = null;
+    this.statisticsDateType = null;
     this.tasktype = null;
     if (!(this.coopBtns.currentDept && !this.coopBtns.allOrders)) {
       this.department = null;
@@ -122,7 +122,7 @@ export class OrderManagementComponent implements OnInit {
     this.department = null;
     this.worker = null;
     this.tasktype = null;
-    this.association = null;
+    this.statisticsDateType = null;
     this.getDeparts();
     this.getAssociation();
     this.getAllWorker();
@@ -132,11 +132,10 @@ export class OrderManagementComponent implements OnInit {
   // 获取关联类型
   getAssociation() {
     let that = this;
-    console.log(that.mainService.getDictionary("list", "association_types"));
     that.mainService
-      .getDictionary("list", "association_types")
+      .getDictionary("list", "statistics_date_type")
       .subscribe((data) => {
-        that.allAssociation = data;
+        that.statisticsDateTypeList = data;
       });
   }
 
@@ -172,8 +171,8 @@ export class OrderManagementComponent implements OnInit {
         simpleQuery: true,
       },
     };
-    if (that.association) {
-      postData.taskType.associationType = { id: that.association };
+    if (that.statisticsDateType) {
+      postData.taskType.statisticsDateType = { id: that.statisticsDateType };
     }
     that.isLoading = true;
     that.mainService
@@ -183,9 +182,9 @@ export class OrderManagementComponent implements OnInit {
         that.isLoading = false;
       });
   }
-  // 选择工单类型
-  selectAssociation(e) {
-    this.association = e;
+  // 选择统计分类
+  selectStatisticsDateType(e) {
+    this.statisticsDateType = e;
     this.changeTasktype("");
     this.tasktype = null;
   }
@@ -232,9 +231,9 @@ export class OrderManagementComponent implements OnInit {
         delete data.workOrder.deleteFlag;
       }
     }
-    if (that.association) {
+    if (that.statisticsDateType) {
       data.workOrder.taskType = {
-        associationType: { id: that.association },
+        statisticsDateType: { id: that.statisticsDateType },
       };
     }
     if (that.tasktype) {
@@ -438,9 +437,9 @@ export class OrderManagementComponent implements OnInit {
         delete postData.workOrder.deleteFlag;
       }
     }
-    if (that.association) {
+    if (that.statisticsDateType) {
       postData.workOrder.taskType = {
-        associationType: { id: that.association },
+        statisticsDateType: { id: that.statisticsDateType },
       };
     }
     if (that.tasktype) {

src/main.ts

@@ -8,7 +8,7 @@ if (environment.production) {
   enableProdMode();
   if (window) {
     window.console.log = function () { };
-    console.info('v2.4.55');
+    console.info('v2.4.56');
   }
 }
 platformBrowserDynamic().bootstrapModule(AppModule)