Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

src/app/routes/datatable/components/invoicetable/invoicetable.component.html

@@ -25,5 +25,8 @@
   <ng-template st-row="unInvoicedAmountCurMonth" let-item let-index="index">
     {{item.unInvoicedAmountCurMonth | currency}}
   </ng-template>
+  <ng-template st-row="invoicedAmount" let-item let-index="index">
+    {{item.invoicedAmount | currency}}
+  </ng-template>
   </st>
 </nz-card>

src/app/routes/datatable/components/invoicetable/invoicetable.component.ts

@@ -55,6 +55,11 @@ export class DatatableInvoicetableComponent implements OnInit {
         title: '申请待开客户',
         index: 'applyWaitCustomer',
       },
+      {
+        title: '已开票金额',
+        index: 'invoicedAmount',
+        render: 'invoicedAmount',
+      },
       {
         title: '未申请开票金额（历史）',
         index: 'unInvoicedAmountHistory',