edit

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

@@ -27,7 +27,15 @@ export class ETCInvoicedLogsComponent implements OnInit {
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
       Object.assign(requestOptions.body, {
-        ...this.sf.value
+        ...this.sf.value,
+        exTime: {
+          start: this.sf.value.exTime?.[0] || null,
+          end: this.sf.value.exTime?.[1] || null
+        },
+        invoiceMakeTime: {
+          start: this.sf.value.invoiceMakeTime?.[0] || null,
+          end: this.sf.value.invoiceMakeTime?.[1] || null
+        }
       });
     }
     return requestOptions;
@@ -63,7 +71,7 @@ export class ETCInvoicedLogsComponent implements OnInit {
             hidden: true
           }
         },
-        orderSn: {
+        invoiceNum: {
           type: 'string',
           title: '发票号码',
           ui: {
@@ -71,21 +79,21 @@ export class ETCInvoicedLogsComponent implements OnInit {
             autocomplete: 'off'
           }
         },
-        orderS2n1: {
+        billCode: {
           type: 'string',
           title: '订单号',
           ui: {
             placeholder: '请输入'
           }
         },
-        orderSn1: {
+        waybillCode: {
           type: 'string',
           title: '运单号',
           ui: {
             placeholder: '请输入'
           }
         },
-        orderSn2: {
+        carNo: {
           type: 'string',
           title: '车牌号',
           ui: {
@@ -95,7 +103,7 @@ export class ETCInvoicedLogsComponent implements OnInit {
             }
           }
         },
-        createTime: {
+        exTime: {
           title: '交易时间',
           type: 'string',
           ui: {
@@ -106,7 +114,7 @@ export class ETCInvoicedLogsComponent implements OnInit {
             }
           } as SFDateWidgetSchema
         },
-        createTime2: {
+        invoiceMakeTime: {
           title: '开票日期',
           type: 'string',
           ui: {
@@ -117,13 +125,11 @@ export class ETCInvoicedLogsComponent implements OnInit {
             }
           } as SFDateWidgetSchema
         },
-        receiveName2: {
+        sellerName: {
           type: 'string',
           title: '销售方',
-          enum: [{ label: '全部', value: '全部' }],
           ui: {
-            widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请输入',
             visibleIf: {
               expand: (value: boolean) => value
             }
@@ -149,25 +155,25 @@ export class ETCInvoicedLogsComponent implements OnInit {
 
   private initST(): STColumn[] {
     return [
-      { title: '发票号码', index: 'no', width: 100, type: 'link', click: item => this.routeTo(item) },
-      { title: '发票代码', index: 'callNo', width: 100 },
-      { title: '订单号', index: 'callNo', width: 100 },
-      { title: '运单号', index: 'callNo', width: 100 },
-      { title: '入站口', index: 'callNo', width: 100 },
-      { title: '出站口', index: 'callNo', width: 100 },
+      { title: '发票号码', index: 'invoiceNum', width: 100, type: 'link', click: item => this.routeTo(item) },
+      { title: '发票代码', index: 'invoiceCode', width: 100 },
+      { title: '订单号', index: 'billCode', width: 100 },
+      { title: '运单号', index: 'waybillCode', width: 100 },
+      { title: '入站口', index: 'enStationName', width: 100 },
+      { title: '出站口', index: 'exStationName', width: 100 },
       { title: '司机', render: 'call3No', width: 140 },
-      { title: '车牌号', index: 'callNo', width: 100 },
-      { title: '里程（km）', index: 'callNo', width: 120 },
-      { title: '交易id', index: 'callNo', width: 100 },
-      { title: '交易金额（元）', index: 'callNo', width: 130 },
-      { title: '税率', index: 'callNo', width: 90 },
-      { title: '金额（元）', index: 'callNo', width: 120 },
-      { title: '税额（元）', index: 'callNo', width: 120 },
-      { title: '价税合计（元）', index: 'callNo', width: 130 },
-      { title: '交易时间', index: 'updatedAt', type: 'date', width: 150 },
-      { title: '开票日期', index: 'updatedAt', type: 'date', width: 150 },
-      { title: '销售方', index: 'callNo', width: 90 },
-      { title: '网络货运人', index: 'callNo', width: 120 }
+      { title: '车牌号', index: 'carNo', width: 100 },
+      { title: '里程（km）', index: 'mileage', width: 120 },
+      { title: '交易id', index: 'tradeId', width: 100 },
+      { title: '交易金额（元）', index: 'fee', width: 130 },
+      { title: '税率', index: 'taxRate', width: 90 },
+      { title: '金额（元）', index: 'invoiceAmount', width: 120 },
+      { title: '税额（元）', index: 'totalTaxAmount', width: 120 },
+      { title: '价税合计（元）', index: 'totalAmount', width: 130 },
+      { title: '交易时间', index: 'exTime', type: 'date', width: 150 },
+      { title: '开票日期', index: 'invoiceMakeTime', type: 'date', width: 150 },
+      { title: '销售方', index: 'sellerName', width: 90 },
+      { title: '网络货运人', index: 'enterpriseInfoName', width: 120 }
     ];
   }
 }