优化

src/app/routes/ticket-management/components/billing-order/billing-order.component.ts

@@ -207,27 +207,12 @@ export class BillingOrderComponent implements OnInit {
 
   private initST(): STColumn[] {
     return [
-      { title: '发票号码', index: 'invoiceNum', width: 100, type: 'link', click: item => this.routeTo(item) },
-      { title: '发票代码', index: 'invoiceCode', width: 130 },
       { title: '订单号', index: 'billCode', width: 180 },
       { title: '运单号', index: 'waybillCode', width: 180 },
-      { title: '入站口', index: 'enStationName', width: 100 },
-      { title: '出站口', index: 'exStationName', width: 100 },
-      { title: '司机', render: 'call3No', width: 140 },
-      { title: '车牌号', index: 'carNo', width: 100 },
-      // { title: '里程（km）', index: 'mileage', width: 120 },
-      { title: '交易id', index: 'tradeId', width: 200 },
+      { title: '银行类型', index: 'bankTypeLabel', width: 100 },
+      { title: '网络货运人', index: 'enterpriseInfoName', width: 220 },
       {
-        title: '交易金额（元）',
-        index: 'fee',
-        width: 150,
-        type: 'widget',
-        className: 'text-right',
-        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.fee }) }
-      },
-      { title: '税率', index: 'taxRate', width: 90, format: item => `${item.taxRate ? ((item.taxRate as number) * 100).toFixed(2) : 0}%` },
-      {
-        title: '金额（元）',
+        title: '开票金额（元）',
         index: 'invoiceAmount',
         width: 120,
         type: 'widget',
@@ -235,25 +220,84 @@ export class BillingOrderComponent implements OnInit {
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.invoiceAmount }) }
       },
       {
-        title: '税额（元）',
-        index: 'totalTaxAmount',
-        width: 150,
+        title: '总费用（元）',
+        index: 'totalAmount',
+        width: 120,
         type: 'widget',
         className: 'text-right',
-        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.totalTaxAmount }) }
-      },
-      {
-        title: '价税合计（元）',
-        index: 'totalAmount',
-        width: 150,
-        type: 'widget',
-        className: 'text-right font-weight-bold',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.totalAmount }) }
       },
-      { title: '交易时间', index: 'exTime', type: 'date', width: 150 },
+      {
+        title: '运输费（元）',
+        index: 'shippingFee',
+        width: 120,
+        type: 'widget',
+        className: 'text-right',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.shippingFee }) }
+      },
+      {
+        title: '技术服务费（元）',
+        index: 'invoiceAmount',
+        width: 120,
+        type: 'widget',
+        className: 'text-right',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.invoiceAmount }) }
+      },
+      {
+        title: '附加费（元）',
+        index: 'aliasFee',
+        width: 120,
+        type: 'widget',
+        className: 'text-right',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.aliasFee }) }
+      },
+      {
+        title: '附加费率',
+        className: 'text-right',
+        index: 'aliasFeeRatio',
+        width: 130,
+        format: record => `${record.aliasFeeRatio}%`
+      },
+      { title: '货主名称', index: 'enterpriseName', className: 'text-center', width: '200px' },
+      { title: '所属项目', index: 'projectName', width: 100 },
+      {
+        title: '服务类型',
+        index: 'serviceTypeLabel',
+        width: 150
+      },
+      { title: '装货地', index: 'loadingAddressArr', width: '120px', className: 'text-left' },
+      { title: '卸货地', index: 'dischargeAddress', className: 'text-center'},
+      { title: '货物信息', index: 'goodsName', className: 'text-center', width: '180px' },
+      { title: '车牌号', index: 'carNo', width: 100 },
+      {
+        title: '承运司机',
+        className: 'text-right',
+        width: '150px',
+        render: 'driverName'
+      },
+      {
+        title: '车队长',
+        className: 'text-left',
+        width: '180px',
+        index: 'payeeName',
+        render: 'payeeName'
+      },
+      { title: '业务员',width: '100px', index: 'salesmanName',className: 'text-center', },
+      { title: '录单时间', index: 'recordTime',type: 'date', className: 'text-center', width: '150px' },
+      { title: '装货时间', index: 'loadingTime', type: 'date', width: '150px',className: 'text-center', },
+      { title: '卸货时间', index: 'unloadingTime', type: 'date', width: '150px',className: 'text-center', },
+      { title: '订单完成时间', index: 'billfinTime', type: 'date', width: 150,className: 'text-center', },
+      { title: '支付完成时间', index: 'payfinTime', type: 'date', width: 150,className: 'text-center', },
+      { title: '开票状态', index: 'approvalStatus2', className: 'text-center', width: 180 },
+      { title: '申请开票时间', index: 'approvalInvoiceTime',type: 'date', className: 'text-center', width: 180 },
+      { title: '申请开票编号', index: 'approvalInvoiceNO', className: 'text-center', width: 180 },
+      { title: '分票编号', index: 'vatinvcode',className: 'text-center', },
+      { title: '发票号码', index: 'invoiceNum', width: 100,className: 'text-center', },
+      { title: '发票代码', index: 'invoiceCode', width: 130 },
+      { title: '审核时间', index: 'approveTime',type: 'date', width: 130 },
       { title: '开票日期', index: 'invoiceMakeTime', type: 'date', width: 150 },
-      { title: '销售方', index: 'sellerName', width: 150 },
-      { title: '网络货运人', index: 'enterpriseInfoName', width: 220 }
+      { title: '作废日期', index: 'invalidTime', type: 'date', width: 150 },
+      { title: 'ETC开票金额', render: 'vatmoney', className: 'text-left', width: 200 }
     ];
   }
 }