chenchuang 2 jaren geleden
bovenliggende
commit
a02e97a51e
1 gewijzigde bestanden met toevoegingen van 7 en 7 verwijderingen
  1. 7 7
      src/app/routes/fbs-scan-code/list/list.component.ts

+ 7 - 7
src/app/routes/fbs-scan-code/list/list.component.ts

@@ -298,13 +298,13 @@ export class FbsScanCodeListComponent implements OnInit {
           ['WBS元素'],
           ['WBS元素描述'],
           ['报工WBS'],
-          ['报工网络'],
-          ['报工活动'],
+          ['网络号'],
+          ['网络活动号'],
+          ['完工成度'],
           ['过账日期'],
-          ['完工数量'],
           ['正常工时'],
           ['单位'],
-          ['完工成度']
+          ['完工数量']
         ]
         data.push(title);
         //添加导出行数据
@@ -319,11 +319,11 @@ export class FbsScanCodeListComponent implements OnInit {
             row.push(element.workReportWbs)
             row.push(element.workReportNetwork)
             row.push(element.workReportingActivities)
-            row.push(fbsWorkingStatistics.end)
-            row.push(element.qualifiedNumber)
+            row.push(element.speedOfProgress)
+            row.push(this.datePipe.transform(fbsWorkingStatistics.end, 'yyyyMMdd'))
             row.push(element.workingHours)
             row.push('H')
-            row.push(element.speedOfProgress)
+            row.push(element.qualifiedNumber)
             data.push(row)
           });
         }