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',

src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts

@@ -90,15 +90,16 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
           ui: {
             placeholder: '请选择',
             widget: 'select',
-            containsAllLabel: true,
+            containsAllLabel: true
           },
           default: ''
         },
-        resourceCode: {
+        declareResult: {
           type: 'string',
           title: '申报结果',
           ui: {
-            placeholder: '请输入'
+            placeholder: '请选择',
+            widget: 'select',
           }
         },
         overdueStatus: {
@@ -112,11 +113,11 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
           ui: {
             placeholder: '请选择',
             widget: 'select',
-            containsAllLabel: true,
+            containsAllLabel: true
           },
           default: ''
         },
-        skss: {
+        taxMonth: {
           title: '税款所属期',
           type: 'string',
           ui: {

src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts

@@ -87,12 +87,22 @@ export class InvoiceRequestedDetailComponent implements OnInit {
       this.service.msgSrv.warning('请选择订单！');
       return;
     }
+    let rows: any[] = [];
+    if (status === '1') {
+      rows = this.st._data.map(item => {
+        const rs = Object.assign({}, { ...item });
+        delete rs._values;
+        return rs;
+      });
+    } else {
+      rows = [...this.selectedRows];
+    }
     const modal = this.nzModalService.create({
       nzTitle: '开票',
       nzContent: RequestedDetailComponent,
       nzWidth: 800,
       nzComponentParams: {
-        i: this.selectedRows,
+        i: rows,
         status: status,
         Id: this.id
       },
@@ -102,14 +112,14 @@ export class InvoiceRequestedDetailComponent implements OnInit {
           label: '手工处理',
           onClick: () => {
             const params = {
-              ficoVatappBillVOList: this.selectedRows,
+              ficoVatappBillVOList: rows,
               id: this.id
             };
             this.service.request(this.service.$api_get_applyFicoVatinv, params).subscribe((res: any) => {
               if (res) {
                 this.loadHeadInfo();
                 this.st.load(1);
-                this.service.msgSrv.success('开票成功');
+                this.service.msgSrv.success('提交成功');
                 modal.destroy();
               }
             });
@@ -120,14 +130,14 @@ export class InvoiceRequestedDetailComponent implements OnInit {
           label: '自动开票',
           onClick: () => {
             const params = {
-              ficoVatappBillVOList: this.selectedRows,
+              ficoVatappBillVOList: rows,
               id: this.id
             };
             this.service.request(this.service.$api_get_applyFicoVatinv, params).subscribe((res: any) => {
               if (res) {
                 this.loadHeadInfo();
                 this.st.load(1);
-                this.service.msgSrv.success('开票成功');
+                this.service.msgSrv.success('提交成功');
                 modal.destroy();
               }
             });