edit

src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html

@@ -28,13 +28,14 @@
         <button nz-button (click)="this.invoiceHongChong()">发票红冲</button>
         <div class="ml-md">
             已选择
-            <strong class="text-red">{{ selectedRows.length }}</strong> 条数据&nbsp;&nbsp; 开票金额总计 <strong class="text-red">{{
+            <strong class="text-red">{{ selectedRows.length }}</strong> 条数据&nbsp;&nbsp; 开票金额总计 <strong
+                class="text-red">{{
                 totalCallNo }}</strong>
             <a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
         </div>
     </div>
 
-    <st #st [data]="service.$mock_url" [columns]="columns"
+    <st #st [data]="service.$api_get_invoice_page" [columns]="columns"
         [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
         [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
         [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
@@ -43,7 +44,9 @@
             {{item.no}}
             <a>预览发票</a>
         </ng-template>
-
+        <ng-template st-row="expresscompany" let-item let-index="index" let-column="column">
+            {{ item.expresscompany }} <br> {{ item.expressno }}
+        </ng-template>
     </st>
 </nz-card>
 

src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.less

@@ -27,11 +27,10 @@
 
 @media (min-width: 1200px) {
     .expend-options {
-        margin-top: -40px;
         max-width : 400px;
         position  : absolute;
         right     : 0;
-        bottom    : 30px;
+        bottom    : 25px;
     }
 
 }

src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts

@@ -32,7 +32,13 @@ export class InvoicedListComponent implements OnInit {
 
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
-      Object.assign(requestOptions.body, { ...this.sf.value });
+      Object.assign(requestOptions.body, {
+        ...this.sf.value,
+        createTime: {
+          start: this.sf.value.createTime?.[0] || '',
+          end: this.sf.value.createTime?.[1] || ''
+        }
+      });
     }
     return requestOptions;
   };
@@ -108,14 +114,14 @@ export class InvoicedListComponent implements OnInit {
             hidden: true
           }
         },
-        orderSn: {
+        invoiceno: {
           type: 'string',
           title: '发票号码',
           ui: {
             autocomplete: 'off'
           }
         },
-        orderSn2: {
+        vatinvcode: {
           type: 'string',
           title: '申请编号',
           ui: {
@@ -126,12 +132,13 @@ export class InvoicedListComponent implements OnInit {
           title: '开票日期',
           type: 'string',
           ui: {
-            widget: 'date',
-            mode: 'range',
-            format: 'yyyy-MM-dd'
+            widget: 'sl-from-to-search',
+            format: 'yyyy-MM-dd',
+            placeholder: '请选择',
+            nzShowTime: true
           } as SFDateWidgetSchema
         },
-        receiveName: {
+        arto: {
           type: 'string',
           title: '购买人',
           enum: [{ label: '全部', value: '全部' }],
@@ -143,17 +150,19 @@ export class InvoicedListComponent implements OnInit {
             }
           }
         },
-        receiveName2: {
+        ltdId: {
           type: 'string',
           title: '网络货运人',
-          enum: [{ label: '全部', value: '全部' }],
           ui: {
             widget: 'select',
             placeholder: '请选择',
+            allowClear: true,
             visibleIf: {
               expand: (value: boolean) => value
-            }
-          }
+            },
+            asyncData: () => this.service.getNetworkFreightForwarder()
+          },
+          default: ''
         }
       }
     };
@@ -162,25 +171,24 @@ export class InvoicedListComponent implements OnInit {
   private initST(): STColumn[] {
     return [
       { title: '', index: 'key', type: 'checkbox' },
-      { title: '发票号码', index: 'no', width: 150 },
-      { title: '申请编号', index: 'callNo', width: 150 },
-      { title: '申请时间', index: 'updatedAt', type: 'date', width: 150 },
-      { title: '发票类型', index: 'callNo', width: 100 },
-      { title: '网络货运人', index: 'callNo', width: 120 },
-      { title: '购买人', index: 'callNo', width: 90 },
-      { title: '订单数', index: 'callNo', width: 90 },
+      { title: '发票号码', index: 'invoiceno', width: 150 },
+      { title: '申请编号', index: 'vatinvcode', width: 150 },
+      { title: '申请时间', index: 'createTime', type: 'date', width: 150 },
+      { title: '发票类型', index: 'invoicetype', width: 100 },
+      { title: '网络货运人', index: 'ltdId', width: 120 },
+      { title: '购买人', index: 'artoname', width: 90 },
+      { title: '订单数', index: 'ordlines', width: 90 },
       { title: '价税合计', index: 'callNo', width: 100 },
-      { title: '金额', index: 'callNo', width: 90 },
+      { title: '金额', index: 'disvatnotax', width: 90 },
       { title: '税率', index: 'callNo', width: 90 },
-      { title: '税额', index: 'callNo', width: 90 },
-      { title: '开票日期', index: 'updatedAt', type: 'date', width: 150 },
+      { title: '税额', index: 'disvattax', width: 90 },
+      { title: '开票日期', index: 'invoicedate', type: 'date', width: 150 },
       {
         title: '快递信息',
-        render: 'logostics',
-        width: 120,
-        format: item => `顺丰快递</br>6202110012313`
+        render: 'expresscompany',
+        width: 120
       },
-      { title: '状态', render: 'logostics', width: 90 },
+      { title: '状态', index: 'sts', width: 90 },
       {
         title: '操作',
         fixed: 'right',
@@ -189,7 +197,7 @@ export class InvoicedListComponent implements OnInit {
         buttons: [
           {
             text: '查看明细',
-            click: item => this.router.navigate(['/ticket/invoice-list/detail/1'])
+            click: item => this.router.navigate(['/ticket/invoice-list/detail/' + item.id])
           },
           {
             text: '查看物流',