seimin 1 년 전
부모
커밋
b571dfdf3a
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      src/app/views/order-management/order-management.component.html
  2. 1 1
      src/main.ts

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

@@ -115,7 +115,7 @@
115
             <td>{{ data.startDept ? data.startDept.dept : '' }}<br>{{ data.endDeptsName || '' }}</td>
115
             <td>{{ data.startDept ? data.startDept.dept : '' }}<br>{{ data.endDeptsName || '' }}</td>
116
             <td>{{ data.taskType.associationType.name}}<br>{{ data.taskType.taskName }}<ng-container *ngIf="data.goodsRemark">-{{data.goodsRemark}}</ng-container></td>
116
             <td>{{ data.taskType.associationType.name}}<br>{{ data.taskType.taskName }}<ng-container *ngIf="data.goodsRemark">-{{data.goodsRemark}}</ng-container></td>
117
             <td>{{ data.startTime|date:'yyyy-MM-dd HH:mm'}}<br>{{ data.workOrderRemark }}</td>
117
             <td>{{ data.startTime|date:'yyyy-MM-dd HH:mm'}}<br>{{ data.workOrderRemark }}</td>
118
-            <td>{{ data.worker?data.worker.name:'' }}<br>{{ data.grade ? data.grade.estimateGradeTotal : '' }}</td>
118
+            <td>{{ data.worker?data.worker.name:'' }}<br>{{ data.grade ? data.grade.gradeTotal : '' }}</td>
119
             <td>{{ data.gdState.name }}</td>
119
             <td>{{ data.gdState.name }}</td>
120
             <td>
120
             <td>
121
               <div class="coop">
121
               <div class="coop">

+ 1 - 1
src/main.ts

@@ -8,7 +8,7 @@ if (environment.production) {
8
   enableProdMode();
8
   enableProdMode();
9
   if (window) {
9
   if (window) {
10
     window.console.log = function () { };
10
     window.console.log = function () { };
11
-    console.info('v2.4.36');
11
+    console.info('v2.4.37');
12
   }
12
   }
13
 }
13
 }
14
 platformBrowserDynamic().bootstrapModule(AppModule)
14
 platformBrowserDynamic().bootstrapModule(AppModule)